acts_as_living 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1886e30cb7c12fb80faac2bb6268651d19770843f332ad8daa8c0283d4654ecb
-  data.tar.gz: 344f2f3cb2dd39378f757440e812eb192d818352776a044e3e684835d54ef1a0
+  metadata.gz: 3e87290cedea511a2ba4b8cab31230571fdb44a028f467b7977a23fd5bed077b
+  data.tar.gz: 39ca800b0d746cdcf75a5351841e93df6dc9e1172ac920366921584422d05e62
 SHA512:
-  metadata.gz: ce3a6411127363f0635cc966dca7b04de9d5e504189c3bc1aa2a9d774ae7e12c66b2a771493c3260568b2673916af48633271f5fce44af3e53e74d3b2ba36381
-  data.tar.gz: cb8b39466ae50ddc3735101587c540e03d7369b89d7d36026dbf5f3888df78c7e655bc3f4c7abf9fa9f762041a595dd7930de72ae17f8be5414652972445eabe
+  metadata.gz: f25c46c79d4a0f7072061260a60676c6a513fd0661052425eb56569bac1d422975c725e91691b11ea3854ec4b3345ebd0d25f7758ece6737b844c809ea7a6741
+  data.tar.gz: 98980a7c434376bb0b28868dac1d77731030347024a9d46844554d217b7fa5e89d5f49e5c6078bd6025d4aa2dbfe0107689dd9f9c3f15ee734de95da73aa9476

data/Changelog.md

@@ -9,3 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.1.3] - 2020-07-12
 ### Added
 - Fixed namespacing of the api endpoint
+
+## [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/scopes_definer.rb

@@ -1,22 +1,17 @@
 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) }
+      stages.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|
-        if delimiters.length == 1
-          scope phase, -> { where(stage: delimiters.first) }
-        else
-          scope phase, lambda {
-            where('stage >= ? AND stage <= ?', stages[delimiters.first], stages[delimiters.second])
-          }
-        end
+      phases.each do |phase, delimiters|
+        scope phase, lambda {
+          where(stage: delimiters)
+        }
       end
     end
   end

data/lib/acts_as_living/version.rb

@@ -1,3 +1,3 @@
 module ActsAsLiving
-  VERSION = "0.1.6"
+  VERSION = "0.1.11"
 end

metadata

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