modularity-rails 0.12.2 → 0.12.3

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

@@ -17,6 +17,18 @@ describe 'ajax_loader', ->
       loader = new modularity.AjaxLoader {caching: yes}
       loader.caching.should.be.true
 
+  describe 'ajax', ->
+
+    describe 'GET request', ->
+
+      it 'buffers the request'
+
+      it 'fires the events'
+
+      it ''
+
+    describe 'other requests'
+
 
   describe 'get', ->
     url = "/users/4"

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

@@ -41,6 +41,7 @@ describe 'PersistenceManager', ->
       persistence_manager.add_all data
       spy.should.have.been.calledOnce
 
+
   describe 'create', ->
     new_obj = {value: 'foo'}
 
@@ -136,6 +137,52 @@ describe 'PersistenceManager', ->
       loading_done_callback.should.have.been.calledOnce
 
 
+  describe 'load_local', ->
+
+    describe 'entry exists in client data cache', ->
+      it 'returns the entry from the @client_data cache if it exists there', ->
+        persistence_manager.client_data.add entry_1
+        result = persistence_manager.load_local 1
+        result.should.equal entry_1
+
+    describe 'entry exists in server data cache', ->
+
+      beforeEach ->
+        persistence_manager.server_data.add entry_1
+
+      it 'adds the entry to the client data cache', ->
+        persistence_manager.load_local 1
+        persistence_manager.client_data.length().should.equal 1
+        persistence_manager.client_data.get(1).should.eql entry_1
+
+      it 'returns the entry from the client data cache', ->
+        result = persistence_manager.load_local 1
+        client_cache_entry = persistence_manager.client_data.get 1
+        result.should.equal client_cache_entry
+
+      it 'returns a different hash than the server data, so that the user can make changes to it', ->
+        result = persistence_manager.load_local 1
+        server_cache_entry = persistence_manager.server_data.get 1
+        result.should.not.equal server_cache_entry
+
+    describe "entry doesn't exist in any cache", ->
+
+      it 'returns undefined', ->
+        expect(persistence_manager.load_local(1)).to.be.undefined
+
+
+  describe 'load_many', ->
+
+    describe 'all entries exists in the cache', ->
+      it 'returns the entries immediately', (done) ->
+        persistence_manager.add_all [entry_1, entry_2]
+        persistence_manager.load_many [1,2], (entries) ->
+          entries.length.should.equal 2
+          entries[0].should.eql entry_1
+          entries[1].should.eql entry_2
+          done()
+
+
   describe 'load', ->
 
     describe 'entry exists in client data cache', ->

data/lib/modularity-rails/version.rb

@@ -1,3 +1,3 @@
 module ModularityRails
-  VERSION = "0.12.2"
+  VERSION = "0.12.3"
 end

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

@@ -24,6 +24,12 @@ class window.modularity.AjaxLoader
     AJAX_LOADED: 'AJAX_LOADED'         # Called when an AJAX request finishes.
 
 
+  # Makes the given AJAX call.
+  # Buffers the call if it's a GET request.
+  # Fires the AJAX events.
+  ajax: (options) ->
+
+
   get: (url, callback) ->
     cached_value = @cache.get url
 

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

@@ -63,16 +63,8 @@ class modularity.PersistenceManager
   # 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 = modularity.clone_hash server_obj
-      @client_data.add client_obj
-      return callback client_obj
+    entry = @load_local key
+    return callback(entry) if entry
 
     # No data on client at all --> load data from server.
     @loader.get "#{@base_url}/#{key}", (server_entry) =>
@@ -94,7 +86,38 @@ class modularity.PersistenceManager
         callback()
     }
 
+
+  # Loads the entry synchronously from the cache.
+  # Doesn't fall back to the server.
+  load_local: (key) ->
+
+    # Try to use client_data cache.
+    client_obj = @client_data.get key
+    return client_obj if client_obj
+
+    # No data in client cache --> try to use server cache.
+    server_obj = @server_data.get key
+    return null unless server_obj
+    client_obj = modularity.clone_hash server_obj
+    @client_data.add client_obj
+    client_obj
  
+
+  # Returns all entries with the given keys.
+  load_many: (keys, callback) ->
+    result = []
+    missing_keys = []
+    for key in keys
+      do (key) =>
+        entry = @load_local key
+        if entry
+          result.push entry
+        else
+          missing_keys.push key
+    alert "modularity.PersistenceManager.load_many(): Missing functionality to load from the server." if missing_keys.length > 0
+    callback result
+
+
   # Saves the given object.
   # Does the right thing (create or update) dependent on
   # whether the object already has a key parameter.

data/vendor/assets/javascripts/modularity/modules/ajax_indicator.coffee

@@ -0,0 +1,24 @@
+# Indicates that an AJAX request is running.
+class sn.AjaxIndicator extends modularity.Module
+
+  constructor: ->
+
+    # The number of currently running ajax requests.
+    @ajax_counter = 0
+
+    @searchManager.bind_event sn.SearchManager.events.AJAX_LOADING, @ajax_loading
+    @searchManager.bind_event sn.SearchManager.events.AJAX_LOADED, @ajax_loaded
+
+
+  # Called when an ajax request starts.
+  ajax_loading: =>
+    @container.addClass 'loading' if @ajax_counter == 0
+    @ajax_counter += 1
+
+
+  # Called when the ajax request is done.
+  ajax_loaded: =>
+    @ajax_counter -= 1
+    @ajax_counter = 0 if @ajax_counter <= 0
+    @container.removeClass 'loading'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modularity-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70099005263540 !ruby/object:Gem::Requirement
+  requirement: &70181204940740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099005263540
+  version_requirements: *70181204940740
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70099005262660 !ruby/object:Gem::Requirement
+  requirement: &70181204936980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099005262660
+  version_requirements: *70181204936980
 - !ruby/object:Gem::Dependency
   name: evergreen
-  requirement: &70099005261600 !ruby/object:Gem::Requirement
+  requirement: &70181204934000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099005261600
+  version_requirements: *70181204934000
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70099005260620 !ruby/object:Gem::Requirement
+  requirement: &70181204930600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099005260620
+  version_requirements: *70181204930600
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &70099005276020 !ruby/object:Gem::Requirement
+  requirement: &70181204926320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099005276020
+  version_requirements: *70181204926320
 description: Description of ModularityRails.
 email:
 - kevin.goslar@gmail.com
@@ -155,6 +155,7 @@ files:
 - 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/ajax_indicator.coffee
 - vendor/assets/javascripts/modularity/modules/autogrow_textarea.coffee
 - vendor/assets/javascripts/modularity/modules/button.coffee
 - vendor/assets/javascripts/modularity/modules/counter_button.coffee