modularity-rails 0.11.1 → 0.12.0

data/demo/spec/javascripts/data/ajax_loader_spec.coffee

@@ -0,0 +1,136 @@
+#= require spec_helper
+#= require modularity/data/ajax_loader
+
+
+describe 'ajax_loader', ->
+  
+  ajax_loader = spy = spy_get = null
+  beforeEach ->
+    spy = sinon.spy()
+    spy_get = sinon.spy jQuery, 'get'
+
+  afterEach ->
+    spy_get.restore()
+
+  describe 'constructor', ->
+    it "stores the 'cache' settings", ->
+      loader = new modularity.AjaxLoader {caching: yes}
+      loader.caching.should.be.true
+
+
+  describe 'get', ->
+    url = "/users/4"
+
+    describe 'with caching enabled', ->
+
+      beforeEach ->
+        ajax_loader = new modularity.AjaxLoader {caching: yes}
+
+      describe 'first time request', ->
+
+        beforeEach ->
+          ajax_loader.get url, spy
+
+        it 'makes an ajax request', ->
+          jQuery.get.should.have.been.called
+
+
+        it 'saves the callback for later', ->
+          ajax_loader.cache.get(url).should.have.length 1
+          ajax_loader.cache.get(url)[0].should.equal spy
+
+        it 'returns without calling the callback', ->
+          spy.should.not.have.been.called
+
+      describe 'the request is already in progress', ->
+
+        beforeEach ->
+          ajax_loader.cache.cache[url] = [spy]
+
+
+        it 'adds the callback to the callback array', ->
+          ajax_loader.cache.get(url).should.have.length 1
+          ajax_loader.cache.get(url)[0].should.equal spy
+
+
+        it 'returns without calling the callback', ->
+          spy.should.not.have.been.called
+
+
+        it 'does not make another ajax request', ->
+          jQuery.get.should.not.have.been.called
+
+      describe 'ajax request successful', ->
+
+        beforeEach ->
+          jquery_callback = null
+          jQuery.get = (url, callback) -> jquery_callback = callback
+          ajax_loader.get url, spy
+          jquery_callback('result')
+
+        it 'calls the given callbacks with the server data', ->
+          spy.should.have.been.calledWith 'result'
+
+        it 'replaces the cache callbacks with returned data', ->
+          ajax_loader.cache.get(url).should.equal 'result'
+
+      describe 'the data has already been loaded', ->
+
+        it 'calls the callback with the cached data', ->
+          ajax_loader.cache.add url, "my data"
+
+          ajax_loader.get(url, spy)
+
+          spy.should.have.been.called
+          spy.should.have.been.calledWith "my data"
+
+
+    describe 'with caching disabled', ->
+
+      beforeEach ->
+        ajax_loader = new modularity.AjaxLoader {caching: no}
+
+      describe 'first time request', ->
+
+        beforeEach ->
+          ajax_loader.get url, spy
+
+        it 'makes an ajax request', ->
+          jQuery.get.should.have.been.called
+
+        it 'saves the callback for later', ->
+          ajax_loader.cache.get(url).should.have.length 1
+          ajax_loader.cache.get(url)[0].should.equal spy
+
+        it 'returns without calling the callback', ->
+          spy.should.not.have.been.called
+
+      describe 'the request is already in progress', ->
+
+        beforeEach ->
+          ajax_loader.cache.cache[url] = [spy]
+
+        it 'adds the callback to the callback array', ->
+          ajax_loader.cache.get(url).should.have.length 1
+          ajax_loader.cache.get(url)[0].should.equal spy
+
+        it 'returns without calling the callback', ->
+          spy.should.not.have.been.called
+
+        it 'does not make another ajax request', ->
+          jQuery.get.should.not.have.been.called
+
+      describe 'ajax request successful', ->
+
+        beforeEach ->
+          jquery_callback = null
+          jQuery.get = (url, callback) -> jquery_callback = callback
+          ajax_loader.get url, spy
+          jquery_callback('result')
+
+        it 'calls the given callbacks with the server data', ->
+          spy.should.have.been.calledWith 'result'
+
+        it 'replaces the cache callbacks with returned data', ->
+          expect(ajax_loader.cache.get(url)).to.be.undefined
+

data/demo/spec/javascripts/{tools → data}/cache_spec.coffee

@@ -1,5 +1,5 @@
 #= require spec_helper
-#= require modularity/tools/cache
+#= require modularity/data/cache
 
 
 describe 'Cache', ->
@@ -18,7 +18,7 @@ describe 'Cache', ->
   describe 'add', ->
 
     it 'stores the given data in the cache', ->
-      cache.add('foo', 'bar')
+      cache.add 'foo', 'bar'
       cache.cache.should.eql({'foo': 'bar'})
 
     it 'overwrites existing entries', ->
@@ -27,6 +27,23 @@ describe 'Cache', ->
       (cache.cache['foo']).should.be.equal('new')
 
 
+  describe 'remove', ->
+
+    it 'removes the entry with the given key from the chache', ->
+      cache.add 'foo', 'bar'
+      cache.remove 'foo'
+      expect(cache.get('foo')).to.be.undefined
+      cache.length().should.equal 0
+
+    it 'only removes the given data and leaves the rest of the cache alone', ->
+      cache.add 1, 'one'
+      cache.add 2, 'two'
+      cache.remove 1
+      expect(cache.get(1)).to.be.undefined
+      expect(cache.get(2)).to.equal 'two'
+      cache.length().should.equal 1
+
+
   describe 'get', ->
 
     it "returns undefined if the entry doesn't exist", ->

data/demo/spec/javascripts/data/indexed_cache_spec.coffee

@@ -0,0 +1,51 @@
+#= require spec_helper
+#= require modularity/data/indexed_cache
+
+
+describe 'IndexedCache', ->
+
+  indexed_cache = null
+  entry_1 = {id: 1, value: 'one'}
+  entry_2 = {id: 2, value: 'two'}
+  beforeEach ->
+    indexed_cache = new modularity.IndexedCache 'id'
+
+
+  describe 'constructor', ->
+    
+    it 'stores the given key attribute', ->
+      indexed_cache.key.should == 'id'
+
+
+  describe 'add', ->
+    
+    beforeEach ->
+      indexed_cache.add entry_1
+
+    it 'adds the given element', ->
+      indexed_cache.cache.length().should.equal 1
+      indexed_cache.cache.cache[1].should.eql entry_1
+
+
+  describe 'add_all', ->
+    it 'adds all the given elements', ->
+      indexed_cache.add_all [entry_1, entry_2]
+      indexed_cache.length().should.equal 2
+      indexed_cache.cache.cache[1].should.eql entry_1
+      indexed_cache.cache.cache[2].should.eql entry_2
+
+
+  describe 'remove', ->
+    it 'removes the given object from the server', ->
+      indexed_cache.add entry_1
+      indexed_cache.remove entry_1
+      indexed_cache.length().should.equal 0
+
+  describe 'get', ->
+    it 'returns the element indexed by the given key', ->
+      indexed_cache.add entry_1
+      indexed_cache.get(1).should.eql entry_1
+
+    it "returns undefined if the element doesn't exist", ->
+      expect(indexed_cache.get(2)).to.be.undefined
+

data/demo/spec/javascripts/data/persistence_manager_spec.coffee

@@ -0,0 +1,276 @@
+#= require spec_helper
+#= require modularity/data/persistence_manager
+#= require jquery
+
+
+describe 'PersistenceManager', ->
+  
+  # Global variables for testing.
+  persistence_manager = null
+  entry_1 = {id: 1, value: 'one'}
+  entry_2 = {id: 2, value: 'two'}
+
+  beforeEach ->
+    persistence_manager = new modularity.PersistenceManager {url: '/users'}
+
+
+  describe 'constructor', ->
+
+    it 'initializes an empty server data cache', ->
+      persistence_manager.server_data.length().should.equal 0
+
+    it 'initializes an empty client data cache', ->
+      persistence_manager.client_data.length().should.eql 0
+
+    it 'stores the given base url', ->
+      persistence_manager.base_url.should.equal '/users'
+
+    it 'stores the given index key', ->
+      persistence_manager = new modularity.PersistenceManager {key: 'my_key', url: '/users'}
+      persistence_manager.key.should.equal 'my_key'
+
+    it "uses 'id' as the default if no key is given", ->
+      persistence_manager.key.should.equal 'id'
+
+
+  describe 'clone', ->
+
+    clone = null
+    beforeEach ->
+      clone = persistence_manager.clone entry_1
+
+    it 'returns an object that has the same properties as the given object', ->
+      clone.id.should.equal 1
+      clone.value.should.equal 'one'
+
+    it 'returns an object that can be changed independently from the given object', ->
+      clone.id = 2
+      clone.value = 'two'
+      entry_1.id.should == 1
+      entry_1.value.should == 'one'
+
+
+  describe 'create', ->
+    new_obj = {value: 'foo'}
+
+    beforeEach ->
+      sinon.stub(jQuery, 'ajax').yieldsTo('success', entry_2)
+      
+    afterEach ->
+      jQuery.ajax.restore()
+
+    it 'makes an ajax POST request to the CREATE url on the server', ->
+      persistence_manager.create new_obj, ->
+      jQuery.ajax.should.have.been.calledOnce
+      args = jQuery.ajax.args[0][0]
+      args.url.should.equal '/users.json'
+      args.type.should.equal 'POST'
+
+    it 'sends the object as payload', ->
+      persistence_manager.create new_obj, ->
+      args = jQuery.ajax.args[0][0]
+      args.data.should.equal new_obj
+
+    it "doesn't updates the server cache immediately because the object doesn't have an id", ->
+      persistence_manager.create new_obj, ->
+      expect(persistence_manager.server_data.get(1)).to.be.undefined
+
+    it 'updates the server cache with the server data when the call returns', (done) ->
+      persistence_manager.create {value: 'bar'}, (server_obj) ->
+        persistence_manager.server_data.get(server_obj.id).should.equal entry_2
+        done()
+
+    it 'calls the given callback when done', (done) ->
+      persistence_manager.create new_obj, ->
+        done()
+
+
+  describe 'delete', ->
+
+    beforeEach ->
+      sinon.stub(jQuery, 'ajax').yieldsTo('success')
+
+    afterEach ->
+      jQuery.ajax.restore()
+
+    it 'makes an ajax DELETE request to the item url on the server', ->
+      persistence_manager.delete entry_1
+      jQuery.ajax.should.have.been.calledOnce
+      args = jQuery.ajax.args[0][0]
+      args.url.should.equal '/users/1.json'
+      args.type.should.equal 'DELETE'
+
+    it 'removes the object from the client and server cache', ->
+      persistence_manager.server_data.add entry_1
+      persistence_manager.client_data.add entry_1
+      persistence_manager.delete entry_1
+      persistence_manager.server_data.length().should.equal 0
+      persistence_manager.client_data.length().should.equal 0
+
+    it 'calls the given callback when done', (done) ->
+      persistence_manager.delete entry_1, ->
+        done()
+
+
+  describe 'entry_url', ->
+
+    it 'returns the url to access a single entry', ->
+      persistence_manager.entry_url(entry_1).should.equal '/users/1.json'
+
+
+  describe 'load_all', ->
+
+    loading_done_callback = null
+    beforeEach ->
+      sinon.stub(jQuery, 'ajax').yieldsTo('success', [entry_1, entry_2])
+      loading_done_callback = sinon.spy()
+      persistence_manager.load_all loading_done_callback, {'q': 'foo'},
+
+    afterEach ->
+      jQuery.ajax.restore()
+      
+    it 'makes a request to the INDEX action of the server', ->
+      jQuery.ajax.should.have.been.calledOnce
+      jQuery.ajax.args[0][0].url.should.equal '/users.json'
+
+    it 'provides the given data as parameters to the request', ->
+      jQuery.ajax.args[0][0].data.should.eql {'q': 'foo'}
+
+    it 'fills the server cache with the response data', ->
+      persistence_manager.server_data.length().should.eql 2
+      persistence_manager.server_data.get(1).should.eql entry_1
+      persistence_manager.server_data.get(2).should.eql entry_2
+
+    it 'calls the given callback method when the data is available', ->
+      loading_done_callback.should.have.been.calledOnce
+
+
+  describe 'load', ->
+
+    describe 'entry exists in client data cache', ->
+      it 'returns the entry from the @client_data cache if it exists there', (done) ->
+        persistence_manager.client_data.add entry_1
+        persistence_manager.load 1, (entry) ->
+          entry.should.equal entry_1
+          done()
+
+    describe 'entry exists in server data cache', ->
+
+      beforeEach ->
+        persistence_manager.server_data.add entry_1
+
+      it 'adds the entry to the client data cache', (done) ->
+        persistence_manager.load 1, ->
+          persistence_manager.client_data.length().should.equal 1
+          persistence_manager.client_data.get(1).should.eql entry_1
+          done()
+
+      it 'returns the entry from the client data cache', (done) ->
+        persistence_manager.load 1, (entry) ->
+          client_cache_entry = persistence_manager.client_data.get 1
+          entry.should.equal client_cache_entry
+          done()
+
+      it 'returns a different hash than the server data, so that the user can make changes to it', (done) ->
+        persistence_manager.load 1, (entry) ->
+          server_cache_entry = persistence_manager.server_data.get 1
+
+          entry.should.not.equal server_cache_entry
+          done()
+
+
+    describe "entry doesn't exist on the client at all", ->
+      
+      beforeEach ->
+        sinon.stub(jQuery, 'ajax').yieldsTo('success', entry_1)
+
+      afterEach ->
+        jQuery.ajax.restore()
+
+      it "retrieves the entry from the server", (done) ->
+        persistence_manager.load 1, ->
+          jQuery.ajax.should.have.been.calledOnce
+          done()
+
+
+      it 'stores the entry in the server cache', (done) ->
+        persistence_manager.load 1, ->
+          persistence_manager.server_data.length().should.equal 1
+          persistence_manager.server_data.get(1).should.equal entry_1
+          done()
+
+      it 'stores a replica of the entry in the client cache', (done) ->
+        persistence_manager.load 1, ->
+          persistence_manager.client_data.get(1).should.not.equal entry_1
+          persistence_manager.client_data.get(1).should.eql entry_1
+          done()
+
+      it 'returns the client replica', (done) ->
+        persistence_manager.load 1, (entry) ->
+          persistence_manager.client_data.get(1).should.equal entry
+          persistence_manager.server_data.get(1).should.not.equal entry
+          done()
+
+
+  describe 'save', ->
+
+    describe 'for unsaved objects', ->
+      it "calls the 'create' action", ->
+        sinon.stub persistence_manager, 'create'
+        persistence_manager.save {value: 'foo'}, ->
+        persistence_manager.create.should.have.been.calledOnce
+
+    describe 'for objects from the server', ->
+      it "calls the 'update' action", ->
+        sinon.stub persistence_manager, 'update'
+        persistence_manager.save entry_1, ->
+        persistence_manager.update.should.have.been.calledOnce
+
+
+  describe 'update', ->
+
+    beforeEach ->
+      sinon.stub(jQuery, 'ajax').yieldsTo('success', entry_2)
+      server_entry = {id: 1, title: 'server title', desc: 'server desc'}
+      persistence_manager.server_data.add server_entry
+      
+    afterEach ->
+      jQuery.ajax.restore()
+
+    it 'makes an ajax PUT request to the UPDATE url on the server', ->
+      persistence_manager.update entry_1, ->
+      jQuery.ajax.should.have.been.calledOnce
+      args = jQuery.ajax.args[0][0]
+      args.url.should.equal '/users/1.json'
+      args.type.should.equal 'PUT'
+
+    it 'sends only updated colums of the object as payload', (done) ->
+      persistence_manager.load 1, (client_entry) ->
+        client_entry.title = 'client title'
+
+        persistence_manager.update client_entry
+
+
+        args = jQuery.ajax.args[0][0]
+        args.data.should.eql {id: 1, title: 'client title'}
+        done()
+
+    it "doesn't perform the call if nothing is changed", (done) ->
+      persistence_manager.load 1, (client_entry) ->
+        persistence_manager.update client_entry
+        jQuery.ajax.should.not.have.been.called
+        done()
+
+    it 'updates the server cache immediately with the given object', ->
+      persistence_manager.update entry_1, ->
+      persistence_manager.server_data.get(1).should.equal entry_1
+
+    it 'updates the server cache with the server object when done', (done) ->
+      persistence_manager.update entry_1, (server_obj) ->
+        persistence_manager.server_data.get(2).should.equal entry_2
+        done()
+
+    it 'calls the given callback when done', (done) ->
+      persistence_manager.update entry_1, ->
+        done()
+

data/demo/spec/javascripts/tools/object_tools_spec.coffee

@@ -0,0 +1,27 @@
+#= require spec_helper
+#= require modularity/tools/object_tools
+
+describe 'object_tools', ->
+
+  describe 'object_diff', ->
+    obj_1 = {title: 'title 1', value: 'value 1'}
+    obj_2 = {title: 'title 2', value: 'value 1'}
+    obj_1b = {title: 'title 1', value: 'value 1'}
+
+    it 'returns a new object that contains only the changed attributes', ->
+      modularity.object_diff(obj_1, obj_2).should.eql {title: 'title 2'}
+
+    it 'returns an empty object if the two objects are equal', ->
+      modularity.object_diff(obj_1, obj_1b).should.eql {}
+
+
+  describe 'object_length', ->
+
+    it 'returns the number of attributes of the given object', ->
+      obj_1 = {1: 'one'}
+      obj_2 = {1: 'one', 2: 'two'}
+      obj_3 = {1: 'one', 2: 'two', 3: 'three'}
+      modularity.object_length({}).should.equal 0
+      modularity.object_length(obj_1).should.equal 1
+      modularity.object_length(obj_2).should.equal 2
+      modularity.object_length(obj_3).should.equal 3

data/lib/modularity-rails/version.rb

@@ -1,3 +1,3 @@
 module ModularityRails
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

data/vendor/assets/javascripts/modularity/{tools → data}/ajax_loader.coffee

@@ -1,4 +1,4 @@
-#= require modularity/tools/cache
+#= require modularity/data/cache
 
 
 # A generic ajax loader for parallel GET requests.
@@ -10,9 +10,13 @@
 #          any new content on the same URL will not be visible!
 class window.modularity.AjaxLoader
 
-  constructor: ->
+  constructor: (params = {}) ->
     @cache = new modularity.Cache()
 
+    # Whether to perform caching of data.
+    # Default: no.
+    @caching = params.caching
+
 
   get: (url, callback) ->
     cached_value = @cache.get url
@@ -22,7 +26,10 @@ class window.modularity.AjaxLoader
       @cache.add url, [callback]
       return jQuery.get url, (data) =>
         cb(data) for cb in @cache.get(url)
-        @cache.add url, data
+        if @caching
+          @cache.add url, data
+        else
+          @cache.remove url
 
     # Request while the GET call is still pending --> 
     # add the given callback to the list of waiting callbacks.

data/vendor/assets/javascripts/modularity/{tools → data}/cache.coffee

@@ -1,3 +1,5 @@
+#= require modularity/tools/object_tools
+
 # A generic cache.
 # Stores key-value pairs.
 class window.modularity.Cache
@@ -34,8 +36,12 @@ class window.modularity.Cache
 
   # Returns the number of cached objects.
   length: () ->
-    # NOTE(KG): This doesn't work in IE8.
-    Object.keys(@cache).length
+    modularity.object_length @cache
+
+
+  # Removes the entry with the given key.
+  remove: (key) =>
+    delete @cache[key]
 
 
   # Replaces the cache with the given data.

data/vendor/assets/javascripts/modularity/data/indexed_cache.coffee

@@ -0,0 +1,26 @@
+#= require modularity/data/cache
+
+# Provides fast and convenient retrieval of hash objects 
+# by indexing them on a given key column.
+class modularity.IndexedCache
+
+  constructor: (@key) ->
+    @cache = new modularity.Cache
+
+  
+  add: (entry) ->
+    @cache.add entry[@key], entry
+
+
+  add_all: (entries) ->
+    @add(entry) for entry in entries
+
+
+  remove: (entry) ->
+    @cache.remove entry[@key]
+
+  get: (key) ->
+    @cache.get key
+
+
+  length: => @cache.length()

data/vendor/assets/javascripts/modularity/data/persistence_manager.coffee

@@ -0,0 +1,131 @@
+#= require modularity/data/indexed_cache
+#= require modularity/tools/object_tools
+
+# Provides persistence services for data models.
+class modularity.PersistenceManager
+
+  constructor: (params) ->
+    
+    # Copy of the data as it is on the server.
+    @server_data = new modularity.IndexedCache 'id'
+    
+    # Copy of the data as it is on the client.
+    @client_data = new modularity.IndexedCache 'id'
+    
+    # The base url on the server. Expected to be a fully RESTful API.
+    @base_url = params.url
+
+    @key = params.key or 'id'
+  
+
+  # Returns a deep replica of the given object.
+  clone: (obj) ->
+    result = {}
+    result[key] = value for own key, value of obj
+    result
+
+
+  # Returns the URL to access the collection of objects.
+  collection_url: ->
+    "#{@base_url}.json"
+
+
+  # Creates the given object on the server.
+  create: (obj, callback) ->
+    jQuery.ajax {
+      url: @collection_url()
+      type: 'POST'
+      data: obj
+      success: (server_obj) =>
+        @server_data.add server_obj
+        callback server_obj
+    }
+
+
+  delete: (obj, callback) ->
+    @client_data.remove obj
+    @server_data.remove obj
+    jQuery.ajax {
+      url: @entry_url(obj)
+      type: 'DELETE'
+      success: ->
+        callback() if callback?
+    }
+
+
+  # Returns the url to access a single entry.
+  entry_url: (entry) ->
+    "#{@base_url}/#{entry[@key]}.json"
+
+
+  # Returns the entry with the given key.
+  load: (key, callback) ->
+    
+    # Try to use client_data cache.
+    client_obj = @client_data.get key
+    return callback(client_obj) if client_obj
+    
+    # No data in client cache --> try to use server cache.
+    server_obj = @server_data.get key
+    if server_obj
+      client_obj = @clone server_obj
+      @client_data.add client_obj
+      return callback client_obj
+
+    # No data on client at all --> load data from server.
+    jQuery.ajax {
+      url: "#{@base_url}/#{key}"
+      cache: no
+      success: (server_entry) =>
+        @server_data.add server_entry
+        client_entry = @clone server_entry
+        @client_data.add client_entry
+        callback client_entry
+    }
+
+
+  # Loads all objects from the server.
+  # Provides the given params as parameters to the GET request.
+  load_all: (callback, params) ->
+    jQuery.ajax {
+      url: @collection_url()
+      cache: no
+      data: params
+      success: (data) =>
+        @server_data.add_all data
+        callback()
+    }
+
+ 
+  # Saves the given object.
+  # Does the right thing (create or update) dependent on
+  # whether the object already has a key parameter.
+  save: (obj, callback) ->
+    if obj[@key]?
+      @update obj, callback
+    else
+      @create obj, callback
+
+
+  update: (obj, callback) ->
+    
+    # Create a new hash, containing only the changed attributes between obj and it's replica in @server_data.
+    diff_obj = modularity.object_diff @server_data.get(obj[@key]), obj
+    return if modularity.object_length(diff_obj) == 0
+    
+    # Add key attribute.
+    diff_obj[@key] = obj[@key]
+    
+    # Update server_data version.
+    @server_data.add obj
+
+    # Send to server
+    jQuery.ajax {
+      url: @entry_url(obj)
+      type: 'PUT'
+      data: diff_obj
+      success: (server_obj) =>
+        @server_data.add server_obj
+        callback server_obj if callback
+    }
+    

data/vendor/assets/javascripts/modularity/tools/object_tools.coffee

@@ -0,0 +1,15 @@
+# Returns an object that contains only the attributes 
+# that are different between obj_1 and obj_2.
+# Only looks for changed attributes, not missing attributes.
+modularity.object_diff = (obj_1, obj_2) ->
+  result = {}
+  for own key, value_2 of obj_2
+    do (key, value_2) ->
+      value_1 = obj_1[key]
+      result[key] = value_2 if value_1 != value_2
+  result
+
+
+modularity.object_length = (obj) ->
+  # NOTE(KG): This doesn't work in IE8.
+  Object.keys(obj).length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modularity-rails
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70319159978280 !ruby/object:Gem::Requirement
+  requirement: &70234292434960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70319159978280
+  version_requirements: *70234292434960
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70319159977360 !ruby/object:Gem::Requirement
+  requirement: &70234292434440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319159977360
+  version_requirements: *70234292434440
 - !ruby/object:Gem::Dependency
   name: evergreen
-  requirement: &70319159976860 !ruby/object:Gem::Requirement
+  requirement: &70234292433920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319159976860
+  version_requirements: *70234292433920
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70319159976360 !ruby/object:Gem::Requirement
+  requirement: &70234292433260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319159976360
+  version_requirements: *70234292433260
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &70319159975780 !ruby/object:Gem::Requirement
+  requirement: &70234292432580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319159975780
+  version_requirements: *70234292432580
 description: Description of ModularityRails.
 email:
 - kevin.goslar@gmail.com
@@ -121,6 +121,10 @@ files:
 - demo/public/index.html
 - demo/public/robots.txt
 - demo/script/rails
+- demo/spec/javascripts/data/ajax_loader_spec.coffee
+- demo/spec/javascripts/data/cache_spec.coffee
+- demo/spec/javascripts/data/indexed_cache_spec.coffee
+- demo/spec/javascripts/data/persistence_manager_spec.coffee
 - demo/spec/javascripts/konacha_config.coffee
 - demo/spec/javascripts/mixins/closable_spec.coffee
 - demo/spec/javascripts/modularity_spec.coffee
