modularity-rails 0.5.2 → 0.6.0

data/README.md

@@ -33,6 +33,33 @@ The easiest way is to add it to `application.js`:
 
 See [http://github.com/kevgo/modularity-coffeescript].
 
+## Mixins
+
+Similar to Ruby mixins, mixins in Modularity allow to include orthogonal functional aspects defined in separate objects into a class.
+```coffeescript
+
+myMixin =
+
+  # This will be called when an instance of a class that includes this mixin is created.
+  constructor: ->
+
+  # This method will be available in every class that includes 
+  myMethod: ->
+
+
+class MyModule extends Module
+
+  @mixin myMixin
+
+  constructor: (container) ->
+    
+    # The super constructor will call the mixin constructors here.
+    super
+
+    # ...
+
+```
+
 
 # Development
 

data/lib/modularity-rails/version.rb

@@ -1,3 +1,3 @@
 module ModularityRails
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/spec/javascripts/modularity_spec.coffee

@@ -17,7 +17,7 @@ describe 'modularity loader', ->
 
     # Test class.
     class window.TestModule extends Module
-      constructor: (container) -> 
+      constructor: (container) ->
         super
 
 
@@ -271,3 +271,37 @@ describe 'modularity', ->
           Module.fire_global_event {}
           expect(mockGlobalContainer.trigger).not.toHaveBeenCalled()
           expect(window.alert).toHaveBeenCalled()
+
+  describe 'mixins', ->
+
+    myMixin = instance = recordedSelf = null
+
+    beforeEach ->
+      myMixin =
+        constructor: -> recordedSelf = @
+        method1: ->
+
+      spyOn(myMixin, 'constructor').andCallThrough()
+
+      class Test extends Module
+        @mixin myMixin
+
+      instance = new Test('testing')
+
+
+    it 'adds all methods from the mixin object to the class prototype', ->
+      expect(typeof instance.method1).toBe("function")
+
+
+    it 'calls the constructor of the mixin', ->
+      expect(myMixin.constructor).toHaveBeenCalled()
+
+
+    it 'calls the constructor with the this pointing to the instance', ->
+      expect(recordedSelf).toBe(instance)
+
+
+
+
+
+

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

@@ -17,6 +17,18 @@ class window.Module
       return alert "Error in Module constructor: The given container ('#{container.selector}') is empty." unless container? and container.length > 0
       return alert "Error in Module constructor: The given container ('#{container.selector}') has more than one element." unless container? and container.length == 1
 
+
+    if @mixins?
+      for mixin in @mixins
+        
+        # Attach all properties from mixin to the prototype.
+        for methodName, method of mixin
+          @[methodName] = method
+
+        # Call constructor function from mixin.
+        mixin.constructor.apply @, arguments
+
+
   # Checks whether the given condition is true.
   # Shows an alert with the given message if not.
   @assert: (condition, message) ->
@@ -39,6 +51,13 @@ class window.Module
     @container.trigger event_type, data ?= {}
 
 
+  # mixin = constructor of Draggable
+  # self = Card
+  @mixin: (mixin) ->
+    @prototype.mixins = [] unless @prototype.mixins?
+    @prototype.mixins.push mixin
+
+
   # GLOBAL EVENTS.
 
   # Subscribes to the given global event, 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modularity-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70138326211200 !ruby/object:Gem::Requirement
+  requirement: &70150578537300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138326211200
+  version_requirements: *70150578537300
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70138326210780 !ruby/object:Gem::Requirement
+  requirement: &70150578536860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138326210780
+  version_requirements: *70150578536860
 - !ruby/object:Gem::Dependency
   name: evergreen
-  requirement: &70138314263400 !ruby/object:Gem::Requirement
+  requirement: &70150578536380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138314263400
+  version_requirements: *70150578536380
 description: Description of ModularityRails.
 email:
 - kevin.goslar@gmail.com