mholling-active_url 0.1.3 → 0.1.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 1

data/lib/active_url/callbacks.rb

@@ -1,15 +1,15 @@
 module ActiveUrl
   module Callbacks
-    def create_with_callbacks
-      result = create_without_callbacks
-      run_callbacks(:after_save) unless result.blank?
-      result
+    def save_with_callbacks
+      returning(save_without_callbacks) do |result|
+        run_callbacks(:after_save) unless result.blank?
+      end
     end
     
     def self.included(base)
       base.class_eval do
         include ActiveSupport::Callbacks # Already included by ActiveRecord.
-        alias_method_chain :create, :callbacks
+        alias_method_chain :save, :callbacks
         define_callbacks :after_save
       end
     end

data/rails/init.rb

@@ -0,0 +1 @@
+require 'active_url'

data/spec/belongs_to_spec.rb

@@ -20,6 +20,10 @@ describe ActiveUrl do
       end
     end
     
+    after(:all) do
+      Object.send(:remove_const, "Secret")
+    end
+    
     before(:each) do
       @url = Secret.new
       @user = User.new

data/spec/callbacks_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe ActiveUrl do
+  before(:each) do
+    ActiveUrl::Config.stub!(:secret).and_return("secret")
+  end
+
+  context "instance with callbacks" do
+    before(:all) do
+      class ::Registration < ActiveUrl::Base  
+        attribute :email
+        after_save :send_registration_email
+      end
+    end
+    
+    after(:all) do
+      Object.send(:remove_const, "Registration")
+    end
+    
+    before(:each) do
+      @registration = Registration.new(:email => "email@example.com")
+      @registration.stub!(:valid?).and_return(true)
+    end
+    
+    it "should not run the callback when saved if the instance is invalid" do
+      @registration.stub!(:valid?).and_return(false)
+      @registration.should_not_receive(:send_registration_email)
+      @registration.save
+    end
+    
+    it "should run the callback when saved if the instance is valid" do
+      @registration.should_receive(:send_registration_email)
+      @registration.save
+    end
+    
+    it "should not run the callback when found from its ID" do
+      @registration.stub!(:send_registration_email).and_return(true)
+      @registration.save
+      @found = Registration.new
+      Registration.should_receive(:new).and_return(@found)
+      @found.should_not_receive(:send_registration_email)
+      Registration.find(@registration.id)
+    end
+  end
+end

data/spec/instance_spec.rb

@@ -49,6 +49,10 @@ describe ActiveUrl do
       end
     end
     
+    after(:all) do
+      Object.send(:remove_const, "DerivedClass")
+    end
+    
     context "instance" do
       it "should have individually accessible attribute readers" do
         @url = DerivedClass.new
@@ -103,6 +107,10 @@ describe ActiveUrl do
           end
         end
         
+        after(:all) do
+          Object.send(:remove_const, "OtherClass")
+        end
+        
         it "should be based on class and attributes only" do
           @url  = DerivedClass.new(:bar => "bar", :baz => "baz")
           @url2 = DerivedClass.new(:bar => "bar", :baz => "baz")

data/spec/validations_spec.rb

@@ -13,14 +13,13 @@ describe ActiveUrl do
         validates_format_of :email, :with => /^[\w\.=-]+@[\w\.-]+\.[a-zA-Z]{2,4}$/ix
         validates_length_of :password, :minimum => 8
         validates_numericality_of :age
-        after_save :send_registration_email
-      
-        def send_registration_email
-          @sent = true
-        end
       end
     end
     
+    after(:all) do
+      Object.send(:remove_const, "Registration")
+    end
+    
     context "when invalid" do
       before(:each) do
         @registration = Registration.new(:email => "user @ example . com", :password => "short", :age => "ten")
@@ -63,10 +62,6 @@ describe ActiveUrl do
         it "should validate numericality of an attribute" do
           @registration.errors[:age].should_not be_nil
         end
-        
-        it "should not execute any after_save callbacks" do
-          @registration.instance_variables.should_not include("@sent")
-        end
       end
     end
     
@@ -92,10 +87,6 @@ describe ActiveUrl do
           @registration.id.should == @registration.to_param
         end
         
-        it "should execute any after_save callbacks" do
-          @registration.instance_variables.map(&:to_s).should include("@sent")
-        end
-        
         context "and re-found by its class" do
           before(:each) do
             @found = Registration.find(@registration.id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mholling-active_url
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Matthew Hollingworth
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,9 @@ files:
 - lib/active_url/crypto.rb
 - lib/active_url/errors.rb
 - lib/active_url/validations.rb
+- rails/init.rb
 - spec/belongs_to_spec.rb
+- spec/callbacks_spec.rb
 - spec/crypto_spec.rb
 - spec/instance_spec.rb
 - spec/spec_helper.rb
@@ -77,6 +79,7 @@ specification_version: 2
 summary: A Rails library for generating secret URLs.
 test_files: 
 - spec/belongs_to_spec.rb
+- spec/callbacks_spec.rb
 - spec/crypto_spec.rb
 - spec/instance_spec.rb
 - spec/spec_helper.rb