switcher 0.2.0 → 0.2.1

data/Gemfile

@@ -7,6 +7,6 @@ gem "guard-rspec"
 
 group "activerecord" do
   gem "activerecord", "~> 3.0.0"
-  gem 'sqlite3-ruby', :platforms => :ruby
+  gem 'sqlite3', :platforms => :ruby
   gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
 end

data/LICENSE

@@ -0,0 +1,8 @@
+Copyright (c) 2012, Andrey Savchenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+* Except as contained in this notice, the name(s) of the above copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -116,4 +116,17 @@ user.save
 
 * ActiveModel
 * Virtus
-* Mongoid
+* Mongoid
+
+## License
+
+The modified MIT license
+
+Copyright (c) 2012 Andrey Savchenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+* Except as contained in this notice, the name(s) of the above copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/switcher/adapters/active_record.rb

@@ -1,53 +1,11 @@
 module Switcher
   module ActiveRecord
-
-    module Initializer
-    end
-
-    module ClassMethods
-      def switcher_pre_initialize(inst, spec)
-        inst.class_eval do
-          spec_name = spec.name
-
-          define_method(:"#{spec_name}_spec") { spec }
-          define_method(:"#{spec_name}_prev") { self.instance_variable_get(:"@#{spec_name}_statement").state_prev }
-
-          define_method(:"#{spec_name}") { self.instance_variable_get(:"@#{spec_name}_statement").state_current }
-          define_method(:"#{spec_name}=") { nil } # FIXME - raise exception
-
-          define_method(:"#{spec_name}_force") { |state| self.instance_variable_get(:"@#{spec_name}_statement").force_state(state.to_sym) }
-
-          events = []
-
-          spec.states.each_pair do |state_name, state|
-            define_method(:"#{spec_name}_#{state_name}?") do
-              state_name == self.send(:"#{spec_name}")
-            end
-
-            events << state.event_names
-          end
-
-          events.flatten.each do |event_name|
-            define_method(:"can_#{event_name}?") do
-              self.class.class_variable_get(:@@__specs__).map { |spc|
-                spc.states[self.send(:"#{spc.name}")].event_names.include?(event_name)
-              }.include?(true)
-            end
-
-            define_method(:"#{event_name}!") do |*args|
-              switch_from(nil, event_name, *args)
-            end
-          end
-
-        end
-      end
-    end
-
     def self.included(base)
       base.extend Switcher::ClassMethods
-      base.extend Switcher::ActiveRecord::ClassMethods
 
       base.class_eval do
+        include Switcher
+
         after_initialize do
           self.class.class_variable_get(:@@__specs__).each do |spec|
             spec_name     = spec.name
@@ -60,10 +18,6 @@ module Switcher
       end
     end
 
-    def switch(event, *args)
-      switch_from(self.class, event, *args)
-    end
-
     def switch_from(orig, event, *args)
       return false unless (self.respond_to?(:"can_#{event}?") and self.send(:"can_#{event}?"))
 
@@ -80,6 +34,5 @@ module Switcher
 
       true
     end
-
   end
 end

data/lib/switcher/adapters/object.rb

@@ -11,52 +11,13 @@ module Switcher
       end
     end
 
-    module ClassMethods
-      def switcher_pre_initialize(inst, spec)
-        inst.class_eval do
-          spec_name = spec.name
-
-          define_method(:"#{spec_name}_spec") { spec }
-          define_method(:"#{spec_name}_prev") { self.instance_variable_get(:"@#{spec_name}_statement").state_prev }
-
-          define_method(:"#{spec_name}") { self.instance_variable_get(:"@#{spec_name}_statement").state_current }
-          define_method(:"#{spec_name}=") { nil }
-
-          define_method(:"#{spec_name}_force") { |state| self.instance_variable_get(:"@#{spec_name}_statement").force_state(state.to_sym) }
-
-          events = []
-
-          spec.states.each_pair do |state_name, state|
-            define_method(:"#{spec_name}_#{state_name}?") do
-              state_name == self.send(:"#{spec_name}")
-            end
-
-            events << state.event_names
-          end
-
-          events.flatten.each do |event_name|
-            define_method(:"can_#{event_name}?") do
-              self.class.class_variable_get(:@@__specs__).map { |spc|
-                spc.states[self.send(:"#{spc.name}")].event_names.include?(event_name)
-              }.include?(true)
-            end
-
-            define_method(:"#{event_name}!") do |*args|
-              switch(event_name, *args)
-            end
-          end
-        end
-      end
-    end
-
     def self.included(base)
-      base.extend Switcher::ClassMethods
-      base.extend Switcher::Object::Initializer
-      base.extend Switcher::Object::ClassMethods
-    end
+      base.extend  Switcher::ClassMethods
+      base.extend  Switcher::Object::Initializer
 
-    def switch(event, *args)
-      switch_from(self.class, event, *args)
+      base.class_eval do
+        include Switcher
+      end
     end
 
     def switch_from(orig, event, *args)

data/lib/switcher/facade.rb

@@ -3,9 +3,10 @@ module Switcher
     def initialize(target, data)
       @args    = data
       @stopped = false
+      @target  = target
+
       @bubble_cancelled = false
       @target_state     = nil
