web-connect 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4dd9d54db821723fcfae4cd5da92c4cb7f0eae
-  data.tar.gz: eb61afb0a614d86784037143f03b32fe24a91f12
+  metadata.gz: a8bff92c7d13988bc68cf2aa9623c9621624319a
+  data.tar.gz: 303b28ea1214ce4c065527f0b5ab1efda2d2268c
 SHA512:
-  metadata.gz: e73df512556bf4cfab146473e2fd1029b8c947786b08fd458ee0a1356aeb5fb825635dbe7d9baed871022bb04617cbef0c9f96c731661d56b67b2cfa0875773d
-  data.tar.gz: eac0ccbf6651b1f03d35a190c02e39f69207f57377aeae70e101c92a8057d8512d4afd6db0396594b56d6fda3bd1e61c91e145e4ad6e5834cb1516dfd8d0e130
+  metadata.gz: 7136d9aa509a71ff9d8208e5d463746d4f5d99c5a30ff1718ccd6427e7cbc0c95fc4432bf6f597b647f441d34b2070d77e875c430e635d9da114a506dd6882fb
+  data.tar.gz: 4b9672b379f9330b7537c35b88980de3405ac7d5294e3150af2814ac9049b8e9fb02a6f11b117cf533fc9ee6d20f85bc02b9b4d0ff99a46593e8e46077c41a41

data/lib/netfira/web_connect/components.rb

@@ -1 +1,2 @@
 require_relative 'components/octa_word'
+require_relative 'components/hash_of_models'

data/lib/netfira/web_connect/components/hash_of_models.rb

@@ -0,0 +1,52 @@
+module Netfira::WebConnect
+  class HashOfModels < Hash
+
+    def initialize
+      super { |hash, key| hash[key] = [] }
+    end
+
+    def [](key)
+      super class_for_key(key)
+    end
+
+    def <<(value)
+      raise 'Only models are acceptable' unless Model === value
+      self[value.class] << value
+    end
+
+    def method_missing(sym, *args, &block)
+      if respond_to_missing? sym
+        klass = class_for_key(sym)
+        -> { self[klass] }.tap { |method| self.class.__send__ :define_method, sym, method }.call
+      else
+        super sym, *args, &block
+      end
+    end
+
+    def respond_to_missing?(sym)
+      sym !~ /[^\w]/ && !!class_for_key(sym)
+    end
+
+    def as_json(options = nil)
+      map do |klass, records|
+        is_relation = klass < Model::Relation
+        [
+            klass.name.demodulize.to_sym,
+            records.map { |record| is_relation ? record.records.map(&:origin_id) : record.origin_id }
+        ]
+      end.to_h
+    end
+
+    private
+
+    def class_for_key(key)
+      return key if Class === key and key < Model
+      class_name = key.to_s.demodulize.camelize.singularize.to_sym
+      if Models.const_defined? class_name
+        klass = Models.const_get(class_name)
+        klass < Model and klass
+      end
+    end
+
+  end
+end

data/lib/netfira/web_connect/events.rb

@@ -4,10 +4,30 @@ module Netfira::WebConnect
     @event_delegates ||= []
   end
 
-  def self.dispatch_event(event, *args)
-    target = :"on_#{event}"
-    event_delegates.map do |delegate|
-      delegate.__send__(target, *args) if delegate.respond_to? target
+  def self.dispatch_event(timing, event, *args)
+
+    # Allow multiple timings to be dispatched simultaneously, e.g. [:on, :after]
+    return timing.each{ |t| dispatch_event t, event, *args } if timing.respond_to? :each
+
+    # The method to invoke, e.g. :on_update_product
+    target = :"#{timing}_#{event}"
+
+    # Delegates that respond to this method
+    delegates = event_delegates.select { |d| d.respond_to? target }
+
+    # 'Around' events get special treatment
+    if timing == :around
+      chain_runner = -> do
+        delegate = delegates.shift
+        if delegate
+          delegate.__send__ target, *args, &chain_runner
+        else
+          yield
+        end
+      end
+      chain_runner.call
+    else
+      delegates.map { |d| d.__send__ target, *args }
     end
   end
 

data/lib/netfira/web_connect/model.rb

@@ -25,6 +25,10 @@ module Netfira::WebConnect
       end
     end
 
+    def dispatch_event(*args, &block)
+      Netfira::WebConnect.dispatch_event *args, &block
+    end
+
   end
 end
 

data/lib/netfira/web_connect/model/record.rb

@@ -94,6 +94,12 @@ module Netfira::WebConnect
       instance_variable_set :@readonly, false
     end
 
+    def as_readwrite
+      instance_variable_set :@readonly, false
+      yield
+      readonly!
+    end
+
     def reload
       clear_translations if has_languages?
       super

data/lib/netfira/web_connect/model/record/events.rb

@@ -5,7 +5,7 @@ module Netfira::WebConnect
 
       included do
         around_save :dispatch_create_or_update
-        before_destroy :dispatch_destroy
+        around_destroy :dispatch_destroy
       end
 
       private
@@ -16,20 +16,37 @@ module Netfira::WebConnect
           value = Checksum.new(value) if value and (key == 'checksum' or key == 'digest')
           [key, value]
         end.to_h
-        previous.merge! previous_translations if previous && has_languages?
-        yield
+        event_name = previous ? 'update' : 'create'
+        event_args = [event_name, self]
+        named_event_args = ["#{event_name}_#{self.class.single_name}", self]
+        if previous
+          previous.merge! previous_translations if has_languages?
+          event_args << previous
+          named_event_args << previous
+        end
         as_readonly do
-          if previous
-            Netfira::WebConnect.dispatch_event "update_#{self.class.single_name}", self, previous
-          else
-            Netfira::WebConnect.dispatch_event "create_#{self.class.single_name}", self
+          dispatch_event :before, *named_event_args
+          dispatch_event :before, *event_args
+          dispatch_event :around, *named_event_args do
+            dispatch_event(:around, *event_args) { as_readwrite { yield } }
           end
+          dispatch_event [:on, :after], *named_event_args
+          dispatch_event [:on, :after], *event_args
         end
       end
 
       def dispatch_destroy
-        as_readonly { Netfira::WebConnect.dispatch_event "delete_#{self.class.single_name}", self }
-        true # Returned so we don't cancel the before_destroy callback chain
+        event_args = ['delete', self]
+        named_event_args = ["delete_#{self.class.single_name}", self]
+        as_readonly do
+          dispatch_event [:before, :on], *named_event_args
+          dispatch_event [:before, :on], *event_args
+          dispatch_event :around, *named_event_args do
+            dispatch_event(:around, *event_args) { as_readwrite { yield } }
+          end
+          dispatch_event :after, *named_event_args
+          dispatch_event :after, *event_args
+        end
       end
 
     end

data/lib/netfira/web_connect/model/record/relations.rb

@@ -10,7 +10,7 @@ module Netfira::WebConnect
             wrong_shop: 'Tried to add a record from shop %s to shop %s'
         }
         prepare_relation(record, error_messages) do |relation_class, attrs|
-          relation_class.find_or_create_by attrs
+          relation_class.with_deleted.find_or_create_by(attrs).tap { |x| x.restore! if x.destroyed? }
         end
       end
 
@@ -22,7 +22,7 @@ module Netfira::WebConnect
             wrong_shop: 'Tried to remove a record of shop %s from shop %s'
         }
         prepare_relation(record, error_messages) do |relation_class, attrs|
-          relation_class.where(attrs).destroy_all
+          relation_class.with_deleted.find_by(attrs).tap { |x| x.destroy! if x }
         end
       end
 

data/lib/netfira/web_connect/model/relation.rb

@@ -12,7 +12,11 @@ module Netfira::WebConnect
         klass = Class.new(self)
         Models.const_set "#{name_a}To#{name_b}", klass
         klass.related_classes = [name_a, name_b].map{ |n| Models.const_get n.camelize.singularize }
-        klass.acts_as_paranoid if Netfira::WebConnect.paranoia?
+        if Netfira::WebConnect.paranoia?
+          klass.acts_as_paranoid
+        else
+          def klass.with_deleted; self end
+        end
       end
 
       def related_classes=(classes)

data/lib/netfira/web_connect/model/relation/events.rb

@@ -4,26 +4,36 @@ module Netfira::WebConnect
       extend ActiveSupport::Concern
 
       included do
-        after_save    :dispatch_create
-        after_destroy :dispatch_destroy
+        around_save    :dispatch_create
+        around_destroy :dispatch_destroy
       end
 
       private
 
       def dispatch_create
-        dispatch_relation_event 'add_%s_to_%s'
+        dispatch_relation_event(:add, :to) { yield }
       end
 
       def dispatch_destroy
-        dispatch_relation_event 'remove_%s_from_%s'
+        dispatch_relation_event(:remove, :from) { yield }
       end
 
-      def dispatch_relation_event(event_name_template)
+      def dispatch_relation_event(action, preposition)
         [records, records.reverse].each do |records|
-          event_name = (event_name_template % records.map{ |record| record.class.single_name }).to_sym
+          event_name = ("#{action}_%s_#{preposition}_%s" % records.map{ |record| record.class.single_name }).to_sym
+          named_event_args = [event_name].concat(records)
+          event_args = [action].concat(records)
           records[0].as_readonly do
             records[1].as_readonly do
