gexp 0.0.3 → 0.0.4

data/lib/gexp/handler/transition.rb

@@ -2,7 +2,7 @@ module Gexp
   class Handler
     class Transition
 
-      attr_accessor :transition, :config, :object, :subject, :provider
+      attr_accessor :transition, :object, :subject, :provider
 
       def self.namespaces
         @namespaces ||= {
@@ -11,29 +11,57 @@ module Gexp
         }
       end
 
-      # transition - объект транзакции от стейт машины
-      # object     - объект у которого вызывается событие стейтмашины
-      # subject    - объект кто вызывает событие (всегда User)
-      # provider   - объект которому принадлежит object (иногда User иногда Friend)
+      # @params [StateMachine::Transaction] transition - объект транзакции от стейт машины
+      # @params [Item]                      object     - объект у которого вызывается событие стейтмашины
+      # @params [User]                      subject    - объект кто вызывает событие (всегда User)
+      # @params [User]                      provider   - объект которому принадлежит object (иногда User иногда Friend)
+      #
+      # @note Выбор конечного объекта определяется конфигом object
       #
-      # Выбор конечного объекта определяется конфигом object
       def initialize(transition, object = nil, subject = nil, provider = nil)
         @transition = transition
+        actor       = @transition.args.first
+
+        unless self.actor_support?(actor)
+          raise "Unsupported actor type #{@actor.class.name}"
+        else
+          @actor = actor
+        end
+      end
 
-        @object     = object
-        @subject    = subject
-        @provider   = provider
+      def object
+        @object   ||= @actor.object
+      end
+
+      def subject
+        @subject  ||= @actor.subject
+      end
 
-        @config     = @object.config
+      def provider
+        @provider ||= @actor.provider
       end
 
+      def config
+        @config   ||= self.object.config
+      end
+
+      def actor_support?(actor)
+        !actor.nil?
+      end
+
+      # Создает объект обработчика
+      #
+      # @params [Gexp::Handler]
       def produce(params, type)
         producer = Gexp::Handler::Producer.new params, type
         producer.emit
       end
 
+      # Возвращает массив обработчиков
+      #
+      # @return [Array(Gexp::Handler)]
       def handlers(type = nil)
-        type = :checkers
+        type ||= :checkers
         (self.send(type) || []).map do |handler_params|
           self.produce(handler_params, type)
         end

data/lib/gexp/handler/transition/builder.rb

@@ -6,24 +6,50 @@ module Gexp
       # в зависимости от перехода FSM (StateMachine)
       class Builder < self
 
+        # XXX: метод не используется
+        # тк определение событий хранит
+        # только информацию по переходам
         def events(last_key)
-          event = @config[:events][@transition.event]
+          event = self.config.to_hash[:states][:events][@transition.event.to_sym]
           (event || {})[last_key] || []
         end
 
+        # Возвращает конфиги для создания обработчиков
+        #
+        # @params [Symbol] last_key - [ :check | :modify ]
+        # @returns [Array]
+        def conf_handlers(last_key)
+          from        = self.transition.from_name
+          to          = self.transition.to_name
+          from_branch = self.config.to_hash[:states][:states][from] || {}
+
+          configs     = (from_branch[to] || {})[last_key] || []
+        end
+
         def transitions(last_key)
-          from = @transition.from_name
-          to = @transition.to_name
-          from_branch = @config[:transitions][from] || {}
-          (from_branch[to] || {})[last_key] || []
+          conf = conf_handlers(last_key)
+          type = last_key == :check ? :checkers : :modifiers
+
+          observers = conf.map do |params|
+
+            producer = Gexp::Handler::Producer.new(params, type, { 
+              object: self.object,
+              subject: self.subject,
+              provider: self.provider,
+            })
+
+            producer.emit
+          end
+
+          observers
         end
 
         def checkers
-          events(:check) + transitions(:check)
+          transitions(:check)
         end
 
         def modifiers
-          events(:modify) + transitions(:modify)
+          transitions(:modify)
         end
 
       end

