tractor 0.2.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/lib/tractor/model/base.rb

@@ -81,14 +81,8 @@ module Tractor
       
       def save
         raise "Probably wanna set an id" if self.id.nil? || self.id.to_s.empty?
-        key_base = "#{self.class}:#{self.id}"
-        #raise "Duplicate value for #{self.class} 'id'" if Tractor.redis.keys("#{key_base}:*").any?
         
-        scoped_attributes = attribute_store.inject({}) do |h, (attr_name, value)| 
-          h["#{key_base}:#{attr_name}"] = value
-          h
-        end
-        Tractor.redis.mset scoped_attributes
+        Tractor.redis["#{self.class}:#{self.id}"] = Marshal.dump(self)
         Tractor.redis.sadd "#{self.class}:all", self.id
         add_to_indices
         
@@ -96,10 +90,9 @@ module Tractor
       end
       
       def destroy
-        keys = Tractor.redis.keys("#{self.class}:#{self.id}:*")
-        delete_from_indices(keys.map{|k| k.split(":").last })
+        delete_from_indices(attribute_store)
         Tractor.redis.srem("#{self.class}:all", self.id)
-        keys.each { |k| Tractor.redis.del k }
+        Tractor.redis.del "#{self.class}:#{self.id}"
       end
       
       def update(attributes = {})
@@ -136,40 +129,40 @@ module Tractor
         attr_reader :attributes, :associations, :indices
         
         def create(attributes={})
+          raise "Duplicate value for #{self} 'id'" if Tractor.redis.sismember("#{self}:all", attributes[:id])
           m = new(attributes)
           m.save
           m
         end
+        
+        def ids
+          Tractor.redis.smembers "#{self}:all"
+        end
+        
+        def count
+          ids.size
+        end
 
         def find_by_id(id)
-          keys = Tractor.redis.keys("#{self}:#{id}:*")
-          return nil if keys.empty?
-
-          scoped_attributes = Tractor.redis.mapped_mget(*keys)
-          unscoped_attributes = scoped_attributes.inject({}) do |h, (key, value)| 
-
-            name = key.split(":").last
-            type = attributes[name.to_sym][:type]
-            if type == :integer
-              value = value.to_i
-            elsif type == :boolean
-              value = value.to_s.match(/(true|1)$/i) != nil
-            end
-            h[name] = value
-            h
-          end
-          self.new(unscoped_attributes)
+          redis_obj = Tractor.redis["#{self}:#{id}"]
+          return nil if redis_obj.nil?
+          
+          Marshal.load(redis_obj)
         end
 
         # 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)
 
-          ids = Tractor.redis.smembers(Index.key_for(self, name, value))
+          ids = ids_for_find(name, value)
           ids.map do |id|
             find_by_id(id)
           end
         end
+        
+        def ids_for_find(name, value)
+          Tractor.redis.smembers(Index.key_for(self, name, value))
+        end
 
         def find(options = {})
           return [] if options.empty?

data/spec/model/base_spec.rb

@@ -54,7 +54,7 @@ describe Tractor::Model::Base do
       end
     end
   end
-  
+    
   describe "#association" do
     attr_reader :game, :player1, :player2
     
@@ -143,9 +143,11 @@ describe Tractor::Model::Base do
       game = Game.new({:id => '1', :board => "large", :flying_object => "disc"})
       game.save
       
-      redis["Game:1:id"].should == "1"
-      redis["Game:1:board"].should == "large"
-      redis["Game:1:flying_object"].should == "disc"
+      redis["Game:1"].should_not be_nil
+      redis_game = Marshal.load(redis["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
@@ -156,7 +158,7 @@ describe Tractor::Model::Base do
       Game.all.size.should == 1
     end
   end
-  
+    
   describe ".all" do
     it "every object that is created for this class will be in this set" do
       MonkeyClient.all.size.should == 0
@@ -182,26 +184,66 @@ describe Tractor::Model::Base do
     end
   end
   
+  describe ".ids" do
+    before do
+      Sammich.create({ :id => 's1', :weight => "medium", :product => "Turkey Avocado" })
+      Sammich.create({ :id => 's2', :weight => "medium", :product => "Reuben Sammich" })
+      Player.create({ :id => 'p1', :name => "delicious" })
+    end
+    
+    it "returns all the ids for a given class" do
+      Sammich.ids.should == ['s1', 's2']
+      Player.ids.should == ['p1']
+    end
+  end
+  
+  describe ".count" do
+    before do
+      Sammich.create({ :id => 's1', :weight => "medium", :product => "Turkey Avocado" })
+      Sammich.create({ :id => 's2', :weight => "medium", :product => "Reuben Sammich" })
+      Player.create({ :id => 'p1', :name => "delicious" })
+    end
+    
+    it "returns the count of all items of a given class" do
+      Sammich.count.should == 2
+      Player.count.should == 1
+    end
+  end
+  
+  describe ".ids_for_find" do
+    before do
+      Sammich.create({ :id => 's1', :weight => "medium", :product => "Turkey Avocado" })
+      Sammich.create({ :id => 's2', :weight => "medium", :product => "Reuben Sammich" })
+      Player.create({ :id => 'p1', :name => "delicious" })
+    end
+    
+    it "returns all the ids for a given attribute and value on a class" do
+      Sammich.ids_for_find(:weight, "medium").should == ['s1', 's2']
+    end
+  end
+  
   describe "#create" do
     it "allows you to specify which attributes should be unique"
-    # it "raises exception if the id exists" 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
+
+    it "raises exception if the id exists" 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
     
     it "should write attributes to redis" do
       sammich = Sammich.create({ :id => '1', :product => "Veggie Sammich" })
       
-      redis["Sammich:1:id"].should == "1"
-      redis["Sammich:1:product"].should == "Veggie Sammich"
+      redis_sammich = Marshal.load(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
       Sammich.create({ :id => '1', :weight => "heavy", :product => "Ham Sammich" })
       Sammich.create({ :id => '2', :weight => "heavy", :product => "Tuna Sammich" })
-
+  
       redis.smembers("Sammich:product:SGFtIFNhbW1pY2g=").should include('1')
       redis.smembers("Sammich:product:VHVuYSBTYW1taWNo").should include('2')
       redis.smembers("Sammich:weight:aGVhdnk=").should == ['1', '2']

data/tractor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tractor}
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-02-12}
+  s.date = %q{2010-02-24}
   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.2.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Shane Wolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -08:00
+date: 2010-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: []