opium 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13533d8b2fcc45702678a6aedb3dbbe64ed6d491
-  data.tar.gz: 9e1c3e23b1d6aee6bf6638c60a069178f02fb632
+  metadata.gz: bcecdde21391716e2fa90f3d7e69ed2ab99cec6e
+  data.tar.gz: b424a700e0cd350b3840ddaae829ef3b964776ab
 SHA512:
-  metadata.gz: 97acb7e80800dc6efca574bc48de2dbabeac93127e808ca61aa3b916869cfaa78835bfe1ad813e39c1b329f776f09a4293a107f571462957a07ac749bbafd081
-  data.tar.gz: 60d7e817319d5b7fd5c373149282f109a24fd1ed7006fdef5898453da05ce54c7c76a807c58d708c33fbe7714ce2eaaa4e5f359b94451fab2a1e4afa849ffa20
+  metadata.gz: 3f8768756d6016fad4a9c92065b955dee1b3382d9626a7079782cbb71ad2287653bb1e016fc1cac2ea43c221a0ed9e6126d04d88e30a70dfcb93d367cb1dccb9
+  data.tar.gz: e7def16e2b043a3ce5121fd65d8a08aa7f4ed94a6d45617217e5260b090fcae1f50c9bd87d9c12341bd43db2506e29a35b69b5eaf2e0c5eb08965c37c1fe8886

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.5
+### Resolved Issues
+- #37: Callbacks no longer makes `:update` a private method.
+
 ## 1.1.4
 ### Resolved Issues
 - Persistable now filters out any readonly fields from the data sent on create.

data/lib/opium/model/callbacks.rb

@@ -15,16 +15,17 @@ module Opium
         define_model_callbacks :save, :create, :update, :destroy
         
         wrap_callbacks_around :save, :destroy, :touch, :find
-        wrap_callbacks_around :initialize, :create, :update, private: true
+        wrap_callbacks_around :initialize, :_create, :_update, private: true
       end
       
       module ClassMethods
         def wrap_callbacks_around( *methods )
           options = methods.last.is_a?(::Hash) ? methods.pop : {}
           methods.each do |method|
+            callback_name = method.to_s.gsub(/\A_/, '').to_sym
             class_eval do
               define_method method do |*args|
-                run_callbacks( method ) do
+                run_callbacks( callback_name ) do
                   super( *args )
                 end
               end

data/lib/opium/version.rb

@@ -1,3 +1,3 @@
 module Opium
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/opium/model/callbacks_spec.rb

@@ -7,11 +7,12 @@ describe Opium::Model::Callbacks do
       def save( o = {} ) end
       def destroy; end
       def touch; end
-      def create; end
+      def _create; end
+      def _update; end
       def update; end
       def find( id ) end
       
-      private :create, :update
+      private :_create, :_update
       
       include Opium::Model::Callbacks
     end
@@ -35,7 +36,7 @@ describe Opium::Model::Callbacks do
       subject { model.new }
       
       it 'should run callbacks' do
-        subject.should receive(:run_callbacks).with(method)
+        subject.should receive(:run_callbacks).with(options[:callback_name] || method)
         subject.send(method, *options[:args])
       end
       
@@ -51,9 +52,11 @@ describe Opium::Model::Callbacks do
   
   it_should_behave_like 'its callbacks should be invoked for', :initialize, private: true
   it_should_behave_like 'its callbacks should be invoked for', :save
-  it_should_behave_like 'its callbacks should be invoked for', :create, private: true
-  it_should_behave_like 'its callbacks should be invoked for', :update, private: true
+  it_should_behave_like 'its callbacks should be invoked for', :_create, private: true, callback_name: :create
+  it_should_behave_like 'its callbacks should be invoked for', :_update, private: true, callback_name: :update
   it_should_behave_like 'its callbacks should be invoked for', :destroy
   it_should_behave_like 'its callbacks should be invoked for', :touch
   it_should_behave_like 'its callbacks should be invoked for', :find, args: ['abcd1234']
+  
+  it { expect( model.new ).to respond_to(:update) }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opium
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Joshua Bowers