acts_as_living 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22753ff3ef8b8cea17388e829a27a35d7df50f149d2122e0eb78bb03adfd7268
-  data.tar.gz: 88bd7bc883536421e6eb8253f780caa759156015ae5fe077ec366c5708289846
+  metadata.gz: a9a3d707aedeaa9b4f50be9387fa7071fcfefb84781400355b7f8db379e9e586
+  data.tar.gz: 2e14f610949e6758b521a1f8c5eac4362eeca7477d7b2db3a66c083c77540dff
 SHA512:
-  metadata.gz: 5bd734f95d3fafce29a5b4b8bffb26a630f77d4b19cecf3dbbb069fc14ec9bff3fbab5a65f0b5ecae26a866baf7c6a6cce7a1531470b5b379ec4989313caab95
-  data.tar.gz: 9d61ea225e1626724de291ddd01410e3d07b75df945b73c3b7b176cf4417ff8b743d8e43258056f4a0215ba5886b742a4ea13ab5be52d708faa3eb1c8841c500
+  metadata.gz: 555d8a9fddc3d6c334cc0e18fd5f7e038ff2a58a6dfd4fba7ad9dc7ad734291f99ca4c79fd5dc7f44163b5645fb4744d675ddc04e32243beaf2c7a2d737c2a96
+  data.tar.gz: ad7ff2e43e41feec0338c4118e65f4abd1f06a662b5408b804b512a3aedbc603422890b2ef9d9e53cbf192a609ad389cc3427c7e021a0ada754a21f115106025

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,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,17 +1,17 @@
 module ActsAsLiving::ScopesDefiner
   def self.call(klass)
     klass.class_eval do
-      byebug
-      stages.each do |stage, _num|
-        scope "past_#{stage}", -> { where('stage >= ?', stages[stage]) }
-        scope "pre_#{stage}", -> { where('stage < ?', stages[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.8"
+  VERSION = "0.1.13"
 end

metadata

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