sports_db 0.2 → 0.2.1

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

@@ -1,47 +1,48 @@
-(function($){
+;(function($){
     var load_timer;
     var LOADING_TEXT = 'Loading…';
-    function prevent(e) {
-        e.preventDefault();
-    }
-    function freeze() {
-        $(document.body).bind("touchmove", prevent);
-    }
-    function thaw() {
-        $(document.body).unbind('touchmove', prevent);
-    }
-    function showLoaderNow() {
-        $('#app_load_loader').remove();
-        freeze();
-        loading_text = LOADING_TEXT;
-        if (Application.currentView && Application.currentView.params.loading_text) {
-            loading_text = Application.currentView.params.loading_text;
-        }
-        $('#loading_text').html(loading_text);
-
-        $('#loading').css({'height': document.documentElement.clientHeight + 'px'});
-        $.alignLoader();
+    var $loading = $('#loading');
+    var v = parseFloat($.os.version);
+    var deviceHasNativeSupport = ($.os.ios && v >= 5) || ($.os.android && v >= 2.2);
 
-        $('#loading').show();
+    function alignLoader() {
+        if (!deviceHasNativeSupport && $loading.css('display') === 'block') {
+            $loading
+                .css('position', 'absolute')
+                .find('.loading_text')
+                .css('margin-top', (window.pageYOffset + 80) + 'px');
+        }
     }
-    $.alignLoader = function() {
-        $('#loading').css({'top': window.scrollY + 'px'});
-    };
-    $.showLoader = function(loader_text) {
+    $.showLoader = function() {
         if (load_timer) {
-            load_timer.stop();
-            load_timer = undefined;
+            window.clearTimeout(load_timer);
         }
-        load_timer = new Timer(showLoaderNow, 222);
-        load_timer.start();
+        load_timer = setTimeout(function() {
+            var txt = LOADING_TEXT;
+            if (Application.currentView && Application.currentView.params.loading_text) {
+                txt = Application.currentView.params.loading_text;
+            }
+            $('#loading_text').html(txt);
+            $loading
+                .freeze()
+                .show();
+            alignLoader();
+        }, 333);
     };
     $.hideLoader = function() {
-        load_timer.stop();
-        thaw();
-        $('#loading').hide();
-        $('#app_load_loader').remove();
-        if (Application.currentView && Application.currentView.params.loading_text) {
-            Application.currentView.params.loading_text = LOADING_TEXT;
+        if (load_timer) {
+            window.clearTimeout(load_timer);
         }
+
+        $loading
+          .freeze({'unfreeze':true})
+          .hide();
+
+        $('#app_load_loader').remove();
+
+        Application.currentView.params.loading_text = LOADING_TEXT;
     };
+
+    $(window).on('scroll', alignLoader);
+
 })(Zepto);

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

@@ -3,7 +3,7 @@
     var MAX = 17;
     var DEFAULT = 15;
     var p = Application.params.font_size;
-    var pi = parseInt(p);
+    var pi = parseInt(p,10);
     var size = ((!isNaN(p) && pi <= MAX && pi >= MIN)) ? pi : DEFAULT;
 
     $.fn.resizeable = function() {

data/app/assets/javascripts/plugins/zepto.freeze.js

@@ -0,0 +1,24 @@
+;(function($){
+
+    $.extend($.fn, {
+        freeze: function(opts) {
+
+            var params = $.extend({ 'unfreeze': false }, opts);
+
+            return this.each(function() {
+                // This won't work in some versions of Android.
+                // http://code.google.com/p/android/issues/detail?id=5491
+                // http://code.google.com/p/android/issues/detail?id=4549
+
+                var freeze = function(e){ e.preventDefault(); };
+
+                if (params.unfreeze) {
+                    $(this).off('touchmove', freeze);
+                } else {
+                    $(this).on('touchmove', freeze);
+                }
+            });
+        }
+    });
+
+})(Zepto);

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

@@ -1,18 +1,34 @@
 html, body {
-    background-color: $page_bg;
+    background-color: $body_background_color;
 }
 * {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
+    margin: 0;
+    padding :0;
+    border: 0;
+    outline: 0;
+
+    font-size: 100%;
+	line-height: 1;
+
+    vertical-align: baseline;
+
+    background-color: transparent;
+    background-repeat: no-repeat;
+    -webkit-background-size: contain;
+    background-size: contain;
+
     -webkit-tap-highlight-color: rgba(0,0,0,0);
+
     -webkit-user-select: none;
     -webkit-user-modify: read-only;
     -webkit-touch-callout: none;
-    background-repeat: no-repeat;
+
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
 }
 body {
     font-size: $default_font_size;
-    color: $txt_gray;
+    color: $default_color;
     margin: 0 auto;
 }
 body.ios {
@@ -22,3 +38,13 @@ body.ios {
 body.android {
     font-family: sans-serif;
 }
+ol,ul {
+    list-style-type: none;
+}
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+a {
+  text-decoration: none;
+}

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

@@ -1,9 +1,21 @@
 #flash {
-    background-color: #666;
-    color: #fff;
+    background-color: $hl_color;
     line-height: 24px;
-    font-size: 14px;
     padding: 0 10px;
     text-align: center;
+    color: #fff;
+    text-shadow: $txt_shadow;
+    font-weight: bold;
+
+    opacity: 1;
+    -webkit-transition: opacity .5s ease-in;
+
     height: 24px;
+    -webkit-transition: height .5s ease-in;
+
+    font-size: 14px;
+}
+#flash.hide {
+    opacity: 0 !important;
+    height: 0 !important;
 }

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

@@ -1,28 +1,20 @@
-loading{
-    display: block;
-    z-index:99999;
-    position:absolute;
-    top:0;
-    left:0;
-    right:0;
-    bottom: 0;
+.loading {
+    z-index: 99999;
+    position: fixed;
+    top: 0; left: 0; right: 0; bottom: 0;
     text-align: center;
-    background-color:rgba(20,20,20,.1);
-    color:#fff;
+    background-color: rgba(20,20,20,.2);
 }
-loading_text{
-    padding: 4px 10px;
+.loading_text {
+    padding: 8px 16px;
     display: inline-block;
     border: 1px solid #777;
     margin-top: 80px;
     text-align: center;
-    font-size: 18px;
-    line-height: 1;
-    font-family: "Helvetica Neue",Helvetica,sans-serif;
     color: #fff;
-    background-color:rgba(10,10,10,.8);
-    -webkit-border-radius: 4px;
+    background-color: rgba(10,10,10,.8);
+    -webkit-border-radius: 3px;
     -webkit-background-clip: padding-box;
     -webkit-box-shadow: 1px 1px 5px #000;
-    -webkit-user-select: none;
+    font-size: 15px;
 }

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

@@ -12,8 +12,9 @@
     // - NOTE the .play class is added to a parent element of the <img>,
     //   not the <img> itself, because <img>s do not allow psuedo elements.
     &::after {
-        // This url will not work from an app autogen/ file.
-        background: transparent url(#{$imghost}playbutton@2x.png) no-repeat center;
+        background-repeat: no-repeat;
+        background-image: url(#{$imghost}playbutton@2x.png);
+        background-position: center;
         -webkit-background-size:  auto 50%;
         background-size:  auto 50%;
     }

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

@@ -1,6 +1,5 @@
-$txt_shadow: 1px 1px 0 rgba(10, 10, 10, .2);
-
 #mock-toolbar-container {
+    font-size: 10px;
     -webkit-user-select: none;
     margin:0;
     padding:0;
@@ -14,7 +13,6 @@ $txt_shadow: 1px 1px 0 rgba(10, 10, 10, .2);
     color: white !important;
     margin: 0;
     height: 44px;
-    -webkit-box-sizing: border-box;
     border-collapse: collapse;
     border: 1px solid #111;
     background: -webkit-gradient(linear,left top,left bottom,color-stop(0, #2a2a2a),color-stop(1, #0a0a0a));
@@ -25,7 +23,7 @@ $txt_shadow: 1px 1px 0 rgba(10, 10, 10, .2);
     font-size: 18px;
     font-weight: bold;
     line-height: 2.3;
-    text-shadow: $txt_shadow;
+    text-shadow: 1px 1px 0 rgba(10, 10, 10, .2);
 }
 #mock-left, #mock-right {
     display: block;

data/app/views/application/load.html.erb

@@ -1 +1,3 @@
-<loading id="app_load_loader"><loading_text>Loading&hellip;</loading_text></loading>
+<div id="loading" class="loading">
+    <div id="loading_text" class="loading_text">Loading&hellip;</div>
+</div>

data/app/views/shared/_heading.html.erb

@@ -0,0 +1,20 @@
+<% if item.is_twitter? %>
+    <h3 class="tweet article_heading">
+<% else %>
+    <h3 class="article_heading">
+<% end %>
+<% if item.title.present? %>
+    <% if item.is_video? %>
+        <span class="is_video_prefix">[VIDEO]</span>
+    <% end %>
+    <%= raw item.title %>
+<% end %>
+</h3>
+<p class="author_and_date">
+    <% if item.is_twitter?  %>
+        <%= "via #{item.author} -" unless item.source.blank? %>
+        <%= short_date item.published_at unless item.published_at.blank? %>
+    <% else %>
+        <%= date_time item.published_at unless item.published_at.blank? %>
+    <% end %>
+</p>

data/app/views/shared/_poster.html.erb

@@ -0,0 +1,11 @@
+<% if item.is_video? && item.high_bandwidth_url.present? %>
+    <a class="link poster_bx play br" target="_blank" href="<%= item.high_bandwidth_url %>">
+        <div style="background-image: url(<%= item.article_image_url %>)"></div>
+        <%# <img src="< % # = item.article_image_url % >"> fixes FB#25010 %>
+    </a>
+<% elsif item.is_article? && item.article_image_url.present? %>
+    <div class="poster_bx">
+        <div style="background-image: url(<%= item.article_image_url %>)"></div>
+        <%# <img src="< % # = item.article_image_url % >"> fixes FB#25010 %>
+    </div>
+<% end %>

data/app/views/shared/_sharing.html.erb

@@ -0,0 +1,16 @@
+<% if item.attribute_present?(:link) && item.link.present? %>
+    <%
+        # The gsub at the end is to replace a mdash with a hyphen. It was causing Android to barf.
+        summary = truncate(strip_tags(item.contents.strip), :length => 90).gsub("—", "-")
+    %>
+    <div class="share_btn btn hhl"
+         data-url="<%= item.link %>"
+         data-title="<%= item.title %>"
+         data-summary=" <%= summary %> "
+         <% if get_article_img_url(item) %>
+             data-fbimg="<%= get_article_img_url(item) %>"
+         <% end %>
+         >
+         Share
+    </div>
+<% end %>

data/app/views/shared/_toolbar.html.erb

@@ -0,0 +1,12 @@
+<div class="toolbar row">
+    <div class="col">
+        <%= render 'shared/sharing', :item => item %>
+    </div>
+    <div class="col stretch"></div>
+    <div class="col">
+        <div class="btn resizeable down hhl" data-dir="-1">T-</div>
+    </div>
+    <div class="col">
+        <div class="btn resizeable up hhl" data-dir="+1">T+</div>
+    </div>
+</div>

data/lib/sports_db/engine.rb

@@ -1,5 +1,17 @@
 module SportsDb
     class Engine < Rails::Engine
+        if Rails.env.development?
+          config.to_prepare do
+            Rails.logger.debug "*** reloading sports_db gem (only in development mode) ***"
+            require_dependency SportsDb::Engine.root.join('lib', 'sports_db').to_s
+          end
+
+          config.after_initialize do
+            # optional, without it will call `to_prepend` only when a file changes,
+            # not on every request
+            Rails.application.config.reload_classes_only_on_change = false
+          end
+        end
 
     end
-end
+end

data/lib/sports_db/version.rb

@@ -1,3 +1,3 @@
 module SportsDb
-    VERSION = "0.2"
+    VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sports_db
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,13 +52,11 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/clients/android/client.js
 - app/assets/javascripts/clients/ios/client.js
-- app/assets/javascripts/core/Application.js
-- app/assets/javascripts/core/BaseView.js
 - app/assets/javascripts/core/History.js
 - app/assets/javascripts/core/Mock.js
 - app/assets/javascripts/core/Timer.js
 - app/assets/javascripts/core/utilities.js
-- app/assets/javascripts/core/View.js
+- app/assets/javascripts/libs/ICanHaz.js
 - app/assets/javascripts/libs/microjungle.zepto.js
 - app/assets/javascripts/libs/SimpleInheritance.js
 - app/assets/javascripts/libs/zepto-v1.0rc1/ajax.js
@@ -75,7 +73,6 @@ files:
 - app/assets/javascripts/libs/zepto-v1.0rc1/stack.js
 - app/assets/javascripts/libs/zepto-v1.0rc1/touch.js
 - app/assets/javascripts/libs/zepto-v1.0rc1/zepto.js
-- app/assets/javascripts/libs/zepto_0.8.js
 - app/assets/javascripts/plugins/assert.js
 - app/assets/javascripts/plugins/calnav.js
 - app/assets/javascripts/plugins/detect.js
@@ -85,6 +82,7 @@ files:
 - app/assets/javascripts/plugins/loading.js
 - app/assets/javascripts/plugins/params.js
 - app/assets/javascripts/plugins/resizeable.js
+- app/assets/javascripts/plugins/zepto.freeze.js
 - app/assets/stylesheets/_base.css.scss
 - app/assets/stylesheets/_filterable.css.scss
 - app/assets/stylesheets/_flash.css.scss
@@ -115,7 +113,10 @@ files:
 - app/models/score_notification.rb
 - app/models/twitter.rb
 - app/views/application/load.html.erb
-- app/views/layouts/application.html.erb
+- app/views/shared/_heading.html.erb
+- app/views/shared/_poster.html.erb
+- app/views/shared/_sharing.html.erb
+- app/views/shared/_toolbar.html.erb
 - config/routes.rb
 - lib/sports_db/engine.rb
 - lib/sports_db/external_feed_builder.rb

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

@@ -1,173 +0,0 @@
-var Application = Class.extend({
-    initialize: function() {
-        this.app_is_initializing = true;
-        this.views = {};
-        this.params = {};
-        this.cache = {};
-        this.currentView = null;
-        this.clientCallbackHandlers = [];
-        this.params = {};
-
-        // Get hash params
-        if (window.location.hash) {
-            this.params = $.hashStrToObj();
-        }
-
-        // I'm not reallys ure we want to store these together, but whatever (For now)
-        this.params = $.extend(window.CONFIG, this.params);
-
-        // Start timer for game updates
-        // TODO only run this on game views
-        this.timer = new Timer($.proxy(this._fireTimerEvent, this), this.params.GAME_UPDATE_FREQUENCY);
-        this.timer.start();
-    },
-    // Fire a timer event
-    _fireTimerEvent: function() {
-        $(document.body).trigger("timerReachInterval", false, false);
-    },
-    // Call the view if the method exists
-    _onTimerReachedInterval: function() {
-        var view = this.currentView;
-        if (view && view._onTimerReachedInterval) {
-            view._onTimerReachedInterval.call(view);
-        }
-    },
-    // Register a view constructor under a specific name. If a link in the application has
-    // a parameter named "view" that points to a registered view name, then the `Application`
-    // will load that view. Optionally, you can pass in parameters, and these will be merged
-    // with any other parameters in the link that triggers view loading (parameters in the
-    // link override parameters in the registration binding). This allows you to bind the
-    // same view under different names with different parameters in order to parameterize
-    // its behavior.
-    //
-    //      @param {Object} name
-    //      @param {Object} constructor
-    //      @param {Object} params (optional)
-    registerView: function(name, constructor, params) {
-        this.views[name] = { constructor: constructor, params: (params || {}) };
-    },
-    // Stash a view, i.e. change the url to something meaningful, but do not show the
-    // 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) {
-        var local = {};
-        local.view = params.view;
-        if (params.filter) { local.filter = params.filter; }
-        if (params.key) { local.key = params.key; }
-        local.stash = true;
-        var url = "#" + $.objToQueryStr(local);
-
-        document.location = url;
-    },
-    // Show a view based on the supplied parameters. The only required parameter is "view"
-    // which must reference a valid view name.
-    //
-    //      @param {Object} params
-    showView: function(params) {
-        $.assert(params.view, "No view specified (use #view=<viewName>)", "Error: no view specified.");
-        var binding = this.views[params.view];
-
-        $.assert(binding, params.view + " is not a registered view name. Did you add it to views.js?", "Error: not a registered view.");
-
-        // Merge binding parameters (from views.js) into any parameters that were supplied in the URL
-        for (var prop in binding.params) {
-            if (typeof params[prop] === 'undefined') {
-                params[prop] = binding.params[prop];
-            }
-        }
-        var view = new binding.constructor(params);
-        $.assert(view.create, params.view + " doesn't have a create method and is not a valid view", "Error: not a valid view.");
-
-        view.create();
-    },
-    // When the view is done initializing, it must call this method.
-    appendView: function(view) {
-        view.beforeViewAppended(view.params);
-        view.buffer.html('empty');
-
-        // if we have a reference to the previous view, remove() it
-        if (this.currentView && this.currentView.element) {
-            $(this.currentView.element).remove();
-        }
-
-        // re-assign this.curentView to the new view, and add it to the
-        // Application.cache
-        this.currentView = this.cache[History.currentHash()] = view;
-
-        document.body.appendChild(view.element);
-
-        if (view.params.scrollY) {
-            window.scrollTo(0,view.params.scrollY);
-            this.params.scrollY = 0;
-        } else {
-            window.scrollTo(0,0);
-        }
-        $.alignLoader();
-
-        view.afterViewAppended(view.params);
-
-        $(view.element).addClass('cached');
-        if (!view.params.skip_metrics === true) this.sendMetrics();
-    },
-    sendMetrics: function() {
-        var view = Application.currentView;
-        Client.notify({
-            "metric": view.getMetric(),
-            "title": view.getTitle(),
-            "buttons": view.getButtons(),
-            "action": view.getAction(),
-            "filter": view.getFilter(),
-            "section": view.getSection()
-        });
-    },
-    // The web application is receiving a callback from the client to set a value or execute some
-    // behavior. If the view has an `onClientCallback` method, this will be executed first. It can
-    // cancel any further event handling by returning `true`. Otherwise, the application sends the
-    // event to all of the `clientCallbackHandlers` that are registered with the application, in the
-    // order they were registered.
-    //
-    //      @param {String} name
-    //      @param {Object} value
-    onClientCallback: function(name, value) {
-        var handled = false;
-        var view = this.currentView;
-        if (view && view.onClientCallback) {
-            handled = view.onClientCallback.call(view, name, value);
-        }
-        if (!handled) {
-            this.clientCallbackHandlers.forEach(function(handler) {
-                handler.call(this, name, value);
-            }, this);
-        }
-    },
-    // load a view from cache or the server when we get a hashchange event
-    _onHashChange: function(event, data) {
-        // If the app is not initializing, and the view is stashed, do not do anything
-        if (!this.app_is_initializing && data.stash) {
-            console.log('=> App is not initializing & a view is stashed. RETURN');
-            return;
-        }
-
-        $.assert(data.view, "No view specified (use #view=<viewName>)", "Error: no view specified.");
-
-        var view = this.cache[History.currentHash()];
-        view ? this.appendView(view) : this.showView(data);
-
-        this.app_is_initializing = false;
-    },
-    // Initializes application functionality on page load, and kicks off loading the view.
-    //
-    //     @private
-    _onReady: function() {
-        $(document.body)
-            .on("hashchange", $.proxy(Application._onHashChange, this))
-            .on("timerReachInterval", $.proxy(Application._onTimerReachedInterval, this));
-    }
-});
-
-// Singleton.
-Application = new Application();
-
-Zepto(function($) {
-    Application._onReady();
-});