fallback 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/fallback.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fallback}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-05-06}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Rakefile",

data/lib/fallback.rb

@@ -32,7 +32,7 @@ module Fallback
           # {:if => :a, :unless => :a} --> [true, false].all? --> false
           conditions.map do |condition, value|
             result = !!(value.respond_to?(:call) ? value.call(self) : send(value))
-            condition == :unless ? result : !result
+            condition == :if ? result : !result
           end.all?
         end
 

data/spec/fallback_spec.rb

@@ -28,6 +28,12 @@ class User4 < ActiveRecord::Base
   fallback :name => :description, :if => lambda{|u| u.xxx}
 end
 
+class User5 < ActiveRecord::Base
+  include Fallback
+  set_table_name :users
+  fallback :name => :description, :if => :xxx
+end
+
 
 describe Fallback do
   describe 'without delegation' do
@@ -93,13 +99,34 @@ describe Fallback do
 
     it "returns original if lambda returns false" do
       @user.stub!(:xxx).and_return false
-      @user.name.should == 'D'
+      @user.name.should == 'N'
     end
 
     it "delegates if lambda returns true" do
       @user.stub!(:xxx).and_return true
+      @user.name.should == 'D'
+    end
+  end
+
+  describe 'with method as symbol' do
+    before do
+      @user = User5.new(:name => 'N', :description => 'D')
+    end
+
+    it "asks method" do
+      @user.should_receive(:xxx).and_return true
+      @user.name
+    end
+
+    it "returns original if method returns false" do
+      @user.stub!(:xxx).and_return false
       @user.name.should == 'N'
     end
+
+    it "delegates if method returns true" do
+      @user.stub!(:xxx).and_return true
+      @user.name.should == 'D'
+    end
   end
 
   describe "without fallback" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +02:00
+date: 2010-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: []