joosy 1.0.0.RC1 → 1.0.0.RC2

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    joosy (0.1.0.RC3)
+    joosy (1.0.0.RC1)
       coffee-rails
       haml_coffee_assets
       i18n-js
@@ -82,7 +82,7 @@ GEM
     guard-coffeescript (0.5.7)
       coffee-script (>= 2.2.0)
       guard (>= 0.8.3)
-    haml_coffee_assets (0.8.5)
+    haml_coffee_assets (0.9.1)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)
@@ -95,8 +95,7 @@ GEM
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.6)
-    json (1.6.6-java)
+    json (1.7.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)

data/README.md

@@ -2,78 +2,18 @@
 
 ## What is Joosy
 
-Joosy is a full-featured javascript MVC framework, which mostly follows Rails philosophy, particularly in preferring conventions over configuration. It helps you to avoid boilerplate and makes it easy to maintain and extend the app.
+Joosy is a javascript framework. Being a harmonious extensions to Rails it introduces everything you like about this framework right to your browser. Ready conventions set, extensive CoffeeScript, HAML support, Helpers, seamless backend integration, automatic code generation and more.
 
-Joosy allows you to create web apps which work completely in the browser. So that, it helps you to relocate all your Rails Views to the client side. It also helps you with managing the growing quantity of JS code. On another hand, it makes your backend to have exactly one function --  to be a simple REST provider. That leads to easier development support and improves the scalability greatly.
+Joosy allows you to create web apps which work completely in the browser. So that, it helps you to relocate all your Rails Views to the client side. It also helps you with managing the growing quantity of JS code. On another hand, it makes your backend to have exactly one function – to be a simple REST provider. That leads to easier development support and improves the scalability greatly.
 
