redismodel 0.1.3 → 0.1.4

data/lib/redismodel.rb

@@ -11,7 +11,7 @@ class DateTime
 end
 
 class RedisModel
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   DEFAULT_CONFIG = {
     :atomic => true,
     :default_sort => "created_at"
@@ -19,8 +19,7 @@ class RedisModel
   
   module ArrayProxy
     def <<(other)
-      tmp = self.dup.push(other)
-      @__model__.send(:set, @__property__, tmp)
+      @__model__.send(:set, @__property__, super)
       super
     end
     
@@ -32,7 +31,7 @@ class RedisModel
   module HashProxy
     def []=(a,b)
       tmp = self.dup
-      tmp[a] = b
+      tmp[a] = super
       @__model__.send(:set, @__property__, tmp)
       super
     end
@@ -61,6 +60,7 @@ class RedisModel
   #   #cast( Hash, "--- \nb: \"2\"\n:c: \n- c\n:a: 1\n" ) => {"b"=>"2", :c=>["c"], :a=>1}
   #
   def self.cast(klass, value)
+    return value if value.nil?
     klass = klass.to_s
     v_class = value.class.to_s
         
@@ -93,22 +93,39 @@ class RedisModel
   end
   
   
+  def self.blank_record
+    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
+    end
+    hash.delete(:id)
+    hash
+  end
+  
   # Creates a new object. If `{:id => "..."}` is passed, it'll attempt to recover the record
   # from the redis DB. If it can't find such a record, it'll raise RedisModel::RecordNotFound
   def initialize(hash={})
     @_data = {}
+            
     if hash[:id].nil?
+      hash = self.class.blank_record.merge(hash)          
+      self.send("id=", generate_uniq_token) 
       
-      self.send("id=", generate_uniq_token)  
       if self.class.properties.include?(:created_at)
         set :created_at, DateTime.now
       end
+      
       hash.to_a.each do |property|
         begin
           self.send("#{property[0]}=", property[1])
         rescue
         end
       end
+      
       redis.set "#{self.class}:#{id}:id", id
       redis.incr "#{self.class}:_meta:count"
       
@@ -121,7 +138,7 @@ class RedisModel
         self.reload
       end
       
-    end
+    end    
   end
   
   
@@ -130,7 +147,7 @@ class RedisModel
   def inspect
     "#<#{self.class} #{self.class.properties.to_a.map{|c| "#{c[0].to_s}: #{get(c[0]).inspect}"}.join(", ")}>"
   end
-  
+
   
   # Updates all keys from redis
   def reload
@@ -190,13 +207,19 @@ class RedisModel
       end
       
       if type == Array || type == Hash
-        proxy = (type == Array) ? ArrayProxy : HashProxy 
+        case type.to_s
+        when "Array"
+          proxy = ArrayProxy
+        when "Hash"
+          proxy = HashProxy
+        end
         define_method(name) do
           value = get(name)
           return value if value.is_a?(proxy)
           value.tap do |value|
-            value.extend(proxy).instance_variable_set(:@__model__, self)
-            value.extend(proxy).instance_variable_set(:@__property__, name)
+            value.extend(proxy)
+            value.instance_variable_set(:@__model__, self)
+            value.instance_variable_set(:@__property__, name)
           end
         end
       else
@@ -299,6 +322,15 @@ 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

@@ -21,7 +21,6 @@ class ClassMethodTests < Test::Unit::TestCase
     assert Person.count == 2
     Person.destroy(@person1.id, @person2.id)
     assert Person.count == 0
-    assert @person1.name == nil
   end
   
   def test_all

data/test/models/person.rb

@@ -1,7 +1,11 @@
+# require 'rubygems'
+# # require 'redismodel'
+# require File.dirname(__FILE__) + '/../../lib/redismodel'
+
 class Person < RedisModel
   # config :host => "1.2.3.4",
   #        :port => 5678
-  
+
   property :name, String
   property :age, Integer
   property :dob, DateTime
@@ -9,4 +13,15 @@ class Person < RedisModel
   property :test_hash, Hash
   property :created_at, DateTime
   property :updated_at, DateTime
-end
+end
+
+# ashley = Person.new(:name => "ashley")
+# puts ashley.inspect
+# ashley.favorite_games << "Portal"
+# ashley.favorite_games << "WoW"
+# 
+# me = Person.find( ashley.id )
+# puts me.name
+#   #=> ashley
+# puts me.favorite_games.inspect
+#   #=> ["Portal", "WoW"]

data/test/property_type_tests.rb

@@ -5,10 +5,9 @@ class ColumnTypeTests < Test::Unit::TestCase
     @person = Person.new(
                          :name => "ashley",
                          :age => 18,
-                         :dob => DateTime.parse("05-09-1991"),
-                         :favorite_games => ["Portal", "WoW", 101],
-                         :test_hash => {:a => 1, 'b' => "2", :c => ["Portal", 1, :c, [1,2,3]]}
+                         :dob => DateTime.parse("05-09-1991")
                         )
+                        
   end
   
   # def teardown
@@ -23,32 +22,42 @@ class ColumnTypeTests < Test::Unit::TestCase
     assert @person.age == 18
   end
   
+  def test_integer_increment
+    @person.age += 1
+    assert @person.age == 19
+  end
+  
   def test_datetime
     assert @person.dob.class == DateTime
     assert @person.dob.to_s == "1991-09-05T00:00:00+00:00"
   end
   
   def test_array
-    assert @person.favorite_games == ["Portal", "WoW", 101]
+    @person.favorite_games << "Portal"
+    @person.favorite_games << "WoW"
+    assert @person.favorite_games == ["Portal", "WoW"]
   end
   
   def test_add_to_array_left_left
+    @person.favorite_games = ["Portal", "WoW", 101]
     @person.favorite_games << "Awesome"
     assert @person.favorite_games.size == 4
   end
   
   def test_add_to_array_push
+    @person.favorite_games = ["Portal", "WoW", 101]
     @person.favorite_games.push("Awesome")
     assert @person.favorite_games.size == 4
   end
   
   def test_hash
+    @person.test_hash = {:a => 1, 'b' => "2", :c => ["Portal", 1, :c, [1,2,3]]}
     assert @person.test_hash == {:a => 1, 'b' => "2", :c => ["Portal", 1, :c, [1,2,3]]}
   end
   
   def test_add_key_to_hash
-    @person.test_hash[:add] = 123
-    assert @person.test_hash[:add] == 123
+    @person.test_hash[:first_key] = 123
+    assert @person.test_hash[:first_key] == 123
   end
   
   def test_id
@@ -62,4 +71,16 @@ class ColumnTypeTests < Test::Unit::TestCase
   def test_updated_at
     assert @person.updated_at.class == DateTime
   end
+  
+  def test_inital_array_value
+    assert Person.new().favorite_games == []
+  end
+  
+  def test_inital_hash_value
+    assert Person.new().test_hash == {}
+  end
+  
+  def test_inital_string_value
+    assert Person.new().name == ""
+  end
 end

metadata

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