acts_as_living 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9822b425e62e24627e57fae895b68fff7c1b0472257c20a06207014cb95b38d1
-  data.tar.gz: f6baf7c93a6ad1ac060aefab50f232d7fe6057df4f4cde1c12dc4cc98294c378
+  metadata.gz: 766149e13a944e10eae12248a3ae63eebf60bba40a479808402eb99ef209170f
+  data.tar.gz: fc87211523a5e977c8f2c2974984cbbaa5c5980a99960da54f5e253cefc9af14
 SHA512:
-  metadata.gz: 1aa1299dc9875da2f207389013a46e6924f96dd3366a2415b2100e31018570b52278571c4826192dfd23fd94912849f5af6f6497d2553f9328adf1376faa7ffe
-  data.tar.gz: 7b441512986cd8436cdf6eeb8d78767b3d8297fb37b2f67b45b96222da50ac4e4da580bcd02d292647676e842eb2486416eed5fda7dbf8aed4684e38e72e6a3f
+  metadata.gz: 814e49cd0c1f5fb42d9039cc7da128bcc986c7e1594b1a89bdb59211b1c6e038cb313b6bf8773c7620892883cb9faf63c26740040cc7342decedcc3fc11a408e
+  data.tar.gz: 0b33966724c9b203df3823dfce69065b82b344601e1193893d1c27364c0d7f73bb6a09c6fdc6abef4ee4c79db9862d7a881b94f3ba4607d2df86d580af08ff2b

data/Changelog.md

@@ -13,3 +13,8 @@ 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

data/lib/acts_as_living/acts_as_living.rb

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

data/lib/acts_as_living/enum_definer.rb

@@ -5,12 +5,12 @@ module ActsAsLiving::EnumDefiner
     klass.class_eval do
       extend ClassMethods
 
-      enum @column => enum_options
+      enum @column => stages_enum
     end
   end
 
   module ClassMethods
-    def enum_options
+    def stages_enum
       stages = @stage_keys.map.with_index(&method(:to_enum_map)).to_h
       stages.merge(@death => @spread * -1)
     end

data/lib/acts_as_living/methods_definer.rb

@@ -105,7 +105,7 @@ module ActsAsLiving::MethodsDefiner
     end
 
     def stage_keys
-      stages.keys
+      @stage_keys
     end
 
     def stages_after(stage)
@@ -144,7 +144,7 @@ module ActsAsLiving::MethodsDefiner
     end
 
     def newborn_stage
-      stages.key(0)
+      stage_keys.first
     end
 
     def death
@@ -156,11 +156,11 @@ module ActsAsLiving::MethodsDefiner
     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,15 +1,14 @@
 module ActsAsLiving::ScopesDefiner
   def self.call(klass)
     klass.class_eval do
-      stages.each do |stage, _num|
-        scope "past_#{stage}", -> { where('stage >= ?', stages[stage]) }
-        scope "pre_#{stage}", -> { where('stage < ?', stages[stage]) }
-        scope "not_#{stage}", -> { where.not(stage: 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, delimiters|
         scope phase, lambda {
           where(stage: delimiters)
         }

data/lib/acts_as_living/version.rb

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

metadata

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