active_repository 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4066b2f88bcb0854427c407b27da4ae0a17a5b92
-  data.tar.gz: a39ab7fe4b4dd35ccd0af5fcbf1a8e3c9ab67376
+  metadata.gz: 970b623c79bc3d82f26ec2633ecd5f161a9da6c0
+  data.tar.gz: c27de7763704247ee533b1328fbb5bfa353769fc
 SHA512:
-  metadata.gz: d47c8c5572ce3b52e1d0c4c4dbe7871777a5805995008251152cd03b658a227dfe8931f4562124a995170fa6129879db7c8c7d922d68d944c3e4411b1e99d6ef
-  data.tar.gz: 7626c6fc598178aad7104ac083f0e174bf7e274e25c64a43e273e197652d0d765faa8ec0d060953ee12871b329e70de28311b38bcdf90924bb84ac8fdae91ad1
+  metadata.gz: 74be967296edef046a1b499f4732176ee44bb4dec3088537c373c397d240a59a6b7689853aa424bbfa66ffa4b11b82a70ae850a3f174183d417191109932a115
+  data.tar.gz: 92a5a7ab239154a9281b4b114cc7fd65e20372892489ff1a161c5edff5d98b9f02a3ce5abd9dd3cc1b74126737bd8351236f5d20d86577852fc0ae402a024a0f

data/lib/active_repository/base.rb

@@ -62,11 +62,11 @@ module ActiveRepository
     end
 
     def self.before_save(*methods, options)
-      self.before_save_methods = ((before_save_methods || []) + methods).flatten
+      add_callbacks(__method__, methods, options)
     end
 
     def self.after_save(*methods, options)
-      self.after_save_methods = ((after_save_methods || []) + methods).flatten
+      add_callbacks(__method__, methods, options)
     end
 
     # Constantize class name
@@ -90,6 +90,10 @@ module ActiveRepository
       self.model_class.to_s.constantize
     end
 
+    def self.repository?
+      self == persistence_class
+    end
+
     # Returns the Class responsible for persisting the objects
     def self.get_model_class
       puts '[deprecation warning] This method is going to be deprecated, use "persistence_class" instead.'
@@ -203,7 +207,7 @@ module ActiveRepository
     end
 
     def save(force=false)
-      (before_save_methods || []).each { |method| self.send(method) }
+      execute_callbacks(before_save_methods)
       result = true
 
       if self.class == persistence_class
@@ -220,7 +224,8 @@ module ActiveRepository
         result = self.persist
       end
 
-      (after_save_methods || []).each { |method| self.send(method) }
+      execute_callbacks(after_save_methods)
+      # (after_save_methods || []).each { |method| self.send(method) }
 
       result
     end
@@ -260,8 +265,25 @@ module ActiveRepository
       end
 
     private
-      def self.repository?
-        self == persistence_class
+      def self.add_callbacks(kind, methods, options)
+        methods = methods.map { |method| {method: method, options: options} }
+        current_callbacks = (self.send("#{kind}_methods") || [])
+        self.send("#{kind}_methods=", (current_callbacks + methods)).flatten
+      end
+      private_class_method :set_callback
+
+      def execute_callbacks(callbacks)
+        callbacks.each do |callback|
+          method = callback[:method]
+          options = callback[:options]
+
+          if_option = !!options[:if].try(:call, self)
+          else_option = options[:else].try(:call, self)
+
+          if if_option || !(else_option.nil? ? true : else_option)
+            self.send(method)
+          end
+        end
       end
 
       # Updates created_at and updated_at

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash