preprocessor-aasm 2.0.6 → 2.0.8

data/README.rdoc

@@ -4,17 +4,13 @@ This fork make possible use Integer columns in AR objects (for DB perfomance).
 
   class Mary < ActiveRecord::Base
 	  include AASM
-	  aasm_integers 0 => :pending,
-	                1 => :started,
-	                2 => :finished
-
 	  aasm_initial_state :pending
 		
 		aasm_column :status
 		
-	  aasm_state :pending
-	  aasm_state :started    
-	  aasm_state :finished
+	  aasm_state :pending, :integer => 0
+	  aasm_state :started, :integer => 1   
+	  aasm_state :finished, :integer => 2
 	
     aasm_event :start do
       transitions :to => :started, :from => [:pending]
@@ -36,6 +32,9 @@ This fork make possible use Integer columns in AR objects (for DB perfomance).
 	mary.aasm_current_state  => :started
 	mary.status  => 1
 	
+	# For writing conditions like { :state => Blog.aasm_integers[:closed] }
+	Mary.aasm_integers[:started] => 1
+	
 	
 Auto generated named scopes (Mary.pending, Mary.started) also works.
 

data/Rakefile

@@ -41,8 +41,8 @@ if !defined?(Gem)
   puts "Package target requires RubyGEMs"
 else
   spec = Gem::Specification.new do |s|
-    s.name = 'aasm'
-    s.version = $package_version
+    s.name = 'aaasm'
+    s.version = "2.0.8"
     s.summary = 'State machine mixin for Ruby objects'
     s.description = <<-EOF
     AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.

data/lib/aasm.rb

@@ -2,6 +2,7 @@ require File.join(File.dirname(__FILE__), 'event')
 require File.join(File.dirname(__FILE__), 'state')
 require File.join(File.dirname(__FILE__), 'state_machine')
 require File.join(File.dirname(__FILE__), 'persistence')
+require File.join(File.dirname(__FILE__), 'integers')
 
 module AASM
   def self.Version

data/lib/persistence/active_record_persistence.rb

@@ -88,10 +88,6 @@ module AASM
           # @aasm_column
           AASM::StateMachine[self].config.column
         end
-        
-        def aasm_integers(integers)
-          AASM::StateMachine[self].config.integers = integers
-        end
 
         def find_in_state(number, state, *args)
           with_state_scope state do
@@ -111,14 +107,18 @@ module AASM
           end
         end
         
+        def aasm_integers
+          AASM::StateMachine[self].integers
+        end
+        
         # Get state name by integer if integers are set
         def aasm_state_name(value)
-          AASM::StateMachine[self].config.integers && value.is_a?(Integer) ? AASM::StateMachine[self].config.integers[value] : value.to_s
+          aasm_integers.setted? && value.is_a?(Integer) ? aasm_integers.by_integer(value) : value.to_s
         end
         
         # Get state integer by symbol if integers are set
         def aasm_state_integer(value)
-          AASM::StateMachine[self].config.integers && value.is_a?(Symbol) ? AASM::StateMachine[self].config.integers.invert[value] : value
+          aasm_integers.setted? && value.is_a?(Symbol) ? aasm_integers.by_state(value) : value
         end
         
 

data/lib/state.rb

@@ -1,10 +1,14 @@
 module AASM
   module SupportingClasses
     class State
-      attr_reader :name, :options, :integer
+      attr_reader :name, :options
 
       def initialize(name, options={})
-        @name, @options = name, options
+        @name, @options = name, options        
+      end
+      
+      def method_name
+        
       end
 
       def ==(state)

data/lib/state_machine.rb

@@ -11,7 +11,7 @@ module AASM
       (@machines ||= {})[args] = val
     end
     
-    attr_accessor :states, :events, :initial_state, :config
+    attr_accessor :states, :events, :initial_state, :config, :integers
     attr_reader :name
     
     def initialize(name)
@@ -20,6 +20,7 @@ module AASM
       @states = []
       @events = {}
       @config = OpenStruct.new
+      @integers = AASM::SupportingClasses::Integers.new
     end
 
     def clone
@@ -29,7 +30,11 @@ module AASM
     end
 
     def create_state(name, options)
-      @states << AASM::SupportingClasses::State.new(name, options) unless @states.include?(name)
+      unless @states.include?(name)
+        state = AASM::SupportingClasses::State.new(name, options) 
+        @states << state
+        integers.add_integer(state) if state.options[:integer]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: preprocessor-aasm
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  version: 2.0.8
 platform: ruby
 authors: 
 - Scott Barron