gexp 0.0.1 → 0.0.2

data/gexp.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
+
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gexp/version'
 
@@ -22,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rr"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "pry"
   gem.add_development_dependency "state_machine"
   gem.add_development_dependency "activesupport"
   gem.add_development_dependency 'bson', '= 1.8.0'
@@ -29,4 +31,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mongo', '~> 1.8.0'
   gem.add_development_dependency "mongoid", "~> 3.0.0"
   gem.add_development_dependency 'money-mongoid', '= 0.1.2'
+  gem.add_development_dependency "mongoid-rspec", '= 1.4.5'
 end

data/lib/examples/item_example.rb

@@ -0,0 +1,68 @@
+class ItemExample
+  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
+
+  attr_accessor :current_command
+
+  include Mongoid::Document
+
+  field :state, type: String, default: 'created'
+  field :uid, type: String
+  field :social_type_id, type: Integer
+
+  field :x, type: Integer, default: 0
+  field :y, type: Integer, default: 0
+
+  scope :with_class_and_uid, lambda { |klass, uid, social_type_id| 
+    where(_type: klass, uid: uid, social_type_id: social_type_id) 
+  }
+
+  # TODO: по возможности переделать на Mongoid::Observer или скрыть из конфига
+  def around_handlers(transition, &block)
+    self.check_handlers(transition)
+    self.before_event(transition)
+    #require 'pry'
+    #binding.pry
+    block.call
+    self.after_event(transition)
+    self.modify_handlers(transition)
+  rescue => e
+    raise
+  end
+
+  def before_event(transition)
+  end
+
+  def after_event(transition)
+  end
+
+  def check_handlers(transition)
+  end
+
+  def modify_handlers(transition)
+  end
+
+end

data/lib/examples/user_example.rb

@@ -0,0 +1,14 @@
+class UserExample
+  include Mongoid::Document
+
+  field :energy, type: Integer
+  field :exp, type: Integer
+  field :exp_level, type: Integer
+
+  def max_energy
+    [ 10, 40, 50, 60, 80, 90, 100][self.exp_level || 0]
+  end
+
+  def after_change!(param)
+  end
+end

data/lib/gexp.rb

@@ -14,3 +14,10 @@ module Gexp
     end
   end
 end
+
+Dir["#{File.dirname(__FILE__)}/gexp/**/*.rb"].sort.each do |path|
+  require path
+end
+
+require "#{File.dirname(__FILE__)}/examples/user_example"
+require "#{File.dirname(__FILE__)}/examples/item_example"

data/lib/gexp/command.rb

@@ -1,7 +1,11 @@
 # encoding: utf-8
+require 'state_machine/core'
+
 module Gexp
   class Command
 
+    extend StateMachine::MacroMethods
+
     attr_accessor :errors
     attr_accessor :context
     attr_accessor :params

data/lib/gexp/command/object.rb

@@ -24,6 +24,8 @@ module Gexp
 
         def load_object
           if @params[:object]
+            #require 'pry'
+            #binding.pry
             label  = @params[:object].keys.first
             id     = @params[:object].values.first
             @object = Gexp.label_to_class(label).find(id)

data/lib/gexp/mongoid/transaction.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'mongoid'
 
 # Gexp::Mongoid::Transaction::Observer.started?
 

data/lib/gexp/object.rb

@@ -1,5 +1,5 @@
-require File.join(APP_ROOT, 'lib', 'gexp', 'state_definition')
-require File.join(APP_ROOT, 'lib', 'gexp', 'state_definition', 'state_machine')
+require File.join('gexp', 'state_definition')
+require File.join('gexp', 'state_definition', 'state_machine')
 
 module Gexp
   module Object

data/lib/gexp/state_definition/state_machine.rb

@@ -14,6 +14,10 @@ module Gexp
           state_aliases = [ :all, :any ]
 
           self.instance_eval do
+            unless self.methods.include?("state_machine")
+              extend ::StateMachine::MacroMethods
+            end
+
             state_machine initial: sm[:initial] do
 
               # Внешний хук от Handlers

data/lib/gexp/version.rb

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

data/spec/gexp/command/object_spec.rb

@@ -6,7 +6,7 @@ describe Gexp::Command::Object do
   context "Команда pick на объекте у себя в локации" do
 
     before do
-      @user    = Fabricate(:user)
+      @user    = UserExample.new
       @request = HashWithIndifferentAccess.new({ 
         :params => {
           :sended_at => 123456789.012,
@@ -17,7 +17,7 @@ describe Gexp::Command::Object do
             :stage => { x: 100, y: 200 },
             :rewards => { energy: -1, exp: 5 },
             :timestamp => 123456789.012,
-            :object => { 'item.stage.house' => '55a55' },
+            :object => { 'item_example' => '55a55' },
             :transition => { :builded => :builded },
             :seed => 532434234,
           }]
@@ -27,7 +27,7 @@ describe Gexp::Command::Object do
       @object = Object.new
       @context  = Object.new
 
-      stub(Item::Stage::House).find.with('55a55') { @object }
+      stub(ItemExample).find.with('55a55') { @object }
 
       lambda {
         @command = Gexp::Command::Object.new @request[:params][:commands].first

data/spec/gexp/command/stack_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
 
 describe Gexp::Command::Stack do
 
@@ -50,7 +50,7 @@ describe Gexp::Command::Stack do
     }
 
     before do
-      @user = Fabricate(:user)
+      @user = UserExample.new
       @request = request
     end
 

data/spec/gexp/command_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 describe Gexp::Command do
 
   context "Базовый функционал команды" do
 
     before do
-      @user    = Fabricate(:user)
+      @user    = UserExample.new
       @request = HashWithIndifferentAccess.new({
         :params => {
                 :event => :command_event, 

data/spec/gexp/handler/check/item_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Check::Item do
 
   before do
-    @user   = User.new
+    @user   = UserExample.new
     @object = Object.new
 
     subject.user   = @user

data/spec/gexp/handler/check/resources_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Check::Resources do
 
   before do
-    @user   = User.new
+    @user   = UserExample.new
     @object = Object.new
 
     subject.user   = @user

data/spec/gexp/handler/check_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Check do
 end

data/spec/gexp/handler/modify/resources_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Modify::Resources do
 
   before do
-    @user   = User.new
-    @object = Item.new
+    @user   = UserExample.new
+    @object = ItemExample.new
 
     subject.user   = @user
     subject.object = @object

data/spec/gexp/handler/modify_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Modify do
 

data/spec/gexp/handler/producer_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Producer do
 

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

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Transition::Builder do
 

data/spec/gexp/handler/transition_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
 
 describe Gexp::Handler::Transition do
 

data/spec/gexp/mongoid/transaction_spec.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
 
 describe Gexp::Mongoid::Transaction do
 
+  before { pending }
+
   context "Transactional Object" do
 
     before do

data/spec/gexp/state_definition/state_machine_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper.rb')
 
 describe Gexp::StateDefinition::StateMachine do
 

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
 require "bundler"
 require 'bundler/setup'
+require 'state_machine/core'
 require 'gexp'
 
-RSpec.configure do |config|
-  #config.treat_symbols_as_metadata_keys_with_true_values = true
-  #config.run_all_when_everything_filtered = true
-  #config.filter_run :focus
-  config.mock_with :rr
+ENV["MONGO_URL"] ||= ENV["MONGOHQ_URL"] || "mongodb://localhost/gexp_test"
+
+RSpec.configure do |conf|
+  #conf.include Rack::Test::Methods
+  conf.include Mongoid::Matchers
+  conf.mock_with :rr
+  conf.color_enabled = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gexp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70131204742080 !ruby/object:Gem::Requirement
+  requirement: &2194326880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131204742080
+  version_requirements: *2194326880
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70131204741300 !ruby/object:Gem::Requirement
+  requirement: &2194325600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131204741300
+  version_requirements: *2194325600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70131204740800 !ruby/object:Gem::Requirement
+  requirement: &2194320360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131204740800
+  version_requirements: *2194320360
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &2194317020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2194317020
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70131204740380 !ruby/object:Gem::Requirement
+  requirement: &2194314860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131204740380
+  version_requirements: *2194314860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70131204739900 !ruby/object:Gem::Requirement
+  requirement: &2194312320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131204739900
+  version_requirements: *2194312320
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70131204732540 !ruby/object:Gem::Requirement
+  requirement: &2194309220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +87,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70131204732540
+  version_requirements: *2194309220
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70131204731900 !ruby/object:Gem::Requirement
+  requirement: &2194307800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +98,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70131204731900
+  version_requirements: *2194307800
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70131204731260 !ruby/object:Gem::Requirement
+  requirement: &2194306020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70131204731260
+  version_requirements: *2194306020
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70131204730280 !ruby/object:Gem::Requirement
+  requirement: &2194191400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70131204730280
+  version_requirements: *2194191400
 - !ruby/object:Gem::Dependency
   name: money-mongoid
-  requirement: &70131204729740 !ruby/object:Gem::Requirement
+  requirement: &2194186120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,7 +131,18 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *70131204729740
+  version_requirements: *2194186120
+- !ruby/object:Gem::Dependency
+  name: mongoid-rspec
+  requirement: &2194181460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :development
+  prerelease: false
+  version_requirements: *2194181460
 description: Gexp - comand hadlers
 email:
 - kazantsev.nickolay@gmail.com
@@ -134,6 +156,8 @@ files:
 - README.md
 - Rakefile
 - gexp.gemspec
+- lib/examples/item_example.rb
+- lib/examples/user_example.rb
 - lib/gexp.rb
 - lib/gexp/command.rb
 - lib/gexp/command/object.rb