joosy 1.2.0.alpha.55 → 1.2.0.alpha.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25d487304e9ce59d6de2a9dc4801fb801777239f
-  data.tar.gz: 27ccb7c1ed82c621247e9e00a155845711636ffe
+  metadata.gz: ffe45ebccb32a88133ea2c952189ea4942d15e0e
+  data.tar.gz: 6abce34a7d8760160a0e5eccd8bbffb0a09c0e14
 SHA512:
-  metadata.gz: d98c25370509ebb3abf2ade548ecf7d0da6f99304c7e9bd8ac7a83509903edffb46cee46d049b6f9c83a974e8ca479912aa59a89ff9ffd1cef4997115c8122e9
-  data.tar.gz: 39056008866151263195f9888e34c9ddcac102d3c3c58aa8eee62af7eefec1e4f0f65a9c461a2cb9338147090f9a060174b15d73a839ac26d3ff8e8e088fc7b9
+  metadata.gz: ed3d5616f102390ddaec6797dac25c0d6842c93bfd7c4329350ba4ef0fe9bdd14cc27af709945fdb32326b63ca562b66431b799e1713815afd508022422d87f5
+  data.tar.gz: 3b6e52d5eb9e28b3916d5c931f17bf590a4ad42bdebad55a4d3ae5291334c2679a06597a224ce6b54630ab255d30eded88eb41384f34e91af5b18dd65801c321

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.55",
+  "version": "1.2.0-alpha.56",
   "main": "lib/joosy.js",
   "ignore": [
     "bin",

data/build/joosy/extensions/resources-form.js

@@ -132,7 +132,7 @@
         Object.each(data, function(property, val) {
           var entity, i, input, key, _i, _len, _ref, _results;
           key = _this.concatFieldName(scope, property);
-          input = _this.$fields("[name='" + key + "']:not(:file),[name='" + (key.underscore()) + "']:not(:file),[name='" + (key.camelize(false)) + "']:not(:file)");
+          input = _this.$fields().filter("[name='" + key + "']:not(:file),[name='" + (key.underscore()) + "']:not(:file),[name='" + (key.camelize(false)) + "']:not(:file)");
           if (input.length > 0) {
             if (input.is(':checkbox')) {
               if (val) {
@@ -247,7 +247,7 @@
     };
 
     Form.prototype.findField = function(field) {
-      return this.$fields("[name='" + field + "']");
+      return this.$fields().filter("[name='" + field + "']");
     };
 
     Form.prototype.__markMethod = function(method) {

data/build/joosy/extensions/resources.js

@@ -428,11 +428,14 @@
       }, '');
     };
 
-    REST.basePath = function(options) {
+    REST.collectionPath = function(options) {
       var path;
       if (options == null) {
         options = {};
       }
+      if (options.url) {
+        return options.url;
+      }
       if ((this.__source != null) && (options.parent == null)) {
         path = this.__source;
       } else {
@@ -447,52 +450,42 @@
       if (options.parent != null) {
         path = this.__parentsPath(Object.isArray(options.parent) ? options.parent : [options.parent]) + path;
       }
-      return path;
-    };
-
-    REST.prototype.basePath = function(options) {
-      if (options == null) {
-        options = {};
-      }
-      return this.constructor.basePath(options);
-    };
-
-    REST.memberPath = function(id, options) {
-      var path;
-      if (options == null) {
-        options = {};
-      }
-      path = this.basePath(options) + ("/" + id);
       if (options.from != null) {
         path += "/" + options.from;
       }
       return path;
     };
 
-    REST.prototype.memberPath = function(options) {
+    REST.prototype.collectionPath = function(options) {
       if (options == null) {
         options = {};
       }
-      return this.constructor.memberPath(this.id(), options);
+      return this.constructor.collectionPath(options);
     };
 
-    REST.collectionPath = function(options) {
-      var path;
+    REST.memberPath = function(id, options) {
+      var from, path;
       if (options == null) {
         options = {};
       }
-      path = this.basePath(options);
-      if (options.from != null) {
-        path += "/" + options.from;
+      if (options.url) {
+        return options.url;
+      }
+      from = options.from;
+      path = this.collectionPath(Object.merge(options, {
+        from: void 0
+      })) + ("/" + id);
+      if (from != null) {
+        path += "/" + from;
       }
       return path;
     };
 
-    REST.prototype.collectionPath = function(options) {
+    REST.prototype.memberPath = function(options) {
       if (options == null) {
         options = {};
       }
-      return this.constructor.collectionPath(options);
+      return this.constructor.memberPath(this.id(), options);
     };
 
     REST.get = function(options, callback) {

data/build/joosy.js

@@ -496,11 +496,11 @@
     },
     __wrapElement: function(value) {
       var _this = this;
-      return function(filter) {
-        if (!filter) {
+      return function(context) {
+        if (!context) {
           return _this.$(value);
         }
-        return _this.$(value).filter(filter);
+        return _this.$(value, context);
       };
     },
     __delegateEvents: function() {

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.55",
+  "version": "1.2.0-alpha.56",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {

data/source/joosy/extensions/resources/rest.coffee

@@ -69,14 +69,16 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     , ''
 
   #
-  # Builds base path
+  # Builds collection path
   #
   # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
   #
   # @example Basic usage
-  #   Resource.basePath() # /resources
+  #   Resource.collectionPath() # /resources/
   #
-  @basePath: (options={}) ->
+  @collectionPath: (options={}) ->
+    return options.url if options.url
+
     if @__source? && !options.parent?
       path = @__source
     else
@@ -87,15 +89,17 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     if options.parent?
       path = @__parentsPath(if Object.isArray(options.parent) then options.parent else [options.parent]) + path
 
+    path += "/#{options.from}" if options.from?
+
     path
 
   #
-  # Builds base path
+  # Builds collection path
   #
-  # @see Joosy.Resources.REST.basePath
+  # @see Joosy.Resources.REST.collectionPath
   #
-  basePath: (options={}) ->
-    @constructor.basePath options
+  collectionPath: (options={}) ->
+    @constructor.collectionPath options
 
   #
   # Builds member path based on the given id.
@@ -107,8 +111,11 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #   Resource.memberPath(1, from: 'foo') # /resources/1/foo
   #
   @memberPath: (id, options={}) ->
-    path  = @basePath(options) + "/#{id}"
-    path += "/#{options.from}" if options.from?
+    return options.url if options.url
+
+    from = options.from
+    path  = @collectionPath(Object.merge(options, from: undefined)) + "/#{id}"
+    path += "/#{from}" if from?
     path
 
   #
@@ -122,27 +129,6 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   memberPath: (options={}) ->
     @constructor.memberPath @id(), options
 
-  #
-  # Builds collection path
-  #
-  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
-  #
-  # @example Basic usage
-  #   Resource.collectionPath() # /resources/
-  #
-  @collectionPath: (options={}) ->
-    path = @basePath(options)
-    path += "/#{options.from}" if options.from?
-    path
-
-  #
-  # Builds collection path
-  #
-  # @see Joosy.Resources.REST.collectionPath
-  #
-  collectionPath: (options={}) ->
-    @constructor.collectionPath options
-
   #
   # Sends the GET query using collectionPath.
   # Callback will get parsed JSON object as a parameter.

data/source/joosy/extensions/resources-form/form.coffee

@@ -179,7 +179,7 @@ class Joosy.Form extends Joosy.Module
       data.__joosy_form_filler_lock = true
       Object.each data, (property, val) =>
         key = @concatFieldName scope, property
-        input = @$fields("[name='#{key}']:not(:file),[name='#{key.underscore()}']:not(:file),[name='#{key.camelize(false)}']:not(:file)")
+        input = @$fields().filter("[name='#{key}']:not(:file),[name='#{key.underscore()}']:not(:file),[name='#{key.camelize(false)}']:not(:file)")
         if input.length > 0
           if input.is ':checkbox'
             if val
@@ -292,7 +292,7 @@ class Joosy.Form extends Joosy.Module
   # @param [String] field         Name of field to find
   #
   findField: (field) ->
-    @$fields("[name='#{field}']")
+    @$fields().filter("[name='#{field}']")
 
   #
   # Simulates REST methods by adding hidden _method input with real method

data/source/joosy/module.coffee

@@ -16,10 +16,6 @@ class Joosy.Module
   #   Remember: minifcation will rename your classes. Therefore it
   #   is only intended for development debugging purposes.
   #
-  # @note Go @jashkenas Go! Give us https://github.com/jashkenas/coffee-script/issues/2052.
-  #   Please go vote for this feature if you are reading this. It will
-  #   give us ability to eleminate a lot of boilerplate for you.
-  #
   # @return [String]
   #
   @__className: (klass) ->

data/source/joosy/modules/dom.coffee

@@ -90,9 +90,9 @@ Joosy.Modules.DOM =
   # @private
   #
   __wrapElement: (value) ->
-    (filter) =>
-      return @$(value) unless filter
-      return @$(value).filter(filter)
+    (context) =>
+      return @$(value) unless context
+      return @$(value, context)
 
   #
   # Binds events defined in 'events' to container

data/spec/joosy/extensions/resources/rest_spec.coffee

@@ -56,23 +56,26 @@ describe "Joosy.Resources.REST", ->
       clone = @Test.at 'rumbas', 'salsas', Fluffy.build(1)
       expect(clone.__source).toEqual '/rumbas/salsas/fluffies/1/tests'
 
-  it "build base path", ->
-    parent = FluffyParent.build 1
-    grandParent = FluffyParent.build 666
+  describe '@memberPath', ->
+    beforeEach ->
+      @parent = FluffyParent.build 1
+      @grandParent = FluffyParent.build 666
 
-    expect(Animal.Cat.basePath()).toEqual '/animal/cats'
-    expect(Animal.Cat.basePath parent: parent).toEqual '/fluffy_parents/1/animal/cats'
-    expect(Animal.Cat.basePath parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/animal/cats'
+    it 'builds member path', ->
+      expect(Fluffy.memberPath 1).toEqual '/fluffies/1'
 
-  it "builds member path", ->
-    parent = FluffyParent.build 1
-    grandParent = FluffyParent.build 666
+    it 'builds member path with single parent', ->
+      expect(Fluffy.memberPath 1, parent: @parent).toEqual '/fluffy_parents/1/fluffies/1'
+
+    it 'builds member path with array parent', ->
+      expect(Fluffy.memberPath 1, parent: [@grandParent, @parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/fluffies/1'
+
+    it 'builds member path with parent and from', ->
+      expect(Fluffy.memberPath 1, parent: @parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/1/test'
+
+    it 'builds member path with parent, from and params', ->
+      expect(Fluffy.memberPath 1, parent: @parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/1/test'
 
-    expect(Fluffy.memberPath 1).toEqual '/fluffies/1'
-    expect(Fluffy.memberPath 1, parent: parent).toEqual '/fluffy_parents/1/fluffies/1'
-    expect(Fluffy.memberPath 1, parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/fluffies/1'
-    expect(Fluffy.memberPath 1, parent: parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/1/test'
-    expect(Fluffy.memberPath 1, parent: parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/1/test'
 
   it "builds collection path", ->
     parent = FluffyParent.build 1
@@ -84,71 +87,81 @@ describe "Joosy.Resources.REST", ->
     expect(Fluffy.collectionPath parent: parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/test'
     expect(Fluffy.collectionPath parent: parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/test'
 
-  describe "finds resource", ->
+  describe '@find(:id)', ->
     rawData = '{"fluffy": {"id": 1, "name": "test1"}}'
 
-    callback = sinon.spy (target, data) ->
-      expect(target instanceof Fluffy).toEqual true
-      expect(target.id()).toEqual 1
-      expect(target 'name').toEqual 'test1'
-      expect(data).toEqual $.parseJSON(rawData)
-
-    it "without params", ->
-      resource = Fluffy.find 1, callback
+    beforeEach ->
+      @callback = sinon.spy (target, data) ->
+        expect(target instanceof Fluffy).toEqual true
+        expect(target.id()).toEqual 1
+        expect(target 'name').toEqual 'test1'
+        expect(data).toEqual $.parseJSON(rawData)
+
+    it "gets item without params", ->
+      resource = Fluffy.find 1, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/, rawData
-      expect(callback.callCount).toEqual 1
+      expect(@callback.callCount).toEqual 1
 
-    it "with from", ->
-      resource = Fluffy.find 1, {from: 'action'}, callback
+    it "gets item with from", ->
+      resource = Fluffy.find 1, {from: 'action'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\/action\?_=\d+/, rawData
-      expect(callback.callCount).toEqual 2
+      expect(@callback.callCount).toEqual 1
 
-    it "with from and parent", ->
-      resource = Fluffy.find 1, {parent: FluffyParent.build(1), from: 'action'}, callback
+    it "gets item with from and parent", ->
+      resource = Fluffy.find 1, {parent: FluffyParent.build(1), from: 'action'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffy_parents\/1\/fluffies\/1\/action\?_=\d+/, rawData
-      expect(callback.callCount).toEqual 3
+      expect(@callback.callCount).toEqual 1
 
-    it "with params", ->
-      resource = Fluffy.find 1, params: {foo: 'bar'}, callback
+    it "gets item with params", ->
+      resource = Fluffy.find 1, params: {foo: 'bar'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?foo=bar&_=\d+/, rawData
-      expect(callback.callCount).toEqual 4
+      expect(@callback.callCount).toEqual 1
 
-    it "with direct assignation", ->
-      resource = Fluffy.find 1, ->
-        expect(resource instanceof Fluffy).toEqual true
-        expect(resource.id()).toEqual 1
-        expect(resource 'name').toEqual 'test1'
+    it "gets item with url", ->
+      resource = Fluffy.find 1, url: '/some/custom/url', @callback
+      checkAndRespond @server.requests[0], 'GET', /^\/some\/custom\/url\?_=\d+/, rawData
+      expect(@callback.callCount).toEqual 1
 
+    it "gets item with direct assignation", ->
+      resource = Fluffy.find 1, (cbResource) ->
+        expect(resource).toBe cbResource
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/, rawData
 
-  describe "finds collection", ->
+  describe '@find(\'all\')', ->
     rawData = '{"page": 42, "fluffies": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}'
 
-    callback = sinon.spy (target, data) ->
-      expect(target instanceof Joosy.Resources.RESTCollection).toEqual true
-      expect(target.size()).toEqual 2
-      expect(target.at(0) instanceof Fluffy).toEqual true
-      expect(data).toEqual $.parseJSON(rawData)
-
-    it "without params", ->
-      resource = Fluffy.find 'all', callback
+    beforeEach ->
+      @callback = sinon.spy (target, data) ->
+        expect(target instanceof Joosy.Resources.RESTCollection).toEqual true
+        expect(target.size()).toEqual 2
+        expect(target.at(0) instanceof Fluffy).toEqual true
+        expect(data).toEqual $.parseJSON(rawData)
+
+    it "gets collection without params", ->
+      resource = Fluffy.find 'all', @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\?_=\d+/, rawData
-      expect(callback.callCount).toEqual 1
+      expect(@callback.callCount).toEqual 1
 
-    it "with from", ->
-      resource = Fluffy.find 'all', {from: 'action'}, callback
+    it "gets collection with from", ->
+      resource = Fluffy.find 'all', {from: 'action'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/action\?_=\d+/, rawData
-      expect(callback.callCount).toEqual 2
+      expect(@callback.callCount).toEqual 1
 
-    it "with from and parent", ->
-      resource = Fluffy.find 'all', {parent: FluffyParent.build(1), from: 'action'}, callback
+    it "gets collection with from and parent", ->
+      resource = Fluffy.find 'all', {parent: FluffyParent.build(1), from: 'action'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffy_parents\/1\/fluffies\/action\?_=\d+/, rawData
-      expect(callback.callCount).toEqual 3
+      expect(@callback.callCount).toEqual 1
 
-    it "with params", ->
-      resource = Fluffy.find 'all', params: {foo: 'bar'}, callback
+    it "gets collection with params", ->
+      resource = Fluffy.find 'all', params: {foo: 'bar'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\?foo=bar&_=\d+/, rawData
-      expect(callback.callCount).toEqual 4
+      expect(@callback.callCount).toEqual 1
+
+    it 'gets collection with url', ->
+      resource = Fluffy.find 'all', url: '/some/custom/url', @callback
+      checkAndRespond @server.requests[0], 'GET', /^\/some\/custom\/url\?_=\d+/, rawData
+      expect(@callback.callCount).toEqual 1
+
 
   it "reloads resource", ->
     rawData  = '{"fluffy": {"id": 1, "name": "test1"}}'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.55
+  version: 1.2.0.alpha.56
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets