jquery-historyjs 0.2.2 → 0.2.3

data/lib/generators/historyjs/install/install_generator.rb

@@ -3,27 +3,21 @@ require 'rails'
 module Historyjs
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      desc "This generator installs HistoryJS #{Historyjs::Rails::HISTORYJS_VERSION}, JSON2, and Amplify Store #{Historyjs::Rails::AMPLIFY_STORE_VERSION}"
+      desc "This generator installs HistoryJS #{Historyjs::Rails::HISTORYJS_VERSION} and JSON2"
       source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
 
       def copy_historyjs
         say_status("copying", "History.js (#{Historyjs::Rails::HISTORYJS_VERSION})", :green)
 
         copy_file "history_core.js",           "public/javascripts/history.js"
-        copy_file "history.html4.js",          "public/javascripts/history.html4.js"
-        copy_file "history.adapter.jquery.js", "public/javascripts/history.adapter.jquery.js"
+        copy_file "history_html4.js",          "public/javascripts/history.html4.js"
+        copy_file "history_adapter_jquery.js", "public/javascripts/history.adapter.jquery.js"
       end
 
       def copy_json2
         say_status("copying", "JSON2 (#{Historyjs::Rails::JSON2_VERSION})", :green)
         copy_file "json2.js", "public/javascripts/json2.js"
       end
-
-      def copy_amplify_store
-        say_status("copying", "Amplify Store (#{Historyjs::Rails::AMPLIFY_STORE_VERSION[0..5]})", :green)
-        copy_file "amplify_store.js", "public/javascripts/amplify.store.js"
-      end
-
     end
   end
-end if ::Rails.version < "3.1"
+end if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled

data/lib/historyjs/rails/version.rb

@@ -1,7 +1,7 @@
 module Historyjs
   module Rails
-    VERSION               = "0.2.2"
+    VERSION               = "0.2.3"
     HISTORYJS_VERSION     = "1.7.1-r2"
-    JSON2_VERSION         = "8e0b15cb492f63067a88"
+    JSON2_VERSION         = "47a9882cdd"
   end
 end

data/vendor/assets/javascripts/json2.js

@@ -1,6 +1,6 @@
 /*
     http://www.JSON.org/json2.js
-    2011-02-23
+    2011-10-19
 
     Public Domain.
 
@@ -146,7 +146,7 @@
     redistribute.
 */
 
-/*jslint evil: true, strict: false, regexp: false */
+/*jslint evil: true, regexp: true */
 
 /*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
     call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
@@ -165,7 +165,7 @@ if (!JSON) {
 }
 
 (function () {
-    "use strict";
+    'use strict';
 
     function f(n) {
         // Format integers to have at least two digits.
@@ -176,13 +176,14 @@ if (!JSON) {
 
         Date.prototype.toJSON = function (key) {
 
-            return isFinite(this.valueOf()) ?
-                this.getUTCFullYear()     + '-' +
-                f(this.getUTCMonth() + 1) + '-' +
-                f(this.getUTCDate())      + 'T' +
-                f(this.getUTCHours())     + ':' +
-                f(this.getUTCMinutes())   + ':' +
-                f(this.getUTCSeconds())   + 'Z' : null;
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
         };
 
         String.prototype.toJSON      =
@@ -218,8 +219,9 @@ if (!JSON) {
         escapable.lastIndex = 0;
         return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
             var c = meta[a];
-            return typeof c === 'string' ? c :
-                '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
         }) + '"' : '"' + string + '"';
     }
 
@@ -303,9 +305,11 @@ if (!JSON) {
 // Join all of the elements together, separated with commas, and wrap them in
 // brackets.
 
-                v = partial.length === 0 ? '[]' : gap ?
-                    '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
-                    '[' + partial.join(',') + ']';
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
                 gap = mind;
                 return v;
             }
@@ -340,9 +344,11 @@ if (!JSON) {
 // Join all of the member texts together, separated with commas,
 // and wrap them in braces.
 
-            v = partial.length === 0 ? '{}' : gap ?
-                '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
-                '{' + partial.join(',') + '}';
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
             gap = mind;
             return v;
         }
@@ -468,8 +474,9 @@ if (!JSON) {
 // In the optional fourth stage, we recursively walk the new structure, passing
 // each name/value pair to a reviver function for possible transformation.
 
-                return typeof reviver === 'function' ?
-                    walk({'': j}, '') : j;
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
             }
 
 // If the text is not JSON parseable, then a SyntaxError is thrown.
@@ -477,4 +484,4 @@ if (!JSON) {
             throw new SyntaxError('JSON.parse');
         };
     }
-}());
+}());

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-historyjs
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70133267709340 !ruby/object:Gem::Requirement
+  requirement: &70137982107680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133267709340
+  version_requirements: *70137982107680
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70133267720160 !ruby/object:Gem::Requirement
+  requirement: &70137982117720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70133267720160
+  version_requirements: *70137982117720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70133267717140 !ruby/object:Gem::Requirement
+  requirement: &70137982114440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70133267717140
+  version_requirements: *70137982114440
 description: This gem provides History.js and the related HTML4 dependencies for using
   History.js with jQuery in your Rails 3+ application.
 email:
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3126758407894072590
+      hash: -3263187480763743088
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: