modularity-rails 0.16.0 → 0.17.0

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

@@ -8,7 +8,7 @@
 #
 # Warning: Caches the responses, so once a request is cached,
 #          any new content on the same URL will not be visible!
-class window.modularity.AjaxLoader
+class modularity.AjaxLoader
 
   constructor: (params = {}) ->
 
@@ -55,7 +55,7 @@ class window.modularity.AjaxLoader
     # Fire 'loading' event if this is the start of a loading operation.
     @loader_count++
     if @loader_count == 1
-      window.modularity.fire_global_event window.modularity.AjaxLoader.events.AJAX_LOADING
+      modularity.fire_global_event modularity.AjaxLoader.events.AJAX_LOADING
 
     # Perform the request.
     jQuery.get url, (data) =>
@@ -73,5 +73,5 @@ class window.modularity.AjaxLoader
       # Fire 'loaded' event.
       @loader_count--
       if @loader_count == 0
-        window.modularity.fire_global_event window.modularity.AjaxLoader.events.AJAX_LOADED
+        modularity.fire_global_event modularity.AjaxLoader.events.AJAX_LOADED
 

data/app/assets/javascripts/modularity/data/cache.coffee

@@ -2,9 +2,11 @@
 
 # A generic cache.
 # Stores key-value pairs.
-class window.modularity.Cache
+class modularity.Cache
 
   constructor: ->
+
+    # Container for the cached objects.
     @cache = {}
 
 

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

@@ -4,7 +4,7 @@
 # by indexing them on a given key column.
 class modularity.IndexedCache
 
-  constructor: (@key) ->
+  constructor: (@key = 'id') ->
     @cache = new modularity.Cache
 
 
@@ -21,7 +21,7 @@ class modularity.IndexedCache
 
 
   remove_many: (entries) ->
-    @cache.remove_many entries
+    @cache.remove_many (entry[@key] for entry in entries)
 
 
   get: (key) ->

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

@@ -8,10 +8,10 @@ class modularity.PersistenceManager
   constructor: (params) ->
 
     # Copy of the data as it is on the server.
-    @server_data = new modularity.IndexedCache 'id'
+    @server_data = new modularity.IndexedCache
 
     # Copy of the data as it is on the client.
-    @client_data = new modularity.IndexedCache 'id'
+    @client_data = new modularity.IndexedCache
 
     # The base url on the server. Expected to be a fully RESTful API.
     @base_url = params.url
@@ -43,6 +43,7 @@ class modularity.PersistenceManager
         callback server_obj
 
 
+  # Deletes the given object from the server.
   delete: (obj, callback) ->
     @client_data.remove obj
     @server_data.remove obj
@@ -53,9 +54,10 @@ class modularity.PersistenceManager
         callback() if callback?
 
 
+  # Deletes the given objects from the server.
   delete_many: (objects, callback) ->
-    @client_data.remove_many obj
-    @server_data.remove_many obj
+    @client_data.remove_many objects
+    @server_data.remove_many objects
     jQuery.ajax
       url: @base_url
       type: 'DELETE'

data/app/assets/javascripts/modularity/mixins/clickable.coffee

@@ -1,21 +1,16 @@
 # This mixin adds a 'clickable' aspect to modules.
 # This means clicking anywhere on the module fires the 'clicked' event.
-window.modularity.clickable =
+modularity.clickable =
 
   constructor: ->
     @container.click @container_clicked
 
 
-  # Events that are fired by this mixin.
-  events:
-    clicked: 'clicked'
-
-
   # Programmatically click this clickable element.
   # For testing and scripting.
   click: -> @container.click()
 
 
   # Event handler for clicks on this clickable element.
-  container_clicked: -> @fire_event modularity.clickable.events.clicked
+  container_clicked: -> @fire 'clicked'
 

data/app/assets/javascripts/modularity/mixins/closable.coffee

@@ -1,21 +1,16 @@
-window.modularity.closable =
+modularity.closable =
 
   constructor: (container) ->
     close_button = @container.find('.CloseButton')
     unless close_button?.length > 0
-      window.alert 'Error: Close button not found'
+      alert 'Error: Close button not found'
     close_button.click => @close_button_clicked()
 
 
-  # The events that can be fired by closable objects.
-  events:
-    closed: 'closed'
-
-
   # Called when the button got clicked by the user or programmatically.
   close_button_clicked: ->
     if @closable_closing
       return unless @closable_closing()
-    @fire_event 'closed'
+    @fire 'closed'
     @container.remove()
     @closable_closed() if @closable_closed

data/app/assets/javascripts/modularity/modularity.coffee

@@ -8,7 +8,7 @@
 # and https://github.com/kevgo/modularity-rails for Rails integration.
 
 
-window.modularity = {
+@modularity = {
 
   # Checks whether the given condition is true.
   # Shows an alert with the given message if not.
@@ -37,11 +37,11 @@ window.modularity = {
   # Returns the DOM object that is used to fire global events on.
   global_event_container: -> modularity.global_event_container_cache or= $(window)
 }
-window.modularity.bindGlobalEvent = window.modularity.bind_global_event
-window.modularity.fireGlobalEvent = window.modularity.fire_global_event
+@modularity.bindGlobalEvent = @modularity.bind_global_event
+@modularity.fireGlobalEvent = @modularity.fire_global_event
 
 
-class window.modularity.Module
+class @modularity.Module
 
   # The container variable is required. Provide 'testing' in tests.
   constructor: (container) ->
@@ -81,6 +81,7 @@ class window.modularity.Module
     return alert "Module.bind_event: parameter 'callback' must be a function, #{callback} (#{typeof callback}) given." unless typeof callback == 'function'
     @container.bind event_type, callback
   bindEvent: Module::bind_event
+  on: Module::bind_event
 
   # Fires the given local event with the given data payload.
   fire_event: (event_type, data) =>
@@ -88,6 +89,7 @@ class window.modularity.Module
     return alert("Module.fire_event: Event type must be a string, #{event_type} (#{typeof event_type}) given.") unless typeof event_type == 'string'
     @container.trigger event_type, data ?= {}
   fireEvent: Module::fire_event
+  fire: Module::fire_event
 
 
   # Hides this module.
@@ -106,25 +108,3 @@ class window.modularity.Module
   # Shows this module.
   show: ->
     @container.show()
-
-
-# jQuery integration for creating Modules.
-#
-# Call like this: myModule = $('...').module(MyModuleClass)
-#
-# Parameters:
-# * klass: the class of the Module to instantiate
-# * any additional parameters are forwarded to the Module constructor.
-# Returns the created module instance.
-#
-# Messages errors in alert boxes.
-#
-jQuery.fn.module = (klass, args...) ->
-
-  # Check parameters.
-  if typeof klass != 'function'
-    return alert "ERROR!\n\nYou must provide the Module class when calling $.module().\n\nExample: $('...').module(MyModuleClass)\n\nYou provided: #{klass} (#{typeof klass})"
-
-  # Instantiate the class and return the instance.
-  new klass(this, args...)
-

data/app/assets/javascripts/modularity/modules/autogrow_textarea.coffee

@@ -1,5 +1,5 @@
 # Autogrowing textarea.
-class window.modularity.AutogrowTextArea extends modularity.Module
+class modularity.AutogrowTextArea extends modularity.Module
 
   constructor: (container) ->
     super

data/app/assets/javascripts/modularity/modules/button.coffee

@@ -3,6 +3,6 @@
 # A button module.
 # Responds to clicks on the container element.
 # The container element is expected to already be populated.
-class window.modularity.Button extends window.modularity.Module
-  @mixin window.modularity.clickable
+class modularity.Button extends modularity.Module
+  @mixin modularity.clickable
 

data/app/assets/javascripts/modularity/tools/array_tools.coffee

@@ -1,5 +1,5 @@
 # Returns a copy of the given array with duplicates removed.
-window.modularity.array_unique = (array) ->
+modularity.array_unique = (array) ->
   output = {}
   output[array[i]] = array[i] for i in [0...array.length]
   value for key, value of output

data/config/initializers/konacha.rb

@@ -1,6 +1,5 @@
 require 'capybara/poltergeist'
 Konacha.configure do |config|
-  config.spec_dir     = 'spec/javascripts'
   config.driver       = :poltergeist
 end if defined?(Konacha)
 

data/lib/modularity-rails/version.rb

@@ -1,3 +1,3 @@
 module ModularityRails
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

metadata

@@ -2,14 +2,14 @@
 name: modularity-rails
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Kevin Goslar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false