delay_henka 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b31b86cd41356b8d1c04f5b1083b323db289be8
-  data.tar.gz: 76eabe3da784f9d0e99760f1f587823cb4e7340c
+  metadata.gz: a39adac1df7c9b05c934d9c2f0853f779d9791e5
+  data.tar.gz: 9ed97b2a9c49a3cbb8fd4ad1f3cffa402b41ef66
 SHA512:
-  metadata.gz: 555290369edf790469236db7ab45afdea3ef5cb30a275df226a83b4f6b9aea25f773c0e7958a991d0047a647e75abf9cb977197f5dc3bf280e8bf0b33c814cce
-  data.tar.gz: c4c499d7ed6e524c43366935f37e73f9bbce5608eaf5ab050b038b490fe0561bf591b236661763867c87f2fa610e381d77f7b2904d68b9af14bdfd39e73365b6
+  metadata.gz: f83331cb2a3b624e0c57d3c0548be8ad6db6db5fed2dc7577c1dc2247222c83bf6a256611c5df89157cbf0002f02e09345d70c70d22582f5ff84ac99b581152a
+  data.tar.gz: e7ed972193881fb57fa415e74b65712165fefac008e8b1d8cddf2cda5db5844a8959ea0a42a01f72683d5942be30f368466310d8d475c141a3e648a700fab467

data/README.md

@@ -32,11 +32,17 @@ end
 # In your controller (or factory service),
 class SomeController
   def update
-    product = SomeModel.find(params[:id])
+    @product = SomeModel.find(params[:id])
     delayed_changes = some_params.extract!(:discount_pct, :price)
-    if product.update some_params.except(:discount_pct, :price)
-      DelayHenka::ScheduledChange.schedule(record: product, changes: delayed_changes, by_id: current_user.id)
-      redirect_to #..., success
+    if @product.update some_params.except(:discount_pct, :price)
+      result = DelayHenka::ScheduledChange.schedule(record: @product, changes: delayed_changes, by_id: current_user.id)
+      if result.ok? # returns a Keka object
+        redirect_to #..., success
+      else
+        # no change is scheduled. display error and have user try again.
+        flash.now[:error] = result.msg
+        render :edit
+      end
     else
       render :edit
     end

data/app/models/delay_henka/scheduled_change.rb

@@ -18,12 +18,31 @@ module DelayHenka
     scope :staged, -> { where(state: STATES[:STAGED]) }
 
     def self.schedule(record:, changes:, by_id:, schedule_at: Time.current)
-      changes.each do |attribute, new_val|
-        old_val = record.public_send(attribute)
-        cleaned_new_val = cleanup_val(new_val)
-        record.public_send("#{attribute}=", cleaned_new_val)
-        next unless record.public_send("#{attribute}_changed?")
-        create!(changeable: record, submitted_by_id: by_id, attribute_name: attribute, old_value: old_val, new_value: cleaned_new_val, schedule_at: schedule_at)
+      Keka.run do
+        service = WhetherSchedule.new(record)
+        new_changes = changes.each_with_object([]) do |(attribute, new_val), accum|
+          old_val = record.public_send(attribute)
+          cleaned_new_val = cleanup_val(new_val)
+          decision = service.make_decision(attribute, cleaned_new_val)
+          if decision.ok?
+            accum << new(
+              changeable: record,
+              submitted_by_id: by_id,
+              attribute_name: attribute,
+              old_value: old_val,
+              new_value: cleaned_new_val,
+              schedule_at: schedule_at
+            )
+          elsif decision.msg
+            return decision # error present
+          else
+            # otherwise do nothing - maybe no change is made
+          end
+        end
+
+        transaction do
+          new_changes.each(&:save!)
+        end
       end
     end
 
@@ -47,7 +66,8 @@ module DelayHenka
 
     def self.cleanup_val(val)
       return val unless val.respond_to?(:strip)
-      val.strip == '' ? nil : val
+      stripped = val.strip
+      stripped == '' ? nil : stripped
     end
 
     def set_initial_state

data/app/services/delay_henka/whether_schedule.rb

@@ -0,0 +1,24 @@
+require 'pry'
+module DelayHenka
+  class WhetherSchedule
+
+    def initialize(record)
+      @record = record.dup
+    end
+
+    def make_decision(attribute, new_val)
+      Keka.run do
+        old_val = record.public_send(attribute)
+        record.public_send("#{attribute}=", new_val)
+        # can't use xxx_changed? because #dup gives us a new instance
+        Keka.err_if! old_val == record.public_send(attribute)
+        Keka.ok_if! record.valid?
+        Keka.err_if! true, record.errors.full_messages.join(', ')
+      end
+    end
+
+    private
+    attr_reader :record
+
+  end
+end

data/lib/delay_henka/engine.rb

@@ -2,6 +2,9 @@ module DelayHenka
   class Engine < ::Rails::Engine
     isolate_namespace DelayHenka
 
+    # load service directory
+    Dir[File.expand_path('../../../app/services/delay_henka/*.rb', __FILE__)].each { |f| require f }
+
     config.generators do |g|
       g.test_framework :rspec
     end

data/lib/delay_henka/version.rb

@@ -1,3 +1,3 @@
 module DelayHenka
-  VERSION = '0.2.7'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delay_henka
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - zino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: keka
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +126,7 @@ files:
 - app/helpers/delay_henka/application_helper.rb
 - app/models/delay_henka/application_record.rb
 - app/models/delay_henka/scheduled_change.rb
+- app/services/delay_henka/whether_schedule.rb
 - app/views/delay_henka/web/admin/scheduled_changes/_summary_table.html.haml
 - app/views/delay_henka/web/admin/scheduled_changes/index.html.haml
 - app/views/layouts/delay_henka/application.html.erb