simple_model 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed17a81c487856f929ab1d5bc05a8c89414b93c
-  data.tar.gz: dc64ef73dfd207421014127616a13e4d55fc9e04
+  metadata.gz: 40145db9483512a0a6d4209605362c68fdac9679
+  data.tar.gz: aaac8adad7bcbba5e3a08058c2b8b8a6df19317f
 SHA512:
-  metadata.gz: 79b0a3d2342b150e50c5dc176da157469fde7196effe529fc04ad2759edebbb6ba427e5de318c266fafaf2651ed4cd5585a9be06f24e479f30ed2f3d1f9d39ae
-  data.tar.gz: 5cfca5c5954df4e38fde878ba77cadda5fcdc60108181faca997f10df5d9874c7392368df384caecdb3622c3b3ee99b7d657ca91144e5f62645a4f29ed858b94
+  metadata.gz: ab3cf5ed3c7a3213ba5bb2853da12181015e7c6a6110eebf5fb72d3043c2a3686636b3cc29431a44a458558f092498a4e8407cb35eafbe1f45d5b12cd5c35f14
+  data.tar.gz: cd6bcd5f4e94bd2e8985a62179026401ce55efe8cc5d01359021463d352ee207d35ddb509d673702b659d6c53b79ca1a8e3e7bff88eb4fbaa50b057e32171804

data/lib/simple_model/attributes.rb

@@ -229,7 +229,13 @@ module SimpleModel
     end
 
     module ClassMethods
-      attr_accessor :config
+      attr_writer :config,
+        :defined_attributes,
+        :alias_attributes,
+        :default_attribute_settings
+
+      attr_reader :before_initialize,
+        :after_initialize
 
       AVAILABLE_ATTRIBUTE_METHODS.each do |method,method_options|
         define_method(method) do |*attributes|
@@ -263,18 +269,10 @@ module SimpleModel
         @alias_attributes ||= Hash.new
       end
 
-      def alias_attributes=alias_attributes
-        @alias_attributes = alias_attributes
-      end
-
       def defined_attributes
         @defined_attributes ||= Hash.new
       end
 
-      def defined_attributes=defined_attributes
-        @defined_attributes = defined_attributes
-      end
-
       def attribute_defined?(attr)
         defined_attributes.has_key?(attr.to_sym)
       end
@@ -300,10 +298,6 @@ module SimpleModel
         @default_attribute_settings ||= DEFAULT_ATTRIBUTE_SETTINGS
       end
 
-      def default_attribute_settings=default_attribute_settings
-        @default_attribute_settings = default_attribute_settings
-      end
-
       # We want to re-run define_attribute_methods since attributes are not all defined
       # at once, so we must set @attribute_methods_generated to nil to allow the
       # re-run to occur ONLY IN RAILS 3.0.
@@ -335,6 +329,7 @@ module SimpleModel
         define_method(attr) do
           get_attribute(attr,options)
         end
+
         define_method("#{attr}?") do
           get_attribute?(attr)
         end
@@ -375,13 +370,6 @@ module SimpleModel
 
       # A hook to perform actions on the pending attributes or the object before
       # the pending attributes have been initialized.
-      # Expects an lambda that accept the object, the pending attributes hash and
-      # should return a hash to be set
-      # EX: lambda {|obj,attrs| attrs.select{|k,v| !v.blank?}}
-      def before_initialize
-        @before_initialize
-      end
-
       # Expects an lambda that accept the object, the pending attributes hash and
       # should return a hash to be set
       # EX: lambda {|obj,attrs| attrs.select{|k,v| !v.blank?}}
@@ -391,12 +379,6 @@ module SimpleModel
       end
 
       # A hook to perform actions after all attributes have been initialized
-      # Expects an lambda that accept the object and the pending attributes hash
-      # EX: lambda {|obj| puts "initialized"}
-      def after_initialize
-        @after_initialize
-      end
-
       # Expects an lambda that accept the object and the pending attributes hash
       # EX: lambda {|obj| puts "initialized"}
       def after_initialize=after_initialize

data/lib/simple_model/base.rb

@@ -83,6 +83,11 @@ module SimpleModel
 
     class << self
 
+      def after_any(meth=nil)
+        @after_any = meth if meth
+        @after_any
+      end
+      
       # Defines the model action's instance methods and applied defaults. For every
       # action defined, we also define that actions ! method which raises exceptions
       # when the action fails.
@@ -91,11 +96,14 @@ module SimpleModel
         actions = [action,"#{action}!".to_sym]
         actions.each do |a|
           define_method(a) do |opts = {}|
+            rslt = nil
             options = default_options.merge(opts)
             options[:raise_exception] = a.to_s.match(/\!$/)
             run_callbacks(action) do
-              run_model_action(methods,options)
+              rslt = run_model_action(methods,options)
             end
+            run_after_any
+            rslt
           end
         end
       end
@@ -126,6 +134,10 @@ module SimpleModel
 
     private
 
+    def run_after_any
+      self.send(self.class.after_any) if self.class.after_any
+    end
+
     # Skeleton for action instance methods
     def run_model_action(methods,options)
       completed = true

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/spec/simple_model/base_spec.rb

@@ -94,12 +94,17 @@ describe SimpleModel::Base do
         save :my_save_method
         before_validation :set_foo
         after_validation :set_bar
-        attr_accessor :foo,:bar
+        attr_accessor :foo,:bar, :log
         validates :foo, :presence => true
-
+        after_any :log_stuff
 
         private
 
+        def log_stuff
+          @log = "stuff"
+        end
+
+
         def my_save_method
           true
         end
@@ -125,10 +130,15 @@ describe SimpleModel::Base do
 
     it "should implement ActiveModel::Callbacks" do
       base_test.save
-
       expect(base_test.foo).to eql('foo')
       expect(base_test.bar).to eql('bar')
     end
+
+    it "should run after any" do
+      allow(base_test).to receive(:foo).and_return(nil)
+      expect(base_test.save).to eql(false)
+      expect(base_test.log).to eql("stuff")
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Joshua T Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport