joosy 1.2.0.beta.1 → 1.2.0.beta.2

data/spec/joosy/resources/modules/cacher_spec.coffee

@@ -20,13 +20,13 @@ describe 'Joosy.Modules.Resources.Cacher', ->
 
     it 'caches', ->
       @Cacher.cached (instance) =>
-        expect(instance()).toEqual 1
+        expect(instance.get()).toEqual 1
 
         expect(localStorage['scalar']).toEqual '[1]'
         expect(@spy.callCount).toEqual 1
 
         instance.refresh (instance) =>
-          expect(instance()).toEqual 1
+          expect(instance.get()).toEqual 1
           expect(@spy.callCount).toEqual 2
 
   describe 'Array', ->

data/spec/joosy/resources/modules/function_spec.coffee

@@ -0,0 +1,32 @@
+describe 'Joosy.Modules.Resources.Function', ->
+
+  it 'works', ->
+    class Generic extends Joosy.Module
+      @extend Joosy.Modules.Resources.Function
+
+      constructor: (@bar) ->
+        @foo = 'bar'
+
+      __call: -> '123'
+
+    generic = Generic.build 'foo'
+
+    expect(typeof generic).toEqual 'function'
+    expect(generic.foo).toEqual 'bar'
+    expect(generic.bar).toEqual 'foo'
+    expect(generic()).toEqual '123'
+
+  describe 'Hash', ->
+    it 'works', ->
+      class Hash extends Joosy.Resources.Hash
+        @extend Joosy.Modules.Resources.Function
+
+        constructor: (data) ->
+          data.bar = 'foo'
+          super data
+
+      hash = Hash.build {foo: 'bar'}
+
+      expect(typeof hash).toEqual 'function'
+      expect(hash 'foo').toEqual 'bar'
+      expect(hash 'bar').toEqual 'foo'

data/spec/joosy/resources/modules/identity_map_spec.coffee

@@ -34,9 +34,9 @@ describe "Joosy.Modules.Resources.IdentityMap", ->
       id: 1
       test_inlines: [{id: 1}, {id: 2}]
 
-    inline('foo', 'bar')
+    inline.set('foo', 'bar')
 
-    expect(root('test_inlines')[0]('foo')).toEqual 'bar'
+    expect(root.get('test_inlines')[0].get('foo')).toEqual 'bar'
 
   it "handles nested bi-directional reference", ->
     biDirectionTestNode = TestNode.build
@@ -44,4 +44,4 @@ describe "Joosy.Modules.Resources.IdentityMap", ->
       yolo: true
       children: [{id: 2, parent: {id: 1, yolo: true}}]
 
-    expect(biDirectionTestNode).toEqual(biDirectionTestNode('children')[0]('parent'))
+    expect(biDirectionTestNode).toEqual(biDirectionTestNode.get('children')[0].get('parent'))

data/spec/joosy/resources/modules/model_spec.coffee

@@ -4,7 +4,7 @@ describe "Joosy.Modules.Resources.Model", ->
     @include Joosy.Modules.Resources.Model
 
   beforeEach ->
-    @resource = new Model @data =
+    @resource = Model.build @data =
       foo: 'bar'
       bar: 'baz'
       very:
@@ -15,35 +15,31 @@ describe "Joosy.Modules.Resources.Model", ->
     expect(Model::__primaryKey).toEqual 'id'
 
   it "remembers where it belongs", ->
-    resource = new Model foo: 'bar'
+    resource = Model.build foo: 'bar'
     expect(resource.data).toEqual foo: 'bar'
 
-  it "produces magic function", ->
-    expect(typeof(@resource) == 'function').toBeTruthy()
-    expect(@resource.data).toEqual @data
-
   it "gets values", ->
-    expect(@resource 'foo').toEqual 'bar'
-    expect(@resource 'very.deep').toEqual value: 'boo!'
-    expect(@resource 'very.deep.value').toEqual 'boo!'
+    expect(@resource.get 'foo').toEqual 'bar'
+    expect(@resource.get 'very.deep').toEqual value: 'boo!'
+    expect(@resource.get 'very.deep.value').toEqual 'boo!'
 
   it "sets values", ->
-    expect(@resource 'foo').toEqual 'bar'
-    @resource 'foo', 'baz'
-    expect(@resource 'foo').toEqual 'baz'
+    expect(@resource.get 'foo').toEqual 'bar'
+    @resource.set 'foo', 'baz'
+    expect(@resource.get 'foo').toEqual 'baz'
 
