sports_db 0.2.6 → 0.2.7

data/app/assets/javascripts/core/App.js

@@ -1,25 +1,34 @@
 var Application = Class.extend({
     initialize: function() {
 
-        this.views = {};
-        this.params = {};
-        this.cache = {};
-        this.currentView = null;
         this.clientCallbackHandlers = [];
-        this.wrapper = $('#view_wrapper');
-        this.buffer = $('#tmp');
-        this.footer = $('#footer');
-        this.client = {};
-        this.setClientParams();
+        this.views       = {};
+        this.params      = {};
+        this.cache       = {};
+        this.client      = {};
+        this.features    = {};
+        this.currentView = null;
+        this.wrapper     = $('#view_wrapper');
+        this.buffer      = $('#tmp');
+        this.footer      = $('#footer');
+
+        this.parseClientParams();
 
         // Get hash params
         if (window.location.hash) {
-            this.params = $.serialize(location.hash.slice(1));
+            this.params = $.deserialize(location.hash.slice(1));
         }
 
         this.params = $.extend(window.CONFIG, this.params);
 
-        if (!this.params.clientSupportsClose) {
+        var client = this.client.ios ? 'ios' : 'android';
+
+        this.features.supportsClose    = this.getConfigValue('clientSupportsClose', false);
+        this.features.supportsAlert    = this.getConfigValue('clientSupportsAlert', false);
+        this.features.supportsNudgeNav = this.getConfigValue('clientSupportsNudgeNav', true);
+        this.features.hasFooter        = this.getConfigValue('hasFooter', !!document.getElementById('footer'));
+
+        if (!this.features.supportsClose) {
             this.app_is_initializing = true;
         }
 
@@ -28,7 +37,10 @@ var Application = Class.extend({
         this.timer = new Timer($.proxy(this._fireTimerEvent, this), this.params.defaultTimer);
         this.timer.start();
     },
-    setClientParams: function() {
+    getConfigValue: function(value, defaultValue) {
+        return this.params.hasOwnProperty(value) ? this.params[value] : defaultValue;
+    },
+    parseClientParams: function() {
         var q = $.deserialize( location.search.slice(1) );
 
         $.assert(q.client, '`client` param is required.');
@@ -68,10 +80,10 @@ var Application = Class.extend({
     // view based on this URL change. This is needed in cases where the device goes to
     // sleep, and then reloads upon awakening.
     stashView: function(params) {
-        $.assert(!this.params.clientSupportsClose, "App should not be using Application.stashView method");
+        $.assert(!this.features.supportsClose, "App should not be using Application.stashView method");
 
         // TODO kill this method in all apps. Need client support.
-        if (!this.params.clientSupportsClose) {
+        if (!this.features.supportsClose) {
             console.log('** Application.stashView');
             var local = {};
             local.view = params.view;
@@ -148,8 +160,7 @@ var Application = Class.extend({
         $(document.body).trigger('Application:viewAppended', [this.currentView.params]);
 
         // Show the footer
-        // TODO do not show the footer if this is NFL3 v5 or above
-        if (this.footer) {
+        if (this.footer && this.features.hasFooter) {
             this.footer.show();
         }
 
@@ -210,7 +221,7 @@ var Application = Class.extend({
     },
     // load a view from cache or the server when we get a hashchange event
     _onHashChange: function(event, memo) {
-        if (!this.params.clientSupportsClose) {
+        if (!this.features.supportsClose) {
             // If the app is not initializing, and the view is stashed, do not do anything
             if (!this.app_is_initializing && memo.stash) {
                 console.log('=> App is not initializing & a view is stashed. RETURN');
@@ -230,7 +241,7 @@ var Application = Class.extend({
             this.showView(memo);
         }
 
-        if (!this.params.clientSupportsClose) {
+        if (!this.features.supportsClose) {
             this.app_is_initializing = false;
         }
     },

data/app/assets/javascripts/plugins/articles.js

@@ -29,23 +29,27 @@
 
             window.scrollTo(0,1);
 
-            if (Application.params.clientSupportsClose) {
-                Client.notify({
-                    'buttons': ($('.summary_link').size() < 2) ? 'Close:' : 'Close:NudgeNav',
-                    'metric': getMetricPrefix(view) + '/Detail',
-                    'refreshAd': true
-                });
-            } else {
-                // Makes the back button to work
+            // Kind of ridiculous.
+            // Does the client support the close button?
+            var backOrClose = Application.features.supportsClose ? 'Close:' : 'Back:';
+            // Does the client support Nudge Nav. Note, on android while nudge nav is
+            // "supported", there are not nudge nav buttons in the toolbar (they are in
+            // the hardware/software menu button)
+            var nudgeOrNot = (Application.features.supportsNudgeNav && $('.summary_link').size() > 1) ? 'NudgeNav' : '';
+            var buttons = backOrClose + nudgeOrNot;
+
+            if (!Application.features.supportsClose) {
+                // Makes the back button to work on clients
+                // that don't support close.
                 Application.stashView(view.params);
-                Client.notify({
-                    "buttons": view.params.should_have_buttons,
-                    "metric": getMetricPrefix(view) + "/Detail",
-                    "title": view.getTitle(),
-                    'refreshAd': true
-                });
             }
-
+            Client.notify({
+                'buttons': buttons,
+                'metric': getMetricPrefix(view) + '/Detail',
+                // I'm not sure if title is reqd here or not. cstuart 2013-07-29
+                'title': view.getTitle(),
+                'refreshAd': true
+            });
         };
 
         var handlers = function() {
@@ -117,7 +121,7 @@
                 });
                 show_article({ 'id': params.digest });
             } else {
-                if (Application.params.clientSupportsAlert) {
+                if (Application.features.supportsAlert) {
                     Client.notify({
                         'action': 'alert',
                         'heading': 'An error occurred',
@@ -141,12 +145,16 @@
             $('.article_wrapper').hide();
             $(document.body).removeClass('displaying_article');
 
+            if (Application.features.hasFooter) {
+                Application.footer.show();
+            }
+
             handlers();
 
             if (opts.params.digest) {
                 handle_notifications(opts.params);
             }
-            if (!Application.params.clientSupportsClose) {
+            if (!Application.features.supportsClose) {
                 Application.currentView.params.should_have_buttons = ($('.summary_link').size() < 2) ? "Back:" : "Back:NudgeNav";
             }
         }
@@ -164,6 +172,10 @@
             $('.article_wrapper').hide();
             $(document.body).removeClass('displaying_article');
 
+            if (Application.features.hasFooter){
+                Application.footer.show();
+            }
+
             window.scrollTo(0, view.params.pageYOffset);
 
             Client.notify({

data/app/assets/stylesheets/_base.css.scss

@@ -30,7 +30,18 @@ body {
     font-size: $default_font_size;
     font-family: $default_font;
     margin: 0 auto;
+    color: $default_color;
+}
+#app_wrapper {
+    position: relative;
 }
+#view_wrapper,
+#footer {
+    position: relative;
+    padding: 5px;
+}
+#html_params { display: none; }
+
 body.ios {
     font-family: helvetica, sans-serif;
     text-rendering: optimizeLegibility;

data/app/assets/stylesheets/_table_base.scss

@@ -39,7 +39,7 @@
         padding-bottom: 4px !important;
         text-align: left;
         vertical-align: top;
-        font-size: 12px;
+        font-size: 13px;
         font-weight: bold;
         background-color: $zebra_strip_even;
     }

data/app/models/media.rb

@@ -2,10 +2,10 @@ require 'digest/md5'
 
 class Media < ActiveRecord::Base
 
-    # Create a hash based on publication time and title that should uniquely identify 
+    # Create a hash based on publication time and title that should uniquely identify
     # this publication of the document.
     before_save :before_save_method
-     
+
     def before_save_method
         if (self["title"].nil?)
             raise "This is an issue.... there's no title"
@@ -15,19 +15,19 @@ class Media < ActiveRecord::Base
         str = (self["published_at"].nil?) ? self["title"] : (self["title"] + self["published_at"].to_s)
         self["digest"] = Digest::SHA1.hexdigest(str)
     end
-    
-    def is_video? 
+
+    def is_video?
         true
     end
 
     def is_twitter?
         false
     end
-    
+
     def is_article?
         false
     end
-    
+
     def thumbnail_url
         self.thumb_image_url
     end

data/lib/sports_db/version.rb

@@ -1,3 +1,13 @@
+# == Given a version number MAJOR.MINOR.PATCH, increment the:
+
+# - MAJOR version when you make incompatible API changes,
+# - MINOR version when you add functionality in a
+#   backwards-compatible manner, and
+# - PATCH version when you make backwards-compatible bug fixes.
+#
+# Additional labels for pre-release and build metadata are
+# available as extensions to the MAJOR.MINOR.PATCH format.
+
 module SportsDb
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sports_db
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails