aasm 4.11.1 → 4.12.0

data/gemfiles/rails_4.2_mongoid_5.gemfile

@@ -1,15 +1,11 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "sqlite3",                          :platforms => :ruby
-gem 'rubysl',                           :platforms => :rbx
-gem 'rubinius-developer_tools',         :platforms => :rbx
-gem "jruby-openssl",                    :platforms => :jruby
+gem "sqlite3", :platforms => :ruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3')
 gem "rails", "4.2.5"
-gem 'mongoid', '~>5.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
-gem 'sequel'
-gem 'dynamoid', '~> 1',                 :platforms => :ruby
-gem 'aws-sdk', '~>2',                   :platforms => :ruby
+gem "mime-types", "~> 2", :platforms => [:ruby_19, :jruby]
+gem "mongoid", "~>5.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -1,21 +1,12 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "sqlite3",                          :platforms => :ruby
-gem 'rubysl',                           :platforms => :rbx
-gem 'rubinius-developer_tools',         :platforms => :rbx
-gem "jruby-openssl",                    :platforms => :jruby
+gem "sqlite3", :platforms => :ruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-
-gem "rails", "5.0.0.beta4"
-
-# mongoid is not yet Rails 5 compatible
-# gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
-
-gem 'sequel'
-
-# dynamoid is not yet Rails 5 compatible
-# gem 'dynamoid', '~> 1',                 :platforms => :ruby
-
-gem 'aws-sdk', '~>2',                   :platforms => :ruby
+gem "rails", "5.0.0"
+gem "mongoid", "~>6.0"
+gem "sequel"
+gem "aws-sdk", "~>2", :platforms => :ruby
 
 gemspec :path => "../"

data/lib/aasm/aasm.rb

@@ -42,7 +42,7 @@ module AASM
 
       raise ArgumentError, "The class #{aasm_klass} must inherit from AASM::Base!" unless aasm_klass.ancestors.include?(AASM::Base)
 
-      @aasm ||= {}
+      @aasm ||= Concurrent::Map.new
       if @aasm[state_machine_name]
         # make sure to use provided options
         options.each do |key, value|
@@ -67,12 +67,12 @@ module AASM
     unless AASM::StateMachineStore.fetch(self.class, true).machine(name)
       raise AASM::UnknownStateMachineError.new("There is no state machine with the name '#{name}' defined in #{self.class.name}!")
     end
-    @aasm ||= {}
+    @aasm ||= Concurrent::Map.new
     @aasm[name.to_sym] ||= AASM::InstanceBase.new(self, name.to_sym)
   end
 
   def initialize_dup(other)
-    @aasm = {}
+    @aasm = Concurrent::Map.new
     super
   end
 
@@ -150,6 +150,7 @@ private
       persist_successful = aasm(state_machine_name).set_current_state_with_persistence(new_state_name)
       if persist_successful
         yield if block_given?
+        event.fire_callbacks(:before_success, self)
         event.fire_transition_callbacks(self, *process_args(event, old_state.name, *args))
         event.fire_callbacks(:success, self)
       end
@@ -158,6 +159,11 @@ private
       yield if block_given?
     end
 
+    binding_event = event.options[:binding_event]
+    if binding_event
+      __send__("#{binding_event}#{'!' if persist}")
+    end
+
     if persist_successful
       old_state.fire_callbacks(:after_exit, self,
         *process_args(event, aasm(state_machine_name).current_state, *args))

data/lib/aasm/base.rb

@@ -208,7 +208,9 @@ module AASM
              klass.defined_enums.values.any?{ |methods|
                  methods.keys{| enum | enum + '?' == method_name }
              })
-         @state_machine.config.logger.warn "#{klass.name}: overriding method '#{method_name}'!"
+        unless AASM::Configuration.hide_warnings
+          @state_machine.config.logger.warn "#{klass.name}: overriding method '#{method_name}'!"
+        end
       end
 
       klass.send(:define_method, method_name, method_definition)

data/lib/aasm/configuration.rb

@@ -34,5 +34,9 @@ module AASM
 
     # Configure a logger, with default being a Logger to STDERR
     attr_accessor :logger
+
+    class << self
+      attr_accessor :hide_warnings
+    end
   end
 end

data/lib/aasm/core/event.rb

@@ -22,10 +22,21 @@ module AASM::Core
         :before_transaction,
         :ensure,
         :error,
+        :before_success,
         :success,
       ], &block) if block
     end
 
+    # called internally by Ruby 1.9 after clone()
+    def initialize_copy(orig)
+      super
+      @transitions = @transitions.collect { |transition| transition.clone }
+      @guards      = @guards.dup
+      @unless      = @unless.dup
+      @options     = {}
+      orig.options.each_pair { |name, setting| @options[name] = setting.is_a?(Hash) || setting.is_a?(Array) ? setting.dup : setting }
+    end
+
     # a neutered version of fire - it doesn't actually fire the event, it just
     # executes the transition guards to determine if a transition is even
     # an option given current conditions.
@@ -122,16 +133,19 @@ module AASM::Core
           args.unshift(to_state)
           to_state = nil
         end
+      else
+        args.unshift(nil) if args.nil? || args.empty? # If single arg given which is nil, push it back to args
       end
 
       transitions.each do |transition|
         next if to_state and !Array(transition.to).include?(to_state)
-        if (options.key?(:may_fire) && Array(transition.to).include?(options[:may_fire])) ||
+        if (options.key?(:may_fire) && transition.eql?(options[:may_fire])) ||
            (!options.key?(:may_fire) && transition.allowed?(obj, *args))
-          result = to_state || Array(transition.to).first
+
           if options[:test_only]
-            # result = true
+            result = transition
           else
+            result = to_state || Array(transition.to).first
             Array(transition.to).each {|to| @valid_transitions[to] = transition }
             transition.execute(obj, *args)
           end

data/lib/aasm/core/state.rb

@@ -9,6 +9,13 @@ module AASM::Core
       update(options)
     end
 
+    # called internally by Ruby 1.9 after clone()
+    def initialize_copy(orig)
+      super
+      @options = {}
+      orig.options.each_pair { |name, setting| @options[name] = setting.is_a?(Hash) || setting.is_a?(Array) ? setting.dup : setting }
+    end
+
     def ==(state)
       if state.is_a? Symbol
         name == state

data/lib/aasm/core/transition.rb

@@ -28,6 +28,15 @@ module AASM::Core
       @opts = opts
     end
 
+    # called internally by Ruby 1.9 after clone()
+    def initialize_copy(orig)
+      super
+      @guards = @guards.dup
+      @unless = @unless.dup
+      @opts   = {}
+      orig.opts.each_pair { |name, setting| @opts[name] = setting.is_a?(Hash) || setting.is_a?(Array) ? setting.dup : setting }
+    end
+
     def allowed?(obj, *args)
       invoke_callbacks_compatible_with_guard(@guards, obj, args, :guard => true) &&
       invoke_callbacks_compatible_with_guard(@unless, obj, args, :unless => true)

data/lib/aasm/persistence.rb

@@ -12,9 +12,6 @@ module AASM
         elsif hierarchy.include?("Mongoid::Document")
           require_persistence :mongoid
           include_persistence base, :mongoid
-        elsif hierarchy.include?("MongoMapper::Document")
-          require_persistence :mongo_mapper
-          include_persistence base, :mongo_mapper
         elsif hierarchy.include?("Sequel::Model")
           require_persistence :sequel
           include_persistence base, :sequel

data/lib/aasm/persistence/active_record_persistence.rb

@@ -103,7 +103,7 @@ module AASM
       private
 
         def aasm_update_column(name, value)
-          self.class.where(self.class.primary_key => self.id).update_all(self.class.aasm(name).attribute_name => value) == 1
+          self.class.unscoped.where(self.class.primary_key => self.id).update_all(self.class.aasm(name).attribute_name => value) == 1
         end
 
         def aasm_rollback(name, old_value)

data/lib/aasm/persistence/mongoid_persistence.rb

@@ -50,8 +50,7 @@ module AASM
 
       module InstanceMethods
 
