Merge branch 'master' of https://github.com/aasm/aasm

Conflicts: Gemfile gemfiles/rails_4.0.gemfile gemfiles/rails_4.1.gemfile gemfiles/rails_4.2.gemfile
aasm · Feb 14, 2015 · 7134072 · 7134072
2 parents 3138764 + 123700c
commit 7134072
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 21 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,14 +1,14 @@
 source "https://rubygems.org"
 
 gem "sqlite3",                          :platforms => :ruby
-gem "coveralls",                        :platforms => :ruby
+gem "coveralls"
 gem 'rubysl',                           :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rails", "~>4.1"
-#gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'mongo_mapper'
 gem 'bson_ext',                          :platforms => :ruby
+gem 'mongoid'
 gem 'sequel'
 
 gemspec
diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile
@@ -6,13 +6,10 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.0.12"
-
-# mongoid is not yet compatible with Rails >= 4
-# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem "rails", "4.0.13"
+gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'mongo_mapper'
 gem 'bson_ext',                          :platforms => :ruby
-
 gem 'sequel'
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
@@ -6,13 +6,10 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.1.8"
-
-# mongoid is not yet compatible with Rails >= 4
-# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem "rails", "4.1.9"
+gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'mongo_mapper'
 gem 'bson_ext',                          :platforms => :ruby
-
 gem 'sequel'
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -7,12 +7,9 @@ gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rails", "4.2.0"
-
-# mongoid is not yet compatible with Rails >= 4
-# gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
+gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'mongo_mapper'
 gem 'bson_ext',                          :platforms => :ruby
-
 gem 'sequel'
 
 gemspec :path => "../"
diff --git a/lib/aasm/persistence/active_record_persistence.rb b/lib/aasm/persistence/active_record_persistence.rb
@@ -166,7 +166,7 @@ def aasm_raw_attribute_value(state)
         def aasm_ensure_initial_state
           # 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?
+          if attribute_names.include?(self.class.aasm.attribute_name.to_s) && send(self.class.aasm.attribute_name).blank?
             aasm.enter_initial_state
           end
         end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -11,6 +11,8 @@
 # require 'ruby-debug/completion'
 # require 'pry'
 
+SEQUEL_DB = defined?(JRUBY_VERSION) ? 'jdbc:sqlite::memory:' : 'sqlite:/'
+
 def load_schema
   config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
   ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")

diff --git a/spec/unit/persistence/mongoid_persistance_spec.rb b/spec/unit/persistence/mongoid_persistance_spec.rb
@@ -1,6 +1,4 @@
-describe 'mongoid', :if => Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') do
-# describe 'mongoid' do
-
+describe 'mongoid' do
   begin
     require 'mongoid'
     require 'logger'

diff --git a/spec/unit/persistence/sequel_persistence_spec.rb b/spec/unit/persistence/sequel_persistence_spec.rb
@@ -6,7 +6,8 @@
     require 'spec_helper'
 
     before(:all) do
-      db = Sequel.sqlite
+      db = Sequel.connect(SEQUEL_DB)
+
       # if you want to see the statements while running the spec enable the following line
       # db.loggers << Logger.new($stderr)
       db.create_table(:models) do