redis_assist 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa85c951b1af2427edd4810a0f66a741d105d09e
-  data.tar.gz: 7ed0c449fc3dbfe11e3a033ad4ca78eb03857b0f
+  metadata.gz: dfb1cde901db1c06163e7aaab7f8eec71007f8e8
+  data.tar.gz: ffd1186e43e0e85ed936ab08ce0cc264fde1cd76
 SHA512:
-  metadata.gz: 3525dbfaefc4d333297400e9852cab71a959a499cf6e58f5d1d8ae8efab896758fb36effe1aebbb8d1e88a782386119bc732ce8961ef23dd52129504e863aa0c
-  data.tar.gz: d3839bb4921a10d891847cd76789f96e3d40a6df49938c6aa70b3747caf709897f1414db45e13f35d31e2e5ecf3cde1f13f2658fddeb4fb50916238f02839cfb
+  metadata.gz: f11c0538e2b2e5825b9d04817e8f5c97ec4e31a65ecb2fed7b9eddb7d5b93402ac9014917c6e687639e9d168307e3c44b7e1c0c44647e36b4fb2e044612a6055
+  data.tar.gz: 5ca61fb2b41180426831e822b97a56b793a039275ca4929d7ba24228d6d1f2a22a2530927bce2e4dc674673b18041aca36ab5a0e470f44dbc1e33ffaced99b71

data/lib/redis_assist/associations.rb

@@ -0,0 +1,78 @@
+module RedisAssist
+  module Associations
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def has_many(name, opts={})
+        define_has_many(name, opts)
+      end
+
+      def belongs_to(name, opts={})
+        define_belongs_to(name, opts)
+      end
+
+      private
+
+      def define_has_many(name, opts={})
+        singular_name = StringHelper.singularize(name)
+        class_name    = opts[:class_name] ? opts[:class_name] : StringHelper.camelize(singular_name)
+
+        attr_persist("#{singular_name}_ids".to_sym, as: :list, default: [])
+
+        define_method(name) do
+          klass       = Module.const_get(class_name)
+          records     = instance_variable_get("@_#{name}")
+          return      records if records
+          record_ids  = send("#{singular_name}_ids")
+          records     = klass.find(record_ids)
+
+          instance_variable_set("@_#{name}", records)
+        end
+
+        define_method("#{name}=") do |records|
+          instance_variable_set("@_#{name}", records.collect(&:id))
+        end
+
+        define_method("add_#{singular_name}") do |record|
+          current_records = instance_variable_get("@_#{name}")
+
+          if record.respond_to?(StringHelper.underscore(self.class.name))
+            record.send("#{StringHelper.underscore(self.class.name)}=", self)
+          end
+
+          if record.new_record?
+            record.save 
+          end
+
+          if current_records
+            current_records << record
+          else
+            current_records = [record]
+          end
+
+          send("#{singular_name}_ids") << record.id
+        end
+      end
+
+      def define_belongs_to(name, opts={})
+        class_name = opts[:class_name] ? opts[:class_name] : StringHelper.camelize(name)
+        attr_persist("#{name}_id".to_sym, as: :integer, default: nil)
+
+        define_method(name) do
+          klass = Module.const_get(class_name)
+          record = instance_variable_get("@_#{name}")
+          return record if record
+          record = klass.find(send("#{name}_id"))
+          instance_variable_set("@_#{name}", record)
+        end
+
+        define_method("#{name}=") do |record|
+          send("#{name}_id=", record.id)
+          instance_variable_set("@_#{name}", record)
+        end
+      end
+    end
+  end
+end

data/lib/redis_assist/base.rb

@@ -3,11 +3,14 @@ module RedisAssist
 
     include Callbacks
     include Validations
+    include Associations
   
-    before_create {|instance| instance.created_at = Time.now.to_f if instance.respond_to?(:created_at) }
-    before_update {|instance| instance.updated_at = Time.now.to_f if instance.respond_to?(:updated_at) }
-    after_delete  {|instance| instance.deleted_at = Time.now.to_f if instance.respond_to?(:deleted_at) }
-    after_create  {|instance| instance.new_record = false }
+    def self.inherited(base)
+      base.before_create {|record| record.send(:created_at=, Time.now.to_f) if record.respond_to?(:created_at) }
+      base.before_update {|record| record.send(:updated_at=, Time.now.to_f) if record.respond_to?(:updated_at) }
+      base.after_delete  {|record| record.send(:deleted_at=, Time.now.to_f) if record.respond_to?(:deleted_at) }
+      base.after_create  {|record| record.send(:new_record=, false) }
+    end
  
     class << self
 
@@ -19,7 +22,7 @@ module RedisAssist
         elsif opts[:as].eql?(:hash)
           define_hash(name)
         else
-          define_field(name)
+          define_attribute(name)
         end
       end
 
@@ -201,7 +204,7 @@ module RedisAssist
         end
       end
 
-      def define_field(name)
+      def define_attribute(name)
         define_method(name) do 
           self.class.transform(:from, name, attributes[name])
         end
@@ -216,9 +219,9 @@ module RedisAssist
     attr_reader :id
   
     def initialize(attrs={})
-      @attributes = {}
-      self.lists  = {}
-      self.hashes = {}
+      self.attributes = {}
+      self.lists      = {}
+      self.hashes     = {}
   
       if attrs[:id]
         self.id = attrs[:id]
@@ -236,7 +239,7 @@ module RedisAssist
         attrs.delete(name)
       end
   
-      raise "RedisAssist: #{self.class.name} does not support fields: #{attrs.keys.join(', ')}" if attrs.length > 0
+      raise "RedisAssist: #{self.class.name} does not support attributes: #{attrs.keys.join(', ')}" if attrs.length > 0
     end
   
     def saved?
@@ -255,7 +258,7 @@ module RedisAssist
 
       redis.multi do
         # build the arguments to pass to redis hmset
-        # and insure the fields are explicitely declared
+        # and insure the attributes are explicitely declared
         attribute_args = hash_to_redis(attributes)
  
         redis.hmset(key_for(:attributes), *attribute_args)

data/lib/redis_assist/config.rb

@@ -3,7 +3,7 @@ module RedisAssist
     class << self
       def redis_client
         return @redis_client if @redis_client
-        redis_config      = { :host => '127.0.0.1', :driver => :hiredis } 
+        redis_config      = { :host => '127.0.0.1' } 
         self.redis_client = Redis.new(redis_config) 
       end
 

data/lib/redis_assist/version.rb

@@ -1,3 +1,3 @@
 module RedisAssist
-  VERSION = '0.3.0' unless defined?(::RedisAssist::VERSION)
+  VERSION = '0.4.0' unless defined?(::RedisAssist::VERSION)
 end

data/lib/redis_assist.rb

@@ -2,12 +2,12 @@ $LOAD_PATH << File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__F
 
 require 'time'
 require 'redis'
-require 'uuid'
 require 'json'
 require 'redis_assist/config'
 require 'redis_assist/transform'
 require 'redis_assist/callbacks'
 require 'redis_assist/validations'
+require 'redis_assist/associations'
 require 'redis_assist/base'
 
 # == Setup & Configuration
@@ -17,12 +17,25 @@ require 'redis_assist/base'
 module RedisAssist
   module StringHelper
     def self.underscore(str)
-      str.gsub(/::/, '/').
+      str.to_s.gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
         gsub(/([a-z\d])([A-Z])/,'\1_\2').
         tr("-", "_").
         downcase
     end
+
+    def self.camelize(str)
+      str.to_s.split('_').map{|e| e.capitalize}.join
+    end
+
+    # TODO: Would love to integrate a special-cases singulizer/pluralizer without adding dependencies.
+    def self.singularize(str)
+      str.to_s.gsub(/s$/, '')
+    end
+
+    def self.pluralize(str)
+      "#{str}s"
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_assist
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tyler Love
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,56 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
-  name: hiredis
+  name: inflections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 3.2.12.20130314
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.6
-- !ruby/object:Gem::Dependency
-  name: base62
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 3.2.12.20130314
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/redis_assist/associations.rb
 - lib/redis_assist/base.rb
 - lib/redis_assist/callbacks.rb
 - lib/redis_assist/config.rb