acts_as_living 0.1.13 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a3d707aedeaa9b4f50be9387fa7071fcfefb84781400355b7f8db379e9e586
-  data.tar.gz: 2e14f610949e6758b521a1f8c5eac4362eeca7477d7b2db3a66c083c77540dff
+  metadata.gz: cf37165538490c682fd3ad0d6e95de9dd0979b79ebaa0451941138f6ad98d5a9
+  data.tar.gz: b92afce89dcf932c0c8c8bb568a37b440d25ccdcbfd1d2f8565e2c314d25b8bc
 SHA512:
-  metadata.gz: 555d8a9fddc3d6c334cc0e18fd5f7e038ff2a58a6dfd4fba7ad9dc7ad734291f99ca4c79fd5dc7f44163b5645fb4744d675ddc04e32243beaf2c7a2d737c2a96
-  data.tar.gz: ad7ff2e43e41feec0338c4118e65f4abd1f06a662b5408b804b512a3aedbc603422890b2ef9d9e53cbf192a609ad389cc3427c7e021a0ada754a21f115106025
+  metadata.gz: 0decbc9e805acb68fcb27c656c8f1300b843db698b6140dc2d22b8422df8924bcd87734fed6e7e08203dd2974c512370960db2b391108f5f96cef78ae441d18d
+  data.tar.gz: c875f6111028033b17be042ab8ca2ff1b91d3aaabe4081b5da1f9e9ee6adf5b279b08983939892573c64879c0df20cc52a87088d43f820fc3cde750be2ba0856

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

@@ -5,7 +5,7 @@ module ActsAsLiving::EnumDefiner
     klass.class_eval do
       extend ClassMethods
 
-      enum @column => stages_enum
+      enum stage: 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?
@@ -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/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.13"
+  VERSION = "0.1.18"
 end

metadata

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