acts_as_living 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6623143eb72b9906a984375aa0a2e67d30ae49fd10c17e54d89569b52333ea0e
-  data.tar.gz: 2778b40bf555acea1efce2ed87c199c882a9222ccdce8cde905735903125243d
+  metadata.gz: 73d33885449af7caca352c2349ec8bb1897f01b6b3d6906b8dd414d4dda6d6c9
+  data.tar.gz: e8fc368946103d716e0c84132f9f84662f21ddbf392237de7f2309801c8f0f9b
 SHA512:
-  metadata.gz: 3327015d9f2002c6d24e641d872d93098a53abf251ced9e2f51a1156e9524efa1f628896fd7ac4c61061e1f9cb53856628402cae7d22f0b62136becd6f4dde45
-  data.tar.gz: 007a78047238697bfaeb646bc4ec7b9dfd2c41861429f4b101acb4d544624851d99e99798aa52b3897ed2443c7f49bb3e5f2010b375c442c6e2f5643a648a838
+  metadata.gz: 5fca0d7f19165ac60768f58cb92c29f516b7746a8078fcadfb13176d5b7899d3a5acfe8018f638a0ea31256e89cbc24075aee378f4df5f33a0e9c7365612d05e
+  data.tar.gz: 07e876c5194830496f4bccbd9a6e849e59d102bc7607105152acbe01e197a6978f0194a2c1071f797a5b130bfb8e2ea5b6eda041d2ba2df863e50063382b3d73

data/Changelog.md

@@ -13,3 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.1.7] - 2020-07-13
 ### Fixed
 - Stage Scopes
+
+
+## [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/acts_as_living.rb

@@ -16,8 +16,9 @@ module ActsAsLiving::ActsAsLiving
     end
 
     def run_definers
-      ActsAsLiving::EnumDefiner.call(self)
+      # needs to be imported first
       ActsAsLiving::MethodsDefiner.call(self)
+      ActsAsLiving::EnumDefiner.call(self)
       ActsAsLiving::ScopesDefiner.call(self)
       ActsAsLiving::ValidationsDefiner.call(self)
     end

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/version.rb

@@ -1,3 +1,3 @@
 module ActsAsLiving
-  VERSION = "0.1.9"
+  VERSION = "0.1.14"
 end

metadata

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