@@ -134,9 +138,8 @@ files:
 - demo/spec/javascripts/templates/button.jst.ejs
 - demo/spec/javascripts/templates/closable.jst.ejs
 - demo/spec/javascripts/templates/modularity.jst.ejs
-- demo/spec/javascripts/tools/ajax_loader_spec.coffee
 - demo/spec/javascripts/tools/array_tools_spec.coffee
-- demo/spec/javascripts/tools/cache_spec.coffee
+- demo/spec/javascripts/tools/object_tools_spec.coffee
 - demo/vendor/assets/javascripts/.gitkeep
 - demo/vendor/assets/stylesheets/.gitkeep
 - demo/vendor/plugins/.gitkeep
@@ -146,14 +149,17 @@ files:
 - modularity-rails.gemspec
 - run_tests
 - vendor/assets/javascripts/modularity.js.coffee
+- vendor/assets/javascripts/modularity/data/ajax_loader.coffee
+- vendor/assets/javascripts/modularity/data/cache.coffee
+- vendor/assets/javascripts/modularity/data/indexed_cache.coffee
+- vendor/assets/javascripts/modularity/data/persistence_manager.coffee
 - vendor/assets/javascripts/modularity/mixins/clickable.coffee
 - vendor/assets/javascripts/modularity/mixins/closable.coffee
 - vendor/assets/javascripts/modularity/modules/autogrow_textarea.coffee
 - vendor/assets/javascripts/modularity/modules/button.coffee
 - vendor/assets/javascripts/modularity/modules/counter_button.coffee
-- vendor/assets/javascripts/modularity/tools/ajax_loader.coffee
 - vendor/assets/javascripts/modularity/tools/array_tools.coffee
-- vendor/assets/javascripts/modularity/tools/cache.coffee
+- vendor/assets/javascripts/modularity/tools/object_tools.coffee
 homepage: http://github.com/kevgo/modularity-rails
 licenses: []
 post_install_message: 

data/demo/spec/javascripts/tools/ajax_loader_spec.coffee

@@ -1,79 +0,0 @@
-#= require spec_helper
-#= require modularity/tools/ajax_loader
-
-
-describe 'ajax_loader', ->
-  
-  ajax_loader = spy = spy_get = null
-  beforeEach ->
-    ajax_loader = new modularity.AjaxLoader()
-    spy = sinon.spy()
-    spy_get = sinon.spy jQuery, 'get'
-
-  afterEach ->
-    spy_get.restore()
-
-  describe 'get', ->
-
-    url = "/users/4"
-
-    describe 'the data has already been loaded', ->
-
-      it 'calls the callback with the cached data', ->
-        ajax_loader.cache.add url, "my data"
-
-        ajax_loader.get(url, spy)
-
-        spy.should.have.been.called
-        spy.should.have.been.calledWith "my data"
-
-
-    describe 'the request is already in progress', ->
-
-      beforeEach ->
-        ajax_loader.cache.cache[url] = [spy]
-
-
-      it 'adds the callback to the callback array', ->
-        ajax_loader.cache.get(url).should.have.length 1
-        ajax_loader.cache.get(url)[0].should.equal spy
-
-
-      it 'returns without calling the callback', ->
-        spy.should.not.have.been.called
-
-
-      it 'does not make another ajax request', ->
-        jQuery.get.should.not.have.been.called
-
-
-    describe 'first time request', ->
-      
-      beforeEach ->
-        ajax_loader.get url, spy
-
-      it 'makes an ajax request', ->
-        jQuery.get.should.have.been.called
-
-
-      it 'saves the callback for later', ->
-        ajax_loader.cache.get(url).should.have.length 1
-        ajax_loader.cache.get(url)[0].should.equal spy
-
-      it 'returns without calling the callback', ->
-        spy.should.not.have.been.called
-
-    
-    describe 'ajax request successful', ->
-
-      beforeEach ->
-        jquery_callback = null
-        jQuery.get = (url, callback) -> jquery_callback = callback
-        ajax_loader.get url, spy
-        jquery_callback('result')
-
-      it 'calls the given callbacks', ->
-        spy.should.have.been.calledWith 'result'
-
-      it 'replaces the cache callbacks with returned data', ->
-        ajax_loader.cache.get(url).should.equal 'result'