active_redis 0.0.5 → 0.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDI3NjI4MjQwYjg4NmI4YTQzMjk1Y2RkYTdmMzk1ZDA3MWM4YjM0OA==
-  data.tar.gz: !binary |-
-    MDdjN2ViZGVlODZhNDdkMGQ1OWRmNWQ3NzE5ZGY1MGQ2NzkzMGFiOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MTliYzEyZDQxOTgxY2MyZWVhZjlmOTg5MTZkMjk3OWMwZjVhMmU4MzQyMDJj
-    Y2U0YzA3MTEyYTk5ZWU2OWQwYWM1ZWFhMTU1ZTIzNzY0ZDBkNDFkMjIyMWU5
-    NGM5NzEzOGFmZjA2MDU1MDIzNzNkYWVjNmRkNjg1M2VmNGM0NjQ=
-  data.tar.gz: !binary |-
-    Y2ZlMzRiYzAzNjJkMmRmY2RkZjFkNGFlMmEzMWFkNWMxYWE3NGVhZTVlNWVh
-    ZDY5Yjk4ZWFlZTU4MmUyZmI2ZDUxOGQyNjkxM2IyNTY3OWJlMWQzZmNhZDJk
-    YThiMmE4ZDMyMGI5YjY3Yjk0MmI5NzliYWI3NTc0ODlkZGVmYmU=
+SHA1:
+  metadata.gz: 045f4c85e0aeb767fd6391f797427c932771c9b7
+  data.tar.gz: 9e250673aa1a847c1bdd33a1f85550ea9cedc8e1
+SHA512:
+  metadata.gz: 3f54e5432066d8cd19c9844e84dc37b68d4a15bc02c2b13dc7ee618a9934c0edae3aa23685f835a45fdf69dd50b01ed64e20f6bbb41916da8f417a400c26961b
+  data.tar.gz: 91f1c901ff380025adc212ff0adb214d7f2c6577cffbd0017f3cf4f99752d4c4ded90efd9a74112cbad9350315f66421fd9a6b502b65b0df5faed39bbd7c3598

data/README.md

@@ -83,7 +83,7 @@ p Article.count # => 0
 
 #### belongs_to association
 
-### Finders and Calculations
+### Finders
 
 You may find 'row' by it's id
 
@@ -101,10 +101,6 @@ end
 Article.create(views: 1000, link: "http://someblog.com/1", title: "Title article")
 Article.create(views: 3000, link: "http://someblog.com/2", title: "Title article")
 
-Article.sum(:views)    # => 4000
-Article.min(:views)    # => 1000
-Article.max(:views)    # => 3000
-Article.pluck(:id)     # => ["1", "2"]
 ```
 
 From version 0.0.2 you are able to search item by multiple attributes using method __where__
@@ -136,6 +132,14 @@ class User < ActiveRedis::Base
 end
 ```
 
