joosy 1.1.0.alpha.1 → 1.1.0.alpha.2

data/Gemfile.lock

@@ -11,9 +11,8 @@ GIT
 PATH
   remote: .
   specs:
-    joosy (1.1.0.alpha.1)
+    joosy (1.1.0.alpha.2)
       haml_coffee_assets
-      i18n-js
       sprockets
 
 GEM
@@ -71,8 +70,6 @@ GEM
       tilt (>= 1.3.3)
     hike (1.2.1)
     i18n (0.6.1)
-    i18n-js (2.1.2)
-      i18n
     jasmine-core (1.3.1)
     journey (1.0.4)
     jquery-rails (2.2.0)

data/app/assets/javascripts/joosy/core/modules/events.js.coffee

@@ -12,36 +12,42 @@ Joosy.Modules.Events =
   # @param [Function] callback          Action to run when all events were triggered at least once
   # @param [Hash] options               Options
   #
-  # @option options [Boolean] unique    Call has no effect if true and the given pair
-  #                                     of events and callback is already set up
-  #
-  wait: (events, callback, options = {}) ->
+  wait: (name, events, callback) ->
+    @__oneShotEvents ||= Object.extended()
+
+    # unnamed binding
+    if Object.isFunction(events)
+      callback = events
+      events   = name
+      name     = @__oneShotEvents.keys().length.toString()
+
     events = @__splitEvents events
     @__validateEvents events
 
-    return if options.unique && @__isBound(events, callback, true)
-
-    @__oneShotEvents ||= []
-    @__oneShotEvents.push [events, callback]
+    @__oneShotEvents[name] = [events, callback]
+    name
 
   #
-  # Binds action to run each time any of given even was triggered
+  # Binds action to run each time any of given event was triggered
   #
   # @param [String|Array] events        List of events separated by space
   # @param [Function] callback          Action to run on trigger
   # @param [Hash] options               Options
   #
-  # @option options [Boolean] unique    Call has no effect if true and the given pair
-  #                                     of events and callback is already set up
-  #
-  bind: (events, callback, options = {}) ->
+  bind: (name, events, callback) ->
+    @__boundEvents ||= Object.extended()
+
+    # unnamed binding
+    if Object.isFunction(events)
+      callback = events
+      events   = name
+      name     = @__boundEvents.keys().length.toString()
+
     events = @__splitEvents events
     @__validateEvents events
 
-    return if options.unique && @__isBound(events, callback)
-
-    @__boundEvents ||= []
-    @__boundEvents.push [events, callback]
+    @__boundEvents[name] = [events, callback]
+    name
 
   #
   # Unbinds action from runing on trigger
@@ -49,10 +55,14 @@ Joosy.Modules.Events =
   # @param [Function] target            Action to unbind
   #
   unbind: (target) ->
-    for [events, callback], index in @__boundEvents
-      if callback == target
-        @__boundEvents.splice index, 1
-        return
+    needle = undefined
+
+    for name, [events, callback] of @__boundEvents
+      if (Object.isFunction(target) && callback == target) || name == target
+        needle = name
+        break
+
+    delete @__boundEvents[needle] if needle?
 
   #
   # Triggers event for {bind} and {wait}
@@ -63,16 +73,16 @@ Joosy.Modules.Events =
     Joosy.Modules.Log.debugAs @, "Event #{event} triggered"
     if @__oneShotEvents
       fire = []
-      for [events, callback], index in @__oneShotEvents
+      for name, [events, callback] of @__oneShotEvents
         events.remove event
         if events.length == 0
-          fire.push index
-      fire.each (index) =>
-        callback = @__oneShotEvents[index][1]
-        @__oneShotEvents.removeAt index
+          fire.push name
+      fire.each (name) =>
+        callback = @__oneShotEvents[name][1]
+        delete @__oneShotEvents[name]
         callback data...
     if @__boundEvents
