redis-objects-rmap 0.0.1 → 0.1.0

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in redis-objects-rmap.gemspec
 gemspec
+
+gem 'sqlite3'
+gem 'activerecord'
+gem 'rspec'
+gem 'pry'

data/README.md

@@ -25,12 +25,26 @@ class Foo < ActiveRecord::Base
 end
 
 Foo.create! :title => 'foo'
-Foo.rmap # {'foo' => '1'} <- Does SQL request and puts to Redis
-Foo.rmap # {'foo' => '1'} <- Gets from Redis without SQL query
+Foo.rmap # {1 => 'foo'} <- Does SQL request and puts to Redis
+Foo.rmap # {1 => 'foo'} <- Gets from Redis without an SQL query
+```
+
+You can specify field to use as an ID source:
 
-Foo.create! :title => 'bar'
-Foo.rmap # {'foo' => '1', 'bar' => '2'} <- Does SQL request and puts to Redis
-Foo.rmap # {'foo' => '1', 'bar' => '2'} <- Gets from Redis without SQL query
+```ruby
+class Foo < ActiveRecord::Base
+  include Redis::Objects::RMap
+  has_rmap :title, :my_id
+end
+```
+
+Or even specify lambdas to prepare your cache:
+
+```ruby
+class Foo < ActiveRecord::Base
+  include Redis::Objects::RMap
+  has_rmap :title => lambda{|x| x.camelize}, :id => lambda{|x| x.to_s}
+end
 ```
 
 ## Contributing

data/lib/redis/objects/rmap/version.rb

@@ -1,7 +1,7 @@
 class Redis
   module Objects
     module Rmap
-      VERSION = "0.0.1"
+      VERSION = "0.1.0"
     end
   end
 end

data/lib/redis/objects/rmap.rb

@@ -1,3 +1,4 @@
+require 'active_support/concern'
 require 'redis/objects'
 require 'pry'
 
@@ -7,7 +8,7 @@ class Redis
       included do
         include Redis::Objects
 
-        cattr_accessor :rmap_title_field
+        class << self; attr_accessor :rmap_options; end
         value :rmap_storage, :global => true, :marshal => true
 
         after_save do
@@ -20,14 +21,40 @@ class Redis
       end
 
       module ClassMethods
-        def has_rmap(title_field)
-          self.rmap_title_field = title_field
+        def has_rmap(title=nil, id=nil)
+          options = {
+            :title => title,
+            :id    => id || :id
+          }.with_indifferent_access
+
+          raise "title can not be blank" if options[:title].blank?
+
+          self.rmap_options = {}.with_indifferent_access
+
+          %w(id title).each do |x|
+            if options[x].is_a?(Hash)
+              self.rmap_options["#{x}_field"] = options[x].keys[0].to_sym
+              self.rmap_options["#{x}_proc"]  = options[x].values[0]
+            else
+              self.rmap_options["#{x}_field"] = options[x].to_sym
+              self.rmap_options["#{x}_proc"]  = nil
+            end
+          end
         end
 
         def rmap_cache
-          models = self.select([:id, rmap_title_field]).map{|a|
-            [a.send(rmap_title_field), a.id.to_s]
-          }
+          models = self.select([rmap_options[:id_field], rmap_options[:title_field]]).map do |a|
+            data = []
+
+            %w(id title).each do |x|
+              value = a.send(rmap_options["#{x}_field"])
+              value = rmap_options["#{x}_proc"].call(value) unless rmap_options["#{x}_proc"].blank?
+
+              data << value
+            end
+
+            data
+          end
 
           self.rmap_storage = Hash[*models.flatten]
         end

data/redis-objects-rmap.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency "activesupport"
   gem.add_dependency "redis-objects"
 end

data/spec/lib/redis/objects/rmap_spec.rb

@@ -0,0 +1,84 @@
+require_relative '../../../spec_helper'
+
+describe Redis::Objects::RMap do
+  describe "Module" do
+    it "includes" do
+      class Model < ActiveRecord::Base
+        include Redis::Objects::RMap
+      end
+    end
+
+    it "requires title" do
+      expect {
+        class Foo < ActiveRecord::Base
+          include Redis::Objects::RMap
+          has_rmap
+        end
+      }.to raise_error
+    end
+  end
+
+  describe "Declaration" do
+    it "can be simple" do
+      class Foo < ActiveRecord::Base
+        include Redis::Objects::RMap
+        has_rmap 'foo'
+      end
+
+      Foo.rmap_options.should == {
+        "id_field" => :id,
+        "id_proc" => nil,
+        "title_field" => :foo,
+        "title_proc" => nil
+      }
+    end
+
+    it "can contain id" do
+      class Foo < ActiveRecord::Base
+        include Redis::Objects::RMap
+        has_rmap 'foo', :bar
+      end
+
+      Foo.rmap_options.should == {
+        "id_field" => :bar,
+        "id_proc" => nil,
+        "title_field" => :foo,
+        "title_proc" => nil
+      }
+    end
+
+    it "can contain lambdas" do
+      class Foo < ActiveRecord::Base
+        include Redis::Objects::RMap
+        has_rmap 'foo' => lambda{|x| x.to_s}
+      end
+
+      Foo.rmap_options[:title_proc].call(:test).should == 'test'
+    end
+  end
+
+  describe "Cache" do
+    it "works" do
+      class Foo < ActiveRecord::Base
+        include Redis::Objects::RMap
+        has_rmap 'name', :id => lambda{|x| x.to_s}
+      end
+
+      Foo.rmap_clear
+      Foo.rmap.should == {}
+
+      Foo.create! :name => "test1"
+      Foo.should_receive(:rmap_cache)
+      Foo.rmap
+      Foo.rspec_reset
+
+      Foo.rmap.should == {"1" => "test1"}
+      Foo.should_not_receive(:rmap_cache)
+      Foo.rmap
+      Foo.rspec_reset
+
+      Foo.destroy_all
+      Foo.rmap.should == {}
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'redis/objects/rmap'
+require 'active_record'
+
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+ActiveRecord::Migration.create_table :foos do |t|
+  t.string :name
+end
+
+RSpec.configure do |config|
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects-rmap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70093162372080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70093162372080
 - !ruby/object:Gem::Dependency
   name: redis-objects
-  requirement: &70207114757980 !ruby/object:Gem::Requirement
+  requirement: &70093162387240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207114757980
+  version_requirements: *70093162387240
 description: Adds fast-map to a AR model
 email:
 - boris@roundlake.ru
@@ -38,6 +49,8 @@ files:
 - lib/redis/objects/rmap.rb
 - lib/redis/objects/rmap/version.rb
 - redis-objects-rmap.gemspec
+- spec/lib/redis/objects/rmap_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/inossidabile/redis-objects-rmap
 licenses: []
 post_install_message: 
@@ -62,5 +75,7 @@ rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Adds fast-map to a AR model
-test_files: []
+test_files:
+- spec/lib/redis/objects/rmap_spec.rb
+- spec/spec_helper.rb
 has_rdoc: