tractor 0.4.6 → 0.4.7

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/gizm0duck/tractor"
     gem.authors = ["Shane Wolf"]
     gem.add_dependency "redis", ">=2.0.0"
-    gem.add_dependency "yajl-ruby", ">=0.7.6"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/tractor/model/base.rb

@@ -1,5 +1,4 @@
 require 'base64'
-require 'yajl'
 
 module Tractor
   
@@ -78,7 +77,6 @@ module Tractor
       def initialize(attributes={})
         @attribute_store = {}
         @association_store = {}
-        @encoder = Yajl::Encoder.new
         attributes.each do |k,v|
           send("#{k}=", v)
         end
@@ -86,7 +84,8 @@ module Tractor
       
       def save
         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.mapped_hmset("#{self.class}:#{self.id}", self.send(:attribute_store))
         Tractor.redis.sadd "#{self.class}:all", self.id
         add_to_indices
         add_to_associations
@@ -158,10 +157,9 @@ module Tractor
         end
 
         def find_by_id(id)
-          obj_data = Tractor.redis["#{self}:#{id}"]
-          return nil if obj_data.nil?
-          parser = Yajl::Parser.new
-          new(parser.parse(obj_data))
+          obj_data = Tractor.redis.mapped_hmget("#{self}:#{id}", *attributes.keys)
+          return nil if obj_data.reject{|k,v| v.nil?}.empty?
+          new(obj_data)
         end
 
         # use method missing to do craziness, or define a find_by on each index (BETTER)

data/spec/model/base_spec.rb

@@ -162,12 +162,10 @@ describe Tractor::Model::Base do
       game = Tractor::Model::Game.new({:id => '1', :board => "large", :flying_object => "disc"})
       game.save
       
-      redis["Tractor::Model::Game:1"].should_not be_nil
-      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"
+      redis_game_attributes = Tractor.redis.mapped_hmget("Tractor::Model::Game:1", "id", "board", "flying_object")
+      redis_game_attributes["id"].should == "1"
+      redis_game_attributes["board"].should == "large"
+      redis_game_attributes["flying_object"].should == "disc"
     end
     
     it "appends the new object to the Game set" do
@@ -238,8 +236,7 @@ describe Tractor::Model::Base do
     
     it "should write attributes to redis" do
       sammich = Sammich.create({ :id => '1', :product => "Veggie Sammich" })
-      parser = Yajl::Parser.new
-      redis_sammich = parser.parse(redis["Sammich:1"])
+      redis_sammich = Tractor.redis.mapped_hmget("Sammich:1", "id", "product")
       redis_sammich["id"].should == "1"
       redis_sammich["product"].should == "Veggie Sammich"
     end

data/tractor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tractor}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-10-29}
   s.description = %q{Very simple object mappings for ruby objects}
   s.email = %q{shanewolf@gmail.com}
   s.extra_rdoc_files = [
@@ -51,14 +51,11 @@ Gem::Specification.new do |s|
 
     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
       s.add_dependency(%q<redis>, [">= 2.0.0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0.7.6"])
     end
   else
     s.add_dependency(%q<redis>, [">= 2.0.0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0.7.6"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tractor
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Shane Wolf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -07:00
+date: 2010-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,22 +34,6 @@ dependencies:
         version: 2.0.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  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
-  type: :runtime
-  version_requirements: *id002
 description: Very simple object mappings for ruby objects
 email: shanewolf@gmail.com
 executables: []