sports_db 0.2.1 → 0.2.2

data/app/assets/javascripts/clients/android/client.js

@@ -1,4 +1,4 @@
-if ($.client && $.client.android || Application.client && Application.client.android) {
+if (window.location.search.indexOf("client=android") !== -1) {
     console.log('=> Using AndroidClient.js');
 
     // This should be in a mock file...

data/app/assets/javascripts/clients/ios/client.js

@@ -1,13 +1,18 @@
-if ($.client.ios) {
+if (window.location.search.indexOf("client=ios") !== -1) {
     console.log('=> Using iOSClient.js');
 
     var Client = Class.extend({
+        initialize: function() {
+            this.commands = [];
+            this.timer = new Timer($.proxy(this._sendNotifications, this), 133);
+            this.timer.start();
+        },
         // Called by the web application to send values to the client.
         //
         //     @param {Object} obj - a set of key/value parameters to send to client
         notify: function(obj) {
             if (top.location === self.location) {
-                this._createUrlForClientInterception("client_notify", obj);
+                this.commands.push(obj);
             }
         },
         // Called by the client to set a value or trigger an action in the web page.
@@ -17,6 +22,14 @@ if ($.client.ios) {
         callback: function(name, value) {
             Application.onClientCallback(name, value);
         },
+        _sendNotifications: function() {
+            // Do nothing if array is empty.
+            if (this.commands.length === 0) return;
+
+            // Send the first command in the array.
+            this._createUrlForClientInterception("client_notify", this.commands[0]);
+            this.commands.shift();
+        },
         _createUrlForClientInterception: function(prefix, obj) {
             this._initClientTransportIfNecessary(prefix);
             for (var prop in obj) {

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

@@ -0,0 +1,121 @@
+// A basic view implementation that expects an `URL` to be passed as one of the parameters
+// to the view; it will format that `URL` using any other parameters, and use it to retrieve
+// an `HTML` fragment from the server. This is only one of many strategies that could be
+// followed to create views, of course. It also assumes that the parameters object will
+// get a title property.
+var BaseView = View.extend({
+    // Subclasses must ensure there is an url property to the parameter object passed
+    // into this superconstructor, i.e.:
+    //
+    //     this._super(params)
+    //
+    // Any parameters passed in to the view constructor will be substituted
+    // into the URL string using the String format method (see utilities.js).
+    //
+    //     @param {Object} params
+    initialize: function(params) {
+        this.url    = this.getUrl(params);
+        this.params = params;
+    },
+    getUrl: function(params) {
+        if (params.url) {
+            return params.url.format(params);
+        } else {
+            return "/"+Application.params.serverPath+"/" + params.view;
+        }
+    },
+    getTitle: function() {
+        // The title varies on the Team View between Android and iOS.
+        // cstuart 2011-08-29
+        if (Application.client.ios) {
+            this.params.title = this.params.ios_title || this.params.title;
+        }
+        return this.params.title || this.params.view.capitalize();
+    },
+    getMetric: function() {
+        return this.params.metric || "/" + this.params.view.capitalize();
+    },
+    setMetric: function(metric) {
+        $.log('((( setMetric '+ metric +' )))');
+        return this.params.metric = metric;
+    },
+    getButtons: function() {
+        return this.params.buttons || "Back:";
+    },
+    getAction: function() {
+        return this.params.action || "<None>";
+    },
+    getFilter: function() {
+        return this.params.filter || "<None>";
+    },
+    getSection: function() {
+        return this.params.section || this.params.view;
+    },
+    shouldRefreshAd: function() {
+        return this.params.hasOwnProperty('refreshAd') ? this.params.refreshAd : true;
+    },
+    // Loads the content of the view from the server (the content should be wrapped by a `div`).
+    // The content is inserted into the page.
+    create: function(params) {
+        if (!params.skipLoadingIndicator) {
+            $.showLoader();
+        }
+         // This is a hack. The TSN keys include periods that confuse the Rails page caching system. Convert
+        // here to underscores, and back to periods again on the server using a filter.
+        this.url = this.url.dotToBar();
+
+        $.ajax({
+            url: this.url,
+            success: $.proxy(function(response) {
+                if (params.isAutoUpdating && params.view !== Application.currentView.params.view) {
+                    console.log('$$ BaseView.create(): Not appending autoupdate view. We are no longer on that view!');
+                } else {
+                    // NBA3 only
+                    if ($.highResifyLogosForRetinaAndAndroid) {
+                        console.log('adjusting Android');
+                        response = $.highResifyLogosForRetinaAndAndroid(response);
+                    }
+
+                    // Get a node rather than plain HTML
+                    this.element = Application.buffer.html(response).find('div').get(0);
+                    Application.appendView(this);
+
+                    // NBA3 only
+                    if ($.delayedLoad) {
+                        $.delayedLoad();
+                    }
+                }
+            }, this),
+            error: function(e) {
+                $.hideLoader();
+                $.flash("A network error occurred.", Application.currentView.params, true);
+                throw new Error('An error occurred.');
+            }
+        });
+    },
+    onClientCallback: function(name, value) {
+        $.log('BaseView.onClientCallback({' + name + ': ' + value + '})');
+    },
+    // If HTML returned from the server includes a `<div id="html_data" data-params=""></div>` element,
+    // this should contain an object literal (JSON string) with values that will be merged into
+    // the parameters for this view instance. This is used to pass back additional information
+    // from the server via the HTML. For example, when loading a player it might be useful to
+    // return the key for the player's team so that can be used when communicating with the client:
+    //
+    //     <data id="view_data" data="{'title': '<%= @team.city_name %> <%= @team.team_name %>'}"></data>
+    //
+    // This will add the integer 1588 (correctly typed) under the property "team_key" to the
+    // parameters (`this.params`) for this view.
+    _evaluateDataAttribute: function() {
+        var params = $('#html_params', Application.wrapper).data('params');
+
+        if (params) {
+            var data = JSON.parse(params);
+
+            for (var key in data) {
+                // If you escape a non-string value, it is first converted to a string, which we don't want
+                this.params[key] = (typeof data[key] == "string") ? unescape(data[key]) : data[key];
+            }
+        }
+    }
+});

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

@@ -1,8 +1,10 @@
+//= require core/mock_config.js
+
 // Mock client interface
 var Mock = Class.extend({
     initialize: function(client) {
         this.client = client;
-        window.addEventListener("load", this._makeToolbar.bind(this), true);
+        window.addEventListener("load", $.proxy(this._makeToolbar, this), true);
     },
     _makeToolbar: function(){
         var toolbar = document.createElement("div");
@@ -21,33 +23,6 @@ var Mock = Class.extend({
 
 var Mock = new Mock(Client);
 
-Client.notify = function(obj) {
-    if (typeof obj.buttons !== 'undefined') {
-        this.makeButtons(obj.buttons);
-    }
-    if (typeof obj.title !== 'undefined') {
-        this.makeTitle(obj.title);
-    }
-
-    if (obj.action === "getFavesAndNotifs") {
-        Client.callback("favesAndNotifs", {
-            faves: Application.params.MOCK_FAVORITES,
-            notifs: Application.params.MOCK_NOTIFS
-        });
-    }
-
-    // Client.notify logs notifications to the console.
-    if (window.console && window.console.log) {
-        var arr = [];
-        for (var prop in obj) {
-            if (typeof obj[prop] !== "function") {
-                arr.push(escape(prop) + ": " + escape(obj[prop]));
-            }
-        }
-        console.log("Client.notify({ " + arr.join(", ") + " })");
-    }
-};
-
 Client.makeButtons = function(str) {
     if (!str) return;
     var specs = str.split(":");
@@ -63,7 +38,7 @@ Client.makeButtons = function(str) {
             $('#'+id).show();
             if (str === "NudgeNav") {
                 // Support for nudge nav in mock toolbar.
-                $('#'+id).html("<action name='nudge' value='prev'>&uarr;</action>&nbsp;<action name='nudge' value='next'>&darr;</action>");
+                $('#'+id).html("<action id='nudge_prev' name='nudge' value='prev'>&uarr;</action>&nbsp;<action id='nudge_next' name='nudge' value='next'>&darr;</action>");
             } else {
                 $('#'+id).html("<action name='callback' value=" + str + ">" + str + "</action>");
             }
@@ -71,13 +46,49 @@ Client.makeButtons = function(str) {
     }
 };
 
+Client.notify = function(obj) {
+    if (typeof obj.buttons !== 'undefined') {
+        this.makeButtons(obj.buttons);
+    }
+    if (typeof obj.title !== 'undefined' && typeof obj.action !== 'undefined' && obj.action !== 'share') {
+        this.makeTitle(obj.title);
+    }
+
+    if (obj.action === "getFavesAndNotifs") {
+        Client.callback("favesAndNotifs", MOCK_FAVES_CONFIG);
+    }
+
+    // CFB2 only
+    if (obj.action === "alert") {
+        alert(obj.heading + "\n" + obj.text);
+    }
+
+    // CFB2 only
+    if (obj.action === "navigateTo") {
+        if (obj.location === 'home') {
+            document.location = 'zcanvas.html';
+        } else {
+            alert('Pretend you have navigated to: ' + obj.location + '.');
+        }
+    }
+
+    // Client.notify logs notifications to the console.
+    if (window.console && window.console.log) {
+        var arr = [];
+        for (var prop in obj) {
+            arr.push(prop + ": " + obj[prop]);
+        }
+        console.log("))) Client.notify({ " + arr.join(", ") + " })");
+    }
+};
+
 // Set the view title
 Client.makeTitle = function(title) {
     $("#mock-center").html(title);
 };
 
 setTimeout(function() {
-    $('#mock-toolbar').delegate('action', 'click', function(e) {
+    $('#mock-toolbar').on('click', 'action', function(e) {
         var name = $(e.target).attr('name');
         var value = $(e.target).attr('value');
 
@@ -86,5 +97,6 @@ setTimeout(function() {
 }, 400);
 
 Application.clientCallbackHandlers.push(function(name, value) {
-    if (value === "Back") history.back();
+    if (value === 'Back') history.back();
+    if (value === 'Close') Client.callback('close');
 });

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

@@ -0,0 +1,55 @@
+// If your view implements an initialization function, that function will be passed a parameter
+// object containing all the query parameters in the URL that triggered the view's creation, plus
+// all of those values that were assigned to the view when it was registered and bound to a name.
+// It does not need to hold on to these values (although the base implementation of view does, as
+// `this.params`). At the end of a view's create method, it should have inserted a dom element into
+// the body of the page. This will be assigned as the "element" property to the view by the application,
+// as it needs to be referenced outside your view class.
+var View = Class.extend({
+    // This method should create (by any means desirable) a DOM element and insert it into the page.
+    // Our base implementation queries for an HTML fragment from the server, but this is up to
+    // your view implementation.
+    create: function() {
+        throw new Error("Create method not implemented in subclass");
+    },
+    // Title of this view. We may not actually use titles in this version of the application,
+    // but we needed to provide this in the past.
+    getTitle: function() {
+        throw new Error("getTitle method not implemented in subclass");
+    },
+    // The name of the view that is used to log metrics to Google Analytics. The view
+    // may also provide additional calls to `Client.notify({'metric': 'metricName'})` if it updates
+    // internally (changing tabs, for example).
+    getMetric: function() {
+        throw new Error("getMetric method not implemented in subclass");
+    },
+    getButtons: function() {
+        throw new Error("getButtons method not implemented in subclass");
+    },
+    // Send off any necessary notifications to the client. This avoids and issue on iOS where
+    // two notifications send right after one another causes one of them to fail.
+    getAction: function() {
+        throw new Error("getAction method not implemented in subclass");
+    },
+    // Tell the client what a filtereable view is filtered to.
+    getFilter: function() {
+        throw new Error("getFilter method not implemented in subclass");
+    },
+    // Tell the client what section we are in.
+    getSection: function() {
+        throw new Error("getSection method not implemented in subclass");
+    },
+    // Tell the client if a new ad should be displayed.
+    shouldRefreshAd: function() {
+        throw new Error("shouldRefreshAd method not implemented in subclass");
+    },
+    // Called before the view is appended to the page.
+    onViewChanged: function() {
+        console.log('### View#onViewChanged');
+    }
+    // The client has executed a callback on the web page, to pass a value to the page
+    // or to execute some functionality.
+    /*
+    ,onClientCallback( name, value ) {}
+    */
+});

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

@@ -167,3 +167,15 @@ $.fixImage = function(elem, src) {
     }
     elem.fixed = true;
 };
+
+
+
+var macrojungle = function(tmpl) {
+    // This is kind of stupid.
+    // But at least it's only written once.
+    var html = $('#tmp').empty().microjungle(tmpl).html();
+    // If we don't actually want to get any html back (just a string),
+    // we wrap the string in <tmp>string</tmp> and then remove
+    // the tags here.
+    return html.replace(/<(\/){0,1}tmp>/g, '');
+};

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

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title><%= CONFIG.app_path %> - <%= Rails.env %></title>
+    <meta name="viewport" content="user-scalable=no, initial-scale=1">
+    <%= stylesheet_link_tag "application" %>
+</head>
+<body>
+    <%= yield %>
+    <div id="app_wrapper">
+        <div id="flash" style="display:none"></div>
+        <div id="view_wrapper"></div>
+        <%= render "shared/footer" %>
+        <div id="loading" class="loading" style="display:none">
+            <div id="loading_text" class="loading_text">Loading&hellip;</div>
+        </div>
+    </div>
+    <div id="tmp" style="display:none"></div>
+    <%= javascript_include_tag "application" %>
+    <%# Allows us to use mock on test or production without screwing up caching of page. %>
+    <script>
+        if (Application.params.mock === 'true' || '<%= request.host %>' == 'localhost' || '<%= request.host %>'.indexOf('.dev') !== -1) {
+            document.write("<link rel='stylesheet' href='/<%= CONFIG.app_path %>/assets/mock.css'>");
+            document.write("<script src='/<%= CONFIG.app_path %>/assets/core/Mock.js'><\/script>");
+        }
+    </script>
+</body>
+</html>

data/lib/sports_db/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sports_db
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,10 +52,12 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/clients/android/client.js
 - app/assets/javascripts/clients/ios/client.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
@@ -113,6 +115,7 @@ 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