-      for [events, callback] in @__boundEvents
+      for name, [events, callback] of @__boundEvents
         if events.any event
           callback data...
 
@@ -89,7 +99,7 @@ Joosy.Modules.Events =
   # @param [Function] block           Configuration block (see example)
   #
   synchronize: (block) ->
-    context = new Joosy.Modules.Events.SynchronizationContext(this)
+    context = new Joosy.Events.SynchronizationContext(this)
     block.call(this, context)
 
     if context.expectations.length == 0
@@ -113,27 +123,25 @@ Joosy.Modules.Events =
     unless Object.isArray(events) && events.length > 0
       throw new Error "#{Joosy.Module.__className @}> bind invalid events: #{events}"
 
-  __isBound: (events, callback, oneShot = false) ->
-    haystack = if oneShot
-      @__oneShotEvents
-    else
-      @__boundEvents
 
-    return false unless haystack
+Joosy.Events = {}
+
+class Joosy.Events.Namespace
+  constructor: (@parent) ->
 
-    result = haystack.find (item) ->
-      item[0].length == events.length &&
-        item[0].subtract(events).isEmpty() &&
-        item[1] == callback
+  bindings: []
 
-    !!result
+  bind: (args...) -> @bindings.push @parent.bind(args...)
+  unbind: ->
+    @parent.unbind b for b in @bindings
+    @bindings = []
 
 #
 # Internal representation of {Joosy.Modules.Events.synchronize} context
 #
 # @see Joosy.Modules.Events.synchronize
 #
-class Joosy.Modules.Events.SynchronizationContext
+class Joosy.Events.SynchronizationContext
   @uid = 0
 
   constructor: (@parent) ->

data/lib/joosy/version.rb

@@ -1,3 +1,3 @@
 module Joosy
-  VERSION = "1.1.0.alpha.1"
+  VERSION = "1.1.0.alpha.2"
 end

data/spec/javascripts/joosy/core/modules/events_spec.js.coffee

@@ -65,19 +65,6 @@ describe "Joosy.Modules.Events", ->
       @box.wait 'event', callback
     expect(@box.__oneShotEvents).toEqual [[['event'], callback], [['event'], callback], [['event'], callback]]
 
-  it "should ignore multiple binding", ->
-    callback = ->
-
-    @box.bind 'event', callback
-    3.times =>
-      @box.bind 'event', callback, unique: true
-    expect(@box.__boundEvents).toEqual [[['event'], callback]]
-
-    @box.wait 'event', callback
-    3.times =>
-      @box.wait 'event', callback, unique: true
-    expect(@box.__oneShotEvents).toEqual [[['event'], callback]]
-
   it "should handle inheritance well", ->
     callback = sinon.spy()
     @sub.wait 'foo', callback

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha.1
+  version: 1.1.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70197702471700 !ruby/object:Gem::Requirement
+  requirement: &70336034677120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197702471700
+  version_requirements: *70336034677120
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
-  requirement: &70197702471180 !ruby/object:Gem::Requirement
+  requirement: &70336034676020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197702471180
+  version_requirements: *70336034676020
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70197702470700 !ruby/object:Gem::Requirement
+  requirement: &70336034674640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197702470700
+  version_requirements: *70336034674640
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70197702469920 !ruby/object:Gem::Requirement
+  requirement: &70336034673840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197702469920
+  version_requirements: *70336034673840
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70197702469260 !ruby/object:Gem::Requirement
+  requirement: &70336034672920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197702469260
+  version_requirements: *70336034672920
 - !ruby/object:Gem::Dependency
   name: guard-sprockets
-  requirement: &70197702467920 !ruby/object:Gem::Requirement
+  requirement: &70336034671560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197702467920
+  version_requirements: *70336034671560
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70197702465880 !ruby/object:Gem::Requirement
+  requirement: &70336034670000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197702465880
+  version_requirements: *70336034670000
 description: A gem wrapper to include Joosy via the asset pipeline.
 email: boris@roundlake.ru
 executables: []