tractor 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/tractor/model/base.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'yajl'
 
 module Tractor
   
@@ -7,11 +8,7 @@ module Tractor
     
     # important options are port, host and db
     def connectdb(options={})
-      if options.nil?
-        @redis = Redis.new(options)
-      else
-        @redis = Redis.new(:db => 1)
-      end
+      @redis = options.nil? ? Redis.new(:db => 1) : Redis.new(options)
     end
 
     def flushdb
@@ -54,7 +51,7 @@ module Tractor
     end
     
     def insert(id)
-      Tractor.redis.sadd(key, id) unless Tractor.redis.smembers(key).include?(id)
+      Tractor.redis.sadd(key, id) unless Tractor.redis.sismember(key, id)
     end
     
     def delete(id)
@@ -77,6 +74,7 @@ module Tractor
       def initialize(attributes={})
         @attribute_store = {}
         @association_store = {}
+        @encoder = Yajl::Encoder.new
         attributes.each do |k,v|
           send("#{k}=", v)
         end
@@ -84,8 +82,7 @@ module Tractor
       
       def save
         raise "Probably wanna set an id" if self.id.nil? || self.id.to_s.empty?
-        
-        Tractor.redis["#{self.class}:#{self.id}"] = Marshal.dump(self)
+        Tractor.redis["#{self.class}:#{self.id}"] = @encoder.encode(self.send(:attribute_store))
         Tractor.redis.sadd "#{self.class}:all", self.id
         add_to_indices
         add_to_associations
@@ -151,12 +148,16 @@ module Tractor
           m.save
           m
         end
+        
+        def exists?(id)
+          Tractor.redis.sismember("#{self}:all", id)
+        end
 
         def find_by_id(id)
-          redis_obj = Tractor.redis["#{self}:#{id}"]
-          return nil if redis_obj.nil?
-          
-          Marshal.load(redis_obj)
+          obj_data = Tractor.redis["#{self}:#{id}"]
+          return nil if obj_data.nil?
+          parser = Yajl::Parser.new
+          new(parser.parse(obj_data))
         end
 
         # use method missing to do craziness, or define a find_by on each index (BETTER)

data/lib/tractor/model/mapper.rb

@@ -12,7 +12,7 @@ module Tractor
         end
         
         def representation_for(server_instance)
-          if find_from_instance(server_instance)
+          if exists?(server_instance.id)
             update_from_instance(server_instance)
           else
             create_from_instance(server_instance)

data/spec/model/base_spec.rb

@@ -163,10 +163,11 @@ describe Tractor::Model::Base do
       game.save
       
       redis["Tractor::Model::Game:1"].should_not be_nil
-      redis_game = Marshal.load(redis["Tractor::Model::Game:1"])
-      redis_game.id.should == "1"
-      redis_game.board.should == "large"
-      redis_game.flying_object.should == "disc"
+      parser = Yajl::Parser.new
+      redis_game = parser.parse(redis["Tractor::Model::Game:1"])
+      redis_game["id"].should == "1"
+      redis_game["board"].should == "large"
+      redis_game["flying_object"].should == "disc"
     end
     
     it "appends the new object to the Game set" do
@@ -237,10 +238,10 @@ describe Tractor::Model::Base do
     
     it "should write attributes to redis" do
       sammich = Sammich.create({ :id => '1', :product => "Veggie Sammich" })
-      
-      redis_sammich = Marshal.load(redis["Sammich:1"])
-      redis_sammich.id.should == "1"
-      redis_sammich.product.should == "Veggie Sammich"
+      parser = Yajl::Parser.new
+      redis_sammich = parser.parse(redis["Sammich:1"])
+      redis_sammich["id"].should == "1"
+      redis_sammich["product"].should == "Veggie Sammich"
     end
     
     it "populates all the indices that are specified on the class" do
@@ -258,6 +259,17 @@ describe Tractor::Model::Base do
     end
   end
   
+  describe ".exists?" do
+    it "returns true if the object with the given id exists" do
+      MonkeyClient.create({ :id => 'a1a', :evil => true, :birthday => "Dec 3" })
+      MonkeyClient.exists?('a1a').should be_true
+    end
+    
+    it "returns false if the object with the given id does not exist" do
+      MonkeyClient.exists?('a1a').should be_false
+    end
+  end
+  
   describe ".find_by_id" do
     it "takes an id and returns the object from redis" do
       sammich = Sammich.create({ :id => '1', :product => "Cold Cut Trio" })

data/tractor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tractor}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-06-09}
   s.description = %q{Very simple object mappings for ruby objects}
   s.email = %q{shanewolf@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tractor
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Shane Wolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -07:00
+date: 2010-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: []