data/lib/gexp/item.rb

@@ -0,0 +1,73 @@
+module Gexp
+
+  module Item
+
+    def self.included(base)
+      base.instance_eval do
+        class << self
+          def inherited(sub)
+            sub.instance_eval do
+              include Gexp::Object
+            end
+          end
+
+          def register
+            @register ||= {}
+
+            if @register.empty?
+              register = Configuration.for 'register'
+              register.keys.each do |key|
+                @register[key] = Configuration.for(key).to_hash
+              end
+            end
+
+            @register
+          end
+
+          def reload_register!
+            @register = {}
+          end
+
+        end
+      end
+    end
+
+    def around_handlers(fsm_transition, &block)
+      # объект команды (как параметр к событию)
+      transition = Gexp::Handler::Transition::Builder.new(fsm_transition)
+
+      self.check_handlers(transition)
+      self.before_event(transition)
+      block.call # выполнение самого перехода
+      self.after_event(transition)
+      self.modify_handlers(transition)
+    rescue => e
+      raise e unless self.on_error(e)
+    end
+
+    def on_error(exception)
+      # TODO: Сделать обработку ошибок перехода
+    end
+
+    def before_event(transition)
+      # TODO: сделать обработку события
+    end
+
+    def after_event(transition)
+      # TODO: сделать обработку события
+    end
+
+    def check_handlers(transition)
+      transition.checkers.each { |handler|
+        handler.process(*handler.params)
+      }
+    end
+
+    def modify_handlers(transition)
+      transition.modifiers.each { |handler|
+        handler.process(*handler.params)
+      }
+    end
+
+  end
+end

data/lib/gexp/object.rb

@@ -7,6 +7,14 @@ module Gexp
     include ::Gexp::StateDefinition::StateMachine
 
     def self.included(base)
+      self.linked_config base
+    end
+
+    # Определяет конфиг как переменную класса
+    # Определяя ключ конфига как имя класса
+    #
+    # @params [Class]
+    def self.linked_config(base)
       @config_name = base.name.gsub('::', '.').underscore
       @end_class_name = base.name.split('::').last
 

data/lib/gexp/receiver/example.rb

@@ -3,11 +3,11 @@ module Gexp
     class Example < self
 
       def receive
+        # Start transaction
         @stack.map do |hash, command|
-          # Start transaction
           command.perform
-          # finish transaction
         end
+        # finish transaction
       end
       
     end

data/lib/gexp/receiver/mongoid.rb

@@ -3,13 +3,13 @@ module Gexp
     class Mongoid < self
 
       def receive
-        @stack.map do |command|
-          Gexp::Mongoid::Transaction.with do |context|
+        Gexp::Mongoid::Transaction.with do |context|
+          @stack.map do |command|
             command.perform
           end
         end
       end
-      
+
     end
   end
 end

data/lib/gexp/state_definition/state_machine.rb

@@ -27,12 +27,14 @@ module Gexp
               smc = self
 
               # State definition
-              sm[:states].each do |name, methods|
-                smc.state name do
-                  (methods || []).each do |method|
-                    self.send(method)
-                  end
-                end
+              sm[:states].each do |name, hash|
+                smc.state name.to_sym
+              #  method = hash
+              #  smc.state name do
+              #    (methods || []).each do |method|
+              #      self.send(method)
+              #    end
+              #  end
               end
 
               # Events definition

data/lib/gexp/user.rb

@@ -0,0 +1,9 @@
+module Gexp
+  module User
+
+    def after_change!(param)
+      raise NotImplementedError.new
+    end
+
+  end
+end

data/lib/gexp/version.rb

@@ -1,3 +1,3 @@
 module Gexp
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/gexp/command/object_spec.rb

@@ -5,9 +5,8 @@ describe Gexp::Command::Object do
 
   context "Команда pick на объекте у себя в локации" do
 