-        # Writes <tt>state</tt> to the state column and persists it to the database
-        # using update_attribute (which bypasses validation)
+        # Writes <tt>state</tt> to the state field and persists it to the database
         #
         #   foo = Foo.find(1)
         #   foo.aasm.current_state # => :opened
@@ -62,17 +61,24 @@ module AASM
         # NOTE: intended to be called from an event
         def aasm_write_state(state, name=:default)
           old_value = read_attribute(self.class.aasm(name).attribute_name)
-          write_attribute(self.class.aasm(name).attribute_name, state.to_s)
+          aasm_write_attribute(state, name)
 
-          unless self.save(:validate => false)
-            write_attribute(self.class.aasm(name).attribute_name, old_value)
-            return false
+          success = if aasm_skipping_validations(name)
+                      value = aasm_raw_attribute_value(state, name)
+                      aasm_update_column(name, value)
+                    else
+                      self.save
+                    end
+
+          unless success
+            aasm_rollback(name, old_value)
+            raise Mongoid::Errors::Validations.new(self) if aasm_whiny_persistence(name)
           end
 
-          true
+          success
         end
 
-        # Writes <tt>state</tt> to the state column, but does not persist it to the database
+        # Writes <tt>state</tt> to the state field, but does not persist it to the database
         #
         #   foo = Foo.find(1)
         #   foo.aasm.current_state # => :opened
@@ -85,11 +91,44 @@ module AASM
         #
         # NOTE: intended to be called from an event
         def aasm_write_state_without_persistence(state, name=:default)
-          write_attribute(self.class.aasm(name).attribute_name, state.to_s)
+          aasm_write_attribute(state, name)
         end
 
       private
 
+        def aasm_update_column(name, value)
+          attribute_name = self.class.aasm(name).attribute_name
+
+          if Mongoid::VERSION.to_f >= 4
+            set(Hash[attribute_name, value])
+          else
+            set(attribute_name, value)
+          end
+
+          true
+        end
+
+        def aasm_rollback(name, old_value)
+          write_attribute(self.class.aasm(name).attribute_name, old_value)
+          false
+        end
+
+        def aasm_skipping_validations(state_machine_name)
+          AASM::StateMachineStore.fetch(self.class, true).machine(state_machine_name).config.skip_validation_on_save
+        end
+
+        def aasm_whiny_persistence(state_machine_name)
+          AASM::StateMachineStore.fetch(self.class, true).machine(state_machine_name).config.whiny_persistence
+        end
+
+        def aasm_write_attribute(state, name=:default)
+          write_attribute(self.class.aasm(name).attribute_name, aasm_raw_attribute_value(state, name))
+        end
+
+        def aasm_raw_attribute_value(state, _name=:default)
+          state.to_s
+        end
+
         # Ensures that if the aasm_state column is nil and the record is new
         # that the initial state gets populated before validation on create
         #

data/lib/aasm/state_machine.rb

@@ -16,8 +16,10 @@ module AASM
     # called internally by Ruby 1.9 after clone()
     def initialize_copy(orig)
       super
-      @states = @states.dup
-      @events = @events.dup
+      @states = orig.states.collect { |state| state.clone }
+      @events = {}
+      orig.events.each_pair { |name, event| @events[name] = event.clone }
+      @global_callbacks = @global_callbacks.dup
     end
 
     def add_state(state_name, klass, options)

data/lib/aasm/state_machine_store.rb

@@ -1,8 +1,11 @@
+require 'concurrent'
 module AASM
   class StateMachineStore
+    @stores = Concurrent::Map.new
+
     class << self
       def stores
-        @stores ||= {}
+        @stores
       end
 
       # do not overwrite existing state machines, which could have been created by
@@ -38,7 +41,7 @@ module AASM
     end
 
     def initialize
-      @machines = {}
+      @machines = Concurrent::Map.new
     end
 
     def clone

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.11.1"
+  VERSION = "4.12.0"
 end

data/lib/motion-aasm.rb

@@ -13,7 +13,6 @@ exclude_files = [
   'aasm/rspec.*',
   'aasm/persistence/active_record_persistence.rb',
   'aasm/persistence/dynamoid_persistence.rb',
-  'aasm/persistence/mongo_mapper_persistence.rb',
   'aasm/persistence/mongoid_persistence.rb',
   'aasm/persistence/sequel_persistence.rb',
   'aasm/persistence/redis_persistence.rb'

data/spec/generators/active_record_generator_spec.rb

@@ -1,44 +1,47 @@
 require 'spec_helper'
-require 'generator_spec'
-require 'generators/active_record/aasm_generator'
 
-describe ActiveRecord::Generators::AASMGenerator, type: :generator do
-  destination File.expand_path("../../../tmp", __FILE__)
+if defined?(ActiveRecord)
+  require 'generator_spec'
+  require 'generators/active_record/aasm_generator'
+
+  describe ActiveRecord::Generators::AASMGenerator, type: :generator do
+    destination File.expand_path("../../../tmp", __FILE__)
+
+    before(:all) do
+      prepare_destination
+    end
+
+    it "creates model with aasm block for default column_name" do
+      run_generator %w(user)
+      assert_file "app/models/user.rb", /include AASM\n\n  aasm do\n  end\n/
+    end
+
+    it "creates model with aasm block for custom column_name" do
+      run_generator %w(user state)
+      assert_file "app/models/user.rb", /aasm :column => 'state' do\n  end\n/
+    end
+
+    it "creates model with aasm block for namespaced model" do
+      run_generator %w(Admin::User state)
+      assert_file "app/models/admin/user.rb", /aasm :column => 'state' do\n  end\n/
+    end
+
+    it "creates migration for model with aasm_column" do
+      run_generator %w(post)
+      assert_migration "db/migrate/aasm_create_posts.rb", /create_table(:posts) do |t|\n  t.string :aasm_state\n/
+    end
+
+    it "add aasm_column in existing model" do
+      run_generator %w(job)
+      assert_file "app/models/job.rb"
+      run_generator %w(job)
+      assert_migration "db/migrate/add_aasm_state_to_jobs.rb"
+    end
+
+    it "add custom aasm_column in existing model" do
+      run_generator %w(job state)
+      assert_migration "db/migrate/add_state_to_jobs.rb"
+    end
 
-  before(:all) do
-    prepare_destination
   end
-
-  it "creates model with aasm block for default column_name" do
-    run_generator %w(user)
-    assert_file "app/models/user.rb", /include AASM\n\n  aasm do\n  end\n/
-  end
-
-  it "creates model with aasm block for custom column_name" do
-    run_generator %w(user state)
-    assert_file "app/models/user.rb", /aasm :column => 'state' do\n  end\n/
-  end
-
-  it "creates model with aasm block for namespaced model" do
-    run_generator %w(Admin::User state)
-    assert_file "app/models/admin/user.rb", /aasm :column => 'state' do\n  end\n/
-  end
-
-  it "creates migration for model with aasm_column" do
-    run_generator %w(post)
-    assert_migration "db/migrate/aasm_create_posts.rb", /create_table(:posts) do |t|\n  t.string :aasm_state\n/
-  end
-
-  it "add aasm_column in existing model" do
-    run_generator %w(job)
-    assert_file "app/models/job.rb"
-    run_generator %w(job)
-    assert_migration "db/migrate/add_aasm_state_to_jobs.rb"
-  end
-
-  it "add custom aasm_column in existing model" do
-    run_generator %w(job state)
-    assert_migration "db/migrate/add_state_to_jobs.rb"
-  end
-
 end

data/spec/generators/mongoid_generator_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
-require 'generator_spec'
-require 'generators/mongoid/aasm_generator'
 
-begin
-  require "mongoid"
+if defined?(Mongoid::Document)
+  require 'generator_spec'
+  require 'generators/mongoid/aasm_generator'
 
   describe Mongoid::Generators::AASMGenerator, type: :generator do
     destination File.expand_path("../../../tmp", __FILE__)
@@ -28,6 +27,5 @@ begin
     end
 
   end
-rescue LoadError
-  puts "Not running Mongoid specs because mongoid gem is not installed!!!"
+
 end