-    expect(@resource 'very.deep').toEqual value: 'boo!'
-    @resource 'very.deep', 'banana!'
-    expect(@resource 'very.deep').toEqual 'banana!'
+    expect(@resource.get 'very.deep').toEqual value: 'boo!'
+    @resource.set 'very.deep', 'banana!'
+    expect(@resource.get 'very.deep').toEqual 'banana!'
 
-    @resource 'another.deep.value', 'banana strikes back'
-    expect(@resource 'another.deep').toEqual value: 'banana strikes back'
+    @resource.set 'another.deep.value', 'banana strikes back'
+    expect(@resource.get 'another.deep').toEqual value: 'banana strikes back'
 
   it "triggers 'changed' right", ->
     callback = sinon.spy()
     @resource.bind 'changed', callback
-    @resource 'foo', 'baz'
-    @resource 'foo', 'baz2'
+    @resource.set 'foo', 'baz'
+    @resource.set 'foo', 'baz2'
 
     expect(callback.callCount).toEqual(2)
 
@@ -54,9 +50,9 @@ describe "Joosy.Modules.Resources.Model", ->
         data.tested = true
         data
 
-      resource = new R()
+      resource = R.build()
 
-      expect(resource 'tested').toBeTruthy()
+      expect(resource.get 'tested').toBeTruthy()
 
   it "should map inlines", ->
     class RumbaMumba extends Model
@@ -68,18 +64,18 @@ describe "Joosy.Modules.Resources.Model", ->
     class S extends Model
       @map 'rumbaMumba', RumbaMumba
 
-    resource = new R
+    resource = R.build
       rumbaMumbas: [
         {foo: 'bar'},
         {bar: 'baz'}
       ]
-    expect(resource('rumbaMumbas') instanceof Joosy.Resources.Array).toBeTruthy()
-    expect(resource('rumbaMumbas')[0]('foo')).toEqual 'bar'
+    expect(resource.get('rumbaMumbas') instanceof Joosy.Resources.Array).toBeTruthy()
+    expect(resource.get('rumbaMumbas')[0].get('foo')).toEqual 'bar'
 
-    resource = new S
+    resource = S.build
       rumbaMumba: {foo: 'bar'}
-    expect(resource('rumbaMumba') instanceof Model).toBeTruthy()
-    expect(resource('rumbaMumba.foo')).toEqual 'bar'
+    expect(resource.get('rumbaMumba') instanceof Model).toBeTruthy()
+    expect(resource.get('rumbaMumba.foo')).toEqual 'bar'
 
   it "allows to override a collection", ->
     class Array extends Joosy.Resources.Array
@@ -91,9 +87,24 @@ describe "Joosy.Modules.Resources.Model", ->
     class R extends Model
       @map 'rumbaMumbas', RumbaMumba
 
-    resource = new R
+    resource = R.build
       rumbaMumbas: [
         {foo: 'bar'},
         {bar: 'baz'}
       ]
-    expect(resource('rumbaMumbas') instanceof Array).toBeTruthy()
+    expect(resource.get('rumbaMumbas') instanceof Array).toBeTruthy()
+
+  it "sets attributes", ->
+    class Fluffy extends Model
+      @attrAccessor 'foo', 'bar'
+
+    fluffy = Fluffy.build foo: 'bar', bar: 'foo'
+
+    expect(fluffy.foo()).toEqual 'bar'
+    expect(fluffy.bar()).toEqual 'foo'
+
+    fluffy.foo 'bar1'
+    fluffy.bar 'foo1'
+
+    expect(fluffy.foo()).toEqual 'bar1'
+    expect(fluffy.bar()).toEqual 'foo1'

data/spec/joosy/resources/rest_spec.coffee

@@ -128,7 +128,7 @@ describe "Joosy.Resources.REST", ->
       @callback = sinon.spy (error, target, data) ->
         expect(target instanceof Fluffy).toEqual true
         expect(target.id()).toEqual 1
-        expect(target 'name').toEqual 'test1'
+        expect(target.get 'name').toEqual 'test1'
         expect(data).toEqual $.parseJSON(rawData)
 
     it "gets item without params", ->
@@ -207,38 +207,38 @@ describe "Joosy.Resources.REST", ->
       resource = Fluffy.build id: 1
 
       it "with get", ->
