redismodel 0.1.4 → 0.1.5

data/lib/redismodel.rb

@@ -11,7 +11,7 @@ class DateTime
 end
 
 class RedisModel
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   DEFAULT_CONFIG = {
     :atomic => true,
     :default_sort => "created_at"
@@ -37,7 +37,8 @@ class RedisModel
     end
   end
   
-  class InvalidRecord < RuntimeError; end
+  class RecordNotFound < RuntimeError; end
+  class PropertyTypeIncorrect < RuntimeError; end
   
   def self.connection(klass)
     hash = {}
@@ -54,7 +55,7 @@ class RedisModel
   # Casts a object type as a compatible type for redis, or reverses the process.
   #
   # Examples:
-  #   #cast( Integer, "1" ) => 1
+  #   #cast( Fixnum, "1" ) => 1
   #   #cast( Array, [1,2,3] ) => "[1,2,3]"
   #   #cast( Hash, {:a => 1, 'b' => "2", :c => ['c']} ) => "--- \nb: \"2\"\n:c: \n- c\n:a: 1\n"
   #   #cast( Hash, "--- \nb: \"2\"\n:c: \n- c\n:a: 1\n" ) => {"b"=>"2", :c=>["c"], :a=>1}
@@ -64,7 +65,7 @@ class RedisModel
     klass = klass.to_s
     v_class = value.class.to_s
         
-    if klass == "Integer" && v_class == "String"
+    if klass == "Fixnum" && v_class == "String"
       value.to_i
     elsif (klass == "Array" || klass == "Hash") && v_class == "String"
       YAML.load(value)
@@ -93,14 +94,15 @@ class RedisModel
   end
   
   
-  def self.blank_record
-    hash = {}
+  def self.blank_record(hash={})
+    blanks = {
+      String => "",
+      Array => [],
+      Hash => {}
+    }
     self.properties.to_a.map do |c|
-      # # value ||= self.class.blank_value(c)
-      blank = self.blank_value(c[1])
-      unless blank.nil?
-        hash[c[0]] = blank
-      end
+      blank = blanks[c[1]]
+      hash[c[0]] = blank unless blank.nil?
     end
     hash.delete(:id)
     hash
@@ -128,24 +130,21 @@ class RedisModel
       
       redis.set "#{self.class}:#{id}:id", id
       redis.incr "#{self.class}:_meta:count"
-      
-    else
-      
+    else 
       self.send("id=", hash[:id])
       if get(:id).nil?
-        raise RedisModel::InvalidRecord
+        raise RedisModel::RecordNotFound
       else
         self.reload
       end
-      
     end    
   end
   
   
   # Custom model inspect in the format of:
-  #   #<MyModel id: "8a80300a9b3251ec4d930f8ab5e381e2", created_at: "2010-08-01T01:32:11+01:00">
+  #   #<MyModel:8a80300a9b id: "8a80300a9b...", created_at: "2010-08-01T01:32:11+01:00">
   def inspect
-    "#<#{self.class} #{self.class.properties.to_a.map{|c| "#{c[0].to_s}: #{get(c[0]).inspect}"}.join(", ")}>"
+    "#<#{self.class}:#{self.id} #{self.class.properties.to_a.delete_if{|c| c[0] == :id}.map{|c| "#{c[0].to_s}: #{g=get(c[0]); v=g.inspect; g.class == String && v.size > 10 ? v[0..(v.size-2)]+'..."' : v}"}.join(", ")}>"
   end
 
   
@@ -195,7 +194,7 @@ class RedisModel
   #
   #   class MyModel < RedisModel
   #     property :name, String
-  #     property :age, Integer
+  #     property :age, Fixnum
   #   end
   #
   def self.property(name, type)
@@ -295,6 +294,7 @@ class RedisModel
   # Writes a property value to redis, and updates #updated_at if required.
   def set(property, value)
     c = self.class.type(property)
+    raise RedisModel::PropertyTypeIncorrect if value.class != c
     value = RedisModel.cast c, value
     redis.set "#{self.class}:#{id}:#{property}", value
     @_data[property] = value
@@ -322,15 +322,6 @@ class RedisModel
     properties[property]
   end
   
-  def self.blank_value(type)
-    blanks = {
-      String => "",
-      Array => [],
-      Hash => {}
-    }
-    return blanks[type]
-  end
-  
   
   # Keeps track of the properties declared via #property
   def self.properties

data/test/class_mathod_tests.rb

@@ -4,13 +4,19 @@ class ClassMethodTests < Test::Unit::TestCase
   def setup
     Person.destroy_all
     @person1 = Person.new(:name => "ashley", :age => 18)                        
-    @person2 = Person.new(:name => "ashley", :age => 18)   
+    @person2 = Person.new(:name => "ashley", :age => 18)
   end
   
   def test_find
     assert Person.find(@person1.id).name == @person1.name
   end
   
+  def test_invalid_find_raises_error
+    assert_raises RedisModel::RecordNotFound do
+      Person.find("abcd")
+    end
+  end
+  
   def test_destroy_all
     assert Person.count == 2
     Person.destroy_all
@@ -29,6 +35,11 @@ class ClassMethodTests < Test::Unit::TestCase
     assert all[0].name == @person1.name
   end
   
+  def test_all_when_no_records_exist
+    Person.destroy_all
+    assert Person.all == []
+  end
+  
   def test_search
     Person.search(:age, 19)
   end

data/test/models/person.rb

@@ -1,5 +1,5 @@
 # require 'rubygems'
-# # require 'redismodel'
+# require 'redismodel'
 # require File.dirname(__FILE__) + '/../../lib/redismodel'
 
 class Person < RedisModel
@@ -7,7 +7,7 @@ class Person < RedisModel
   #        :port => 5678
 
   property :name, String
-  property :age, Integer
+  property :age, Fixnum
   property :dob, DateTime
   property :favorite_games, Array
   property :test_hash, Hash

data/test/property_type_tests.rb

@@ -14,6 +14,12 @@ class ColumnTypeTests < Test::Unit::TestCase
   #   Person.destroy_all
   # end
   
+  def test_doesnt_allow_incorrect_types
+    assert_raises RedisModel::PropertyTypeIncorrect do
+      @person.dob = [1,2,3]
+    end
+  end
+  
   def test_string
     assert @person.name == "ashley"
   end

data/test/test_helper.rb

@@ -1,5 +1,12 @@
 require 'stringio'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/redismodel' unless defined? RedisModel
+
+if ARGV.include?("g")
+  require 'rubygems'
+  require 'redismodel'
+else
+  require File.dirname(__FILE__) + '/../lib/redismodel' unless defined? RedisModel
+end
+
 Dir.glob("test/models/*.rb").each{|f| require f}
 Dir.glob("test/*_tests.rb").each{|f| require f}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ashley Williams