tractor 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/tractor/model/mapper.rb

@@ -25,7 +25,7 @@ module Tractor
         
         def create_from_instance(server_instance)
           hydrate_attributes(server_instance) do |attributes|
-            self.create(attributes)
+            return self.create(attributes)
           end
         end
         
@@ -34,7 +34,7 @@ module Tractor
           raise "Cannot update an object that doesn't exist." unless existing_record
           
           hydrate_attributes(server_instance) do |attributes|
-            existing_record.update(attributes)
+            return existing_record.update(attributes)
           end
         end
         
@@ -44,10 +44,16 @@ module Tractor
           obj_to_destroy.destroy
         end
         
-        def hydrate_attributes(server_instance)
+        def hydrate_attributes(server_instance, hydrate_only=false, &block)
           attributes = attribute_mapper(server_instance)
-          ensure_dependencies_met(server_instance)
-          yield attributes
+          if hydrate_only
+            ensure_dependencies_met(server_instance, hydrate_only, &block)
+            block.call([self.to_s, attributes])
+          else
+            ensure_dependencies_met(server_instance, hydrate_only)
+            yield attributes
+          end
+          return attributes
         end
         
         def attribute_mapper(server_instance)
@@ -70,15 +76,19 @@ module Tractor
           return true
         end
         
-        def ensure_dependencies_met(server_instance)          
-          return if dependencies_met?(server_instance)
-
+        def ensure_dependencies_met(server_instance, hydrate_only=false, &block)
+          
+          return if !hydrate_only && dependencies_met?(server_instance)
           dependencies.each do |klass, options|
-            if klass.find_by_id(server_instance.send(options[:key_name])).nil?
+            if hydrate_only || klass.find_by_id(server_instance.send(options[:key_name])).nil?
               server_instances = server_instance.send(options[:method_name])
               server_instances = server_instances.is_a?(Array) ? server_instances : [server_instances]
               server_instances.each do |obj|
-                klass.create_from_instance(obj)
+                if hydrate_only
+                  klass.hydrate_attributes(obj, hydrate_only, &block)
+                else
+                  klass.create_from_instance(obj)
+                end
               end
             end
           end

data/tractor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tractor}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2010-06-23}
   s.description = %q{Very simple object mappings for ruby objects}
   s.email = %q{shanewolf@gmail.com}
   s.extra_rdoc_files = [
@@ -31,13 +31,12 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/tractor_spec.rb",
-     "tractor-0.4.3.gem",
      "tractor.gemspec"
   ]
   s.homepage = %q{http://github.com/gizm0duck/tractor}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Very simple object mapping for ruby objects}
   s.test_files = [
     "spec/model/base_spec.rb",
@@ -50,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<redis>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0.7.6"])
     else

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tractor
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Shane Wolf
@@ -15,41 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 7
-        - 6
         version: 0.7.6
-  type: :runtime
-  version_requirements: *id002
+    version: 
 description: Very simple object mappings for ruby objects
 email: shanewolf@gmail.com
 executables: []
@@ -74,7 +56,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/tractor_spec.rb
-- tractor-0.4.3.gem
 - tractor.gemspec
 has_rdoc: true
 homepage: http://github.com/gizm0duck/tractor
@@ -86,27 +67,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Very simple object mapping for ruby objects