aasm 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f80e2467a731eee5737b3c74cfb3d4236be0df5
-  data.tar.gz: 7175348561bd968b2208bb1a54b382dc4d72d2e8
+  metadata.gz: 0fd3025d299701a391be90b67871d0110925522e
+  data.tar.gz: d56adcb31986d0bc257e4c4a32e79462a6715709
 SHA512:
-  metadata.gz: 4b435f505dc2a2f30302ac902fa1264d70f8c40f5d4101ac669dc8bac1ddddc34c9b67aca1ea5c899074814a3ef8fdb272c008ed10480c156bdaacd5adcb4a77
-  data.tar.gz: 50ac955db2fda8ca2bf711f0e2dcabf648996c021bb3921ace2793cef1ea71402407e00326674505e5c5bacf35d8b3d99f09d9acb8eedd7791fc6f3d6d022b6e
+  metadata.gz: f2e8c7bd2e7ce8f614b8b72a48ffbf396c9194c5369a128bbe6d201443e067a48caea69b9f3f9ec4c6af30956b358deb4d8544172599fe7120bd4edbc4c9717d
+  data.tar.gz: b6d9db8e0f1cd99e263d3cb9e16ff837adab1ce57faf918ca222f48a9bb674ebf29bbdae640d4987bd6f676d35896dec9d3060347e709229ad831160702b11a4

data/CHANGELOG.md

@@ -5,6 +5,10 @@
  * `aasm_column` has been removed. Use `aasm.attribute_name` instead
  * `aasm_human_event_name` has been removed. Use `aasm.human_event_name` instead
 
+## 4.0.5
+
+ * bugfix: initialize the aasm state column after initialization of the _ActiveRecord_ instance only if the attribute has been loaded (see [issue #193](https://github.com/aasm/aasm/issues/193) for details)
+
 ## 4.0.4
 
  * corrected callback order in README

data/README.md

@@ -347,7 +347,9 @@ job.run!  # saved
 
 Saving includes running all validations on the `Job` class. If you want make sure
 the state gets saved without running validations (and thereby maybe persisting an
-invalid object state), simply tell AASM to skip the validations:
+invalid object state), simply tell AASM to skip the validations. Be aware, that
+when skipping validations, only the state column will be updated in the database
+(just like ActiveRecord `change_column` is working).
 
 ```ruby
 class Job < ActiveRecord::Base

data/aasm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   # debugging
   # s.add_development_dependency 'debugger'
-  # s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry'
 
   # test coverage
   # s.add_development_dependency 'mime-types', '~> 1.25' # needed by coveralls (>= 2.0 needs Ruby >=1.9.2)

data/lib/aasm/persistence/active_record_persistence.rb

@@ -164,7 +164,11 @@ module AASM
         #   foo.aasm_state # => nil
         #
         def aasm_ensure_initial_state
-          aasm.enter_initial_state if send(self.class.aasm.attribute_name).blank?
+          # checking via respond_to? does not work in Rails <= 3
+          # if respond_to?(self.class.aasm.attribute_name) && send(self.class.aasm.attribute_name).blank? # Rails 4
+          if attributes.key?(self.class.aasm.attribute_name.to_s) && send(self.class.aasm.attribute_name).blank?
+            aasm.enter_initial_state
+          end
         end
 
         def aasm_fire_event(name, options, *args, &block)

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -252,9 +252,20 @@ describe "instance methods" do
     expect(gate.aasm.current_state).to be_nil
   end
 
-  it "should initialize the aasm state on instantiation" do
-    expect(Gate.new.aasm_state).to eql 'opened'
-    expect(Gate.new.aasm.current_state).to eql :opened
+  context 'on initialization' do
+    it "should initialize the aasm state" do
+      expect(Gate.new.aasm_state).to eql 'opened'
+      expect(Gate.new.aasm.current_state).to eql :opened
+    end
+
+    it "should not initialize the aasm state if it has not been loaded" do
+      # we have to create a gate in the database, for which we only want to
+      # load the id, and not the state
+      gate = Gate.create!
+
+      # then we just load the gate ids
+      Gate.select(:id).where(id: gate.id).first
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,6 +60,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AASM is a continuation of the acts as state machine rails plugin, built
   for plain Ruby objects.
 email: scott@elitists.net, ttilley@gmail.com, aasm@mt7.de