active_redis 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGYyYjNmN2ZjY2FhNjgyNmI0MDk0ZjYxZmM1YzhiMmUzOGVmMjQzNA==
+    MDI3NjI4MjQwYjg4NmI4YTQzMjk1Y2RkYTdmMzk1ZDA3MWM4YjM0OA==
   data.tar.gz: !binary |-
-    Y2ZjMWYwODllNjMwMWQzMDg0MTRiMWIzYjY1YjFjZTI5MDUxNzg3Nw==
+    MDdjN2ViZGVlODZhNDdkMGQ1OWRmNWQ3NzE5ZGY1MGQ2NzkzMGFiOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGRjOWU0YzI3YTZhZDVjZmFiNjJhOGE1NzY1ZmFjNDQ5MmNkODZkNTlkMzVl
-    NWJiNTBhMTM4ZjQzMzMzMDY4OWJkMGNkOTZjYzc4NTEyZTgwZjZkNjdmYjJm
-    MjRmZTk0NmEzZjdkZTc3NzlhNWU1YWNiNTZmNWRlZjk4MTJmZDU=
+    MTliYzEyZDQxOTgxY2MyZWVhZjlmOTg5MTZkMjk3OWMwZjVhMmU4MzQyMDJj
+    Y2U0YzA3MTEyYTk5ZWU2OWQwYWM1ZWFhMTU1ZTIzNzY0ZDBkNDFkMjIyMWU5
+    NGM5NzEzOGFmZjA2MDU1MDIzNzNkYWVjNmRkNjg1M2VmNGM0NjQ=
   data.tar.gz: !binary |-
-    OGQxNzY5YWQwYWE0YTdlZjJmYTQyNDEwYWE5Yjc4ZjRiZTdiNWVkZDc1MThm
-    ZmMyNzA3YzMzMzY5MThhMDZmMzY5NzhhNmQ4ZTM4NTY5ZmI1OTkwYWVjZGQ4
-    MWVmYmM4MTZhZWY1YTcyNTk1ZTUzNTE2NTU0ZDc2MjgxMDk1YTg=
+    Y2ZlMzRiYzAzNjJkMmRmY2RkZjFkNGFlMmEzMWFkNWMxYWE3NGVhZTVlNWVh
+    ZDY5Yjk4ZWFlZTU4MmUyZmI2ZDUxOGQyNjkxM2IyNTY3OWJlMWQzZmNhZDJk
+    YThiMmE4ZDMyMGI5YjY3Yjk0MmI5NzliYWI3NTc0ODlkZGVmYmU=

data/README.md

@@ -20,9 +20,11 @@ Or install it yourself as:
 
 ### Basic usage
 
+In model you may add attributes with next types: __string__, __integer__, __time__
+
 ```ruby
 class Article < ActiveRedis::Base
-  attributes :title, :link
+  attributes title: :string, link: :string
 end
 ```
 
@@ -93,7 +95,7 @@ Also gem add support for some aggregation functions like __sum__, __min__, __max
 
 ```ruby
 class Article < ActiveRedis::Base
-  attributes :link, :title, :views
+  attributes link: :string, title: :string, views: :integer
 end
 
 Article.create(views: 1000, link: "http://someblog.com/1", title: "Title article")
@@ -122,7 +124,7 @@ rails g active_redis:model ModelName attribute1 attribute2
 For example:
 
 ```bash
-Sergeys-MacBook-Pro-2:test_active_redis sergey$ rails g active_redis:model User name city
+Sergeys-MacBook-Pro-2:test_active_redis sergey$ rails g active_redis:model User name:string city:string
   create  app/models/user.rb
 ```
 
@@ -130,18 +132,10 @@ The result is app/models/user.rb with stub content
 
 ```ruby
 class User < ActiveRedis::Base
-  attributes :name, :city
+  attributes name: :string, city: :string
 end
 ```
 
-### Future work
-
-At an early time I want to implement such features:
-
-1. Setting/getting attributes with it's types
-2. Relational Operators in where
-3. Scopes???
-
 ## Contributing
 
 1. Fork it

data/lib/active_redis/associations.rb

@@ -28,7 +28,7 @@ module ActiveRedis
       end
 
       def belongs_to(name)
-        define_attributes_accessors "#{name.to_s}_id"
+        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

data/lib/active_redis/attributes/attribute.rb

@@ -0,0 +1,17 @@
+module ActiveRedis
+  module Attributes
+
+    class Attribute
+
+      def self.load(value)
+        raise NotImplementedError
+      end
+
+      def self.dump(value)
+        raise NotImplementedError
+      end
+
+    end
+
+  end
+end

data/lib/active_redis/attributes/integer_attribute.rb

@@ -0,0 +1,15 @@
+module ActiveRedis
+  module Attributes
+    class IntegerAttribute < Attribute
+
+      def self.load(value)
+        value.to_i
+      end
+
+      def self.dump(value)
+        value.to_s
+      end
+
+    end
+  end
+end

data/lib/active_redis/attributes/string_attribute.rb

@@ -0,0 +1,15 @@
+module ActiveRedis
+  module Attributes
+    class StringAttribute < Attribute
+
+      def self.load(value)
+        value.to_s
+      end
+
+      def self.dump(value)
+        value.to_s
+      end
+
+    end
+  end
+end

data/lib/active_redis/attributes/time_attribute.rb

@@ -0,0 +1,15 @@
+module ActiveRedis
+  module Attributes
+    class TimeAttribute < Attribute
+
+      def self.load(value)
+        Time.at(value.to_i)
+      end
+
+      def self.dump(value)
+        value.to_i.to_s
+      end
+
+    end
+  end
+end

data/lib/active_redis/attributes.rb

@@ -1,4 +1,7 @@
+Dir[File.dirname(__FILE__) + '/attributes/*.rb'].each {|file| require file }
+
 module ActiveRedis
+
   module Attributes
 
     def self.included(base)
@@ -12,7 +15,7 @@ module ActiveRedis
     end
 
     def attributes
-      self.class.defined_attributes.inject({}) do |hash, attribute|
+      self.class.attributes_list.inject({}) do |hash, attribute|
         hash[attribute.to_sym] = self.send(attribute.to_s)
         hash
       end
@@ -20,37 +23,51 @@ module ActiveRedis
 
     module ClassMethods
 
-      def attributes(*attrs)
-        attrs = attrs.concat(ActiveRedis::Constants::DEFAULT_ATTRIBUTES)
+      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
-        self.defined_attributes ||= []
+        self.defined_attributes ||= {}
         define_attributes_accessors attrs
       end
 
       def define_attributes_accessors(attrs)
-        attrs = *attrs unless attrs.is_a?(Array)
-        attrs.each do |attribute|
+        attrs.each do |attribute, type|
+          next unless register_attribute(attribute, type)
           read_attribute attribute
           write_attribute attribute
-          register_attribute attribute
         end
       end
 
+      def attributes_list
+        self.defined_attributes.keys.map(&:to_s)
+      end
+
       private
 
-      def register_attribute(attribute)
-        self.defined_attributes << attribute unless self.defined_attributes.include?(attribute)
+      def register_attribute(attribute, type)
+        return 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
+        }
+      end
+
+      def attribute_class(attribute)
+        attr_class = self.defined_attributes[attribute.to_sym][:class]
       end
 
       def read_attribute(attribute)
         define_method attribute do
-          instance_variable_get("@#{attribute}")
+          klass = self.class.send :attribute_class, attribute
+          klass.load(instance_variable_get("@#{attribute}"))
         end
       end
 
       def write_attribute(attribute)
         define_method "#{attribute}=" do |value|
-          instance_variable_set("@#{attribute}", value)
+          klass = self.class.send :attribute_class, attribute
+          klass.dump(instance_variable_set("@#{attribute}", value))
         end
       end
 

data/lib/active_redis/base.rb

@@ -4,6 +4,7 @@ require 'active_redis/persistence'
 require 'active_redis/naming'
 require 'active_redis/calculations'
 require 'active_redis/finders'
+require 'active_redis/inspector'
 
 # TODO: Add Expiring module
 
@@ -16,6 +17,7 @@ module ActiveRedis
     include Attributes
     include Associations
     include Persistence
+    include Inspector
 
   end
 end

data/lib/active_redis/constants.rb

@@ -5,7 +5,7 @@ module ActiveRedis
 
     SAVE_SUCCESS_ANSWER = "OK"
 
-    DEFAULT_ATTRIBUTES = [:id, :created_at, :updated_at]
+    DEFAULT_ATTRIBUTES = {id: :integer, created_at: :time, updated_at: :time}
 
   end
 end

data/lib/active_redis/inspector.rb

@@ -0,0 +1,11 @@
+module ActiveRedis
+  module Inspector
+
+    def inspect
+      string = "#<#{self.class.name}:#{self.object_id} "
+      fields = self.class.attributes_list.map{|field| "#{field}: #{self.send(field)}"}
+      string << fields.join(", ") << ">"
+    end
+
+  end
+end

data/lib/active_redis/persistence.rb

@@ -25,15 +25,15 @@ module ActiveRedis
     private
 
       def fill_attributes
-        self.id ||= ActiveRedis.connection.next_id(self.class)
-        self.created_at ||= Time.now.to_i
-        self.updated_at = Time.now.to_i
+        self.id         ||= ActiveRedis.connection.next_id(self.class)
+        self.created_at ||= Time.now
+        self.updated_at   = Time.now
       end
 
       def prepare_hash
         fill_attributes
-        self.class.defined_attributes.inject({}) do |hash, attribute|
-          hash[attribute] = self.send("#{attribute}"); hash
+        self.class.attributes_list.inject({}) do |hash, attribute|
+          hash[attribute.to_sym] = self.send("#{attribute}"); hash
         end
       end
 

data/lib/active_redis/version.rb

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

data/lib/generators/active_redis/model/model_generator.rb

@@ -3,7 +3,7 @@ require 'generators/active_redis'
 module ActiveRedis
   module Generators
     class ModelGenerator < Base
-      argument :actions, type: :array, default: [], banner: "attribute attribute"
+      argument :actions, type: :array, default: [], banner: "attribute:type attribute:type"
 
       def create_model
         template 'model.rb', File.join('app/models', "#{file_name}.rb")

data/lib/generators/active_redis/model/templates/model.rb

@@ -1,3 +1,3 @@
 class <%= class_name %> < ActiveRedis::Base
-  attributes <%= actions.map{|a| ":#{a}"}.join(", ") %>
+  attributes <%= actions.map{|a| str = a.split(':'); "#{str[0]}: :#{str[1]}"}.join(", ") %>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_redis
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sergey Gernyak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,10 @@ files:
 - lib/active_redis/adapters/basic_adapter.rb
 - lib/active_redis/associations.rb
 - lib/active_redis/attributes.rb
+- lib/active_redis/attributes/attribute.rb
+- lib/active_redis/attributes/integer_attribute.rb
+- lib/active_redis/attributes/string_attribute.rb
+- lib/active_redis/attributes/time_attribute.rb
 - lib/active_redis/base.rb
 - lib/active_redis/calculations.rb
 - lib/active_redis/config.rb
@@ -109,6 +113,7 @@ files:
 - lib/active_redis/errors.rb
 - lib/active_redis/finders.rb
 - lib/active_redis/helpers/lua_scripts.rb
+- lib/active_redis/inspector.rb
 - lib/active_redis/lua_scripts/main.lua
 - lib/active_redis/naming.rb
 - lib/active_redis/persistence.rb