RubyGems - helios - Versions diffs - 0.3.0 → 0.4.0 - Mend

helios 0.3.0 → 0.4.0

Files changed (27) hide show

data/helios.gemspec CHANGED

@@ -5,7 +5,7 @@ require "helios/version"
 Gem::Specification.new do |s|
   s.name        = "helios"
   s.authors     = ["Mattt Thompson"]
-  s.email       = "mattt@heroku.com"
+  s.email       = "m@mattt.me"
   s.license     = "MIT"
   s.homepage    = "http://helios.io"
   s.version     = Helios::VERSION
@@ -20,8 +20,9 @@ Gem::Specification.new do |s|
   s.add_dependency "rack-in-app-purchase", "~> 0.1"
   s.add_dependency "rack-passbook", "~> 0.1"
   s.add_dependency "rack-newsstand", "~> 0.1"
-  s.add_dependency "rack-scaffold", ">= 0.0.3"
-  s.add_dependency "core_data"
+  s.add_dependency "rack-scaffold", "~> 0.2"
+  s.add_dependency "core_data", "~> 0.1"
+  s.add_dependency "pg", "~> 0.17"
   s.add_dependency "json", "~> 1.7"
   s.add_dependency "coffee-script", "~> 2.2"
   s.add_dependency "sinatra", "~> 1.3"
@@ -35,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_dependency "zurb-foundation", "4.1.2"
   s.add_dependency "rails-database-url", "~> 1.0"
   s.add_dependency "fog", "~> 1.10"
-  s.add_dependency "houston", "~> 0.2"
+  s.add_dependency "houston", "~> 2.2"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/lib/helios/backend/push-notification.rb CHANGED

@@ -73,6 +73,7 @@ class Helios::Backend::PushNotification < Sinatra::Base
     options[:alert] = options["aps"]["alert"]
     options[:badge] = options["aps"]["badge"]
     options[:sound] = options["aps"]["sound"]
+    options[:'content-available'] = options["aps"]["content-available"]
     options.delete("aps")
     begin

data/lib/helios/commands/link.rb CHANGED

@@ -8,6 +8,8 @@ command :link do |c|
     say_error "Missing argument: path/to/Model.xcdatamodel" and abort if args.empty?
     path = args.first
+    say_error "Cannot link to a .xcdatamodeld file" and abort if File.extname(path) == ".xcdatamodeld"
     begin
       File.link(path, File.basename(path))
       say_ok "Xcode data model successfully linked"

data/lib/helios/commands/new.rb CHANGED

@@ -37,6 +37,7 @@ command :new do |c|
         erb = ERB.new(File.read(template))
         next if file === "Gemfile" and options.skip_gemfile
+        next if file === ".gitignore" and options.skip_git
         if File.exist?(file)
           if options.force and not options.skip

data/lib/helios/frontend/javascripts/vendor/foundation.js CHANGED

@@ -8,7 +8,69 @@
 /*jslint unparam: true, browser: true, indent: 2 */
-(function () {
+// Accommodate running jQuery or Zepto in noConflict() mode by
+// using an anonymous function to redefine the $ shorthand name.
+// See http://docs.jquery.com/Using_jQuery_with_Other_Libraries
+// and http://zeptojs.com/
+var libFuncName = null;
+if (typeof jQuery === "undefined" &&
+    typeof Zepto === "undefined" &&
+    typeof $ === "function") {
+  libFuncName = $;
+} else if (typeof jQuery === "function") {
+  libFuncName = jQuery;
+} else if (typeof Zepto === "function") {
+  libFuncName = Zepto;
+} else {
+  throw new TypeError();
+}
+(function ($, window, document, undefined) {
+  'use strict';
+  /*
+    matchMedia() polyfill - Test a CSS media
+    type/query in JS. Authors & copyright (c) 2012:
+    Scott Jehl, Paul Irish, Nicholas Zakas.
+    Dual MIT/BSD license
+    https://github.com/paulirish/matchMedia.js
+  */
+  window.matchMedia = window.matchMedia || (function( doc, undefined ) {
+    "use strict";
+    var bool,
+        docElem = doc.documentElement,
+        refNode = docElem.firstElementChild || docElem.firstChild,
+        // fakeBody required for <FF4 when executed in <head>
+        fakeBody = doc.createElement( "body" ),
+        div = doc.createElement( "div" );
+    div.id = "mq-test-1";
+    div.style.cssText = "position:absolute;top:-100em";
+    fakeBody.style.background = "none";
+    fakeBody.appendChild(div);
+    return function(q){
+      div.innerHTML = "&shy;<style media=\"" + q + "\"> #mq-test-1 { width: 42px; }</style>";
+      docElem.insertBefore( fakeBody, refNode );
+      bool = div.offsetWidth === 42;
+      docElem.removeChild( fakeBody );
+      return {
+        matches: bool,
+        media: q
+      };
+    };
+  }( document ));
   // add dusty browser stuff
   if (!Array.prototype.filter) {
     Array.prototype.filter = function(fun /*, thisp */) {
@@ -17,17 +79,13 @@
       if (this == null) {
         throw new TypeError();
       }
       var t = Object(this),
           len = t.length >>> 0;
-      if (typeof fun != "function") {
-        try {
-          throw new TypeError();
-        } catch (e) {
+      if (typeof fun !== "function") {
           return;
-        }
       }
       var res = [],
           thisp = arguments[1];
       for (var i = 0; i < len; i++) {
@@ -38,32 +96,65 @@
           }
         }
       }
       return res;
+    }
+  }
+  if (!Function.prototype.bind) {
+    Function.prototype.bind = function (oThis) {
+      if (typeof this !== "function") {
+        // closest thing possible to the ECMAScript 5 internal IsCallable function
+        throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
+      }
+      var aArgs = Array.prototype.slice.call(arguments, 1),
+          fToBind = this,
+          fNOP = function () {},
+          fBound = function () {
+            return fToBind.apply(this instanceof fNOP && oThis
+               ? this
+               : oThis,
+             aArgs.concat(Array.prototype.slice.call(arguments)));
+          };
+      fNOP.prototype = this.prototype;
+      fBound.prototype = new fNOP();
+      return fBound;
     };
+  }
-    if (!Function.prototype.bind) {
-      Function.prototype.bind = function (oThis) {
-        if (typeof this !== "function") {
-          // closest thing possible to the ECMAScript 5 internal IsCallable function
-          throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
+  if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+      "use strict";
+      if (this == null) {
+        throw new TypeError();
+      }
+      var t = Object(this);
+      var len = t.length >>> 0;
+      if (len === 0) {
+        return -1;
+      }
+      var n = 0;
+      if (arguments.length > 1) {
+        n = Number(arguments[1]);
+        if (n != n) { // shortcut for verifying if it's NaN
+          n = 0;
+        } else if (n != 0 && n != Infinity && n != -Infinity) {
+          n = (n > 0 || -1) * Math.floor(Math.abs(n));
         }
-        var aArgs = Array.prototype.slice.call(arguments, 1),
-            fToBind = this,
-            fNOP = function () {},
-            fBound = function () {
-              return fToBind.apply(this instanceof fNOP && oThis
-                 ? this
-                 : oThis,
-               aArgs.concat(Array.prototype.slice.call(arguments)));
-            };
-        fNOP.prototype = this.prototype;
-        fBound.prototype = new fNOP();
-        return fBound;
-      };
+      }
+      if (n >= len) {
+          return -1;
+      }
+      var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
+      for (; k < len; k++) {
+        if (k in t && t[k] === searchElement) {
+          return k;
+        }
+      }
+      return -1;
     }
   }
@@ -71,17 +162,12 @@
   $.fn.stop = $.fn.stop || function() {
     return this;
   };
-}());
-;(function (window, document, undefined) {
-  'use strict';
   window.Foundation = {
     name : 'Foundation',
-    version : '4.0.0',
+    version : '4.2.3',
-    // global Foundation cache object
     cache : {},
     init : function (scope, libraries, method, options, response, /* internal */ nc) {
@@ -94,10 +180,13 @@
       // used for development only
       if (nc) this.nc = nc;
+      // check RTL
+      this.rtl = /rtl/i.test($('html').attr('dir'));
       // set foundation global scope
       this.scope = scope || this.scope;
-      if (libraries && typeof libraries === 'string') {
+      if (libraries && typeof libraries === 'string' && !/reflow/i.test(libraries)) {
         if (/off/i.test(libraries)) return this.off();
         library_arr = libraries.split(' ');
@@ -108,6 +197,8 @@
           }
         }
       } else {
+        if (/reflow/i.test(libraries)) args[1] = 'reflow';
         for (var lib in this.libs) {
           responses.push(this.init_lib(lib, args));
         }
@@ -122,9 +213,9 @@
     },
     response_obj : function (response_arr, args) {
-      for (var callback in args) {
-        if (typeof args[callback] === 'function') {
-          return args[callback]({
+      for (var i = 0, len = args.length; i < len; i++) {
+        if (typeof args[i] === 'function') {
+          return args[i]({
             errors: response_arr.filter(function (s) {
               if (typeof s === 'string') return s;
             })
@@ -141,6 +232,9 @@
           this.patch(this.libs[lib]);
           return this.libs[lib].init.apply(this.libs[lib], args);
         }
+        else {
+          return function () {};
+        }
       }.bind(this), lib);
     },
@@ -158,6 +252,8 @@
     patch : function (lib) {
       this.fix_outer(lib);
+      lib.scope = this.scope;
+      lib.rtl = this.rtl;
     },
     inherit : function (scope, methods) {
@@ -170,16 +266,31 @@
       }
     },
+    random_str : function (length) {
+      var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+      if (!length) {
+        length = Math.floor(Math.random() * chars.length);
+      }
+      var str = '';
+      for (var i = 0; i < length; i++) {
+        str += chars[Math.floor(Math.random() * chars.length)];
+      }
+      return str;
+    },
     libs : {},
     // methods that can be inherited in libraries
     lib_methods : {
       set_data : function (node, data) {
         // this.name references the name of the library calling this method
-        var id = this.name + (+new Date());
+        var id = [this.name,+new Date(),Foundation.random_str(5)].join('-');
         Foundation.cache[id] = data;
         node.attr('data-' + this.name + '-id', id);
+        return data;
       },
       get_data : function (node) {
@@ -209,13 +320,17 @@
         };
       },
-      // parses dat-options attribute on page nodes and turns
+      // parses data-options attribute on nodes and turns
       // them into an object
       data_options : function (el) {
         var opts = {}, ii, p,
             opts_arr = (el.attr('data-options') || ':').split(';'),
             opts_len = opts_arr.length;
+        function isNumber (o) {
+          return ! isNaN (o-0) && o !== null && o !== "" && o !== false && o !== true;
+        }
         function trim(str) {
           if (typeof str === 'string') return $.trim(str);
           return str;
@@ -227,8 +342,9 @@
           if (/true/i.test(p[1])) p[1] = true;
           if (/false/i.test(p[1])) p[1] = false;
+          if (isNumber(p[1])) p[1] = parseInt(p[1], 10);
-          if (p.length === 2) {
+          if (p.length === 2 && p[0].length > 0) {
             opts[trim(p[0])] = trim(p[1]);
           }
         }
@@ -311,13 +427,13 @@
     },
     zj : function () {
-      try {
+      if (typeof Zepto !== 'undefined') {
         return Zepto;
-      } catch (e) {
+      } else {
         return jQuery;
       }
     }()
-  },
+  };
   $.fn.foundation = function () {
     var args = Array.prototype.slice.call(arguments, 0);
@@ -328,4 +444,4 @@
     });
   };
-}(this, this.document));
+}(libFuncName, this, this.document));

data/lib/helios/frontend/javascripts/vendor/foundation/foundation.alerts.js CHANGED

@@ -6,7 +6,7 @@
   Foundation.libs.alerts = {
     name : 'alerts',
-    version : '4.0.0',
+    version : '4.2.2',
     settings : {
       speed: 300, // fade out speed
@@ -20,8 +20,8 @@
         $.extend(true, this.settings, method);
       }
-      if (typeof method != 'string') {
-        if (!this.settings.init) this.events();
+      if (typeof method !== 'string') {
+        if (!this.settings.init) { this.events(); }
         return this.settings.init;
       } else {
@@ -45,6 +45,8 @@
     off : function () {
       $(this.scope).off('.fndtn.alerts');
-    }
+    },
+    reflow : function () {}
   };
 }(Foundation.zj, this, this.document));

data/lib/helios/frontend/javascripts/vendor/foundation/foundation.clearing.js CHANGED

@@ -6,14 +6,14 @@
   Foundation.libs.clearing = {
     name : 'clearing',
-    version : '4.0.0',
+    version : '4.2.2',
     settings : {
       templates : {
         viewing : '<a href="#" class="clearing-close">&times;</a>' +
           '<div class="visible-img" style="display: none"><img src="//:0">' +
-          '<p class="clearing-caption"></p><a href="#" class="clearing-main-left"><span></span></a>' +
-          '<a href="#" class="clearing-main-right"><span></span></a></div>'
+          '<p class="clearing-caption"></p><a href="#" class="clearing-main-prev"><span></span></a>' +
+          '<a href="#" class="clearing-main-next"><span></span></a></div>'
       },
       // comma delimited list of selectors that, on click, will close clearing,
@@ -26,24 +26,24 @@
     },
     init : function (scope, method, options) {
-      this.scope = this.scope || scope;
-      Foundation.inherit(this, 'set_data get_data remove_data throttle');
+      var self = this;
+      Foundation.inherit(this, 'set_data get_data remove_data throttle data_options');
       if (typeof method === 'object') {
         options = $.extend(true, this.settings, method);
       }
-      if (typeof method != 'string') {
+      if (typeof method !== 'string') {
         $(this.scope).find('ul[data-clearing]').each(function () {
-          var self = Foundation.libs.clearing,
-              $el = $(this),
+          var $el = $(this),
               options = options || {},
+              lis = $el.find('li'),
               settings = self.get_data($el);
-          if (!settings) {
+          if (!settings && lis.length > 0) {
             options.$parent = $el.parent();
-            self.set_data($el, $.extend(true, self.settings, options));
+            self.set_data($el, $.extend({}, self.settings, options, self.data_options($el)));
             self.assemble($el.find('li'));
@@ -70,19 +70,30 @@
           function (e, current, target) {
             var current = current || $(this),
                 target = target || current,
-                settings = self.get_data(current.parent());
+                next = current.next('li'),
+                settings = self.get_data(current.parent()),
+                image = $(e.target);
             e.preventDefault();
             if (!settings) self.init();
+            // if clearing is open and the current image is
+            // clicked, go to the next image in sequence
+            if (target.hasClass('visible') &&
+              current[0] === target[0] &&
+              next.length > 0 && self.is_open(current)) {
+              target = next;
+              image = target.find('img');
+            }
             // set current and target to the clicked li if not otherwise defined.
-            self.open($(e.target), current, target);
+            self.open(image, current, target);
             self.update_paddles(target);
           })
-        .on('click.fndtn.clearing', '.clearing-main-right',
+        .on('click.fndtn.clearing', '.clearing-main-next',
           function (e) { this.nav(e, 'next') }.bind(this))
-        .on('click.fndtn.clearing', '.clearing-main-left',
+        .on('click.fndtn.clearing', '.clearing-main-prev',
           function (e) { this.nav(e, 'prev') }.bind(this))
         .on('click.fndtn.clearing', this.settings.close_selectors,
           function (e) { Foundation.libs.clearing.close(e, this) })
@@ -90,7 +101,7 @@
           function (e) { this.keydown(e) }.bind(this));
       $(window).on('resize.fndtn.clearing',
-        function (e) { this.resize() }.bind(this));
+        function () { this.resize() }.bind(this));
       this.settings.init = true;
       return this;
@@ -101,6 +112,7 @@
       $(this.scope)
         .on('touchstart.fndtn.clearing', '.visible-img', function(e) {
+          if (!e.touches) { e = e.originalEvent; }
           var data = {
                 start_page_x: e.touches[0].pageX,
                 start_page_y: e.touches[0].pageY,
@@ -113,6 +125,7 @@
           e.stopPropagation();
         })
         .on('touchmove.fndtn.clearing', '.visible-img', function(e) {
+          if (!e.touches) { e = e.originalEvent; }
           // Ignore pinch/zoom events
           if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
@@ -142,7 +155,10 @@
     },
     assemble : function ($li) {
-      var $el = $li.parent(),
+      var $el = $li.parent();
+      $el.after('<div id="foundationClearingHolder"></div>');
+      var holder = $('#foundationClearingHolder'),
           settings = this.get_data($el),
           grid = $el.detach(),
           data = {
@@ -152,7 +168,7 @@
           wrapper = '<div class="clearing-assembled"><div>' + data.viewing +
             data.grid + '</div></div>';
-      return settings.$parent.append(wrapper);
+      return holder.after(wrapper).remove();
     },
     // event callbacks
@@ -165,9 +181,12 @@
       if (!this.locked()) {
         // set the image to the selected thumbnail
-        image.attr('src', this.load($image));
+        image
+          .attr('src', this.load($image))
+          .css('visibility', 'hidden');
         this.loaded(image, function () {
+          image.css('visibility', 'visible');
           // toggle the gallery
           root.addClass('clearing-blackout');
           container.addClass('clearing-container');
@@ -195,7 +214,7 @@
           }($(el))), container, visible_image;
       if (el === e.target && root) {
-        container = root.find('div').first(),
+        container = root.find('div').first();
         visible_image = container.find('.visible-img');
         this.settings.prev_index = 0;
         root.find('ul[data-clearing]')
@@ -208,6 +227,10 @@
       return false;
     },
+    is_open : function (current) {
+      return current.parent().attr('style').length > 0;
+    },
     keydown : function (e) {
       var clearing = $('.clearing-blackout').find('ul[data-clearing]');
@@ -255,39 +278,50 @@
         .closest('.carousel')
         .siblings('.visible-img');
-      if (target.next().length) {
+      if (target.next().length > 0) {
         visible_image
-          .find('.clearing-main-right')
+          .find('.clearing-main-next')
           .removeClass('disabled');
       } else {
         visible_image
-          .find('.clearing-main-right')
+          .find('.clearing-main-next')
           .addClass('disabled');
       }
-      if (target.prev().length) {
+      if (target.prev().length > 0) {
         visible_image
-          .find('.clearing-main-left')
+          .find('.clearing-main-prev')
           .removeClass('disabled');
       } else {
         visible_image
-          .find('.clearing-main-left')
+          .find('.clearing-main-prev')
           .addClass('disabled');
       }
     },
     center : function (target) {
-      target.css({
-        marginLeft : -(this.outerWidth(target) / 2),
-        marginTop : -(this.outerHeight(target) / 2)
-      });
+      if (!this.rtl) {
+        target.css({
+          marginLeft : -(this.outerWidth(target) / 2),
+          marginTop : -(this.outerHeight(target) / 2)
+        });
+      } else {
+        target.css({
+          marginRight : -(this.outerWidth(target) / 2),
+          marginTop : -(this.outerHeight(target) / 2)
+        });
+      }
       return this;
     },
     // image loading and preloading
     load : function ($image) {
-      var href = $image.parent().attr('href');
+      if ($image[0].nodeName === "A") {
+        var href = $image.attr('href');
+      } else {
+        var href = $image.parent().attr('href');
+      }
       this.preload($image);
@@ -326,7 +360,7 @@
         return;
       }
-      if (this.complete || this.readyState === 4) {
+      if (image[0].complete || image[0].readyState === 4) {
         loaded();
       } else {
         bindLoad.call(image);
@@ -354,7 +388,7 @@
       if (caption) {
         container
-          .text(caption)
+          .html(caption)
           .show();
       } else {
         container
@@ -472,6 +506,10 @@
       $(window).off('.fndtn.clearing');
       this.remove_data(); // empty settings cache
       this.settings.init = false;
+    },
+    reflow : function () {
+      this.init();
     }
   };