acts_as_living 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37744c54d63f77f31f762160fb5230b4516ac2c90104cca00e22d5e18e7373d7
-  data.tar.gz: 9d7597dae76ce960a72a69c1291fd0fe069a5b3054b43b6124c64b361bb2f050
+  metadata.gz: 22753ff3ef8b8cea17388e829a27a35d7df50f149d2122e0eb78bb03adfd7268
+  data.tar.gz: 88bd7bc883536421e6eb8253f780caa759156015ae5fe077ec366c5708289846
 SHA512:
-  metadata.gz: 2892ed5191f40d93a707a9357cf773d7d25e734db84df8d20da0dbc8e4b05b1298bf49654ad2c414727352e90a22633e950fa4c348c26c83839dfaa73e9b7c92
-  data.tar.gz: 2d2e423e9660af6c6b83184bf60096b6519f9638169f3cca6a145f2942285f7e1db6a56fed39cbd18e68d07d03fb061f18e2042a1e9064546d660bb3913aa968
+  metadata.gz: 5bd734f95d3fafce29a5b4b8bffb26a630f77d4b19cecf3dbbb069fc14ec9bff3fbab5a65f0b5ecae26a866baf7c6a6cce7a1531470b5b379ec4989313caab95
+  data.tar.gz: 9d61ea225e1626724de291ddd01410e3d07b75df945b73c3b7b176cf4417ff8b743d8e43258056f4a0215ba5886b742a4ea13ab5be52d708faa3eb1c8841c500

data/Changelog.md

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

data/lib/acts_as_living/acts_as_living.rb

@@ -5,13 +5,12 @@ module ActsAsLiving::ActsAsLiving
   extend ActiveSupport::Concern
 
   class_methods do
-    def acts_as_living(keys, periods:, lock_on:, death:, spread:, column:)
+    def acts_as_living(keys, phases: [], lock_on: [], death: :cancelled, spread: 1)
       @stage_keys     = keys
-      @periods        = periods
+      @phases         = phases
       @locked_stages  = lock_on
       @death          = death
       @spread         = spread
-      @column         = column
 
       run_definers
     end

data/lib/acts_as_living/callbacks_definer.rb

@@ -7,7 +7,7 @@
 #                           ->(_target, result) { result == false }
 #                         end
 
-#   # defines before, after and around callbaks for each period of the acts_as_living
+#   # defines before, after and around callbaks for each phase of the acts_as_living
 #   #   e.g. before_cancelled { do_something }
 #   #   e.g. after_activated :run_method
 #   #   e.g. after_stage_change :run_method
@@ -19,9 +19,9 @@
 #       include InstanceMethods
 
 #       callbacks_for(:stage_change)
-#       callbacks_for(:period_change)
+#       callbacks_for(:phase_change)
 #       stage_keys.each(&method(:stage_callbacks_for))
-#       @periods.keys.each(&method(:lifeperiod_callbacks_for))
+#       @phases.keys.each(&method(:lifephase_callbacks_for))
 #     end
 #   end
 
@@ -32,7 +32,7 @@
 #       _run_stage_change_callbacks do
 #         run_callbacks("stage_change_to_#{stage}") do
 #           binding.pry if notice_of_termination_received?
-#           period_changed? ? run_period_callbacks { binding.pry; 'hey'; super(*args) } : super(*args)
+#           phase_changed? ? run_phase_callbacks { binding.pry; 'hey'; super(*args) } : super(*args)
 #         end
 #       end
 #     end
@@ -42,46 +42,46 @@
 
 #       _run_stage_change_callbacks do
 #         run_callbacks("stage_change_to_#{stage}") do
-#           period_changed? ? run_period_callbacks { binding.pry; 'hey'; super(*args) } : super(*args)
+#           phase_changed? ? run_phase_callbacks { binding.pry; 'hey'; super(*args) } : super(*args)
 #         end
 #       end
 #     end
 
 #     protected
 
-#     def run_period_callbacks(&block)
-#       _run_period_change_callbacks do
-#         _run_period_started_callbacks do
-#           _run_period_ended_callbacks(&block)
+#     def run_phase_callbacks(&block)
+#       _run_phase_change_callbacks do
+#         _run_phase_started_callbacks do
+#           _run_phase_ended_callbacks(&block)
 #         end
 #       end
 #     end
 
-#     def _run_period_started_callbacks(&block)
-#       periods_started.inject(block) do |blk, period|
-#         _run_period_started_callbacks(period, &blk)
+#     def _run_phase_started_callbacks(&block)
+#       phases_started.inject(block) do |blk, phase|
+#         _run_phase_started_callbacks(phase, &blk)
 #       end
 #     end
 
-#     def _run_period_ended_callbacks(&block)
-#       periods_ended.inject(block) do |blk, period|
-#         _run_period_ended_callbacks(period, &blk)
+#     def _run_phase_ended_callbacks(&block)
+#       phases_ended.inject(block) do |blk, phase|
+#         _run_phase_ended_callbacks(phase, &blk)
 #       end
 #     end
 
-#     def _run_period_started_callbacks(period, &block)
-#       run_callbacks("#{period}_started".to_sym, &block)
+#     def _run_phase_started_callbacks(phase, &block)
+#       run_callbacks("#{phase}_started".to_sym, &block)
 #     end
 
-#     def _run_period_ended_callbacks(period, &block)
-#       run_callbacks("#{period}_ended".to_sym, &block)
+#     def _run_phase_ended_callbacks(phase, &block)
+#       run_callbacks("#{phase}_ended".to_sym, &block)
 #     end
 #   end
 
 #   module ClassMethods
-#     def lifeperiod_callbacks_for(period)
-#       define_callback_methods_for("#{period}_started".to_sym)
-#       define_callback_methods_for("#{period}_ended".to_sym)
+#     def lifephase_callbacks_for(phase)
+#       define_callback_methods_for("#{phase}_started".to_sym)
+#       define_callback_methods_for("#{phase}_ended".to_sym)
 #     end
 
 #     def callbacks_for(callback_name)

data/lib/acts_as_living/methods_definer.rb

@@ -7,7 +7,7 @@ module ActsAsLiving::MethodsDefiner
       include InstanceMethods
 
       @stage_keys.each(&method(:define_stage_queries))
-      @periods.each(&method(:define_period_queries))
+      @phases.each(&method(:define_phase_queries))
     end
   end
 
@@ -64,12 +64,12 @@ module ActsAsLiving::MethodsDefiner
       dead? || dying?
     end
 
-    def klass_periods_with_ranges
-      self.class.periods_with_ranges
+    def klass_phases_with_ranges
+      self.class.phases_with_ranges
     end
 
-    def klass_periods_for(stage)
-      self.class.periods_for(stage)
+    def klass_phases_for(stage)
+      self.class.phases_for(stage)
     end
 
     def klass_stages
@@ -82,20 +82,20 @@ module ActsAsLiving::MethodsDefiner
       @locked_on.to_set.intersect? [stage, stage_was].to_set
     end
 
-    def periods
-      klass_periods_for(stage)
+    def phases
+      klass_phases_for(stage)
     end
 
-    def period_changed?
-      klass_periods_for(stage) != klass_periods_for(stage_was)
+    def phase_changed?
+      klass_phases_for(stage) != klass_phases_for(stage_was)
     end
 
-    def periods_started
-      klass_periods_for(stage) - klass_periods_for(stage_was)
+    def phases_started
+      klass_phases_for(stage) - klass_phases_for(stage_was)
     end
 
-    def periods_ended
-      klass_periods_for(stage_was) - klass_periods_for(stage)
+    def phases_ended
+      klass_phases_for(stage_was) - klass_phases_for(stage)
     end
   end
 
@@ -155,26 +155,26 @@ module ActsAsLiving::MethodsDefiner
       initial_stage == stage
     end
 
-    def periods_with_ranges
-      @periods.map(&method(:to_period_with_range)).to_h
+    def phases_with_ranges
+      @phases.map(&method(:to_phase_with_range)).to_h
     end
 
-    def to_period_with_range(period, delimiter)
-      [period, (stages[delimiter.first]..stages[delimiter.last])]
+    def to_phase_with_range(phase, delimiter)
+      [phase, (stages[delimiter.first]..stages[delimiter.last])]
     end
 
-    def periods
-      @periods
+    def phases
+      @phases
     end
 
-    def periods_for(stage)
-      periods_with_ranges.keys.select do |period|
-        periods_with_ranges[period].include? stages[stage]
+    def phases_for(stage)
+      phases_with_ranges.keys.select do |phase|
+        phases_with_ranges[phase].include? stages[stage]
       end
     end
 
-    def define_period_queries(period, delimiters)
-      define_method("#{period}?") do
+    def define_phase_queries(phase, delimiters)
+      define_method("#{phase}?") do
         if delimiters.length == 1
           klass_stages[stage] == klass_stages[delimiters]
         else
@@ -183,11 +183,11 @@ module ActsAsLiving::MethodsDefiner
         end
       end
 
-      define_method("pre_#{period}?") do
+      define_method("pre_#{phase}?") do
         klass_stages[stage] < klass_stages[delimiters.first] unless cancelled?
       end
 
-      define_method("past_#{period}?") do
+      define_method("past_#{phase}?") do
         klass_stages[stage] > klass_stages[delimiters.last] || cancelled?
       end
     end

data/lib/acts_as_living/railtie.rb

@@ -2,6 +2,7 @@
 
 require 'active_support'
 require 'rails/railtie'
+require 'acts_as_living'
 
 module ActsAsLiving
   class Railtie < Rails::Railtie

data/lib/acts_as_living/scopes_definer.rb

@@ -1,22 +1,18 @@
 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]) }
-        scope "not_#{stage}", -> { where.not(stage: stage) }
       end
 
       scope :cancelled, -> { where('stage < 0') }
 
-      @periods.each do |period, delimiters|
-        if delimiters.length == 1
-          scope period, -> { where(stage: delimiters.first) }
-        else
-          scope period, 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.3"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_living
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Guilherme Andrade
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord