fossil 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]

data/lib/sequel/model_patch.rb

@@ -18,7 +18,9 @@ class Sequel::Model
           # create delegator on the fly
           method_call = arr.shift
           arr.each do |next_call|
-            self.class.delegate next_call.to_sym, :to => method_call.to_sym, :prefix => true, :allow_nil => true
+            unless respond_to? (method_call + "_" + next_call)
+              self.class.delegate next_call.to_sym, :to => method_call.to_sym, :prefix => true, :allow_nil => true 
+            end
             method_call = method_call + "_" + next_call
           end
         end

data/spec/sequel/model_patch_spec.rb

@@ -15,16 +15,18 @@ describe "Sequel::Model extentions" do
       Dude.first.fill_hash([:doo]).should == {:doo=>1}
     end
 
-    describe "recognizes __ in method name" do
-      it "and creates delegator only once" do
+    describe "recognizes __ in method name and creates delegators only once" do
+      it "for one level deep" do
         mock.proxy(Dude).delegate(:name, :to => :my_friend, :prefix => true, :allow_nil => true)
         Dude.first.fill_hash([:my_friend__name,:my_friend__name]).should == {:my_friend_name=>'dans buddy'}
       end
 
-      it "and creates delegator two levels deep" do
+      it "for two levels deep" do
+        MyFriend.column_alias :kid_date, :'kid - date'
         mock.proxy(Horse).delegate(:my_friend, :to => :dude, :prefix => true, :allow_nil => true)
         mock.proxy(Horse).delegate(:name, :to => :dude_my_friend, :prefix => true, :allow_nil => true)
-        Horse.first.fill_hash([:dude__my_friend__name]).should == {:dude_my_friend_name=>'dans buddy'}
+        mock.proxy(Horse).delegate(:kid_date, :to => :dude_my_friend, :prefix => true, :allow_nil => true)
+        Horse.first.fill_hash([:dude__my_friend__kid_date,:dude__my_friend__name]).should == {:dude_my_friend_name=>'dans buddy',:dude_my_friend_kid_date=>1}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol