modularity-rails 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/modularity-rails/version.rb +1 -1
  2. data/spec/javascripts/modularity_spec.coffee +16 -0
  3. data/vendor/assets/javascripts/modularity.js.coffee +2 -2
  4. metadata +13 -13
data/lib/modularity-rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ModularityRails
2
- VERSION = "0.7.0"
2
+ VERSION = "0.7.1"
3
3
  end
data/spec/javascripts/modularity_spec.coffee CHANGED
@@ -269,6 +269,7 @@ describe 'modularity', ->
269
269
  myMixin =
270
270
  constructor: -> recordedSelf = @
271
271
  method1: ->
272
+ method2: ->
272
273
 
273
274
  beforeEach ->
274
275
  class Test extends Module
@@ -281,6 +282,21 @@ describe 'modularity', ->
281
282
  expect(typeof instance.method1).toBe("function")
282
283
 
283
284
 
285
+ it 'calls the proper mixin method when calling from the implementing module', ->
286
+ spyOn(myMixin, 'method1')
287
+ spyOn(myMixin, 'method2')
288
+ instance = new Test('testing')
289
+ instance.method1()
290
+ expect(myMixin.method1).toHaveBeenCalled()
291
+ expect(myMixin.method2).not.toHaveBeenCalled()
292
+
293
+ it 'calls the mixin with the proper paramaters', ->
294
+ spyOn(myMixin, 'method1')
295
+ instance = new Test('testing')
296
+ instance.method1("arg1", "arg2")
297
+ expect(myMixin.method1).toHaveBeenCalledWith("arg1", "arg2")
298
+
299
+
284
300
  it 'calls the constructor of the mixin', ->
285
301
  spyOn(myMixin, 'constructor')
286
302
  instance = new Test('testing')
data/vendor/assets/javascripts/modularity.js.coffee CHANGED
@@ -24,8 +24,8 @@ class window.Module
24
24
 
25
25
  # Attach all properties from mixin to the prototype.
26
26
  for methodName, method of mixin_data.mixin
27
- unless @[methodName]
28
- @[methodName] = => method.call(@, mixin_data.params)
27
+ do (methodName, method) => unless @[methodName]
28
+ @[methodName] = => method.apply(@, arguments)
29
29
 
30
30
  # Call constructor function from mixin.
31
31
  mixin_data.mixin.constructor.apply @, arguments
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: modularity-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-01 00:00:00.000000000 Z
12
+ date: 2012-05-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70343797333300 !ruby/object:Gem::Requirement
16
+ requirement: &70310922324920 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70343797333300
24
+ version_requirements: *70310922324920
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: capybara-webkit
27
- requirement: &70343797332340 !ruby/object:Gem::Requirement
27
+ requirement: &70310922324500 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70343797332340
35
+ version_requirements: *70310922324500
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: evergreen
38
- requirement: &70343797331680 !ruby/object:Gem::Requirement
38
+ requirement: &70310922324020 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70343797331680
46
+ version_requirements: *70310922324020
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rb-fsevent
49
- requirement: &70343797331020 !ruby/object:Gem::Requirement
49
+ requirement: &70310922323560 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70343797331020
57
+ version_requirements: *70310922323560
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: guard-livereload
60
- requirement: &70343797330580 !ruby/object:Gem::Requirement
60
+ requirement: &70310922323080 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70343797330580
68
+ version_requirements: *70310922323080
69
69
  description: Description of ModularityRails.
70
70
  email:
71
71
  - kevin.goslar@gmail.com
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
121
121
  version: '0'
122
122
  requirements: []
123
123
  rubyforge_project:
124
- rubygems_version: 1.8.10
124
+ rubygems_version: 1.8.15
125
125
  signing_key:
126
126
  specification_version: 3
127
127
  summary: Summary of ModularityRails.