From 1c5117720c4115789f52bac3768b6e9ec7d9fc44 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Thu, 16 May 2019 12:27:37 +0200 Subject: [PATCH] Get rid of unneded activesupport dep --- lib/aasm/persistence/active_record_persistence.rb | 2 +- lib/aasm/persistence/base.rb | 2 +- lib/aasm/persistence/core_data_query_persistence.rb | 3 ++- lib/aasm/persistence/dynamoid_persistence.rb | 2 +- lib/aasm/persistence/mongoid_persistence.rb | 2 +- lib/aasm/persistence/no_brainer_persistence.rb | 2 +- lib/aasm/persistence/redis_persistence.rb | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/aasm/persistence/active_record_persistence.rb b/lib/aasm/persistence/active_record_persistence.rb index ae1b8e4..03677c3 100644 --- a/lib/aasm/persistence/active_record_persistence.rb +++ b/lib/aasm/persistence/active_record_persistence.rb @@ -141,7 +141,7 @@ module AASM def aasm_column_is_blank?(state_machine_name) attribute_name = self.class.aasm(state_machine_name).attribute_name - attribute_names.include?(attribute_name.to_s) && send(attribute_name).blank? + attribute_names.include?(attribute_name.to_s) && !send(attribute_name) || send(attribute_name).empty? end def aasm_validate_states diff --git a/lib/aasm/persistence/base.rb b/lib/aasm/persistence/base.rb index 72a31bf..398d951 100644 --- a/lib/aasm/persistence/base.rb +++ b/lib/aasm/persistence/base.rb @@ -34,7 +34,7 @@ module AASM # This allows for nil aasm states - be sure to add validation to your model def aasm_read_state(name=:default) state = send(self.class.aasm(name).attribute_name) - if state.blank? + if !state || state.empty? aasm_new_record? ? aasm(name).determine_state_name(self.class.aasm(name).initial_state) : nil else state.to_sym diff --git a/lib/aasm/persistence/core_data_query_persistence.rb b/lib/aasm/persistence/core_data_query_persistence.rb index 84234fb..d08bc43 100644 --- a/lib/aasm/persistence/core_data_query_persistence.rb +++ b/lib/aasm/persistence/core_data_query_persistence.rb @@ -77,7 +77,8 @@ module AASM # def aasm_ensure_initial_state AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |state_machine_name| - send("#{self.class.aasm(state_machine_name).attribute_name}=", aasm(state_machine_name).enter_initial_state.to_s) if send(self.class.aasm(state_machine_name).attribute_name).blank? + next if !send(self.class.aasm(state_machine_name).attribute_name) || send(self.class.aasm(state_machine_name).attribute_name).empty? + send("#{self.class.aasm(state_machine_name).attribute_name}=", aasm(state_machine_name).enter_initial_state.to_s) end end end # InstanceMethods diff --git a/lib/aasm/persistence/dynamoid_persistence.rb b/lib/aasm/persistence/dynamoid_persistence.rb index c5415c4..6a1ce1c 100644 --- a/lib/aasm/persistence/dynamoid_persistence.rb +++ b/lib/aasm/persistence/dynamoid_persistence.rb @@ -83,7 +83,7 @@ module AASM # def aasm_ensure_initial_state AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |state_machine_name| - aasm(state_machine_name).enter_initial_state if send(self.class.aasm(state_machine_name).attribute_name).blank? + aasm(state_machine_name).enter_initial_state if !send(self.class.aasm(state_machine_name).attribute_name) || send(self.class.aasm(state_machine_name).attribute_name).empty? end end end # InstanceMethods diff --git a/lib/aasm/persistence/mongoid_persistence.rb b/lib/aasm/persistence/mongoid_persistence.rb index e52c2f4..26bbd8f 100644 --- a/lib/aasm/persistence/mongoid_persistence.rb +++ b/lib/aasm/persistence/mongoid_persistence.rb @@ -106,7 +106,7 @@ module AASM # mongoid has_many relationship does not load child object attributes when # only ids are loaded, for example parent.child_ids will not load child object attributes. # This feature is introduced in mongoid > 4. - if attribute_names.include?(attribute_name) && attributes[attribute_name].blank? + if attribute_names.include?(attribute_name) && !attributes[attribute_name] || attributes[attribute_name].empty? # attribute_missing? is defined in mongoid > 4 return if Mongoid::VERSION.to_f >= 4 && attribute_missing?(attribute_name) send("#{self.class.aasm(state_machine_name).attribute_name}=", aasm(state_machine_name).enter_initial_state.to_s) diff --git a/lib/aasm/persistence/no_brainer_persistence.rb b/lib/aasm/persistence/no_brainer_persistence.rb index cbe2677..e7b4019 100644 --- a/lib/aasm/persistence/no_brainer_persistence.rb +++ b/lib/aasm/persistence/no_brainer_persistence.rb @@ -96,7 +96,7 @@ module AASM def aasm_ensure_initial_state AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |name| aasm_column = self.class.aasm(name).attribute_name - aasm(name).enter_initial_state if read_attribute(aasm_column).blank? + aasm(name).enter_initial_state if !read_attribute(aasm_column) || read_attribute(aasm_column).empty? end end end # InstanceMethods diff --git a/lib/aasm/persistence/redis_persistence.rb b/lib/aasm/persistence/redis_persistence.rb index 5e711b7..8843e0e 100644 --- a/lib/aasm/persistence/redis_persistence.rb +++ b/lib/aasm/persistence/redis_persistence.rb @@ -69,7 +69,7 @@ module AASM def aasm_ensure_initial_state AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |name| aasm_column = self.class.aasm(name).attribute_name - aasm(name).enter_initial_state if send(aasm_column).value.blank? + aasm(name).enter_initial_state if !send(aasm_column).value || send(aasm_column).value.empty? end end