-Joosy doesn't compete with jQuery. It is built on the top of [jQuery](http://jquery.com/), and utilizes [CoffeeScript](http://coffeescript.org/). It either includes [Sugar.js](http://sugarjs.com/) in role of ActiveSupport to make your life even better.
+Besides Rails, Joosy is based on top of [CoffeeScript](http://coffeescript.org/), [jQuery](http://jquery.com/) and [Sugar.js](http://sugarjs.com/) in role of ActiveSupport.
 
-Finally, Joosy boosts your development drastically.
+Finally, Joosy boosts your development drastically. Just like the Rails do.
 
-### How is Joosy different from X
-
-We share quite different goals and totally differ in ways to achieve it. While existing MVC frameworks define basic entities for you and leave you alone with application basic patterns and solutions, Joosy tries to give convention for each of them.
-
-#### [Backbone](http://documentcloud.github.com/backbone/)
-
-In Backbone or Spine you only have abstract Views, Models and "Packs of …" and you should even decide on your own what's Controller for you. Joosy gives you the ready plan on how to move on to the success. If you ever used Rails you know that feeling: you concentrate on _what_ you create and not on _how_ to structure it.
-
-#### [Ember](http://emberjs.com/)
-
-Ember is the closest framework by spirit. But it still doesn't give you enough conventions and is even more abstract than Backbone in several parts. It either limits you to Handlebars. Joosy rendering system is built on top of same solution, Morpher. That said you can bind your variables dynamically just like in Ember. But it allows you to any templates syntax.
-
-### The Joosy MVC Interpretation
-
-You probably are familiar with the concept of MVC. It's a pattern to keep code DRY, isolate business logic from the UI. However the concept of Model-View-Controller just doesn't work for browser applications. There are numerous reasons for that that can't be fit into this introduction. Instead we'll tell you what we propose.
-
-#### Views
-
-In Joosy views are just views. Set of files (in templates/ folder). They do not differ from Rails and give you quite the same abilities (including helpers!). Besides that Joosy has renderDynamic which allows you to bind your variables to HTML representation tightly. You change variable value, Joosy changes HTML.
-
-By default Joosy comes with Coffee-Haml (which looks and works pretty much like Ruby Haml). Combined with Sugar.js it will feel very similar to Ruby and server-side and will provide you the easiest migration.
-
-#### Controllers
-
-Unlike server-side, client-side has a state. At server-side you only have incoming data and you convert it to output data. At client-side you work with events. To handle correct bootstrap and help you organize your code well, we have 3 entities which play the role of controller. Their organizing functions are similar but they behavior dramatically different at bootstrap.
-
-They are:
-
-###### Pages
-Pages are the heart of the entire application. They are used to fetch data, bind events, setup widgets, trig visual effects, and pass the data to the templates.
-
-###### Layouts 
-Layouts are mainly used to set a part of your page that won't be reloaded often. Pages are wrapped into Layouts. Just like pages Layouts can bind events and setup widgets. Consider layouts as a bit extended version of what you have in Rails.
-
-###### Widgets 
-Widgets are needed to keep your code DRY. They help you organize it in reusable modules.
-
-#### Models
-
-There are some facts that should be noted to explain it how we understand browser-side models.
-
-* In most cases you will want to leave your logic on server-side. In a real models. 
-* You rarely want to make 5 HTTP requests instead of 1.
-* In most cases you will have to give user a Form as a way to change anything.
-* You'll get different possible set of fields depending on case you use your model at.
-
-With all that in mind we came up to the fact: you can not reproduce real models in browser nor you should try to. What you need is a comfortable channel between browser and server-side to get structured data, work with that and send it back. That's mainly a transport and interface task while models are MUCH more than that. To solve this task Joosy offers you two things:
-
-###### Resources
-Resource is wrapper on top of JSON dump which will help you to get data from server, parse it and structure it. It will trigger 'changed' if you change resource, will map inline hashes in other resources if possible and do all other magic stuff you expect from your model when you read data. Resources either define Collections. In most cases you can say Resources are fully-functional read part of what you get used to as model.
-
-###### Forms
-After you got your data as resources and used it to display something, you'll need to change it. While resource defines modification methods like _save_ and _destroy_ most of complex modifications should go through Joosy.Form. It turns your form into AJAX and binds the resource to it. It handles file uploads, it gives you upload progress callback and makes it a dream to handle. Joosy.Form will either understand standard Rails invalidation response and will mark invalidated fields with ".field_with_errors" out of box.
-
-
-## What is Joosy good for
-
-Joosy is intended to ease building of modern medium and large-sized browser-based applications, minimize code base while providing more features and what's most important, giving you ready conventions for typical tasks.
-
-Compare Joosy to Backbone like Rails to Sinatra. While Rails engine is much more powerful, Sinatra still has a lot of cases to be used at. If all you need is to enable some RICHness on one of your pages, Joosy can handle that. But Backbone will do the trick with lesser dependencies. If you need to move complete web-resource to browser Joosy will do the task at its Best.
-
-## What's next?
-
-We have a set of guidelines showing you, step-by-step, how to create a Joosy application. Follow them at our [Guides site](http://guides.joosy.ws/).
+* [Joosy basics](http://guides.joosy.ws/guides/basics/getting-started.html): introduction and architecture highlights
+* [Joosy vs X](http://guides.joosy.ws/guides/basics/joosy-vs-x.html): comparison to Backbone and Ember.js
+* [Joosy guides](http://guides.joosy.ws/): set of articles that will help you to learn the framework.
+* [Joosy API](http://api.joosy.ws/): Codo-documented API of Joosy.
 
 ### Hello world app
 

data/app/assets/javascripts/joosy/core/application.js.coffee

@@ -12,6 +12,7 @@ Joosy.Application =
   
   loading: true
   identity: true
+  debug: false
 
   #
   # Starts Joosy application by binding to element and bootstraping routes

data/app/assets/javascripts/joosy/core/form.js.coffee

@@ -163,16 +163,26 @@ class Joosy.Form extends Joosy.Module
     else
       data = resource.data
 
-    Object.each data, (key, val) =>
-      key = resource.__entityName + "[#{key}]"
-      input = @fields.filter("[name='#{key.underscore()}']:not(:file),[name='#{key.camelize(false)}']:not(:file)")
-      unless input.is ':checkbox'
-        input.val val
-      else
-        if val
-          input.attr 'checked', 'checked'
-        else
-          input.removeAttr 'checked'
+    filler = (data, scope) =>
+      Object.each data, (key, val) =>
+        key = @concatFieldName scope, key
+        input = @fields.filter("[name='#{key}']:not(:file),[name='#{key.underscore()}']:not(:file),[name='#{key.camelize(false)}']:not(:file)")
+        if input.length > 0
+          unless input.is ':checkbox'
+            input.val val
+          else
+            if val
+              input.attr 'checked', 'checked'
+            else
+              input.removeAttr 'checked'
+        if Object.isObject val
+          filler val, key
+# TODO: decide how to make these cases compatible with Rails
+#        else if val instanceof Joosy.Resource.REST
+#          #filler val.data, key
+#        else if val instanceof Joosy.Resource.RESTCollection
+
+    filler data, resource.__entityName
 
     @__markMethod(options?.method || 'PUT') if resource.id()
 
@@ -300,12 +310,12 @@ class Joosy.Form extends Joosy.Module
         if field.indexOf(".") != -1
           splited = field.split '.'
           field   = splited.shift()
-          if @__resource
+          if @resourceName || @__resource
             name    = @resourceName || @__resource.__entityName
             field   = name + "[#{field}]"
           field  += "[#{f}]" for f in splited
       
-        else if @__resource
+        else if @resourceName || @__resource
           name  = @resourceName || @__resource.__entityName
           field = name + "[#{field}]"
 
@@ -335,4 +345,19 @@ class Joosy.Form extends Joosy.Module
       else
         result["#{scope}[#{key}]"] = value
 
-    result
+    result
+
+  concatFieldName: (wrapper, name) ->
+    items = @splitFieldName(wrapper).concat @splitFieldName(name)
+    "#{items[0]}[#{items.slice(1).join('][')}]"
+
+  splitFieldName: (name) ->
+    items = name.split('][')
+    first = items[0].split('[')
+    if first.length == 2
+      if first[0].isBlank()
+        items.splice 0, 1, first[1]
+      else
+        items.splice 0, 1, first[0], first[1]
+      items[items.length - 1] = items[items.length - 1].split(']')[0]
+    items

data/app/assets/javascripts/joosy/core/helpers/form.js.coffee

@@ -18,6 +18,9 @@ Joosy.helpers 'Application', ->
     delete options.extendIds
     @tag 'input', Joosy.Module.merge {type: type, name: d.name, id: d.id}, options
 
+  #
+  # @private
+  #
   class Form
     constructor: (@context, @resource, @options) ->
     label: (method, options={}, content='') -> @context.label(@resource, method, Joosy.Module.merge(extendIds: @options.extendIds, options), content)
@@ -58,7 +61,7 @@ Joosy.helpers 'Application', ->
   @radioButton = (resource, method, tagValue, options={}) -> input 'radio', resource, method, Joosy.Module.merge(value: tagValue, options)
 
   @checkBox = (resource, method, options={}, checkedValue=1, uncheckedValue=0) ->
-    spy = input 'hidden', resource, method, value: uncheckedValue, extendIds: options.extendIds
+    spy = @tag 'input', Joosy.Module.merge(name: description(resource, method).name, value: uncheckedValue, type: 'hidden')
     box = input 'checkbox', resource, method, Joosy.Module.merge(value: checkedValue, options)
 
     spy+box

data/app/assets/javascripts/joosy/core/joosy.js.coffee

@@ -19,11 +19,6 @@
   #
   Templaters: {}
 
-  #
-  # If enabled Joosy will log to console a lot of 'in progress' stuff
-  #
-  debug: false
-
   #
   # Registeres anything inside specified namespace (objects chain starting from `window`)
   #

data/app/assets/javascripts/joosy/core/modules/log.js.coffee

@@ -21,7 +21,7 @@ Joosy.Modules.Log =
   # Runs `log` if debug is active
   #
   debug: (args...) ->
-    return unless Joosy.debug
+    return unless Joosy.Application.debug
     @log args...
 
   #
@@ -31,6 +31,6 @@ Joosy.Modules.Log =
   # @param [String] string            Message to log
   #
   debugAs: (context, string, args...) ->
-    return unless Joosy.debug
+    return unless Joosy.Application.debug
     context = Joosy.Module.__className(context) || 'unknown context'
     @debug "#{context}> #{string}", args...

data/app/assets/javascripts/joosy/core/page.js.coffee

@@ -131,7 +131,9 @@ class Joosy.Page extends Joosy.Module
   #     $.get '/rumbas', (@data) => complete()
   #
   @fetch: (callback) ->
-    @::__fetch = callback
+    @::__fetch = (complete) -> 
+      @data = {}
+      callback.call(this, complete)
 
   #
   # Sets the several separate methods that will fetch data in parallel.

data/app/assets/javascripts/joosy/core/resource/collection.js.coffee

@@ -39,11 +39,6 @@ class Joosy.Resource.Collection extends Joosy.Module
   #
   @model: (model) -> @::model = model
   
-  #
-  # Modelized data storage
-  #
-  data: []
-  
   #
   # If model param was empty it will fallback to `@model`
   # If both param and `@model` were empty it will throw an exception.
@@ -52,6 +47,11 @@ class Joosy.Resource.Collection extends Joosy.Module
   #
   constructor: (model=false) ->
     @model = model if model
+
+    #
+    # Modelized data storage
+    #
+    @data = []
     
     if !@model
       throw new Error "#{Joosy.Module.__className @}> model can't be empty"

data/app/assets/javascripts/joosy/core/resource/generic.js.coffee

@@ -29,6 +29,10 @@ class Joosy.Resource.Generic extends Joosy.Module
 
   __source: false
 
+  #
+  # Clears the identity map cache. Recomended to be called during layout switch to 
+  # ensure correct garbage collection.
+  #
   @resetIdentity: ->
     Joosy.Resource.Generic.identity = {}
 

data/lib/joosy/rails/version.rb

@@ -1,5 +1,5 @@
 module Joosy
   module Rails
-    VERSION = "1.0.0.RC1"
+    VERSION = "1.0.0.RC2"
   end
 end

data/lib/joosy.rb

@@ -7,3 +7,10 @@ require 'joosy/rails/version'
 require 'rails/resources_with_joosy'
 
 require 'i18n-js'
+
+
+module Joosy
+  def self.resources(namespaces=nil)
+    Joosy::SprocketsHelper.joosy_resources(namespaces).to_json
+  end
+end

data/lib/rails/generators/joosy/application_generator.rb

@@ -10,7 +10,7 @@ module Joosy
 
         template "app.js.coffee", "#{file_path}.js.coffee"
 
-        template "app_resources_predefiner.js.coffee.erb", "#{file_path}_resources_predefiner.js.coffee.erb"
+        template "app_railties.js.coffee.erb", "#{file_path}_railties.js.coffee.erb"
 
         empty_directory file_path
 

data/lib/rails/generators/joosy/templates/app/helpers/application.js.coffee

@@ -1,4 +1,4 @@
 Joosy.helpers 'Application', ->
   
-  # helloWorld = (name) ->
+  # @helloWorld = (name) ->
   #   "Hello World, #{name}"

data/lib/rails/generators/joosy/templates/app.js.coffee

@@ -3,8 +3,8 @@
 #
 #= require_tree ./<%= file_name %>/helpers
 #= require_tree ./<%= file_name %>/templates
+#= require      ./<%= file_name %>_railties
 #= require_tree ./<%= file_name %>/resources
-#= require      ./<%= file_name %>_resources_predefiner
 #= require_tree ./<%= file_name %>/widgets
 #= require_tree ./<%= file_name %>/layouts
 #= require_tree ./<%= file_name %>/pages

data/lib/rails/generators/joosy/templates/{app_resources_predefiner.js.coffee.erb → app_railties.js.coffee.erb}

@@ -1,11 +1,11 @@
 # Whitelist here modules and sub-modules which resources should be predefined
-# e.g. ['front', 'front/products', nil] if you have
+# e.g. [nil, 'front', 'front/products'] if you have
 # Front::SomeController and Front::Products::AnotherController
 # with the associated namespaces in your routes
 # and want to predefine resources with no namespace
 
-# Joosy.defineResources <%= "<%= Joosy::SprocketsHelper.joosy_resources(['" + file_name + "', nil]).to_json %" + ">" %>
+# Joosy.defineResources <%= "<%= Joosy.resources [nil, '" + file_name + "'] %" + ">" %>
 
 # or predefine all resources
 
-Joosy.defineResources <%= "<%= Joosy::SprocketsHelper.joosy_resources.to_json %" + ">" %>
+Joosy.defineResources <%= "<%= Joosy.resources %" + ">" %>

data/spec/javascripts/joosy/core/form_spec.js.coffee

@@ -6,6 +6,8 @@ describe "Joosy.Form", ->
     @nudeForm = "<form id='nude'><input name='test[foo]'/><input name='test[bar]'/><input name='test[bool]' type='checkbox' value='1'/></form>"
     @putForm  = "<form id='put' method='put'><input name='test[camel_baz]'/></form>"
     @moreForm = "<form id='more' method='put'><input name='test[ololo]'/></form>"
+    @nestedForm = "<form id='nested'><input name='test[zee][capped][test]'/></form>"
+    @exactForm = "<form id='nested'><input name='test[EXact][MATCH]'/></form>"
 
     @ground.find('#sidebar').after(@nudeForm).after(@putForm).after(@moreForm)
 
@@ -23,6 +25,11 @@ describe "Joosy.Form", ->
       bar: 'bar'
       camelBaz: 'baz'
       bool: true
+      zee:
+        capped:
+          test: 'test'
+      EXact:
+        MATCH: 'works'
 
   afterEach ->
     @server.restore()
@@ -65,6 +72,8 @@ describe "Joosy.Form", ->
       @nudeForm   = new Joosy.Form @nudeForm
       @putForm    = new Joosy.Form @putForm
       @moreForm   = new Joosy.Form @moreForm
+      @nestedForm = new Joosy.Form @nestedForm
+      @exactForm  = new Joosy.Form @exactForm
 
     it "should fill form, set proper action and method and store resource", ->
       @nudeForm.fill @resource
@@ -82,6 +91,10 @@ describe "Joosy.Form", ->
       expect(@putForm.container.attr('method').toLowerCase()).toEqual 'post'
       expect(@putForm.container.attr 'action').toEqual '/tests/1'
 
+    it "should fill form with any properties", ->
+      @exactForm.fill @resource
+      expect(@exactForm.fields[0].value).toEqual 'works'
+
     it "should fill form with decorator", ->
       @moreForm.fill @resource, 
         decorator: (e) ->
@@ -102,6 +115,25 @@ describe "Joosy.Form", ->
         action: resource.memberPath(from: 'calculate')
       expect(@nudeForm.container.attr 'action').toEqual '/tests/someId/calculate'
 
+    it "should handle field name properly", ->
+      expect(@nudeForm.concatFieldName 'resource', 'key').toEqual 'resource[key]'
+      expect(@nudeForm.concatFieldName 'resource', 'key[key1]').toEqual 'resource[key][key1]'
+      expect(@nudeForm.concatFieldName 'resource[key]', 'key1').toEqual 'resource[key][key1]'
+      expect(@nudeForm.concatFieldName 'resource[key]', 'key1[key2]').toEqual 'resource[key][key1][key2]'
+      expect(@nudeForm.concatFieldName 'resource[key]', '[key1][key2]').toEqual 'resource[key][key1][key2]'
+      expect(@nudeForm.concatFieldName 'resource', 'key[]').toEqual 'resource[key][]'
+      expect(@nudeForm.concatFieldName 'resource[]', 'key1').toEqual 'resource[][key1]'
+      expect(@nudeForm.concatFieldName 'resource[]', 'key1[]').toEqual 'resource[][key1][]'
+      expect(@nudeForm.concatFieldName 'resource[]', '[][]').toEqual 'resource[][][]'
+      expect(@nudeForm.concatFieldName '[resource]', '[]').toEqual 'resource[]'
+      expect(@nudeForm.concatFieldName '[resource]', '[key]').toEqual 'resource[key]'
+      expect(@nudeForm.concatFieldName '[resource][key]', '[key1][key2]').toEqual 'resource[key][key1][key2]'
+      expect(@nudeForm.concatFieldName '[][]', '[][]').toEqual '[][][]' # oops
+
+    it "should fill nested attributes", ->
+      @nestedForm.fill @resource
+      expect(@nestedForm.fields[0].value).toEqual 'test'
+
   describe "Callbacks", ->
 
     beforeEach ->

data/spec/javascripts/joosy/core/helpers/forms_spec.js.coffee

@@ -39,7 +39,7 @@ describe "Joosy.Helpers.Form", ->
     it "renders checkBox", ->
       tags = h.checkBox('a', 'b', {a: 'b'}).match(/<[^>]+>/g)
 
-      expect(tags[0]).toBeTag 'input', '', value: '0', id: 'a_b', name: 'a[b]', type: 'hidden'
+      expect(tags[0]).toBeTag 'input', '', value: '0', name: 'a[b]', type: 'hidden'
       expect(tags[1]).toBeTag 'input', '', value: '1', id: 'a_b', name: 'a[b]', type: 'checkbox', a: 'b'
 
     it "renders radioButton", ->
@@ -69,7 +69,7 @@ describe "Joosy.Helpers.Form", ->
     it "renders checkBox", ->
       tags = form.checkBox('b', {a: 'b'}).match(/<[^>]+>/g)
 
-      expect(tags[0]).toBeTag 'input', '', value: '0', id: 'test_b', name: 'test[b]', type: 'hidden'
+      expect(tags[0]).toBeTag 'input', '', value: '0', name: 'test[b]', type: 'hidden'
       expect(tags[1]).toBeTag 'input', '', value: '1', id: 'test_b', name: 'test[b]', type: 'checkbox', a: 'b'
 
     it "renders radioButton", ->
@@ -93,7 +93,7 @@ describe "Joosy.Helpers.Form", ->
     it "renders checkBox", ->
       tags = form.checkBox('b', {a: 'b'}).match(/<[^>]+>/g)
 
-      expect(tags[0]).toBeTag 'input', '', value: '0', id: 'test_1_b', name: 'test[b]', type: 'hidden'
+      expect(tags[0]).toBeTag 'input', '', value: '0', name: 'test[b]', type: 'hidden'
       expect(tags[1]).toBeTag 'input', '', value: '1', id: 'test_1_b', name: 'test[b]', type: 'checkbox', a: 'b'
 
     it "renders radioButton", ->

data/spec/javascripts/joosy/core/joosy_spec.js.coffee

@@ -1,7 +1,7 @@
 describe "Joosy", ->
 
   it "should properly initialize", ->
-    expect(Joosy.debug).toBeFalsy()
+    expect(Joosy.Application.debug).toBeFalsy()
     expect(Joosy.Modules).toBeDefined()
     expect(Joosy.Resource).toBeDefined()
 

data/spec/javascripts/joosy/core/modules/log_spec.js.coffee

@@ -9,7 +9,7 @@ describe "Joosy.Modules.Log", ->
     @box.log 'message', 'appendix'
 
   it "should log debug messages into console", ->
-    Joosy.debug = true
+    Joosy.Application.debug = true
     @box.debug 'debug message'
-    Joosy.debug = false
+    Joosy.Application.debug = false
     @box.debug 'unseen debug message'

data/spec/javascripts/joosy/core/modules/module_spec.js.coffee

@@ -43,5 +43,5 @@ describe "Joosy.Module", ->
       expect(TestModule[callback].getCall(0).calledOn(Klass)).toBeTruthy()
 
   it "should have minimal set of properties", ->
-    expect(Object.extended(Joosy.Module).keys()).toEqual ['__namespace__', '__className', 'hasAncestor', 'merge', 'include', 'extend']
+    expect(Object.extended(Joosy.Module).keys()).toEqual ['__namespace__', '__className', 'hasAncestor', 'alias', 'aliasStatic', 'merge', 'include', 'extend']
     expect(Object.extended(Joosy.Module.prototype).keys()).toEqual []

data/spec/javascripts/joosy/core/page_spec.js.coffee

@@ -17,7 +17,7 @@ describe "Joosy.Page", ->
 
 
     it "should have appropriate accessors", ->
-      callback_names = ['fetch', 'beforePaint', 'paint', 'afterPaint', 'erase']
+      callback_names = ['beforePaint', 'paint', 'afterPaint', 'erase']
       callback_names.each (func) =>
         @TestPage[func] 'callback'
         expect(@TestPage::['__' + func]).toEqual 'callback'

data/spec/javascripts/joosy/core/resource/rest_collection_spec.js.coffee

@@ -28,4 +28,12 @@ describe "Joosy.Resource.RESTCollection", ->
 
     expect(@collection.data.length).toEqual 3
     expect(@collection.data[0].constructor == Test).toBeTruthy()
-    expect(@collection.data[0].data.name).toEqual 'test3'
+    expect(@collection.data[0].data.name).toEqual 'test3'
+
+  it "should use own storage", ->
+    class TestsCollection extends Joosy.Resource.RESTCollection
+      @model Test
+    collection = new TestsCollection()
+    collection.add 'test'
+    expect(collection.data).toEqual ['test']
+    expect(collection.hasOwnProperty 'data').toBeTruthy()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.RC1
+  version: 1.0.0.RC2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70229720683640 !ruby/object:Gem::Requirement
+  requirement: &70270595054760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70229720683640
+  version_requirements: *70270595054760
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70229720681860 !ruby/object:Gem::Requirement
+  requirement: &70270595054340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70229720681860
+  version_requirements: *70270595054340
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70229720696960 !ruby/object:Gem::Requirement
+  requirement: &70270595053880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70229720696960
+  version_requirements: *70270595053880
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
-  requirement: &70229720695940 !ruby/object:Gem::Requirement
+  requirement: &70270595053460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70229720695940
+  version_requirements: *70270595053460
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &70229720694880 !ruby/object:Gem::Requirement
+  requirement: &70270595053040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70229720694880
+  version_requirements: *70270595053040
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70229720692580 !ruby/object:Gem::Requirement
+  requirement: &70270595052620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229720692580
+  version_requirements: *70270595052620
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70229720691620 !ruby/object:Gem::Requirement
+  requirement: &70270595052200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229720691620
+  version_requirements: *70270595052200
 - !ruby/object:Gem::Dependency
   name: guard-sprockets
-  requirement: &70229720690420 !ruby/object:Gem::Requirement
+  requirement: &70270595051780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229720690420
+  version_requirements: *70270595051780
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70229720689700 !ruby/object:Gem::Requirement
+  requirement: &70270595051360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229720689700
+  version_requirements: *70270595051360
 description: A gem wrapper to include Joosy via the asset pipeline.
 email: boris@roundlake.ru
 executables: []
@@ -181,7 +181,7 @@ files:
 - lib/rails/generators/joosy/templates/app/widgets/template.js.coffee
 - lib/rails/generators/joosy/templates/app_controller.rb
 - lib/rails/generators/joosy/templates/app_preloader.js.coffee.erb
-- lib/rails/generators/joosy/templates/app_resources_predefiner.js.coffee.erb
+- lib/rails/generators/joosy/templates/app_railties.js.coffee.erb
 - lib/rails/generators/joosy/templates/preload.html.erb
 - lib/rails/generators/joosy/templates/preload.html.haml
 - lib/rails/generators/joosy/widget_generator.rb