gexp 0.0.2 → 0.0.3

data/lib/gexp/command/object.rb

@@ -23,11 +23,9 @@ module Gexp
       protected
 
         def load_object
-          if @params[:object]
-            #require 'pry'
-            #binding.pry
-            label  = @params[:object].keys.first
-            id     = @params[:object].values.first
+          if @params[:objects]
+            label   = @params[:objects].keys.first
+            id      = @params[:objects].values.first
             @object = Gexp.label_to_class(label).find(id)
           else
             raise "Can't find object params"

data/lib/gexp/command/stack.rb

@@ -14,7 +14,7 @@ module Gexp
       end
 
       def build_command(command_param = {})
-        Gexp::Command.new(command_param)
+        Gexp::Command::Object.new(command_param)
       end
 
       def fill(request = nil)

data/lib/gexp/receiver.rb

@@ -22,11 +22,8 @@ module Gexp
     end
 
     def receive
-      @stack.map do |command|
-        Gexp::Mongoid::Transaction.with do |context|
-          command.perform
-        end
-      end
+      raise NotImplementedError.new \
+        "Abstract receiver class"
     end
 
   end

data/lib/gexp/receiver/example.rb

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

data/lib/gexp/receiver/mongoid.rb

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

data/lib/gexp/version.rb

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

data/spec/gexp/command/object_spec.rb

@@ -13,13 +13,13 @@ describe Gexp::Command::Object do
           :create_at => 123456789.012,
           :commands => [{ 
             # У себя на карте
-            :event => :pick, 
-            :stage => { x: 100, y: 200 },
-            :rewards => { energy: -1, exp: 5 },
-            :timestamp => 123456789.012,
-            :object => { 'item_example' => '55a55' },
+            :event      => :pick, 
+            :stage      => { x: 100, y: 200 },
+            :rewards    => { energy: -1, exp: 5 },
+            :timestamp  => 123456789.012,
+            :objects    => { 'item_example' => '55a55' },
             :transition => { :builded => :builded },
-            :seed => 532434234,
+            :seed       => 532434234,
           }]
         }
       })
@@ -46,7 +46,7 @@ describe Gexp::Command::Object do
 
     it "Нельзя (так просто взять и) создать команду без параметра-объекта" do
       params = @request[:params][:commands].first
-      params.delete(:object)
+      params.delete(:objects)
       lambda {
         @command = Gexp::Command::Object.new params
       }.should raise_error Regexp.new("Can't find object")

data/spec/gexp/command/stack_spec.rb

@@ -16,7 +16,7 @@ describe Gexp::Command::Stack do
               :stage => { x: 100, y: 200 },
               :rewards => { energy: -1, exp: 5 },
               :timestamp => 123456789.012,
-              :objects => [{ 'item.stage.house' => '50c12939584aa5488a000001' }],
+              :objects => { 'item_example' => '50c12939584aa5488a000001' },
               :transition => { :builded => :builded },
               :timestamp => 123456789.010,
               :seed => 532434234,
@@ -26,21 +26,21 @@ describe Gexp::Command::Stack do
               :uid => '<friend_uid>',
               :rewards => { energy: -1, exp: 5 },
               :timestamp => 123456789.012,
-              :objects => [{ 'item.stage.house' => '50c12939584aa5488a000001' }],
+              :objects => { 'item_example' => '50c12939584aa5488a000002' },
               :transition => { :builded => :builded },
               :timestamp => 123456789.011,
               :seed => 532434234,
             }, { # создание здания
               :event => :create,
               :stage => { x: 100, y: 200 },
-              :objects => [{ 'item.stage.house' => '50c12939584aa5488a000001' }],
+              :objects => { 'item_example' => '50c12939584aa5488a000003' },
               :reward => { gold: -100 },
               :timestamp => 123456789.012,
               :seed => 532434234,
             }, { # создание контракта
               :event => :pick,
               :stage => { x: 100, y: 200 },
-              :objects => [{ 'item.stage.house' => '50c12939584aa5488a000001' }],
+              :objects => { 'item_example' => '50c12939584aa5488a000004' },
               :timestamp => 123456789.013,
               :seed => 532412334,
             },
@@ -49,7 +49,18 @@ describe Gexp::Command::Stack do
       })
     }
 
+    let(:item1) { ItemExample.new }
+    let(:item2) { ItemExample.new }
+    let(:item3) { ItemExample.new }
+    let(:item4) { ItemExample.new }
+
     before do
+
+      stub(ItemExample).find('50c12939584aa5488a000001') { item1 }
+      stub(ItemExample).find('50c12939584aa5488a000002') { item2 }
+      stub(ItemExample).find('50c12939584aa5488a000003') { item3 }
+      stub(ItemExample).find('50c12939584aa5488a000004') { item4 }
+
       @user = UserExample.new
       @request = request
     end