-        resource.get {action: 'foo', params: {foo: 'bar'}}, callback
+        resource.send 'get', {action: 'foo', params: {foo: 'bar'}}, callback
         checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\/foo\?foo=bar&_=\d+/, rawData
 
       it "with post", ->
-        resource.post callback
+        resource.send 'post', callback
         checkAndRespond @server.requests[0], 'POST', /^\/fluffies\/1/, rawData
 
       it "with put", ->
-        resource.put callback
+        resource.send 'put', callback
         checkAndRespond @server.requests[0], 'PUT', /^\/fluffies\/1/, rawData
 
       it "with delete", ->
-        resource.delete callback
+        resource.send 'delete', callback
         checkAndRespond @server.requests[0], 'DELETE', /^\/fluffies\/1/, rawData
 
     describe "collection", ->
       resource = Fluffy
 
       it "with get", ->
-        resource.get {action: 'foo', params: {foo: 'bar'}}, callback
+        resource.send 'get', {action: 'foo', params: {foo: 'bar'}}, callback
         checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/foo\?foo=bar&_=\d+/, rawData
 
       it "with post", ->
-        resource.post callback
+        resource.send 'post', callback
         checkAndRespond @server.requests[0], 'POST', /^\/fluffies/, rawData
 
       it "with put", ->
-        resource.put callback
+        resource.send 'put', callback
         checkAndRespond @server.requests[0], 'PUT', /^\/fluffies/, rawData
 
       it "with delete", ->
-        resource.delete callback
+        resource.send 'delete', callback
         checkAndRespond @server.requests[0], 'DELETE', /^\/fluffies/, rawData
 
     describe "save", ->

data/spec/joosy/resources/scalar_spec.coffee

@@ -2,26 +2,21 @@ describe "Joosy.Resources.Scalar", ->
 
   describe 'in general', ->
     beforeEach ->
-      @scalar = new Joosy.Resources.Scalar(5)
+      @scalar = Joosy.Resources.Scalar.build(5)
 
     it 'wraps', ->
       expect(@scalar+1).toEqual(6)
       expect("#{@scalar}").toEqual('5')
 
-    it 'clones', ->
-      clone = @scalar.clone()
-      clone(1)
-      expect(@scalar()).toEqual(5)
-
     it 'triggers', ->
       spy = sinon.spy()
       @scalar.bind 'changed', spy
 
-      @scalar(7)
-      expect(@scalar()).toEqual 7
+      @scalar.set(7)
+      expect(@scalar.get()).toEqual 7
 
       @scalar.load(8)
-      expect(@scalar()).toEqual 8
+      expect(@scalar.get()).toEqual 8
 
       expect(spy.callCount).toEqual 2
 
@@ -31,11 +26,11 @@ describe "Joosy.Resources.Scalar", ->
         @beforeLoad (data) ->
           data + 1
 
-      scalar = new Scalar(5)
-      expect(scalar()).toEqual 6
+      scalar = Scalar.build(5)
+      expect(scalar.get()).toEqual 6
 
-      scalar(5)
-      expect(scalar()).toEqual 5
+      scalar.set(5)
+      expect(scalar.get()).toEqual 5
 
       scalar.load(7)
-      expect(scalar()).toEqual 8
+      expect(scalar.get()).toEqual 8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta.1
+  version: 1.2.0.beta.2
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -79,6 +79,7 @@ files:
 - source/joosy/modules/renderer.coffee
 - source/joosy/modules/resources.coffee
 - source/joosy/modules/resources/cacher.coffee
+- source/joosy/modules/resources/function.coffee
 - source/joosy/modules/resources/identity_map.coffee
 - source/joosy/modules/resources/model.coffee
 - source/joosy/modules/time_manager.coffee
@@ -121,6 +122,7 @@ files:
 - spec/joosy/resources/array_spec.coffee
 - spec/joosy/resources/hash_spec.coffee
 - spec/joosy/resources/modules/cacher_spec.coffee
+- spec/joosy/resources/modules/function_spec.coffee
 - spec/joosy/resources/modules/identity_map_spec.coffee
 - spec/joosy/resources/modules/model_spec.coffee
 - spec/joosy/resources/rest_spec.coffee
@@ -171,9 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Joosy Framework
 test_files: []
-has_rdoc: