activeredis 0.0.3 → 0.0.4

data/lib/activeredis/version.rb

@@ -1,3 +1,3 @@
 module ActiveRedis
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/activeredis.rb

@@ -37,11 +37,11 @@ module ActiveRedis
 
   class ActiveRedisError < StandardError
   end
-  
+
   # Raised when Active Redis cannot find record by given id or set of ids.
   class RecordNotFound < ActiveRedisError
   end
-  
+
   class Base
     include ActiveModel::Validations
     include ActiveModel::Dirty
@@ -50,7 +50,7 @@ module ActiveRedis
     include ActiveModel::Naming
 
     QUEUED = "QUEUED"
-    
+
     # RAILSISM
     # Returns a hash of all the attributes with their names as keys and the values of the attributes as values
     #  --> means: Strings as keys!
@@ -62,16 +62,16 @@ module ActiveRedis
     attr :frozen
 
     class << self; attr_accessor :_fields; end
-    
+
     # INSTANCE METHODS
-    
+
     def initialize(attributes = {}, id = nil)
       @id = id if id
       @attributes = {}
       initialize_attributes(attributes)
       frozen = false
     end
-    
+
     # Object's attributes' keys are converted to strings because of railsisms.
     # Because of activeredisism, also values are converted to strings for consistency.
     def initialize_attributes(attributes)
@@ -89,26 +89,18 @@ module ActiveRedis
     def save
       creation = new_record?
       @id = self.class.fetch_new_identifier if creation
-      while true
-        begin
-          connection.multi
-        rescue
-          sleep(0.1)
-          redo
+      connection.multi do
+        if @attributes.size > 0
+          @attributes.each_pair { |key, value|
+            if key.to_sym == :updated_at
+              value = Time.now.to_s
+            end
+            connection.hset("#{key_namespace}:attributes", key, value)
+          }
         end
-        break
-      end
-      if @attributes.size > 0  
-        @attributes.each_pair { |key, value|
-          if key.to_sym == :updated_at
-            value = Time.now.to_s
-          end
-          connection.hset("#{key_namespace}:attributes", key, value)
-        }
+        connection.zadd("#{class_namespace}:all", @id, @id) 
       end
-      connection.zadd("#{class_namespace}:all", @id, @id) 
-      connection.exec
-      return true
+      true
     end
 
     def update_attributes(attributes)
@@ -124,19 +116,19 @@ module ActiveRedis
     def reload
       @attributes = connection.hgetall "#{key_namespace}:attributes"
     end
-    
+
     def new_record?
       @id == nil
     end
-    
+
     def key_namespace
       "#{self.class.key_namespace}:#{self.id}"
     end
-    
+
     def class_namespace
       "#{self.class.key_namespace}"
     end
-    
+
     def connection
       self.class.connection
     end
@@ -147,13 +139,13 @@ module ActiveRedis
         connection.zrem "#{class_namespace}:all", @id
         @frozen = true
       end
-      return true     
+      return true
     end
 
     def frozen?
       @frozen
     end
-    
+
     def add_attribute(name, value=nil)
       initialize_attributes({name => value})
     end
@@ -161,11 +153,11 @@ module ActiveRedis
     def [](field)
       send(field)
     end
-  
+
     def []=(field, value)
       send(field+"=", value)
     end
-    
+
     #
     # CLASS METHODS
     #
@@ -173,7 +165,7 @@ module ActiveRedis
     def self.create(attributes)
       self.new(attributes).save
     end
-    
+
     def self.define_field(field)
       define_method field.to_sym do
         if field.to_sym == :updated_at
@@ -201,61 +193,41 @@ module ActiveRedis
     def self.key_namespace
       "#{self}"
     end
-    
+
     def self.fetch_new_identifier
       self.connection.incr self.identifier_sequencer
     end
-    
+
     def self.identifier_sequencer
       "#{key_namespace}:sequence"
     end
-    
+
     def self.inherited(child)
       #puts "Redis.new(:host => #{ActiveRedis.host}, :port => #{ActiveRedis.port})"
       @@redis = Redis.new(:host => ActiveRedis.host, :port => ActiveRedis.port)
       @@class = child
     end
-    
+
     def self.redis_information
       connection.info # call_command [:info]
     end
-    
+
     def self.connection
       @@redis
     end
 
     def self.count
-      begin
-        size = connection.zcard "#{key_namespace}:all"
-        while size == QUEUED
-          sleep(0.1)
-          size = connection.zcard "#{key_namespace}:all"
-        end
-        return size
-      rescue RuntimeError => e
-        return 0
-      end
+      size = connection.zcard "#{key_namespace}:all"
     end
 
     def self.find_all()
-      record = []
+      records = []
       # TODO Interim fix, "QUEUED" is find(id) rescue
-      while true
-        ids = connection.zrange "#{key_namespace}:all", 0, count
-        while ids == QUEUED 
-          sleep(0.1)
-          ids = connection.zrange "#{key_namespace}:all", 0, count
-        end
-        begin
-          ids.each do |id|
-            record << find(id)
-          end
-        rescue
-          redo
-        end
-        break
+      ids = connection.zrange "#{key_namespace}:all", 0, count
+      ids.each do |id|
+        records << find(id)
       end
-      record
+      records
     end
 
     def self.all
@@ -291,11 +263,14 @@ module ActiveRedis
 
     def self.find_by_param(field, value)
       records = find_all_by_param(field, value)
-      if records.size > 0
-        return records[0]
-      else
-        nil
+      ids = connection.zrange "#{key_namespace}:all", 0, count
+      ids.each do |id|
+        record = find(id)
+        if record.attributes[field.to_s] == value.to_s
+          return record
+        end
       end
+      nil
     end
 
     def self.method_missing(name, *args)
@@ -303,7 +278,7 @@ module ActiveRedis
       return find_all_by_param($1.to_sym, args[0]) if name.to_s =~ /^find_all_by_(.*)/
       super
     end
-    
+
     def self.delete_unused_field
       ids = connection.zrange "#{key_namespace}:all", 0, count
       if ids.size > 0

data/lib/old_activeredis.rb

