acts_as_living 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 766149e13a944e10eae12248a3ae63eebf60bba40a479808402eb99ef209170f
-  data.tar.gz: fc87211523a5e977c8f2c2974984cbbaa5c5980a99960da54f5e253cefc9af14
+  metadata.gz: 8980c57bb91eee242c77df0474a818135fb99903e23d540aed8f0e5daa666e4c
+  data.tar.gz: 34cfee00e11742cde4d7a49c68e22f9282ba58d7f701df218e05cde8e6646b47
 SHA512:
-  metadata.gz: 814e49cd0c1f5fb42d9039cc7da128bcc986c7e1594b1a89bdb59211b1c6e038cb313b6bf8773c7620892883cb9faf63c26740040cc7342decedcc3fc11a408e
-  data.tar.gz: 0b33966724c9b203df3823dfce69065b82b344601e1193893d1c27364c0d7f73bb6a09c6fdc6abef4ee4c79db9862d7a881b94f3ba4607d2df86d580af08ff2b
+  metadata.gz: 777d163e2a0e02ba0d479a4ecfa571dfe35347ab6abd65afd14400a53e0ba3555e4b50b37d7866fd256782de75d1190e5cd7fcbbfdd77f279709e34fbde0dec2
+  data.tar.gz: 5d0134a2b6c6cb0d41b691c2ffde08f9e816619eaebaf669cbfb4decca17fe6dba988181a14fa1cdf8671cc35a8b1d003eef87f9068eee53624e3380d55e8700

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

@@ -20,7 +20,7 @@ module ActsAsLiving::ActsAsLiving
       ActsAsLiving::MethodsDefiner.call(self)
       ActsAsLiving::EnumDefiner.call(self)
       ActsAsLiving::ScopesDefiner.call(self)
-      ActsAsLiving::ValidationsDefiner.call(self)
+      # ActsAsLiving::ValidationsDefiner.call(self)
     end
   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?
@@ -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,30 +129,30 @@ 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
-      stage_keys.first
+    def first_stage
+      (stage_keys - %i[cancelled]).first
     end
 
-    def death
-      @death
+    def first_stage?(stage)
+      first_stage == stage
     end
 
-    def newborn?(stage)
-      initial_stage == stage
+    def death
+      @death
     end
 
     def phases_with_ranges

data/lib/acts_as_living/scopes_definer.rb

@@ -8,9 +8,10 @@ module ActsAsLiving::ScopesDefiner
 
       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

@@ -1,32 +1,26 @@
 module ActsAsLiving::ValidationsDefiner
-  def self.call(klass)
-    klass.class_eval do
-      include InstanceMethods
+  # def self.call(klass)
+  #   klass.class_eval do
+  #     include InstanceMethods
 
-      validates :stage, presence: true
+  #     validates :stage, presence: true
 
-      validate :stage_progression, on: :update, if: :stage_changed?
-      validate :initialized_stage, on: :create, if: :stage_changed?
-    end
-  end
+  #     validate :stage_progression, on: :update, if: :stage_changed?
+  #     validate :stage_is_first_stage, on: :create, if: :stage_changed?
+  #   end
+  # end
 
-  module InstanceMethods
-    def stage_progression
-      return if stage.to_s == self.class.death.to_s || stage == stage_after(stage_was)
+  # module InstanceMethods
+  #   def stage_progression
+  #     return if stage.to_s == self.class.death.to_s || stage == stage_after(stage_was)
 
-      message = if stage_was == self.class.final_stage
-                  "The contract can only be updated to '#{self.class.death}'"
-                else
-                  "The contract can only be updated to '#{self.class.death}' or '#{stage_after(stage_was)}'"
-                end
+  #     message = if stage_was == self.class.final_stage
+  #                 "The contract can only be updated to '#{self.class.death}'"
+  #               else
+  #                 "The contract can only be updated to '#{self.class.death}' or '#{stage_after(stage_was)}'"
+  #               end
 
-      errors.add(:stage, message)
-    end
-
-    def initialized_stage
-      return if stage == self.class.initial_stage
-
-      errors.add(:stage, "Contract has to be initialized with '#{self.class.initial_stage}' stage")
-    end
-  end
+  #     errors.add(:stage, message)
+  #   end
+  # end
 end

data/lib/acts_as_living/version.rb

@@ -1,3 +1,3 @@
 module ActsAsLiving
-  VERSION = "0.1.12"
+  VERSION = "0.1.17"
 end

metadata

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