-    before do
-      @user    = UserExample.new
-      @request = HashWithIndifferentAccess.new({ 
+    let(:request) do
+      HashWithIndifferentAccess.new({ 
         :params => {
           :sended_at => 123456789.012,
           :create_at => 123456789.012,
@@ -23,57 +22,105 @@ describe Gexp::Command::Object do
           }]
         }
       })
+    end
 
-      @object = Object.new
-      @context  = Object.new
-
-      stub(ItemExample).find.with('55a55') { @object }
-
-      lambda {
-        @command = Gexp::Command::Object.new @request[:params][:commands].first
-        @command.context = @context
-      }.should_not raise_error
+    let(:context) { Object.new }
+    let(:object) { ItemExample.new }
+    let(:user) do 
+      user = UserExample.new
+      user.energy = 1
+      user.wood = 5
+      user
+    end
+    let(:command) do
+      command = Gexp::Command::Object.new request[:params][:commands].first
+      command.context = context
+      stub(command).subject { user }
+      command
+    end
 
+    before do
+      stub(ItemExample).find.with('55a55') { object }
     end
 
     it "Команда должна загружать объекты" do
-      @command.object.should == @object
+      command.object.should == object
     end
 
     it "Для конмады определенно событие" do
-      @command.event.should == :pick
+      command.event.should == :pick
     end
 
     it "Нельзя (так просто взять и) создать команду без параметра-объекта" do
-      params = @request[:params][:commands].first
+      params = request[:params][:commands].first
       params.delete(:objects)
       lambda {
-        @command = Gexp::Command::Object.new params
+        command = Gexp::Command::Object.new params
       }.should raise_error Regexp.new("Can't find object")
     end
 
     context "#perform" do
 
-      it "При успешном выполнении должен вызывать соотвествующее соьытие у объекта" do
-        mock(@object).pick.once { true }
-        @command.perform
-        @command.should be_done
+      it "должен вызывать соотвествующее соьытие у объекта" do
+        mock(object).pick.with_any_args.once { true }
+        command.perform
+        command.should be_done
+      end
+
+      context "при успешном выполнении команды" do
+
+        it "до вызова объект в первоначальном состоянии" do
+          object.should be_created
+        end
+
+        it "ошибок быть не должно" do
+          command.perform
+          command.errors.should be_empty
+        end
+
+        it "состояние у объекта меняется" do
+          command.perform
+          object.should be_prebuilded
+        end
+
+        it "у объекта вызываются калбеки" do
+          mock(object).modify_handlers(anything)
+          mock(object).check_handlers(anything)
+          mock(object).before_event(anything)
+          mock(object).after_event(anything)
+
+          command.perform
+        end
+
+        it "вызываются конструкторы обработчиков"
+
+        it "у обработчиков действия вызывается #process"
+
+      end
+
+      context "при ошибке обработчика" do
+
+        it "последующие обработчики не вызываются"
+
+        it "состояние объекта не изменяется"
+
       end
 
       context "При неуспешном выполнении" do
 
         before do
-          mock(@object).pick.once { raise 'Something wrong' }
+          mock(object).pick.with_any_args.once { raise 'Something wrong' }
         end
 
         it "Команда должна находится в статусе failed" do
-          @command.perform
-          @command.should be_failed
+          lambda { command.perform }.should raise_error
+          command.should be_failed
         end
 
-        it "исключение должно агрегироваться в соотвествующем поле" do
-          @command.perform
-          @command.errors.should_not be_empty
+        it "исключение должно агрегироваться в #errors" do
+          lambda { command.perform }.should raise_error
+          command.errors.should_not be_empty
+          command.errors.last.message.should == 'Something wrong'
         end
 
       end

data/spec/gexp/handler/transition/builder_spec.rb

@@ -5,33 +5,30 @@ describe Gexp::Handler::Transition::Builder do
 
   shared_examples_for Gexp::Handler::Transition::Builder do
 
-    # let(:to) { to }
-
-    # let(:from) { from }
+    let(:object) do 
+      object = ItemExample.new
+      mock(object).config { config }
+      object
+    end
 
-    # let(:event) { event }
+    let(:actor) {
+      actor = Object.new
+      stub(actor).object { object }
+      stub(actor).subject {}
+      stub(actor).provider {}
+      actor
+    }
 
     let(:transition) do
       transition = Object.new
       stub(transition).to_name { to }
       stub(transition).from_name { from }
       stub(transition).event { event }
+      stub(transition).args { [ actor ] }
 
       transition
     end
 
-    # let(:config) do
-    #   config
-    # end
-
-    # let(:result_chekers) do
-    #   result_chekers
-    # end
-
-    # let(:result_modifiers) do
-    #   result_modifiers
-    # end
-
     let(:object_param) do
       object = Object.new
       stub(object).config { config }
@@ -46,12 +43,12 @@ describe Gexp::Handler::Transition::Builder do
         provider_param
     end
 
-    it "should must be given result checkers" do
-      subject.checkers.should == result_chekers
+    it "должен возвращать массив чекеров" do
+      subject.conf_handlers(:check).should == result_chekers
     end
 
-    it "should must be given result modifiers" do
-      subject.modifiers.should == result_modifiers
+    it "должен возвращать массив модифаеров" do
+      subject.conf_handlers(:modify).should == result_modifiers
     end
 
   end
@@ -63,54 +60,51 @@ describe Gexp::Handler::Transition::Builder do
       let(:from) { :created }
       let(:event) { :place }
       let(:config) do 
-        {
+        conf = Object.new
+        stub(conf).to_hash { { states: {
           events: {
-            place: {
-              check: [
-                [ :resources, :object, { wood: 5, energy: 1 } ],
-                [ :object, [ :place_allowed?, :not_blocked? ] ],
-              ],
-              modify: [
-                [ :object, [ :change_tile_type! ] ]
-              ]
-            },
-            sell: {
-              check: [
-                [ :object, [ :has_current_user? ] ]
-              ]
-            }
+            place: [
+              { from: :created, to: :prebuilded },
+            ],
+            pick: [
+              { from: :prebuilded, to: :postbuilded },
+              { from: :postbuilded, to: :builded },
+              { from: :builded, to: :builded },
+            ],
+            sell: [
+              { from: :prebuilded, to: :selled },
+              { from: :postbuilded, to: :selled },
+              { from: :builded, to: :selled },
+            ]
           },
-          transitions: {
+          states: { # TODO!: Переименовать в transitions
             created: {
               selled: { },
               prebuilded: {
                 check: [
-                  [ :shared_resources, :object, { 0 => 5 } ]
+                  [ :shared_resources, :subject, { 0 => 5 } ]
                 ],
                 modify: [
-                  [ :shared_resources, :object, { 0 => 5 } ],
-                  [ :resources, :object, { wood: -5, energy: -1 } ],
-                  [ :shared_resources, :object, { 0 => -5 } ]
+                  [ :shared_resources, :subject, { 0 => 5 } ],
+                  [ :resources, :subject, { wood: -5, energy: -1 } ],
+                  [ :shared_resources, :subject, { 0 => -5 } ]
                 ]
               }
             }
           }
-        }
+        } } }
       end
 
       let(:result_chekers) { 
         [
-          [ :resources, :object, { wood: 5, energy: 1 } ],
-          [ :object, [ :place_allowed?, :not_blocked? ] ],
-          [ :shared_resources, :object, { 0 => 5 } ],
+          [ :shared_resources, :subject, { 0 => 5 } ],
         ] 
       }
       let(:result_modifiers) { 
         [
-          [ :object, [ :change_tile_type! ] ],
-          [ :shared_resources, :object, { 0 => 5 } ],
-          [ :resources, :object, { wood: -5, energy: -1 } ],
-          [ :shared_resources, :object, { 0 => -5 } ]
+          [ :shared_resources, :subject, { 0 => 5 } ],
+          [ :resources, :subject, { wood: -5, energy: -1 } ],
+          [ :shared_resources, :subject, { 0 => -5 } ]
         ]
       }
       let(:subject_param) { Object.new }