data/spec/gexp/receiver_spec.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe Gexp::Receiver do
+
+  let(:receiver_class) { Gexp::Receiver::Example }
+  let(:user) { UserExample.new }
+  let(:item_id) { 1 }
+  let(:item) { ItemExample.new }
+  let(:request) do
+    HashWithIndifferentAccess.new({ 
+      :params => {
+        :sended_at => 123456789.012,
+        :create_at => 123456789.012,
+        :commands   => [{ 
+          # У себя на карте
+          :event      => :pick, 
+          :stage      => { x: 100, y: 200 },
+          :rewards    => { energy: -1, exp: 5 },
+          :timestamp  => 123456789.012,
+          :objects    => { 'item_example' => item_id },
+          :transition => { :builded => :builded },
+          :seed       => 532434234,
+        }]
+      }
+    })
+  end
+
+  let(:subject) do
+    receiver_class.new(user, request)
+  end
+
+  before do
+    stub(ItemExample).find(item_id) { item }
+  end
+
+  context "Успешная обработка комманды" do
+  
+    it "должна пройти без ошибок" do
+      #lambda {
+        subject.receive
+      #}.should_not raise_error
+    end
+
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gexp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2194326880 !ruby/object:Gem::Requirement
+  requirement: &70143297987720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2194326880
+  version_requirements: *70143297987720
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2194325600 !ruby/object:Gem::Requirement
+  requirement: &70143297986680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2194325600
+  version_requirements: *70143297986680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2194320360 !ruby/object:Gem::Requirement
+  requirement: &70143297985980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2194320360
+  version_requirements: *70143297985980
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2194317020 !ruby/object:Gem::Requirement
+  requirement: &70143297984780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2194317020
+  version_requirements: *70143297984780
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &2194314860 !ruby/object:Gem::Requirement
+  requirement: &70143297983800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2194314860
+  version_requirements: *70143297983800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2194312320 !ruby/object:Gem::Requirement
+  requirement: &70143297982600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2194312320
+  version_requirements: *70143297982600
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2194309220 !ruby/object:Gem::Requirement
+  requirement: &70143297980680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *2194309220
+  version_requirements: *70143297980680
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2194307800 !ruby/object:Gem::Requirement
+  requirement: &70143297979760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *2194307800
+  version_requirements: *70143297979760
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2194306020 !ruby/object:Gem::Requirement
+  requirement: &70143297978700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *2194306020
+  version_requirements: *70143297978700
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2194191400 !ruby/object:Gem::Requirement
+  requirement: &70143297977520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2194191400
+  version_requirements: *70143297977520
 - !ruby/object:Gem::Dependency
   name: money-mongoid
-  requirement: &2194186120 !ruby/object:Gem::Requirement
+  requirement: &70143297976520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *2194186120
+  version_requirements: *70143297976520
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
-  requirement: &2194181460 !ruby/object:Gem::Requirement
+  requirement: &70143297975140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,7 +142,7 @@ dependencies:
         version: 1.4.5
   type: :development
   prerelease: false
-  version_requirements: *2194181460
+  version_requirements: *70143297975140
 description: Gexp - comand hadlers
 email:
 - kazantsev.nickolay@gmail.com
@@ -176,6 +176,8 @@ files:
 - lib/gexp/mongoid/transaction.rb
 - lib/gexp/object.rb
 - lib/gexp/receiver.rb
+- lib/gexp/receiver/example.rb
+- lib/gexp/receiver/mongoid.rb
 - lib/gexp/state_definition.rb
 - lib/gexp/state_definition/state_machine.rb
 - lib/gexp/version.rb
@@ -191,6 +193,7 @@ files:
 - spec/gexp/handler/transition/builder_spec.rb
 - spec/gexp/handler/transition_spec.rb
 - spec/gexp/mongoid/transaction_spec.rb
+- spec/gexp/receiver_spec.rb
 - spec/gexp/state_definition/state_machine_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/realb0t/gexp
@@ -205,12 +208,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3174103148992928154
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3174103148992928154
 requirements: []
 rubyforge_project: gexp
 rubygems_version: 1.8.5
@@ -230,5 +239,6 @@ test_files:
 - spec/gexp/handler/transition/builder_spec.rb
 - spec/gexp/handler/transition_spec.rb
 - spec/gexp/mongoid/transaction_spec.rb
+- spec/gexp/receiver_spec.rb
 - spec/gexp/state_definition/state_machine_spec.rb
 - spec/spec_helper.rb