-      @target  = target
     end
 
     attr_reader :args, :stopped, :target, :target_state, :bubble_cancelled

data/lib/switcher/spec.rb

@@ -7,10 +7,10 @@ module Switcher
       @name        = name.to_sym
       @states      = {}
       @states_list = []
-      @targets     = []
+      @subscribers = []
     end
 
-    attr_reader :name, :states, :states_list, :targets
+    attr_reader :name, :states, :states_list, :subscribers
 
     def state(name, &block)
       listener = Listener.new(name)
@@ -21,7 +21,7 @@ module Switcher
     end
 
     def notify(*list)
-      @targets = list
+      @subscribers = list
     end
 
   end

data/lib/switcher/statement.rb

@@ -1,10 +1,8 @@
 module Switcher
   class Statement
     def initialize(instance, spec, state_current=nil, state_prev=nil)
-      @instance = instance
-
-      @spec = spec
-
+      @spec          = spec
+      @instance      = instance
       @state_prev    = state_prev
       @state_current = state_current
     end
@@ -19,40 +17,41 @@ module Switcher
       @state_prev ? @state_prev.to_sym : nil
     end
 
-    def publish(event, original, args)
+    def publish(event, target, args)
       states = @spec.states
       state  = state_current
 
       return unless states.has_key?(state)
 
-      facade = Facade.new(original, args)
+      listener = states[state]
+      facade   = Facade.new(target, args)
 
       ["before_#{event}", event.to_s].each do |ev|
-        states[state].trigger(ev, facade, @instance, args)
+        listener.trigger(ev, facade, @instance, args)
       end
 
       set_state(facade)
 
-      states[state].trigger("after_#{event}", facade, @instance, args)
+      listener.trigger("after_#{event}", facade, @instance, args)
 
       return if facade.bubble_cancelled
 
-      if @spec.targets.length > 0
-        @spec.targets.each do |target|
-          target_instance = @instance.send(target.to_sym)
-          if target_instance.respond_to?(:each)
-            target_instance.each do |ti|
-              ti.switch_from(original, event, args) if ti.respond_to?(:switch_from)
-            end
+      unless @spec.subscribers.empty?
+        @spec.subscribers.each do |sub|
+          sub_instance = @instance.send(sub.to_sym)
+
+          if sub_instance.respond_to?(:each)
+            sub_instance.each { |ti| sub_switch(ti, target, event, args) }
           else
-            target_instance.switch_from(original, event, args) if target_instance.respond_to?(:switch_from)
+            sub_switch(sub_instance, target, event, args)
           end
-        end
-      end
-    end
+        end # each
+      end # unless
+    end # def publish
 
     def force_state(state)
       return unless @spec.states_list.include?(state.to_sym) # FIXME - raise exception
+
       @state_prev    = state_current
       @state_current = state.to_sym
     end
@@ -66,5 +65,9 @@ module Switcher
       end
     end
 
-  end
+    def sub_switch(sub, target, event, args)
+      sub.switch_from(target, event, args) if sub.respond_to?(:switch_from)
+    end
+
+  end # class Statement
 end

data/lib/switcher/version.rb

@@ -1,3 +1,3 @@
 module Switcher
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/switcher.rb

@@ -14,7 +14,41 @@ module Switcher
 
       self.class_variable_get(:@@__specs__) << spec
 
-      switcher_pre_initialize(self, spec)
+      spec_name = spec.name
+
+      define_method(:"#{spec_name}_spec") { spec }
+      define_method(:"#{spec_name}_prev") { self.instance_variable_get(:"@#{spec_name}_statement").state_prev }
+
+      define_method(:"#{spec_name}") { self.instance_variable_get(:"@#{spec_name}_statement").state_current }
+      define_method(:"#{spec_name}=") { nil }
+
+      define_method(:"#{spec_name}_force") { |state| self.instance_variable_get(:"@#{spec_name}_statement").force_state(state.to_sym) }
+
+      events = []
+
+      spec.states.each_pair do |state_name, state|
+        define_method(:"#{spec_name}_#{state_name}?") do
+          state_name == self.send(:"#{spec_name}")
+        end
+
+        events << state.event_names
+      end
+
+      events.flatten.each do |event_name|
+        define_method(:"can_#{event_name}?") do
+          self.class.class_variable_get(:@@__specs__).map { |spc|
+            spc.states[self.send(:"#{spc.name}")].event_names.include?(event_name)
+          }.include?(true)
+        end
+
+        define_method(:"#{event_name}!") do |*args|
+          switch(event_name, *args)
+        end
+      end
     end
   end
+
+  def switch(event, *args)
+    switch_from(self.class, event, *args)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switcher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000Z
+date: 2012-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70322138874120 !ruby/object:Gem::Requirement
+  requirement: &70130949632800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322138874120
+  version_requirements: *70130949632800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70322138873700 !ruby/object:Gem::Requirement
+  requirement: &70130949632380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322138873700
+  version_requirements: *70130949632380
 description: Switcher is simple, event-driven state machine
 email:
 - andrey@aejis.eu
@@ -44,6 +44,7 @@ files:
 - .travis.yml
 - Gemfile
 - Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/switcher.rb