+## NEW IN VERSION 0.0.7
+
+Method chaining. Now you may calling __where__, __order__, __limit__ something like this:
+
+```ruby
+Article.where(title: "Article title").where(views: 1000).order(title: :asc).limit(per_page: 20, page: 3)
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
 require 'rake/notes/rake_task'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['specs/*_spec.rb']
+  t.verbose = true
+end

data/active_redis.gemspec

@@ -20,8 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "redis"
   spec.add_dependency "activesupport"
+  spec.add_dependency "colorize"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-notes"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "turn"
 end

data/lib/active_redis.rb

@@ -21,4 +21,13 @@ module ActiveRedis
   def self.connection=(value)
     @connection = value
   end
+
+  def self.log
+    raise ActiveRedis::NoLogError, "Connection not provided!" unless @log
+    @log
+  end
+
+  def self.log=(value)
+    @log = value
+  end
 end

data/lib/active_redis/associations.rb

@@ -1,40 +1,41 @@
+Dir[File.dirname(__FILE__) + '/associations/*.rb'].each {|file| require file }
+require 'active_redis/constants'
+require 'active_redis/errors'
+
 module ActiveRedis
   module Associations
 
     def self.included(base)
       base.extend ClassMethods
+      class << base; attr_accessor :associations; end
+      base.send :alias_method_chain, :save, :associations
+    end
+
+    def save_with_associations
+      self.class.associations.each { |key, a| a.save(self) }
+      save_without_associations
     end
 
     module ClassMethods
 
-      def has_one(name)
-        define_method name.to_s do
-          name.to_s.capitalize.constantize.where("#{self.class.foreign_key_name}" => self.id).first
-        end
-        define_method "#{name.to_s}=" do |value|
-          value.send "#{self.class.foreign_key_name}=", self.id
-        end
+      ActiveRedis::Constants::ASSOCIATIONS.each do |assoc|
+        class_eval <<-CODE
+          def #{assoc.to_s}(name, options = {})
+            register_association name, :#{assoc.to_s}, options
+          end
+        CODE
       end
 
-      def has_many(name)
-        define_method name.to_s do
-          name.to_s.singularize.capitalize.constantize.where("#{self.class.foreign_key_name}" => self.id)
-        end
-        define_method "#{name.to_s}=" do |value|
-          value.each do |object|
-            object.send "#{self.class.foreign_key_name}=", self.id
-          end
-        end
+      def association(name)
+        raise UnregisteredAssociationError, "Unknown association :#{name}!" unless self.associations.has_key? name.to_sym
+        self.associations[name.to_sym]
       end
 
-      def belongs_to(name)
-        define_attributes_accessors "#{name.to_s}_id" => :integer
-        define_method name.to_s do
-          name.to_s.capitalize.constantize.find(self.send("#{name.to_s}_id"))
-        end
-        define_method "#{name.to_s}=" do |value|
-          self.send "#{name.to_s}_id=", value.id
-        end
+      private
+
+      def register_association(name, type, options)
+        self.associations ||= {}
+        self.associations[name.to_sym] = "ActiveRedis::Associations::#{type.to_s.classify}Association".constantize.new(name, self, options)
       end
 
     end

data/lib/active_redis/associations/association.rb

@@ -0,0 +1,36 @@
+module ActiveRedis
+  module Associations
+
+    class Association
+
+      def initialize(name, target, options = {})
+        @name, @target = name, target
+        define_read_association
+        define_write_association
+      end
+
+      def reload(object)
+        object.send :instance_variable_set, "@assoc_#{@name}", nil
+      end
+
+      private
+
+      def define_read_association
+        @target.class_eval <<-CODE
+          def #{@name}
+            @assoc_#{@name} ||= self.class.association(:#{@name}).read(self)
+          end
+        CODE
+      end
+
+      def define_write_association
+        @target.class_eval <<-CODE
+          def #{@name}=(value)
+            @assoc_#{@name} = value
+          end
+        CODE
+      end
+    end
+
+  end
+end

data/lib/active_redis/associations/belongs_to_association.rb

@@ -0,0 +1,32 @@
+module ActiveRedis
+  module Associations
+
+    class BelongsToAssociation < Association
+
+      DEFAULT_OPTIONS = {touch: false}
+
+      def initialize(name, target, options = {})
+        super
+        @options ||= DEFAULT_OPTIONS.merge(options)
+        target.define_attributes_accessors("#{@name.to_s}_id" => :integer)
+      end
+
+      def read(object)
+        @name.to_s.capitalize.constantize.where(id: object.send("#{@name.to_s}_id")).top
+      end
+
+      def write(object, value)
+        object.send "#{@name.to_s}_id=", value.id
+      end
+
+      def save(object)
+        value = object.send :instance_variable_get, "@assoc_#{@name}"
+        return unless value
+        write(object, value)
+        value.touch if @options[:touch]
+      end
+
+    end
+
+  end
+end

data/lib/active_redis/associations/has_many_association.rb

@@ -0,0 +1,26 @@
+module ActiveRedis
+  module Associations
+
+    class HasManyAssociation < Association
+
+      def read(object)
+        @name.to_s.singularize.capitalize.constantize.where("#{@target.foreign_key_name}" => object.id)
+      end
+
+      def write(object, value)
+        value.each do |assoc_object|
+          assoc_object.send "#{@target.foreign_key_name}=", object.id
+        end
+      end
+
+      def save(object)
+        value = object.send :instance_variable_get, "@assoc_#{@name}"
+        return unless value
+        write object, value
+        value.each { |v| v.save }
+      end
+
+    end
+
+  end
+end

data/lib/active_redis/associations/has_one_association.rb

@@ -0,0 +1,24 @@
+module ActiveRedis
+  module Associations
+
+    class HasOneAssociation < Association
+
+      def read(object)
+        @name.to_s.capitalize.constantize.where("#{@target.foreign_key_name}" => object.id).top
+      end
+
+      def write(object, value)
+        value.send "#{@target.foreign_key_name}=", object.id
+      end
+
+      def save(object)
+        value = object.send :instance_variable_get, "@assoc_#{@name}"
+        return unless value
+        write object, value
+        value.save
+      end
+
+    end
+
+  end
+end

data/lib/active_redis/attributes.rb

@@ -23,7 +23,7 @@ module ActiveRedis
 
     module ClassMethods
 
-      def attributes(attrs)
+      def attributes(attrs = {})
         raise ActiveRedis::InvalidArgumentError, "Value must be a Hash!" unless attrs.is_a?(Hash)
         attrs = attrs.merge(ActiveRedis::Constants::DEFAULT_ATTRIBUTES)
         class << self; attr_accessor :defined_attributes; end
@@ -46,15 +46,16 @@ module ActiveRedis
       private
 
       def register_attribute(attribute, type)
-        return if self.defined_attributes.has_key? attribute.to_sym
+        return false if self.defined_attributes.has_key? attribute.to_sym
         self.defined_attributes[attribute.to_sym] = {
           class: "ActiveRedis::Attributes::#{type.to_s.capitalize}Attribute".constantize,
           type: type
         }
+        true
       end
 
       def attribute_class(attribute)
-        attr_class = self.defined_attributes[attribute.to_sym][:class]
+        self.defined_attributes[attribute.to_sym][:class]
       end
 
       def read_attribute(attribute)
@@ -67,7 +68,7 @@ module ActiveRedis
       def write_attribute(attribute)
         define_method "#{attribute}=" do |value|
           klass = self.class.send :attribute_class, attribute
-          klass.dump(instance_variable_set("@#{attribute}", value))
+          instance_variable_set("@#{attribute}", klass.dump(value))
         end
       end
 

data/lib/active_redis/attributes/integer_attribute.rb

@@ -3,11 +3,11 @@ module ActiveRedis
     class IntegerAttribute < Attribute
 
       def self.load(value)
-        value.to_i
+        value.nil? || value.empty? ? nil : value.to_i
       end
 
       def self.dump(value)
-        value.to_s
+        value ? value.to_s : nil
       end
 
     end

data/lib/active_redis/attributes/string_attribute.rb

@@ -3,11 +3,11 @@ module ActiveRedis
     class StringAttribute < Attribute
 
       def self.load(value)
-        value.to_s
+        value.nil? || value.empty? ? nil : value.to_s
       end
 
       def self.dump(value)
-        value.to_s
+        value ? value.to_s : nil
       end
 
     end

data/lib/active_redis/attributes/time_attribute.rb

@@ -3,11 +3,11 @@ module ActiveRedis
     class TimeAttribute < Attribute
 
       def self.load(value)
-        Time.at(value.to_i)
+        value.nil? || value.empty? ? nil : Time.at(value.to_i)
       end
 
       def self.dump(value)
-        value.to_i.to_s
+        value ? value.to_i.to_s : nil
       end
 
     end

data/lib/active_redis/base.rb

@@ -3,20 +3,20 @@ require 'active_redis/associations'
 require 'active_redis/persistence'
 require 'active_redis/naming'
 require 'active_redis/calculations'
-require 'active_redis/finders'
 require 'active_redis/inspector'
+require 'active_redis/relation'
 
 # TODO: Add Expiring module
 
 module ActiveRedis
   class Base
     extend Naming
-    extend Calculations
-    extend Finders
+    # extend Calculations
+    extend Relation
 
     include Attributes
-    include Associations
     include Persistence
+    include Associations
     include Inspector
 
   end

data/lib/active_redis/config.rb

@@ -1,14 +1,17 @@
 class ActiveRedis::Config
-	# Specify connection string to Redis. To check all available options please see redis-rb library.
-	#
-	# Some samples:
-	#   ActiveRedis.config.connection_options = {host: 10.10.1.1, port: 6380}
-	# or
-	#   ActiveRedis.config.connection_options = {path: '/tmp/redis.sock'}
-	attr_accessor :connection_options
+  # Specify connection string to Redis. To check all available options please see redis-rb library.
+  #
+  # Some samples:
+  #   ActiveRedis.config.connection_options = {host: 10.10.1.1, port: 6380}
+  # or
+  #   ActiveRedis.config.connection_options = {path: '/tmp/redis.sock'}
+  attr_accessor :connection_options
 
-	# Specify adapter for connection to DB
-	# By default it's ActiveRedis::Adapters::BasicAdapter
-	attr_accessor :adapter
+  # Specify adapter for connection to DB
+  # By default it's ActiveRedis::Adapters::BasicAdapter
+  attr_accessor :adapter
 
+  # Specify log
+  # By default it's ActiveRedis::Logs::ConsoleLog
+  attr_accessor :log
 end

data/lib/active_redis/connection_ext/finders_layer.rb

@@ -1,20 +1,29 @@
+require 'active_redis/logs/query_logger'
+
 module ActiveRedis::ConnectionExt
   module FindersLayer
 
+    def self.included(base)
+      base.send :extend, ActiveRedis::Logs::QueryLogger
+      base.loggable :run_query_analyzer
+    end
+
     def fetch_row(model, id)
-      adapter.hgetall model.table_name(id)
+      fetch_where(model, id: id).first
     end
 
     def fetch_keys(model)
+      ActiveRedis.log.write "Calling ActiveRedis::ConnectionExt::FindersLayer::fetch_keys(#{model.name})"
       adapter.keys model.key_name
     end
 
     def fetch_where(model, params)
+      ActiveRedis.log.write "Calling ActiveRedis::ConnectionExt::FindersLayer::fetch_where(#{model.name}, #{params})"
       run_eval :where, [model.key_name], params.flatten
     end
 
-    def fetch_all(model)
-      fetch_where model, {}
+    def run_query_analyzer(model, params = ["", "", ""])
+      run_eval :query_analyzer, [model.key_name, Time.now.to_i], params
     end
 
   end