Merge branch 'master' of https://github.com/samuelclay/NewsBlur into ipad

apps/feed_import/models.py

@@ -218,8 +218,10 @@ class GoogleReaderImporter(Importer):
         self.subscription_folders = []
         self.scope = "http://www.google.com/reader/api"
         self.xml = xml
+        self.auto_active = False
     
-    def import_feeds(self):
+    def import_feeds(self, auto_active=False):
+        self.auto_active = auto_active
         sub_url = "%s/0/subscription/list" % self.scope
         if not self.xml:
             feeds_xml = self.send_request(sub_url)
@@ -296,7 +298,7 @@ class GoogleReaderImporter(Importer):
                 defaults={
                     'needs_unread_recalc': True,
                     'mark_read_date': datetime.datetime.utcnow() - datetime.timedelta(days=1),
-                    'active': self.user.profile.is_premium,
+                    'active': self.user.profile.is_premium or self.auto_active,
                 }
             )
             if not us.needs_unread_recalc:

apps/feed_import/urls.py

@@ -2,10 +2,10 @@ from django.conf.urls.defaults import *
 from apps.feed_import import views
 
 urlpatterns = patterns('apps.feed_import.views',
-    url(r'^opml_upload$', views.opml_upload, name='opml-upload'),
-    url(r'^opml_export$', views.opml_export, name='opml-export'),
-    url(r'^authorize/$', views.reader_authorize, name='google-reader-authorize'),
-    url(r'^callback/$', views.reader_callback, name='google-reader-callback'),
-    url(r'^signup/$', views.import_signup, name='import-signup'),
-    url(r'^import_from_google_reader/$', views.import_from_google_reader, name='import-from-google-reader')
+    url(r'^opml_upload/?$', views.opml_upload, name='opml-upload'),
+    url(r'^opml_export/?$', views.opml_export, name='opml-export'),
+    url(r'^authorize/?$', views.reader_authorize, name='google-reader-authorize'),
+    url(r'^callback/?$', views.reader_callback, name='google-reader-callback'),
+    url(r'^signup/?$', views.import_signup, name='import-signup'),
+    url(r'^import_from_google_reader/?$', views.import_from_google_reader, name='import-from-google-reader')
 )

apps/feed_import/views.py

@@ -193,8 +193,9 @@ def import_from_google_reader(request):
 
     if request.user.is_authenticated():
         reader_importer = GoogleReaderImporter(request.user)
+        auto_active = bool(request.REQUEST.get('auto_active') or False)
         try:
-            reader_importer.import_feeds()
+            reader_importer.import_feeds(auto_active=auto_active)
             reader_importer.import_starred_items()
         except AssertionError:
             code = -1

apps/social/models.py

@@ -1731,7 +1731,8 @@ class MSocialServices(mongo.Document):
         profile = MSocialProfile.get_user(self.user_id)
         profile.location = profile.location or (facebook_user.get('location') and facebook_user['location']['name'])
         profile.bio = profile.bio or facebook_user.get('bio')
-        profile.website = profile.website or facebook_user.get('website')
+        if not profile.website and facebook_user.get('website'):
+            profile.website = facebook_user.get('website').split()[0]
         profile.save()
         profile.count_follows()
         if not profile.photo_url or not profile.photo_service:

fabfile.py

@@ -372,7 +372,7 @@ def setup_psycopg():
     
 def setup_python():
     # sudo('easy_install -U pip')
-    sudo('easy_install -U fabric django==1.3.1 readline pyflakes iconv celery django-celery django-celery-with-redis django-compress South django-extensions pymongo==2.2.0 stripe BeautifulSoup pyyaml nltk lxml oauth2 pytz boto seacucumber django_ses mongoengine redis requests django-subdomains psutil')
+    sudo('easy_install -U fabric django==1.3.1 readline pyflakes iconv celery django-celery django-celery-with-redis django-compress South django-extensions pymongo==2.2.0 stripe BeautifulSoup pyyaml nltk lxml oauth2 pytz boto seacucumber django_ses mongoengine redis requests django-subdomains psutil python-gflags')
     
     put('config/pystartup.py', '.pystartup')
     # with cd(os.path.join(env.NEWSBLUR_PATH, 'vendor/cjson')):

settings.py

@@ -179,7 +179,7 @@ TEST_DATABASE_NAME      = 'newsblur_test'
 ROOT_URLCONF            = 'urls'
 INTERNAL_IPS            = ('127.0.0.1',)
 LOGGING_LOG_SQL         = True
-APPEND_SLASH            = True
+APPEND_SLASH            = False
 SOUTH_TESTS_MIGRATE     = False 
 SESSION_ENGINE          = "django.contrib.sessions.backends.db"
 TEST_RUNNER             = "utils.testrunner.TestRunner"