modularity-rails 0.7.0 → 0.7.1

data/lib/modularity-rails/version.rb

@@ -1,3 +1,3 @@
 module ModularityRails
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/javascripts/modularity_spec.coffee

@@ -269,6 +269,7 @@ describe 'modularity', ->
     myMixin =
       constructor: -> recordedSelf = @
       method1: ->
+      method2: ->
 
     beforeEach ->
       class Test extends Module
@@ -281,6 +282,21 @@ describe 'modularity', ->
       expect(typeof instance.method1).toBe("function")
 
 
+    it 'calls the proper mixin method when calling from the implementing module', ->
+      spyOn(myMixin, 'method1')
+      spyOn(myMixin, 'method2')
+      instance = new Test('testing')
+      instance.method1()
+      expect(myMixin.method1).toHaveBeenCalled()
+      expect(myMixin.method2).not.toHaveBeenCalled()
+
+    it 'calls the mixin with the proper paramaters', ->
+      spyOn(myMixin, 'method1')
+      instance = new Test('testing')
+      instance.method1("arg1", "arg2")
+      expect(myMixin.method1).toHaveBeenCalledWith("arg1", "arg2")
+
+
     it 'calls the constructor of the mixin', ->
       spyOn(myMixin, 'constructor')
       instance = new Test('testing')

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

@@ -24,8 +24,8 @@ class window.Module
         
         # Attach all properties from mixin to the prototype.
         for methodName, method of mixin_data.mixin
-          unless @[methodName]
-            @[methodName] = => method.call(@, mixin_data.params)
+          do (methodName, method) => unless @[methodName]
+            @[methodName] = => method.apply(@, arguments)
 
         # Call constructor function from mixin.
         mixin_data.mixin.constructor.apply @, arguments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modularity-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70343797333300 !ruby/object:Gem::Requirement
+  requirement: &70310922324920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70343797333300
+  version_requirements: *70310922324920
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70343797332340 !ruby/object:Gem::Requirement
+  requirement: &70310922324500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343797332340
+  version_requirements: *70310922324500
 - !ruby/object:Gem::Dependency
   name: evergreen
-  requirement: &70343797331680 !ruby/object:Gem::Requirement
+  requirement: &70310922324020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343797331680
+  version_requirements: *70310922324020
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70343797331020 !ruby/object:Gem::Requirement
+  requirement: &70310922323560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343797331020
+  version_requirements: *70310922323560
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &70343797330580 !ruby/object:Gem::Requirement
+  requirement: &70310922323080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343797330580
+  version_requirements: *70310922323080
 description: Description of ModularityRails.
 email:
 - kevin.goslar@gmail.com
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Summary of ModularityRails.