acts_as_living 0.1.10 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371a3643108cd762003a4150652a0f12e0853043e3dd4070fe7482c4ea0894dd
-  data.tar.gz: 50d91c499af84693c4dac7f76e5cd8fef9f0cb92bf7328d09c9819fac9c7bd1f
+  metadata.gz: 12b6a909f4824398a5021fc625010ea556647fcb0997b74f4e62b2783be69305
+  data.tar.gz: 7c8b6524858879dcc73fac600f0aa50530302eb7ade4c17a4d4f6af9b284dd85
 SHA512:
-  metadata.gz: 1527dc11a5f19f24b97bcf15a735898098f183f607419d1fa37541a0ecd42855674cea8c285eb17cf9ddf5d8faa30be8c154af58c18fa4893a0dc8444eb29cbd
-  data.tar.gz: eccbaf60b93a8b4e81e3a1aa7769eb59514f08099493307dcd965ce50d5000d4b7ca81b3a56997dde273d1a0d2f2d69e5262ce2b625203434500fe1fd09fbae0
+  metadata.gz: 23499a06971844d813f54856a6b987d734d7ce6a9545d81226a8ad4e68e73da1375b91fe6741509fbeb282c05b02a1b78f5e8ee9b631557f4c59aa3ff3919a9d
+  data.tar.gz: b1d2d9c72c27cf11ad9f956f141e235068777f9878cb77bfd12d2452d3cbae4bbb0723e4ce8ad33190cbddaddac690bd765c49d6367fb134f53f44b24c0ce1ee

data/Changelog.md

@@ -18,3 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.1.10] - 2020-07-13
 ### Fixed
 - Bugs in phase scopes
+
+
+## [0.1.13] - 2020-07-13
+### Fixed
+- fix SQL query for phases

data/lib/acts_as_living/enum_definer.rb

@@ -5,7 +5,7 @@ module ActsAsLiving::EnumDefiner
     klass.class_eval do
       extend ClassMethods
 
-      enum @column => enum_options
+      enum @column => stages_enum
     end
   end
 

data/lib/acts_as_living/methods_definer.rb

@@ -52,8 +52,8 @@ module ActsAsLiving::MethodsDefiner
       self.class.dying?(stage)
     end
 
-    def newborn?
-      self.class.newborn?(stage)
+    def first_stage?
+      self.class.first_stage?(stage)
     end
 
     def dead?
@@ -105,7 +105,7 @@ module ActsAsLiving::MethodsDefiner
     end
 
     def stage_keys
-      stages.keys
+      @stage_keys
     end
 
     def stages_after(stage)
@@ -115,7 +115,7 @@ module ActsAsLiving::MethodsDefiner
     end
 
     def stages_before(stage)
-      return [] if newborn?(stage)
+      return [] if first_stage?(stage)
 
       index = stage_keys.find_index(stage)
       stage_keys[0...index]
@@ -129,38 +129,38 @@ module ActsAsLiving::MethodsDefiner
     end
 
     def stage_before(stage)
-      return if newborn?(stage)
+      return if first_stage?(stage)
 
       index = stage_keys.find_index(stage)
       stage_keys[index - 1]
     end
 
-    def final_stage
-      stage_keys.last
+    def last_stage
+      (stage_keys - %i[cancelled]).last
     end
 
-    def dying?(stage)
-      final_stage == stage
+    def last_stage?(stage)
+      last_stage == stage
     end
 
-    def newborn_stage
-      stages.key(0)
+    def first_stage_stage
+      (stage_keys - %i[cancelled]).first
     end
 
-    def death
-      @death
+    def first_stage?(stage)
+      first_stage_stage == stage
     end
 
-    def newborn?(stage)
-      initial_stage == stage
+    def death
+      @death
     end
 
     def phases_with_ranges
-      @phases.map(&method(:to_phase_with_range)).to_h
+      phases.map(&method(:to_phase_with_range)).to_h
     end
 
     def to_phase_with_range(phase, delimiter)
-      [phase, (stages[delimiter.first]..stages[delimiter.last])]
+      [phase, (stages_enum[delimiter.first]..stages_enum[delimiter.last])]
     end
 
     def phases

data/lib/acts_as_living/scopes_definer.rb

@@ -1,16 +1,17 @@
 module ActsAsLiving::ScopesDefiner
   def self.call(klass)
     klass.class_eval do
-      stages.each do |stage,|
+      stage_keys.each do |stage|
         scope "past_#{stage}", -> { where('stage >= ?', stages_enum[stage]) }
         scope "pre_#{stage}", -> { where('stage < ?', stages_enum[stage]) }
       end
 
       scope :cancelled, -> { where('stage < 0') }
 
-      phases.each do |phase, delimiters|
+      phases.each do |phase, phase_stages|
         scope phase, lambda {
-          where(stage: delimiters)
+          phase_stages_integers = phase_stages.map { |stage| stages_enum[stage] }
+          where(stage: phase_stages_integers)
         }
       end
     end

data/lib/acts_as_living/validations_definer.rb

@@ -6,7 +6,7 @@ module ActsAsLiving::ValidationsDefiner
       validates :stage, presence: true
 
       validate :stage_progression, on: :update, if: :stage_changed?
-      validate :initialized_stage, on: :create, if: :stage_changed?
+      validate :stage_is_first_stage, on: :create, if: :stage_changed?
     end
   end
 
@@ -23,10 +23,10 @@ module ActsAsLiving::ValidationsDefiner
       errors.add(:stage, message)
     end
 
-    def initialized_stage
-      return if stage == self.class.initial_stage
+    def stage_is_first_stage
+      return if stage == self.class.first_stage
 
-      errors.add(:stage, "Contract has to be initialized with '#{self.class.initial_stage}' stage")
+      errors.add(:stage, "Contract has to be initialized with '#{self.class.first_stage}' stage")
     end
   end
 end

data/lib/acts_as_living/version.rb

@@ -1,3 +1,3 @@
 module ActsAsLiving
-  VERSION = "0.1.10"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_living
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.15
 platform: ruby
 authors:
 - Guilherme Andrade