redismodel 0.1.0 → 0.1.1

data/lib/redismodel.rb

@@ -76,244 +76,241 @@ class RedisModel
   end
   
   
-  class Model
-    # Local cache of the data
-    attr_accessor :_data
+  # Local cache of the data
+  attr_accessor :_data
 
-    def redis
-      self.class.redis
-    end
-    
-        
-    def generate_uniq_token
-      "#{MD5.hexdigest("#{self.class.to_s.downcase}-#{self.object_id}-#{rand**rand}-#{Time.now.to_f}")}"
-    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?
-        
-        self.send("id=", generate_uniq_token)  
-        unless self.class.properties[:created_at].nil?
-          set :created_at, DateTime.now
-        end
-        hash.to_a.each do |property|
-          begin
-            self.send("#{property[0]}=", property[1])
-          rescue
-          end
+  def redis
+    self.class.redis
+  end
+  
+      
+  def generate_uniq_token
+    "#{MD5.hexdigest("#{self.class.to_s.downcase}-#{self.object_id}-#{rand**rand}-#{Time.now.to_f}")}"
+  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?
+      
+      self.send("id=", generate_uniq_token)  
+      unless self.class.properties[:created_at].nil?
+        set :created_at, DateTime.now
+      end
+      hash.to_a.each do |property|
+        begin
+          self.send("#{property[0]}=", property[1])
+        rescue
         end
-        redis.set "#{self.class}:#{id}:id", id
-        redis.incr "#{self.class}:_meta:count"
-        
+      end
+      redis.set "#{self.class}:#{id}:id", id
+      redis.incr "#{self.class}:_meta:count"
+      
+    else
+      
+      self.send("id=", hash[:id])
+      if get(:id).nil?
+        raise RedisModel::InvalidRecord
       else
-        
-        self.send("id=", hash[:id])
-        if get(:id).nil?
-          raise RedisModel::InvalidRecord
-        else
-          self.reload
-        end
-        
+        self.reload
       end
+      
     end
-    
-    
-    # Custom model inspect in the format of:
-    #   #<MyModel id: "8a80300a9b3251ec4d930f8ab5e381e2", 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(", ")}>"
-    end
-    
-    
-    # Updates all keys from redis
-    def reload
-      self.class.properties.each do |property|
-        self.get(property)
-      end
-      self
+  end
+  
+  
+  # Custom model inspect in the format of:
+  #   #<MyModel id: "8a80300a9b3251ec4d930f8ab5e381e2", 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(", ")}>"
+  end
+  
+  
+  # Updates all keys from redis
+  def reload
+    self.class.properties.each do |property|
+      self.get(property)
     end
-    
-    
-    # Permamently deletes all traces of the record, and
-    # decrements the model count
-    def destroy
-      redis.keys("#{self.class}:#{id}:*").each do |key|
-        redis.del key
-      end
-      redis.decr "#{self.class}:_meta:count"
+    self
+  end
+  
+  
+  # Permamently deletes all traces of the record, and
+  # decrements the model count
+  def destroy
+    redis.keys("#{self.class}:#{id}:*").each do |key|
+      redis.del key
     end
-    
-    
-    def id
-      @_data['id']
+    redis.decr "#{self.class}:_meta:count"
+  end
+  
+  
+  def id
+    @_data['id']
+  end
+  
+  
+  # Setter and getter for the config. Example:
+  #
+  #   class MyModel < RedisModel
+  #     config :host => "1.2.3.4",
+  #            :port => 5678
+  #   end
+  #
+  def self.config(hash=nil)
+    @_config ||= DEFAULT_CONFIG
+    if hash.nil?
+      return @_config
+    else
+      @_config = @_config.merge(hash)
+      return true
     end
-    
-    
-    # Setter and getter for the config. Example:
-    #
-    #   class MyModel < RedisModel::Model
-    #     config :host => "1.2.3.4",
-    #            :port => 5678
-    #   end
-    #
-    def self.config(hash=nil)
-      @_config ||= DEFAULT_CONFIG
-      if hash.nil?
-        return @_config
-      else
-        @_config = @_config.merge(hash)
-        return true
+  end
+  
+  
+  # Defines a new property. Example:
+  #
+  #   class MyModel < RedisModel
+  #     property :name, String
+  #     property :age, Integer
+  #   end
+  #
+  def self.property(name, type)
+    properties[:id] = String unless properties[:id]
+    properties[name] = type
+    class_eval do
+      define_method("#{name}=") do |str|
+        set(name, str)
       end
-    end
-    
-    
-    # Defines a new property. Example:
-    #
-    #   class MyModel < RedisModel::Model
-    #     property :name, String
-    #     property :age, Integer
-    #   end
-    #
-    def self.property(name, type)
-      properties[:id] = String unless properties[:id]
-      properties[name] = type
-      class_eval do
-        define_method("#{name}=") do |str|
-          set(name, str)
-        end
-        
-        if type == Array || type == Hash
-          proxy = (type == Array) ? ArrayProxy : HashProxy 
-          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)
-            end
-          end
-        else
-          define_method(name) do 
-            get(name)
+      
+      if type == Array || type == Hash
+        proxy = (type == Array) ? ArrayProxy : HashProxy 
+        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)
           end
         end
-        
-        eval "def self.find_by_#{name.to_s}(str); self.search('#{name.to_s}', str); end"
-      end
-    end
-    
-    
-    # Returns all records
-    def self.all
-      arr = []
-      redis.keys("#{klass}:*:id").each do |key|
-        arr << klass.find( key.split(":")[1] )
+      else
+        define_method(name) do 
+          get(name)
+        end
       end
-      arr.sort_by{|m| m.send( DEFAULT_CONFIG[:default_sort] )}
+      
+      eval "def self.find_by_#{name.to_s}(str); self.search('#{name.to_s}', str); end"
     end
-    
-    
-    # Finds a record from it's id
-    def self.find(id)
-      object = klass.new(:id => id)
+  end
+  
+  
+  # Returns all records
+  def self.all
+    arr = []
+    redis.keys("#{klass}:*:id").each do |key|
+      arr << klass.find( key.split(":")[1] )
     end
-    
-    
-    # Returns all records where the value of `property` matches `str`
-    def self.search(property, value)
-      arr = []
-      self.all.each do |record|
-        if record.send(property) == value
-          arr << record
-        end
+    arr.sort_by{|m| m.send( DEFAULT_CONFIG[:default_sort] )}
+  end
+  
+  
+  # Finds a record from it's id
+  def self.find(id)
+    object = klass.new(:id => id)
+  end
+  
+  
+  # Returns all records where the value of `property` matches `str`
+  def self.search(property, value)
+    arr = []
+    self.all.each do |record|
+      if record.send(property) == value
+        arr << record
       end
-      arr
     end
-   
+    arr
+  end
+ 
 
-    # Permamently deletes all records for the model
-    def self.destroy_all
-      redis.keys("#{klass}:*").each do |key|
-        redis.del key
-      end
-      true
+  # Permamently deletes all records for the model
+  def self.destroy_all
+    redis.keys("#{klass}:*").each do |key|
+      redis.del key
     end
+    true
+  end
 
-    
-    # Destroys all records with the ids passed
-    def self.destroy(*ids)
-      ids.each do |id|
-        klass.find(id).destroy
-      end
-    end
-        
-    
-    # Returns the number of records for the model
-    def self.count
-      redis.get("#{klass}:_meta:count").to_i
+  
+  # Destroys all records with the ids passed
+  def self.destroy(*ids)
+    ids.each do |id|
+      klass.find(id).destroy
     end
+  end
+      
+  
+  # Returns the number of records for the model
+  def self.count
+    redis.get("#{klass}:_meta:count").to_i
+  end
 
 
-    # Saves the Redis database to disk
-    def self.save!
-      redis.bgsave == "Background saving started"
-    end
+  # Saves the Redis database to disk
+  def self.save!
+    redis.bgsave == "Background saving started"
+  end
 
 
-    protected
-    
-    # Writes a property value to redis, and updates #updated_at if required.
-    def set(property, value)
-      c = self.class.type(property)
-      value = RedisModel.cast c, value
-      redis.set "#{self.class}:#{id}:#{property}", value
-      @_data[property] = value
-      
-      unless property == :updated_at && !self.class.properties[:updated_at].nil?
-        set :updated_at, DateTime.now
-      end
-    end   
-    
-    # Fetches the value of `property` from redis
-    def get(property)
-      c = self.class.type(property)
-      value = RedisModel.cast c, redis.get("#{self.class}:#{id}:#{property}")
-      @_data[property] = value
-    end
-    
-    
-    # Returns the class of the extended model
-    def self.klass
-      @klass ||= self.ancestors.first
-    end
-    
-    
-    # Returns the property class declared in #property above
-    def self.type(property)
-      properties[property]
-    end
-    
-    
-    # Keeps track of the properties declared via #property
-    def self.properties
-      @_properties ||= {}
-    end
-    
-    
-    
-    # Alias for RedisModel#connection
-    def self.redis
-      RedisModel.connection(klass)
-    end
-    
-    
-    def id=(str)
-      @_data['id'] = str
+  protected
+  
+  # Writes a property value to redis, and updates #updated_at if required.
+  def set(property, value)
+    c = self.class.type(property)
+    value = RedisModel.cast c, value
+    redis.set "#{self.class}:#{id}:#{property}", value
+    @_data[property] = value
+    
+    unless property == :updated_at && !self.class.properties[:updated_at].nil?
+      set :updated_at, DateTime.now
     end
-    
+  end   
+  
+  # Fetches the value of `property` from redis
+  def get(property)
+    c = self.class.type(property)
+    value = RedisModel.cast c, redis.get("#{self.class}:#{id}:#{property}")
+    @_data[property] = value
+  end
+  
+  
+  # Returns the class of the extended model
+  def self.klass
+    @klass ||= self.ancestors.first
+  end
+  
+  
+  # Returns the property class declared in #property above
+  def self.type(property)
+    properties[property]
+  end
+  
+  
+  # Keeps track of the properties declared via #property
+  def self.properties
+    @_properties ||= {}
+  end
+  
+  
+  
+  # Alias for RedisModel#connection
+  def self.redis
+    RedisModel.connection(klass)
+  end
+  
+  
+  def id=(str)
+    @_data['id'] = str
   end
 end

data/test/models/person.rb

@@ -1,4 +1,4 @@
-class Person < RedisModel::Model
+class Person < RedisModel
   # config :host => "1.2.3.4",
   #        :port => 5678
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ashley Williams
@@ -31,7 +31,7 @@ dependencies:
         version: 2.0.4
   type: :runtime
   version_requirements: *id001
-description: Syncs ruby objects with Redis
+description: Syncs you ruby objects to Redis
 email: a.j.r.williams@gmail.com
 executables: []