active_redis 0.0.2 → 0.0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjMwYzRjYzgwNGQzN2U4MTk4MDc0NGVhNzE5YmUzOWEyNjZjNmQ0Mw==
+    YWEwZjlmY2YyODRkNTY3ZTU3NmVlZTlkOTFhNDU0MTM5NjMwNGY3NQ==
   data.tar.gz: !binary |-
-    MmYwMzc0ZGI0YmZjMzczMTU2MTI0MzE2YzMyMjU0YTU3NDg2ZGQyNA==
+    YzNmNjQwZGVhNDVmOTdlZWNmNTM4OTdhNmY2NzhiZTI4YmU2MDUyYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzM1ZDAzMzZmMTE2ZjIxNTYxYzIzNTdhZjhkYzA0ZWM5OTljYmY2ZjM4NzEw
-    ZTEwYjZkMDg0NDJhYmNkODNiNmU5NjM1MDQ5N2FmZDk2NDQzODBmNjRhYTY1
-    NGI0MzA3YjM3MWQ2YTUwMWM0ZGZhOTgyZDQ1NGFjMjFkYmRiMDY=
+    ZjIyZDkwNDk5ODIyMmIzMDEzNzdlZjA3NWIzZmI1MmE5ZDU4YTJhMGYyNDA0
+    YTRlNjJhMWUwNDY0YTdmMjQ4NTdkMmU5MWY5ZDNlNjY5ZmZiYzE1ODk1NGI1
+    NWZjZDk2ZGI2N2ZhYmJhMmI1ZDZjN2U4YTY3ZDU0MTZhYzQ1NzY=
   data.tar.gz: !binary |-
-    MjNmMTdiYWY1M2E3OWFiOWRlMTRlYzg3MmM5Mzg2MDQwYjg5YmQyMjM1Mjll
-    NzUzYjI4ZmU1OWIyMmZkYTgyZTY1NTUyZmI3OWY4ZjRhNjQ2YTBiZjFiYTM5
-    ZjliYWE0ODM0MDkxMTVmOWI0NWI1YjMzMTc4NjMxMWI2ZjkzOGY=
+    ZTRjYTNjY2EwNTNkMTEwOWQwOGJkMjJlZGMxNjdhY2FmODdhYjMxNDNmNTY3
+    Y2ExZTFkMmQ3OGU3NTQ1YmUyNWM4NjFkNWU4ODI3Njg3MjczYjBiZDAzYzZm
+    ZjkzNzE1MDllYTY4N2E5ZTFkZWIxMjQ5YjYxMWQzN2YwZWFjMWU=

data/lib/active_redis/associations.rb

@@ -7,9 +7,13 @@ module ActiveRedis
 
     module ClassMethods
 
-      # TODO: add has_one functionality
-      def has_one
-
+      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
       end
 
       # TODO: add has_many functionality
@@ -18,8 +22,14 @@ module ActiveRedis
       end
 
       # TODO: add belongs_to functionality
-      def belongs_to
-
+      def belongs_to(name)
+        define_attributes_accessors "#{name.to_s}_id"
+        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
       end
 
     end

data/lib/active_redis/attributes.rb

@@ -6,7 +6,8 @@ module ActiveRedis
     end
 
     def attributes=(value)
-      raise ActiveRedis::InvalidArgumentError, "Value must be a Hash" unless value.is_a? Hash
+      raise ActiveRedis::InvalidArgumentError, "Value must be a Hash or Array" if !value.is_a?(Hash) && !value.is_a?(Array)
+      value = Hash[*value] if value.is_a?(Array)
       value.each { |attribute, value| self.send("#{attribute}=", value) }
     end
 
@@ -21,18 +22,36 @@ module ActiveRedis
 
       def attributes(*attrs)
         attrs = attrs.concat(ActiveRedis::Constants::DEFAULT_ATTRIBUTES)
+        class << self; attr_accessor :defined_attributes; end
+        self.defined_attributes ||= []
+        define_attributes_accessors attrs
+      end
+
+      def define_attributes_accessors(attrs)
+        attrs = *attrs unless attrs.is_a?(Array)
         attrs.each do |attribute|
-          define_method "#{attribute}=" do |value|
-            instance_variable_set("@#{attribute}", value)
-          end
-          define_method attribute do
-            instance_variable_get("@#{attribute}")
-          end
+          read_attribute attribute
+          write_attribute attribute
+          register_attribute attribute
+        end
+      end
+
+      private
+
+      def register_attribute(attribute)
+        self.defined_attributes << attribute unless self.defined_attributes.include?(attribute)
+      end
+
+      def read_attribute(attribute)
+        define_method attribute do
+          instance_variable_get("@#{attribute}")
         end
-        class << self
-          attr_accessor :defined_attributes
+      end
+
+      def write_attribute(attribute)
+        define_method "#{attribute}=" do |value|
+          instance_variable_set("@#{attribute}", value)
         end
-        self.defined_attributes = attrs
       end
 
     end

data/lib/active_redis/connection.rb

@@ -9,6 +9,7 @@ module ActiveRedis
 
     include ActiveRedis::ConnectionExt::FindersLayer
     include ActiveRedis::ConnectionExt::PersistenceLayer
+    include ActiveRedis::ConnectionExt::ScriptsLayer
 
     calculations ActiveRedis::Constants::CALCULATION_METHODS
 
@@ -18,5 +19,11 @@ module ActiveRedis
 
     attr_accessor :adapter
 
+    private
+
+    def run_eval(type, keys = [], argv = [])
+      adapter.eval send("#{type}_script"), keys: keys, argv: argv
+    end
+
   end
 end

data/lib/active_redis/connection_ext/calculations_layer.rb

@@ -12,7 +12,7 @@ module ActiveRedis::ConnectionExt
         methods.each do |method|
           eval_string += <<-EVAL
             def calculate_#{method}(model, attributes = "")
-              adapter.eval send("#{method}_script"), keys: [model.key_name], argv: [attributes]
+              run_eval :#{method}, [model.key_name], [attributes]
             end
           EVAL
         end

data/lib/active_redis/connection_ext/finders_layer.rb

@@ -2,7 +2,6 @@ module ActiveRedis::ConnectionExt
   module FindersLayer
 
     def fetch_row(model, id)
-      raise ActiveRedis::NotSpecifiedIdError, "Must specified ID for finding record!" unless id
       adapter.hgetall model.table_name(id)
     end
 
@@ -11,7 +10,11 @@ module ActiveRedis::ConnectionExt
     end
 
     def fetch_where(model, params)
-      adapter.eval where_script, keys: [model.key_name], argv: params.flatten
+      run_eval :where, [model.key_name], params.flatten
+    end
+
+    def fetch_all(model)
+      fetch_where model, {}
     end
 
   end

data/lib/active_redis/connection_ext/persistence_layer.rb

@@ -8,9 +8,8 @@ module ActiveRedis::ConnectionExt
 
     def next_id(model)
       table = model.info_table_name
-      create_info_table(model) unless @adapter.exists(table)
+      create_info_table(model) unless adapter.exists(table)
       adapter.hincrby table, "next_id", 1
-      adapter.hget table, "next_id"
     end
 
     def create_info_table(model)

data/lib/active_redis/connection_ext/scripts_layer.rb

@@ -0,0 +1,9 @@
+module ActiveRedis::ConnectionExt
+  module ScriptsLayer
+
+    def flush_script
+      adapter.script :flush
+    end
+
+  end
+end

data/lib/active_redis/finders.rb

@@ -2,12 +2,21 @@ module ActiveRedis
   module Finders
 
     def find(*ids)
-      ids.map { |id| self.new(ActiveRedis.connection.fetch_row(self, id)) }
+      res = ids.inject([]) do |result, id|
+        attrs = ActiveRedis.connection.fetch_row(self, id)
+        result << self.new(attrs) if attrs.any?
+        result
+      end
+      ids.count == 1 ? res.first : res
     end
 
     def where(params)
       ActiveRedis.connection.fetch_where(self, params).map { |attrs| self.new(attrs) }
     end
 
+    def all
+      ActiveRedis.connection.fetch_all(self).map { |attrs| self.new(attrs) }
+    end
+
   end
 end

data/lib/active_redis/helpers/lua_scripts.rb

@@ -1,3 +1,5 @@
+require 'active_redis/constants'
+
 module ActiveRedis
   module Helpers
     module LuaScripts

data/lib/active_redis/naming.rb

@@ -14,6 +14,10 @@ module ActiveRedis
       "#{self.name.downcase.pluralize}:info"
     end
 
+    def foreign_key_name
+      "#{self.name.downcase}_id"
+    end
+
   end
 
 end

data/lib/active_redis/persistence.rb

@@ -6,7 +6,7 @@ module ActiveRedis
     end
 
     def initialize(attrs = {})
-      self.attributes = Hash[*attrs]
+      self.attributes = attrs
     end
 
     def save

data/lib/active_redis/version.rb

@@ -1,3 +1,3 @@
 module ActiveRedis
-  VERSION = "0.0.2"
+  VERSION = "0.0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_redis
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3.1
 platform: ruby
 authors:
 - Sergey Gernyak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - lib/active_redis/connection_ext/calculations_layer.rb
 - lib/active_redis/connection_ext/finders_layer.rb
 - lib/active_redis/connection_ext/persistence_layer.rb
+- lib/active_redis/connection_ext/scripts_layer.rb
 - lib/active_redis/constants.rb
 - lib/active_redis/errors.rb
 - lib/active_redis/finders.rb