-              Netfira::WebConnect.dispatch_event event_name, *records
+              dispatch_event :before, *named_event_args
+              dispatch_event :before, *event_args
+              dispatch_event :around, *named_event_args do
+                dispatch_event :around, *event_args do
+                  records[0].as_readwrite { records[1].as_readwrite { yield } }
+                end
+              end
+              dispatch_event [:on, :after], *named_event_args
+              dispatch_event [:on, :after], *event_args
             end
           end
         end

data/lib/netfira/web_connect/models/support/setting.rb

@@ -42,14 +42,15 @@ module Netfira::WebConnect
       old = persisted? ? cast_by_content_type(changed_attributes['value'], changed_attributes['content_type']) : nil
       yield
       new = OpenStruct.new(shop: shop, key: key, value: typed_value)
-      Netfira::WebConnect.dispatch_event 'change_setting', new, old unless old == new.value
+      dispatch_event [:on, :after], 'change_setting', new, old unless old == new.value
     end
 
     def dispatch_destroy_event
       return unless persisted?
       new = OpenStruct.new(shop: shop, key: key, value: nil)
       old = typed_value
-      Netfira::WebConnect.dispatch_event 'change_setting', new, old unless old.nil?
+      dispatch_event [:before, :on], 'change_setting', new, old unless old.nil?
+      true
     end
 
   end

data/lib/netfira/web_connect/rack_app/action.rb

@@ -28,6 +28,10 @@ module Netfira::WebConnect
       @headers = ActiveSupport::HashWithIndifferentAccess.new
     end
 
+    def dispatch_event(*args, &block)
+      Netfira::WebConnect.dispatch_event *args, &block
+    end
+
     private
 
     def self.find_action_classes

data/lib/netfira/web_connect/rack_app/actions/version_8/commit.rb

@@ -4,8 +4,13 @@ class Netfira::WebConnect::RackApp
 
       def call
         raise MethodNotAllowed unless verb == :put
-        commit_records input['records'] if input['records']
-        commit_relations input['relations'] if input['relations']
+        dispatch_event :before, :commit, shop
+        dispatch_event :around, :commit, shop do
+          commit_records input['records'] if input['records']
+          commit_relations input['relations'] if input['relations']
+          [completed(:records), completed(:relations)]
+        end
+        dispatch_event [:on, :after], :commit, shop, completed(:records), completed(:relations)
         {
             complete: complete,
             filesToSend: files_to_send
@@ -25,6 +30,10 @@ class Netfira::WebConnect::RackApp
         }
       end
 
+      def completed(type)
+        (@completed ||= {})[type] ||= Netfira::WebConnect::HashOfModels.new
+      end
+
     end
   end
 end

data/lib/netfira/web_connect/rack_app/actions/version_8/commit/records.rb

@@ -43,6 +43,7 @@ module Netfira::WebConnect
       end
 
       def complete_record(record)
+        completed(:records) << record
         list = complete[:records][record.class.name.demodulize] ||= {}
         list[record.origin_id.to_s] = record.digest
       end

data/lib/netfira/web_connect/rack_app/actions/version_8/commit/relations.rb

@@ -8,8 +8,8 @@ class Netfira::WebConnect::RackApp
         relations.each do |class_name, relation_sets|
           klass = class_for_relation_type class_name.sub('&', 'To')
           relation_sets.each do |relation|
-            update_relation klass, relation
-            complete_relation class_name, relation
+            relation_model = update_relation(klass, relation)
+            complete_relation class_name, relation, relation_model
           end
         end
       end
@@ -38,7 +38,8 @@ class Netfira::WebConnect::RackApp
         records[0].unrelate records[1] if records.size == 2
       end
 
-      def complete_relation(class_name, relation)
+      def complete_relation(class_name, relation, relation_model)
+        completed(:relations) << relation_model if relation_model
         list = complete[:relations][class_name] ||= []
         list << relation
       end

data/lib/netfira/web_connect/version.rb

@@ -1,6 +1,6 @@
 module Netfira
   module WebConnect
-    VERSION = '0.3.3'
+    VERSION = '0.4.0'
     PLATFORM_AND_VERSION = 'Rack/' << VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-connect
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -124,6 +124,7 @@ files:
 - lib/netfira/web_connect/components.rb
 - lib/netfira/web_connect/components/checksum.rb
 - lib/netfira/web_connect/components/guid.rb
+- lib/netfira/web_connect/components/hash_of_models.rb
 - lib/netfira/web_connect/components/octa_word.rb
 - lib/netfira/web_connect/configuration.rb
 - lib/netfira/web_connect/db_schema/20140514_support.rb