modularity-rails 0.6.2 → 0.6.3

data/lib/modularity-rails/version.rb

@@ -1,3 +1,3 @@
 module ModularityRails
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/javascripts/mixins/closable_spec.coffee

@@ -13,13 +13,21 @@ describe 'test environment setup', ->
 describe 'Closable', ->
   template 'closable.html'
 
-  beforeEach ->
-    
-  describe 'embedded close button', ->
+  describe 'constructor', ->
+    it 'shows an alert if there is no close button', ->
+      spy = spyOn window, 'alert'
+      new ClosableModuleStandard('#test #closable3')
+      expect(spy).toHaveBeenCalled()
+      expect(spy.argsForCall[0][0]).toMatch(/close button not found/i)
+
+    it 'shows no alert if there is a close button', ->
+      spy = spyOn window, 'alert'
+      new ClosableModuleStandard('#test #closable1')
+      expect(spy).not.toHaveBeenCalled()
+
     it 'finds the close button div automatically', ->
       new ClosableModuleStandard('#test #closable1')
       $('#test #closable1 .CloseButton').click()
-
       expect($('#test #closable1').length).toEqual(0)
 
 

data/spec/javascripts/modularity_spec.coffee

@@ -265,34 +265,30 @@ describe 'modularity', ->
 
   describe 'mixins', ->
 
-    myMixin = instance = recordedSelf = null
+    myMixin = instance = recordedSelf = Test = null
+    myMixin =
+      constructor: -> recordedSelf = @
+      method1: ->
 
     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', ->
+      instance = new Test('testing')
       expect(typeof instance.method1).toBe("function")
 
 
     it 'calls the constructor of the mixin', ->
+      spyOn(myMixin, 'constructor')
+      instance = new Test('testing')
       expect(myMixin.constructor).toHaveBeenCalled()
 
 
     it 'calls the constructor with the this pointing to the instance', ->
+      instance = new Test('testing')
       expect(recordedSelf).toBe(instance)
 
-
-
-
-
-
+    xit 'provides arguments to the @mixin method to the mixin constructor'

data/spec/javascripts/templates/closable.html

@@ -8,3 +8,7 @@
   <div class="CustomCloseButton"></div>
 </div>
 
+<div id="closable3">
+  A section without a close button.
+</div>
+

data/vendor/assets/javascripts/mixins/closable.coffee

@@ -1,8 +1,9 @@
 window.closable =
 
-  constructor: (container, close_button = undefined) ->
-    close_button ||= @container.find('.CloseButton')
-    # TODO: add alert if no close button found.
+  constructor: (container) ->
+    close_button = @container.find('.CloseButton')
+    unless close_button?.length > 0
+      window.alert 'Error: Close button not found'
     close_button.click @close_button_clicked
 
 

data/vendor/assets/javascripts/modules/button.coffee

@@ -1,3 +1,5 @@
+#= require mixins/clickable
+
 # A button module.
 # Responds to clicks on the container element.
 # The container element is expected to already be populated.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modularity-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70127435305940 !ruby/object:Gem::Requirement
+  requirement: &70358087399780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70127435305940
+  version_requirements: *70358087399780
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70127435305520 !ruby/object:Gem::Requirement
+  requirement: &70358087399360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127435305520
+  version_requirements: *70358087399360
 - !ruby/object:Gem::Dependency
   name: evergreen
-  requirement: &70127435305060 !ruby/object:Gem::Requirement
+  requirement: &70358087398900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127435305060
+  version_requirements: *70358087398900
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70127429284100 !ruby/object:Gem::Requirement
+  requirement: &70358087398440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127429284100
+  version_requirements: *70358087398440
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &70127429281440 !ruby/object:Gem::Requirement
+  requirement: &70358087398020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127429281440
+  version_requirements: *70358087398020
 description: Description of ModularityRails.
 email:
 - kevin.goslar@gmail.com