web-connect 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0ddf6670c8a44de80ec1bb828a7f49c48c4602
-  data.tar.gz: fd2e106b6ce8a0e5b203eee8859a3e2896363f03
+  metadata.gz: 9a78c316aa0dd58c987d6a68648bdf9d2af9f851
+  data.tar.gz: 41e0fb236184473185bbd711308fe1a87ed9810d
 SHA512:
-  metadata.gz: 0b8f590197871ca9c2e75d50ad9b7e3ed47f2fb10811e7d9f1be63427b8a0b6ef06cd2d27c487d3dfee235e2380e41ce383dde148bf93b84a712147e41677e44
-  data.tar.gz: da77c1128c56e9fd86801b319efedfc88dc79ad0817f389719f4f5b54893bbcb48e89efbb23bd78ba4a9cbfefd09da0a2c7566dc3b99e4cd3fc24ee3f4260a03
+  metadata.gz: 6eab39887c6b60a94689193dc3d0cb167f7e32c37d76eee2b1803b013db5819413c643b26d3bf25b6d0762f4ae83c9baae5b1c61399597cb2548fa943fa36b3e
+  data.tar.gz: 696ab4061e29e06d5c394c087476a3e20540c00e5b66c84a20123990771f4a2c3119be3780d58bc391d76d4b02e3af137acdaeec7f36a4a15449e63de13753f1

data/lib/netfira/web_connect/events.rb

@@ -7,7 +7,7 @@ module Netfira::WebConnect
   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
+    return timing.each{ |t| dispatch_event(t, event, *args) { yield } } if timing.respond_to? :each
 
     # The method to invoke, e.g. :on_update_product
     target = :"#{timing}_#{event}"

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

@@ -92,12 +92,14 @@ module Netfira::WebConnect
       readonly!
       yield
       instance_variable_set :@readonly, false
+      self
     end
 
     def as_readwrite
       instance_variable_set :@readonly, false
       yield
       readonly!
+      self
     end
 
     def reload

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

@@ -4,49 +4,80 @@ module Netfira::WebConnect
       extend ActiveSupport::Concern
 
       included do
-        around_save :dispatch_create_or_update
-        around_destroy :dispatch_destroy
+        before_save :dispatch_before_update
+        around_save :dispatch_around_update
+        after_save :dispatch_after_update
+        before_destroy :dispatch_before_destroy
+        around_destroy :dispatch_around_destroy
+        after_destroy :dispatch_after_destroy
       end
 
       private
 
-      def dispatch_create_or_update
-        previous = persisted? && changed_attributes.map do |key, value|
-          # TODO: solve this type casting issue without guessing by attribute names!
-          value = Checksum.new(value) if value and (key == 'checksum' or key == 'digest')
-          [key, value]
-        end.to_h
-        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
-          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 } }
+      def update_event_args
+        @event_args ||= [].tap do |args|
+          previous = persisted? && changed_attributes.map do |key, value|
+            # TODO: solve this type casting issue without guessing by attribute names!
+            value = Checksum.new(value) if value and (key == 'checksum' or key == 'digest')
+            [key, value]
+          end.to_h
+          event_name = previous ? 'update' : 'create'
+          args << ["#{event_name}_#{self.class.single_name}", self]
+          args << [event_name, self]
+          if previous
+            previous.merge! previous_translations if has_languages?
+            args.each { |v| v << previous }
           end
-          dispatch_event [:on, :after], *named_event_args
-          dispatch_event [:on, :after], *event_args
         end
       end
 
-      def dispatch_destroy
-        event_args = ['delete', self]
-        named_event_args = ["delete_#{self.class.single_name}", self]
+      def destroy_event_args
+        @event_args ||= [
+            ["delete_#{self.class.single_name}", self],
+            ['delete', self]
+        ]
+      end
+
+      def dispatch_with_args(args, *timing)
         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 } }
+          if block_given?
+            dispatch_event timing, *args.first do
+              dispatch_event(timing, *args.last) { as_readwrite { yield } }
+            end
+          else
+            args.each { |x| dispatch_event timing, *x }
           end
-          dispatch_event :after, *named_event_args
-          dispatch_event :after, *event_args
         end
+        @event_args = nil if timing.include? :after
+        true
+      end
+
+      def dispatch_before_update
+        dispatch_with_args update_event_args, :before
+      end
+
+      def dispatch_around_update
+        dispatch_with_args(update_event_args, :around) { yield }
+      end
+
+      def dispatch_after_update
+        # Paperclip sets this up for us, but it runs after this handler, which
+        # means delegates don't get a saved image. Boo. We can save it twice,
+        # because the second save (the one Paperclip set up) will no-op.
+        attachment.save if has_file?
+        dispatch_with_args update_event_args, :on, :after
+      end
+
+      def dispatch_before_destroy
+        dispatch_with_args destroy_event_args, :before, :on
+      end
+
+      def dispatch_around_destroy
+        dispatch_with_args(destroy_event_args, :around) { yield }
+      end
+
+      def dispatch_after_destroy
+        dispatch_with_args destroy_event_args, :after
       end
 
     end

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

@@ -89,6 +89,15 @@ module Netfira::WebConnect
       self.size = value
     end
 
+    def url
+      exists? && remote_location || attachment.url
+    end
+
+    def exists?
+      !!(remote_location || attachment.exists?)
+    end
+    alias_method :exist?, :exists?
+
     private
 
     def set_file_defaults

data/lib/netfira/web_connect/version.rb

@@ -1,6 +1,6 @@
 module Netfira
   module WebConnect
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
     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.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord