cia 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cia (0.5.2)
+    cia (0.5.3)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/cia
   specs:
-    cia (0.5.1)
+    cia (0.5.2)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/cia
   specs:
-    cia (0.5.1)
+    cia (0.5.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/cia.rb

@@ -5,6 +5,7 @@ require 'cia/auditable'
 module CIA
   autoload 'Event', 'cia/event'
   autoload 'AttributeChange', 'cia/attribute_change'
+  autoload 'SourceValidation', 'cia/source_validation'
 
   class << self
     attr_accessor :exception_handler

data/lib/cia/attribute_change.rb

@@ -1,11 +1,12 @@
 module CIA
   class AttributeChange < ActiveRecord::Base
+    include SourceValidation
     self.table_name = "cia_attribute_changes"
 
     belongs_to :event, :foreign_key => "cia_event_id"
     belongs_to :source, :polymorphic => true
 
-    validates_presence_of :event, :attribute_name, :source
+    validates_presence_of :event, :attribute_name
 
     if ActiveRecord::VERSION::MAJOR > 2
       scope :previous, :order => "id desc"
@@ -18,5 +19,11 @@ module CIA
     def self.on_attribute(attribute)
       scoped(:conditions => {:attribute_name => attribute})
     end
+
+    private
+
+    def source_must_be_present?
+      event.present? && event.source_must_be_present?
+    end
   end
 end

data/lib/cia/event.rb

@@ -1,5 +1,6 @@
 module CIA
   class Event < ActiveRecord::Base
+    include SourceValidation
     self.table_name = "cia_events"
 
     belongs_to :actor, :polymorphic => true
@@ -7,8 +8,6 @@ module CIA
     has_many :attribute_changes, :foreign_key => :cia_event_id
 
     validates_presence_of :action
-    validates_presence_of :source, :if => :source_must_be_exist?
-    validates_presence_of :source_id, :source_type, :unless => :source_must_be_exist?
 
     def self.previous
       scoped(:order => "created_at desc")
@@ -33,9 +32,7 @@ module CIA
       end
     end
 
-    private
-
-    def source_must_be_exist?
+    def source_must_be_present?
       new_record? and action != "destroy" and (!attributes.key?("source_display_name") or source_display_name.blank?)
     end
   end

data/lib/cia/source_validation.rb

@@ -0,0 +1,8 @@
+module CIA
+  module SourceValidation
+    def self.included(base)
+      base.validates_presence_of :source_id, :source_type, :unless => :source_must_be_present?
+      base.validates_presence_of :source, :if => :source_must_be_present?
+    end
+  end
+end

data/lib/cia/version.rb

@@ -1,3 +1,3 @@
 module CIA
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/cia/attribute_change_spec.rb

@@ -42,4 +42,24 @@ describe CIA::AttributeChange do
       CIA::AttributeChange.on_attribute(:xxx).all.should == [a]
     end
   end
+
+  describe "enforcing presence of source" do
+    it "requires a source when associated event requires a source" do
+      event = CIA::Event.new { |event| event.id = 1 }
+      event.stub(:source_must_be_present? => true)
+      change = CIA::AttributeChange.new(:event => event, :attribute_name => 'awesomeness')
+
+      change.valid?.should be_false
+      change.errors.full_messages.should =~ ["Source can't be blank"]
+    end
+
+    it "does not require a source when associated event does not" do
+      event = CIA::Event.new { |event| event.id = 1 }
+      event.stub(:source_must_be_present? => false)
+      change = CIA::AttributeChange.new(:event => event, :attribute_name => 'awesomeness',
+                                        :source_type => 'ObscureType', :source_id => 101)
+
+      change.valid?.should be_true
+    end
+  end
 end

data/spec/cia_spec.rb

@@ -309,7 +309,7 @@ describe CIA do
           CIA.exception_handler = lambda{|e| ex = e }
           yield
           ex
-        rescue
+        ensure
           CIA.exception_handler = old
         end
       end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH.unshift 'lib'
 require 'cia'
 require 'after_commit' if ActiveRecord::VERSION::MAJOR == 2
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cia
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -33,6 +33,7 @@ files:
 - lib/cia/attribute_change.rb
 - lib/cia/auditable.rb
 - lib/cia/event.rb
+- lib/cia/source_validation.rb
 - lib/cia/version.rb
 - spec/cia/attribute_change_spec.rb
 - spec/cia/event_spec.rb
@@ -53,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3219662641279385344
+      hash: 2131541393242182873
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3219662641279385344
+      hash: 2131541393242182873
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25