@@ -0,0 +1,326 @@
+require 'redis'
+require 'time'
+require 'active_model'
+
+require 'active_model/version'
+
+class Module
+  def module_attr_reader(*syms)
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        @@#{sym} = nil unless defined?(@@#{sym})
+        def self.#{sym}()
+          return @@#{sym}
+        end
+      EOS
+    end
+  end
+  def module_attr_writer(*syms)
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+      EOS
+    end
+  end
+  def module_attr_accessor(*syms)
+    module_attr_reader(*syms)
+    module_attr_writer(*syms)
+  end
+end
+
+module ActiveRedis
+  module_attr_accessor :host, :port
+  @@host = "localhost"
+  @@port = "6379"
+
+  class ActiveRedisError < StandardError
+  end
+
+  # Raised when Active Redis cannot find record by given id or set of ids.
+  class RecordNotFound < ActiveRedisError
+  end
+
+  class Base
+    include ActiveModel::Validations
+    include ActiveModel::Dirty
+    include ActiveModel::Serialization
+    include ActiveModel::Serializers::JSON
+    include ActiveModel::Naming
+
+    QUEUED = "QUEUED"
+
+    # RAILSISM
+    # Returns a hash of all the attributes with their names as keys and the values of the attributes as values
+    #  --> means: Strings as keys!
+    #  --> initialize stringifies
+    #
+    #  called by to_json for_example
+    attr_reader :attributes
+    attr_reader :id
+    attr :frozen
+
+    class << self; attr_accessor :_fields; end
+
+    # INSTANCE METHODS
+
+    def initialize(attributes = {}, id = nil)
+      @id = id if id
+      @attributes = {}
+      initialize_attributes(attributes)
+      frozen = false
+    end
+
+    # Object's attributes' keys are converted to strings because of railsisms.
+    # Because of activeredisism, also values are converted to strings for consistency.
+    def initialize_attributes(attributes)
+      fields = Hash[[self.class._fields, Array.new(self.class._fields.size)].transpose]
+      fields.stringify_keys!   # NEEDS to be strings for railsisms
+      attributes.stringify_keys!   # NEEDS to be strings for railsisms
+      attributes.each_pair { |key, value| attributes[key] = value.to_s }
+      fields.merge!(attributes)
+      @attributes.merge!(fields)
+      @attributes.each_pair do |key, value|
+        self.class.define_field key
+      end
+    end
+
+    def save
+      creation = new_record?
+      @id = self.class.fetch_new_identifier if creation
+      while true
+        begin
+          connection.multi
+        rescue
+          sleep(0.1)
+          redo
+        end
+        break
+      end
+      if @attributes.size > 0
+        @attributes.each_pair { |key, value|
+          if key.to_sym == :updated_at
+            value = Time.now.to_s
+          end
+          connection.hset("#{key_namespace}:attributes", key, value)
+        }
+      end
+      connection.zadd("#{class_namespace}:all", @id, @id) 
+      connection.exec
+      return true
+    end
+
+    def update_attributes(attributes)
+      attributes.stringify_keys!   # NEEDS to be strings for railsisms
+      attributes.each_pair { |key, value| attributes[key] = value.to_s }
+      @attributes.merge!(attributes)
+      attributes.each_pair do |key, value|
+        self.class.define_field key
+      end
+      save
+    end
+
+    def reload
+      @attributes = connection.hgetall "#{key_namespace}:attributes"
+    end
+
+    def new_record?
+      @id == nil
+    end
+
+    def key_namespace
+      "#{self.class.key_namespace}:#{self.id}"
+    end
+
+    def class_namespace
+      "#{self.class.key_namespace}"
+    end
+
+    def connection
+      self.class.connection
+    end
+
+    def destroy
+      connection.multi do
+        connection.del "#{key_namespace}:attributes"
+        connection.zrem "#{class_namespace}:all", @id
+        @frozen = true
+      end
+      return true
+    end
+
+    def frozen?
+      @frozen
+    end
+
+    def add_attribute(name, value=nil)
+      initialize_attributes({name => value})
+    end
+
+    def [](field)
+      send(field)
+    end
+
+    def []=(field, value)
+      send(field+"=", value)
+    end
+
+    #
+    # CLASS METHODS
+    #
+
+    def self.create(attributes)
+      self.new(attributes).save
+    end
+
+    def self.define_field(field)
+      define_method field.to_sym do
+        if field.to_sym == :updated_at
+          Time.parse(@attributes["#{field}"])
+        else
+          @attributes["#{field}"]  
+        end
+      end
+
+      define_method "#{field}=".to_sym do |new_value|
+        @attributes["#{field}"] = new_value.to_s
+      end
+    end
+
+    # Run this method to declare the fields of your model.
+    def self.fields(*fields)
+      self._fields ||= []
+      self._fields = fields
+    end
+
+    def self.get_fields
+      self._fields
+    end
+
+    def self.key_namespace
+      "#{self}"
+    end
+
+    def self.fetch_new_identifier
+      self.connection.incr self.identifier_sequencer
+    end
+
+    def self.identifier_sequencer
+      "#{key_namespace}:sequence"
+    end
+
+    def self.inherited(child)
+      #puts "Redis.new(:host => #{ActiveRedis.host}, :port => #{ActiveRedis.port})"
+      @@redis = Redis.new(:host => ActiveRedis.host, :port => ActiveRedis.port)
+      @@class = child
+    end
+
+    def self.redis_information
+      connection.info # call_command [:info]
+    end
+
+    def self.connection
+      @@redis
+    end
+
+    def self.count
+      begin
+        size = connection.zcard "#{key_namespace}:all"
+        while size == QUEUED
+          sleep(0.1)
+          size = connection.zcard "#{key_namespace}:all"
+        end
+        return size
+      rescue RuntimeError => e
+        return 0
+      end
+    end
+
+    def self.find_all()
+      record = []
+      # TODO Interim fix, "QUEUED" is find(id) rescue
+      while true
+        ids = nil
+        while true
+          ids = connection.zrange "#{key_namespace}:all", 0, count
+          break if ids != QUEUED
+          sleep(0.1)
+        end
+        begin
+          ids.each do |id|
+            record << find(id)
+          end
+        rescue
+          redo
+        end
+        break
+      end
+      record
+    end
+
+    def self.all
+      find_all
+    end
+
+    def self.delete_all
+      records = find_all
+      records.each do |record|
+        record.destroy
+      end
+    end
+
+    def self.find(id)
+      return find_all if id == :all
+      exists = connection.zscore "#{key_namespace}:all", id
+      raise RecordNotFound.new("Couldn't find #{self.name} with ID=#{id}") unless exists
+      attributes = connection.hgetall "#{key_namespace}:#{id}:attributes"
+      obj = self.new attributes, id
+      return obj
+    end
+
+    def self.find_all_by_param(field, value)
+      finded = []
+      records = find_all
+      records.each do |record|
+        if record.attributes[field.to_s] == value.to_s
+          finded << record
+        end
+      end
+      return finded
+    end
+
+    def self.find_by_param(field, value)
+      records = find_all_by_param(field, value)
+      if records.size > 0
+        return records[0]
+      else
+        nil
+      end
+    end
+
+    def self.method_missing(name, *args)
+      return find_by_param($1.to_sym, args[0]) if name.to_s =~ /^find_by_(.*)/
+      return find_all_by_param($1.to_sym, args[0]) if name.to_s =~ /^find_all_by_(.*)/
+      super
+    end
+
+    def self.delete_unused_field
+      ids = connection.zrange "#{key_namespace}:all", 0, count
+      if ids.size > 0
+        attributes = connection.hgetall "#{key_namespace}:#{ids[0]}:attributes"
+        now_keys   = self.get_fields
+        array = []
+        now_keys.each do |key|
+          array << key.to_s
+        end
+        attributes.reject! {|key| array.include? key }
+        attributes.keys.each do |delete_key|
+          ids.each do |id|
+            connection.hdel "#{key_namespace}:#{id}:attributes", delete_key
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeredis
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70240177908780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240177908780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70240177908360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240177908360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240177907940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240177907940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveModel based object persistance library for Redis
 email:
 - sonixlabs@sonix.asia
@@ -64,6 +79,7 @@ files:
 - benchmark_results.txt
 - lib/activeredis.rb
 - lib/activeredis/version.rb
+- lib/old_activeredis.rb
 - sample/user.rb
 - spec/active_redis_spec.rb
 - spec/spec_helper.rb
@@ -87,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveModel based object persisting library for Redis key-value database.