batman-rails 0.0.2 → 0.0.3

data/vendor/assets/javascripts/batman/batman.rails.js

@@ -1,4 +1,5 @@
 (function() {
+  var applyExtra;
   var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
     for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
     function ctor() { this.constructor = child; }
@@ -7,52 +8,76 @@
     child.__super__ = parent.prototype;
     return child;
   }, __slice = Array.prototype.slice;
-  Batman.RailsStorage = (function() {
-    __extends(RailsStorage, Batman.RestStorage);
-    function RailsStorage() {
-      RailsStorage.__super__.constructor.apply(this, arguments);
-    }
-    RailsStorage.prototype._addJsonExtension = function(options) {
-      return options.url += '.json';
-    };
-    RailsStorage.prototype.optionsForRecord = function() {
-      var args, callback, _i;
-      args = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), callback = arguments[_i++];
-      return RailsStorage.__super__.optionsForRecord.apply(this, __slice.call(args).concat([function(err, options) {
-        if (!err) {
-          this._addJsonExtension(options);
-        }
-        return callback.call(this, err, options);
-      }]));
-    };
-    RailsStorage.prototype.optionsForCollection = function() {
-      var args, callback, _i;
-      args = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), callback = arguments[_i++];
-      return RailsStorage.__super__.optionsForCollection.apply(this, __slice.call(args).concat([function(err, options) {
-        if (!err) {
-          this._addJsonExtension(options);
-        }
-        return callback.call(this, err, options);
-      }]));
-    };
-    RailsStorage.prototype.after('update', 'create', function(_arg) {
-      var err, key, record, recordOptions, response, validationError, validationErrors, _i, _len, _ref;
-      err = _arg[0], record = _arg[1], response = _arg[2], recordOptions = _arg[3];
-      if (err) {
-        if (err.request.get('status') === 422) {
-          _ref = JSON.parse(err.request.get('response'));
-          for (key in _ref) {
-            validationErrors = _ref[key];
-            for (_i = 0, _len = validationErrors.length; _i < _len; _i++) {
-              validationError = validationErrors[_i];
-              record.get('errors').add(key, "" + key + " " + validationError);
-            }
+  applyExtra = function(Batman) {
+    Batman.mixin(Batman.Encoders, {
+      railsDate: {
+        encode: function(value) {
+          return value;
+        },
+        decode: function(value) {
+          var a;
+          a = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+          if (a) {
+            return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], +a[5], +a[6]));
+          } else {
+            Batman.developer.warn("Unrecognized rails date " + value + "!");
+            return Date.parse(value);
           }
-          return [record.get('errors'), record, response, recordOptions];
         }
       }
-      return arguments[0];
     });
-    return RailsStorage;
-  })();
+    return Batman.RailsStorage = (function() {
+      __extends(RailsStorage, Batman.RestStorage);
+      function RailsStorage() {
+        RailsStorage.__super__.constructor.apply(this, arguments);
+      }
+      RailsStorage.prototype._addJsonExtension = function(options) {
+        return options.url += '.json';
+      };
+      RailsStorage.prototype.optionsForRecord = function() {
+        var args, callback, _i;
+        args = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), callback = arguments[_i++];
+        return RailsStorage.__super__.optionsForRecord.apply(this, __slice.call(args).concat([function(err, options) {
+          if (!err) {
+            this._addJsonExtension(options);
+          }
+          return callback.call(this, err, options);
+        }]));
+      };
+      RailsStorage.prototype.optionsForCollection = function() {
+        var args, callback, _i;
+        args = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), callback = arguments[_i++];
+        return RailsStorage.__super__.optionsForCollection.apply(this, __slice.call(args).concat([function(err, options) {
+          if (!err) {
+            this._addJsonExtension(options);
+          }
+          return callback.call(this, err, options);
+        }]));
+      };
+      RailsStorage.prototype.after('update', 'create', function(_arg) {
+        var err, key, record, recordOptions, response, validationError, validationErrors, _i, _len, _ref;
+        err = _arg[0], record = _arg[1], response = _arg[2], recordOptions = _arg[3];
+        if (err) {
+          if (err.request.get('status') === 422) {
+            _ref = JSON.parse(err.request.get('response'));
+            for (key in _ref) {
+              validationErrors = _ref[key];
+              for (_i = 0, _len = validationErrors.length; _i < _len; _i++) {
+                validationError = validationErrors[_i];
+                record.get('errors').add(key, "" + key + " " + validationError);
+              }
+            }
+            return [record.get('errors'), record, response, recordOptions];
+          }
+        }
+        return arguments[0];
+      });
+      return RailsStorage;
+    })();
+  };
+  if ((typeof module !== "undefined" && module !== null) && (typeof require !== "undefined" && require !== null)) {
+    module.exports = applyExtra;
+  } else {
+    applyExtra(Batman);
+  }
 }).call(this);

data/vendor/assets/javascripts/batman/batman.solo.js

@@ -120,19 +120,19 @@ function(context, win) {
         }
 
         function setType(url) {
-            if (/\.json$/.test(url)) {
+            if (/\.json($|\?)/.test(url)) {
                 return 'json'
             }
-            if (/\.jsonp$/.test(url)) {
+            if (/\.jsonp($|\?)/.test(url)) {
                 return 'jsonp'
             }
-            if (/\.js$/.test(url)) {
+            if (/\.js($|\?)/.test(url)) {
                 return 'js'
             }
-            if (/\.html?$/.test(url)) {
+            if (/\.html?($|\?)/.test(url)) {
                 return 'html'
             }
-            if (/\.xml$/.test(url)) {
+            if (/\.xml($|\?)/.test(url)) {
                 return 'xml'
             }
             return 'js'
@@ -284,7 +284,9 @@ function(context, win) {
     var add, k, name, s, v, value;
     s = [];
     add = function(key, value) {
-      value = (Batman.typeOf(value) === 'function' ? value() : value);
+      if (typeof value === 'function') {
+        value = value();
+      }
       return s[s.length] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
     };
     if (Batman.typeOf(a) === 'Array') {
@@ -320,7 +322,10 @@ function(context, win) {
     }
   };
   Batman.Request.prototype.send = function(data) {
-    var options, xhr, _ref;
+    var options, params, xhr, _ref;
+    if (data == null) {
+      data = this.get('data');
+    }
     this.fire('loading');
     options = {
       url: this.get('url'),
@@ -329,7 +334,7 @@ function(context, win) {
       headers: {},
       success: __bind(function(response) {
         this.set('response', response);
-        this.set('status', xhr.status);
+        this.set('status', (typeof xhr !== "undefined" && xhr !== null ? xhr.status : void 0) || 200);
         return this.fire('success', response);
       }, this),
       error: __bind(function(xhr) {
@@ -342,18 +347,17 @@ function(context, win) {
         return this.fire('loaded');
       }, this)
     };
+    if (!this.get('formData')) {
+      options.headers['Content-type'] = this.get('contentType');
+    }
     if ((_ref = options.method) === 'PUT' || _ref === 'POST') {
-      if (!this.get('formData')) {
-        options.headers['Content-type'] = this.get('contentType');
-        data = data || this.get('data');
-        if (options.method === 'GET') {
-          options.url += param(data);
-        } else {
-          options.data = param(data);
-        }
+      if (this.get('formData')) {
+        options.data = this.constructor.objectToFormData(data);
       } else {
-        options.data = this.constructor.objectToFormData(options.data);
+        options.data = param(data);
       }
+    } else if (options.method === 'GET' && (params = param(data))) {
+      options.url += "?" + params;
     }
     return xhr = (reqwest(options)).request;
   };

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: batman-rails
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 0.0.2
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - John Duff
@@ -10,74 +15,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -04:00
+date: 2011-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: railties
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thor
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 14
         version: "0.14"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rails
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sqlite3
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id006
 description: Quickly get started with Batman.js in a Rails 3.1 app. Provides generators to get started and bundles in the latest version of Batman.js.
 email: 
@@ -180,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4349659790409699146
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -189,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4349659790409699146
+      hash: 3
       segments: 
       - 0
       version: "0"