fossil 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-02-05}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [

data/lib/sequel/model_patch.rb

@@ -5,28 +5,38 @@ class Sequel::Model
   self.use_transactions=false
   plugin :validation_helpers
 
-  # passing in an array of attribute names, fills a hash with values from the model.
-  # can pass in attributes with __ like :passenger__name and the name value will be
-  # delegated to passenger. the delegator is created on the fly.
+  # Passing in an array of attribute / method names, fills a hash with values from
+  # the model. Can pass in attributes with __ like :passenger__name and the 'name'
+  # value will be delegated to 'passenger' with the delegator being created on the fly.
   def fill_hash(attributes)
     attributes.inject({}) do |hash, attribute|
-      arr = attribute.to_s.split(/__/)
-      if arr.size > 1
-        attribute = arr.join("_").to_sym
-        # check to see if method_name ( delegator )  exists first to ensure its not created again
-        unless respond_to? attribute
-          # create delegator on the fly
-          method_call = arr.shift
-          arr.each do |next_call|
-            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
+      attribute_name = attribute.to_s.gsub('__','_').to_sym
+      generate_delegator(attribute) unless respond_to? attribute_name
+      hash[attribute_name] = send(attribute_name) if respond_to? attribute_name
+      hash
+    end
+  end
+
+  def method_missing(method, *args, &block)
+    if method.to_s.split(/__/).size > 1
+      generate_delegator(method)
+    else
+      super
+    end
+  end
+
+  def generate_delegator(method)
+    arr = method.to_s.split(/__/)
+    # check to see if method_name ( delegator )  exists first to ensure its not created again
+    unless respond_to? arr.join('_')
+      # create delegator on the fly
+      method_call = arr.shift
+      arr.each do |next_call|
+        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
-      hash[attribute] = send(attribute) if respond_to? attribute
-      hash
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -08:00
+date: 2010-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency