tractor 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/tractor/model/base.rb

@@ -3,6 +3,10 @@ require 'yajl'
 
 module Tractor
   
+  class MissingIdError < StandardError; end
+  class DuplicateKeyError < StandardError; end
+  class MissingIndexError < StandardError; end
+  
   class << self
     attr_reader :redis
     
@@ -37,7 +41,7 @@ module Tractor
     end
     
     def all
-      ids.inject([]){ |o, id| o << klass.find_by_id(id); o }
+      ids.inject([]){|o, id| o << klass.find_by_id(id); o }
     end
   end
   
@@ -81,7 +85,7 @@ module Tractor
       end
       
       def save
-        raise "Probably wanna set an id" if self.id.nil? || self.id.to_s.empty?
+        raise MissingIdError, "Probably wanna set an id" if self.id.nil? || self.id.to_s.empty?
         Tractor.redis["#{self.class}:#{self.id}"] = @encoder.encode(self.send(:attribute_store))
         Tractor.redis.sadd "#{self.class}:all", self.id
         add_to_indices
@@ -100,7 +104,7 @@ module Tractor
       def update(attributes = {})
         attributes.delete(:id)
         delete_from_indices(attributes)
-        attributes.each{ |k,v| self.send("#{k}=", v) }
+        attributes.each{|k,v| self.send("#{k}=", v) }
         save
       end
       
@@ -143,7 +147,7 @@ module Tractor
         attr_reader :attributes, :associations, :indices
         
         def create(attributes={})
-          raise "Duplicate value for #{self} 'id'" if Tractor.redis.sismember("#{self}:all", attributes[:id])
+          raise DuplicateKeyError, "Duplicate value for #{self} 'id'" if Tractor.redis.sismember("#{self}:all", attributes[:id])
           m = new(attributes)
           m.save
           m
@@ -162,7 +166,7 @@ module Tractor
 
         # use method missing to do craziness, or define a find_by on each index (BETTER)
         def find_by_attribute(name, value)
-          raise "No index on '#{name}'" unless indices.include?(name)
+          raise MissingIndexError, "No index on '#{name}'" unless indices.include?(name)
           find({name => value})
         end
 
@@ -213,7 +217,7 @@ module Tractor
         end
         
         def all
-          ids.inject([]){ |a, id| a << find_by_id(id); a }
+          ids.inject([]){|a, id| a << find_by_id(id); a }
         end
         
         ###

data/lib/tractor/model/mapper.rb

@@ -25,7 +25,11 @@ module Tractor
         
         def create_from_instance(server_instance)
           hydrate_attributes(server_instance) do |attributes|
-            return self.create(attributes)
+            begin
+              return self.create(attributes)
+            rescue DuplicateKeyError
+              return find_from_instance(server_instance)
+            end
           end
         end
         

data/spec/model/base_spec.rb

@@ -153,9 +153,9 @@ describe Tractor::Model::Base do
     it "raises if id is nil or empty" do
       game = Tractor::Model::Game.new
       game.id = nil
-      lambda { game.save }.should raise_error("Probably wanna set an id")
+      lambda { game.save }.should raise_error(Tractor::MissingIdError, "Probably wanna set an id")
       game.id = ''
-      lambda { game.save }.should raise_error("Probably wanna set an id")
+      lambda { game.save }.should raise_error(Tractor::MissingIdError, "Probably wanna set an id")
     end
     
     it "should write attributes to redis" do
@@ -233,7 +233,7 @@ describe Tractor::Model::Base do
       MonkeyClient.create({ :id => 'a1a', :evil => true, :birthday => "Dec 3" })
       lambda do
         MonkeyClient.create({ :id => 'a1a', :evil => false, :birthday => "Jan 4" })
-      end.should raise_error("Duplicate value for MonkeyClient 'id'")
+      end.should raise_error(Tractor::DuplicateKeyError, "Duplicate value for MonkeyClient 'id'")
     end
     
     it "should write attributes to redis" do
@@ -399,7 +399,7 @@ describe Tractor::Model::Base do
     it "raises if index does not exist for given key" do
       lambda do
         Sammich.find_by_attribute(:expensive, true)
-      end.should raise_error("No index on 'expensive'")
+      end.should raise_error(Tractor::MissingIndexError, "No index on 'expensive'")
     end
     
     it "takes an index name and value and finds all matching objects" do

data/spec/model/mapper_spec.rb

@@ -89,8 +89,24 @@ describe Tractor::Model::Mapper do
       redis_monkey.evil.should == true
       redis_monkey.id.should == "a1a"
     end
+    
+    context "when the instance already exists in it's tractor representation" do
+      attr_reader :monkey, :tractor_monkey
+      before do
+        @monkey = Monkey.new("Dec. 3, 1981", true, 'a1a')
+        @tractor_monkey = MonkeyClient.create_from_instance(monkey)
+      end
+      
+      it "returns the instance from the tractor representation" do
+        result = MonkeyClient.create_from_instance(monkey)
+        result.id.should        == tractor_monkey.id
+        result.birthday.should  == tractor_monkey.birthday
+        result.evil.should      == tractor_monkey.evil
+      end
+    end
   end
   
+  
   describe "update_from_instance" do
     it "ensures dependencies are met"
     it "finds an existing record based on id and updates the attributes accordingly" do

data/tractor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tractor}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-08-16}
   s.description = %q{Very simple object mappings for ruby objects}
   s.email = %q{shanewolf@gmail.com}
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/gizm0duck/tractor}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Very simple object mapping for ruby objects}
   s.test_files = [
     "spec/model/base_spec.rb",
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= 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,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tractor
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Shane Wolf
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -07:00
+date: 2010-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 7
+        - 6
         version: 0.7.6
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Very simple object mappings for ruby objects
 email: shanewolf@gmail.com
 executables: []
@@ -67,21 +85,27 @@ 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.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Very simple object mapping for ruby objects