redis_backed_model 0.0.2 → 0.0.3

data/lib/redis_backed_model/redis_backed_model.rb

@@ -13,12 +13,9 @@ module RedisBackedModel
     
     def to_redis
       redis_commands = []
-      redis_commands << redis_set_command
+      redis_commands << id_set_command
       instance_variables.each do | var |
-        redis_commands << instance_variable_to_redis(var) if instance_variable_to_redis(var)
-      end
-      scores.each do |score|
-        redis_commands << score.to_redis
+        build_command_for_variable(var, redis_commands)
       end
       redis_commands
     end
@@ -40,18 +37,29 @@ module RedisBackedModel
         @scores << SortedSet.new(self.class, id, Hash[key,value])
       end
       
+      def build_command_for_variable(variable, collection)
+        value = instance_variable_get(variable)
+        if value.respond_to?(:each)
+          value.each do |redis_object|
+            collection << redis_object.to_redis
+          end
+        else
+          collection << instance_variable_to_redis(variable)
+        end
+      end
+
+      def id_set_command
+        "sadd|#{model_name_for_redis}_ids|#{id}"
+      end
+      
       def instance_variable_to_redis(instance_variable)
-        "hset #{model_name_for_redis}:#{id} #{instance_variable.to_s.deinstance_variableize} #{instance_variable_get(instance_variable.to_s)}" unless instance_variable.to_s == '@id'
+        "hset|#{model_name_for_redis}:#{id}|#{instance_variable.to_s.deinstance_variableize}|#{instance_variable_get(instance_variable.to_s)}"
       end
         
       def model_name_for_redis
         class_as_string = self.class.to_s.demodulize.underscore        
       end
-        
-      def redis_set_command
-        "sadd #{model_name_for_redis}_ids #{id}"
-      end
-      
+              
   end
     
 end

data/lib/redis_backed_model/sorted_set.rb

@@ -11,7 +11,7 @@ module RedisBackedModel
     end
   
     def to_redis
-      "zadd #{key} #{score} #{member}"
+      "zadd|#{key}|#{score}|#{member}"
     end
   
     private

data/lib/redis_backed_model/version.rb

@@ -1,3 +1,3 @@
 module RedisBackedModel
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/redis_backed_model/sorted_set_spec.rb

@@ -44,8 +44,8 @@ describe RedisBackedModel::SortedSet do
     @scored_set.send(:member).should eq(@scored_set.send(:model_id))
   end
 
-  it "returns 'zadd key value model_id' as to_redis" do 
-    @scored_set.to_redis.should eq('zadd false_classes_for_foo_by_bar:wibble wobble 1')
+  it "returns 'zadd|key|value|model_id' as to_redis" do 
+    @scored_set.to_redis.should eq('zadd|false_classes_for_foo_by_bar:wibble|wobble|1')
   end
   
 end

data/spec/redis_backed_model_spec.rb

@@ -7,14 +7,14 @@ describe RedisBackedModel do
   end
   
   before(:each) do
-    @attributes = {}
+    @attributes_with_id = {}
     @size = rand(9) + 1
     key_seed = 'abcdefghijklmn'
     (1..@size).each do | i |
-      key  = key_seed[i..(rand(i)+i)] 
-      @attributes[key] = i
+      key  = key_seed[i..(rand(i)+i)]
+      @attributes_with_id[key] = i
     end
-    @attributes['id'] = 1
+    @attributes_with_id['id'] = 1
     @size += 1
   end
   
@@ -30,9 +30,9 @@ describe RedisBackedModel do
   end
 
   it "creates an instance variable for each member of an attribute hash that doesn't have scores" do
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
+    rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
     rbm.instance_variables.count.should eq(@size)
-    @attributes.each do | key, value|
+    @attributes_with_id.each do | key, value|
       # rbm.instance_variables.include?("@#{key}".to_sym).should eq(true), "no instance variable for #{key}"
       rbm.instance_variables.include?(key.instance_variableize).should eq(true), "no instance variable for #{key}"      
     end
@@ -43,25 +43,27 @@ describe RedisBackedModel do
     expect { RedisBackedModel::RedisBackedModel.new(['w', 1]) }.to raise_error(ArgumentError)
   end
   
-  it "does not create a key for any score_[|] attribute" do 
-    score_key = 'score_[foo|bar]'
-    @attributes[score_key]  = '[1|2]'
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
-    rbm.instance_variables.include?(score_key.instance_variableize).should eq(false)
-  end
+  context "initializing with the attribute hash contains a score_[|] key" do 
+    before(:each) do 
+      @score_key = 'score_[foo|bar]'
+      @attributes_with_id[@score_key]  = '[1|2]'
+    end
+    it "does not create a key for any score_[|] attribute" do 
+      rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
+      rbm.instance_variables.include?(@score_key.instance_variableize).should eq(false)
+    end
   
-  it "creates a scores instance variable if there are any score_[x|y] attributes" do
-    score_key = 'score_[foo|bar]'
-    @attributes[score_key]  = '[1|2]'
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
-    rbm.instance_variables.include?('scores'.instance_variableize).should eq(true)    
+    it "creates a scores instance variable if there are any score_[x|y] attributes" do
+      rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
+      rbm.instance_variables.include?('scores'.instance_variableize).should eq(true)    
+    end
   end
 
-  it "stores score_ attributes in scores as SortedSet objects" do
+  it "stores score_ attributes as SortedSet objects in scores" do
     ['score_[foo|bar]', 'score_[baz|qux]', 'score_[wibble|wobble]'].each_with_index do |score,index|
-      @attributes[score]  = "[#{index}|#{index + 1}]"
+      @attributes_with_id[score]  = "[#{index}|#{index + 1}]"
     end
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
+    rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
     rbm.send(:scores).each do |score|
       score.class.should eq(RedisBackedModel::SortedSet)
     end
@@ -69,70 +71,62 @@ describe RedisBackedModel do
 
   it "does not add near matches to scores instance variable, so it tries to add it as an instance variable instead, raising a name error because of []" do
     ['score_[foobar]', 'score[foo|bar]', 'score_[foobar|]'].each_with_index do |s,i|
-      @attributes[s] = '[i|i+1]'
-      expect { rbm = RedisBackedModel::RedisBackedModel.new(@attributes) }.to raise_error(NameError)
+      @attributes_with_id[s] = '[i|i+1]'
+      expect { rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id) }.to raise_error(NameError)
     end
   end
     
-  it "returns a redis command to adds the model id to a set named (model_name)_ids" do 
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
-    rbm.send(:redis_set_command).should eq('sadd redis_backed_model_ids 1')    
+  it "returns a redis command to add the model id to a set named (model_name)_ids" do 
+    rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
+    rbm.send(:id_set_command).should eq('sadd|redis_backed_model_ids|1')    
   end
   
-  it "creates a hset command for instance variables that are not id" do 
-    rbm = RedisBackedModel::RedisBackedModel.new()
-    rbm.instance_variable_set('@id', 1)    
-    rbm.instance_variable_set('@foo', 20)
-    rbm.send(:instance_variable_to_redis, '@foo').should eq('hset redis_backed_model:1 foo 20')
-  end
+  context "creating an hset command for an instance variable" do
+    before(:each) do 
+      @rbm = RedisBackedModel::RedisBackedModel.new()
+      @rbm.instance_variable_set('@id', 1)    
+      @rbm.instance_variable_set('@foo', 20)      
+    end
+    it "creates a hset command for instance variables" do 
+      @rbm.send(:instance_variable_to_redis, '@foo').should eq('hset|redis_backed_model:1|foo|20')
+    end
 
-  it "puts a underscored version of the model name as the first part of the hset key name in instance_variable_set" do 
-    rbm = RedisBackedModel::RedisBackedModel.new()
-    rbm.instance_variable_set('@id', 1)    
-    rbm.instance_variable_set('@foo', 20)
-    hset_command = rbm.send(:instance_variable_to_redis, '@foo')
-    hset_command.split(' ')[1].split(':')[0].should eq(RedisBackedModel.to_s.underscore)
-  end
+    it "puts a underscored version of the model name as the first part of the hset key name in instance_variable_set" do 
+      hset_command = @rbm.send(:instance_variable_to_redis, '@foo')
+      hset_command.split('|')[1].split(':')[0].should eq(RedisBackedModel.to_s.underscore)
+    end
 
-  it "puts the id as the second part of the hset hset key name in instance_variable_set" do 
-    rbm = RedisBackedModel::RedisBackedModel.new()
-    rbm.instance_variable_set('@id', 1)    
-    rbm.instance_variable_set('@foo', 20)
-    hset_command = rbm.send(:instance_variable_to_redis, '@foo')
-    hset_command.split(' ')[1].split(':')[1].should eq(rbm.instance_variable_get('@id').to_s)  
-  end
+    it "puts the id as the second part of the hset hset key name in instance_variable_set" do 
+      hset_command = @rbm.send(:instance_variable_to_redis, '@foo')
+      hset_command.split('|')[1].split(':')[1].should eq(@rbm.instance_variable_get('@id').to_s)  
+    end
   
-  it "puts the instance_variable_name (without @) as the hset field name in instance_variable_set" do
-    rbm = RedisBackedModel::RedisBackedModel.new()
-    rbm.instance_variable_set('@id', 1)    
-    rbm.instance_variable_set('@foo', 20)
-    hset_command = rbm.send(:instance_variable_to_redis, '@foo')
-    hset_command.split(' ')[2].should eq('foo') 
-  end
+    it "puts the instance_variable_name (without @) as the hset field name in instance_variable_set" do
+      hset_command = @rbm.send(:instance_variable_to_redis, '@foo')
+      hset_command.split('|')[2].should eq('foo') 
+    end
   
-  it "put the instance variable value as the hset value in instance_variable_set" do 
-    rbm = RedisBackedModel::RedisBackedModel.new()
-    rbm.instance_variable_set('@id', 1)    
-    rbm.instance_variable_set('@foo', 20)
-    hset_command = rbm.send(:instance_variable_to_redis, '@foo')
-    hset_command.split(' ')[3].should eq('20') 
+    it "put the instance variable value as the hset value in instance_variable_set" do 
+      hset_command = @rbm.send(:instance_variable_to_redis, '@foo')
+      hset_command.split('|')[3].should eq('20') 
+    end
+    
+    it "only ever has 4 arguments" do
+      @rbm.instance_variable_set('@bar', 'string with spaces')
+      hset_command = @rbm.send(:instance_variable_to_redis, '@bar')
+      hset_command.split('|').count.should eq(4)
+    end
   end
   
-  it "does not create an hset command for the id instance variable" do
-    rbm = RedisBackedModel::RedisBackedModel.new()
-    rbm.instance_variable_set('@id', 1)    
-    rbm.send(:instance_variable_to_redis, '@id').should eq(nil)
-  end
-
   it "includes as sadd command in to_redis" do
-    @attributes['score_[foo|bar]']  = '[1|2012-03-04]'
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
+    @attributes_with_id['score_[foo|bar]']  = '[1|2012-03-04]'
+    rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
     rbm.to_redis.select { |command| command.match(/sadd/)}.count.should eq(1)
   end
   
-  it "includes a hset command for each instance variable except id in to_redis" do
-    @attributes['score_[foo|bar]']  = '[1|2012-03-04]'
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
+  it "includes a hset command for each instance variable except scores in to_redis" do
+    @attributes_with_id['score_[foo|bar]']  = '[1|2012-03-04]'
+    rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
     expected = rbm.instance_variables.count - 1
     rbm.to_redis.select {|command| command.match(/hset/)}.count.should eq(expected)
   end
@@ -140,11 +134,23 @@ describe RedisBackedModel do
   it "includes a sorted_set.to_redis command for each score attribute in to_redis" do 
     scores = ['score_[foo|bar]', 'score_[baz|qux]', 'score_[wibble|wobble]']
     scores.each_with_index do |score,index|
-      @attributes[score]  = "[#{index}|#{index + 1}]"
+      @attributes_with_id[score]  = "[#{index}|#{index + 1}]"
     end
-    rbm = RedisBackedModel::RedisBackedModel.new(@attributes)
+    rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
     rbm.to_redis.select { |command| command.match(/zadd/) }.count.should eq(scores.count)
   end
+  
+  it "should not error if there are no scores" do
+    rbm = RedisBackedModel::RedisBackedModel.new(@attributes_with_id)
+    rbm.to_redis.select { |command| command.include?('score')}.count.should eq(0)
+  end
+
+  it "should convert symbol attributes to strings" do
+    attributes = {:id => 1, :first_name => 'jane', :last_name => 'doe'}
+    rbm = RedisBackedModel::RedisBackedModel.new(attributes)
+    rbm.instance_variables.include?(:@id).should eq(true)
+    rbm.instance_variable_get(:@id).should eq(1)
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_backed_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000Z
+date: 2012-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153616260 !ruby/object:Gem::Requirement
+  requirement: &2156372240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153616260
+  version_requirements: *2156372240
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2153615840 !ruby/object:Gem::Requirement
+  requirement: &2156371820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153615840
+  version_requirements: *2156371820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153615420 !ruby/object:Gem::Requirement
+  requirement: &2156371400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153615420
+  version_requirements: *2156371400
 description: Provides methods to models that are backed by a redis instance.
 email:
 - iwhitney@ssa-i.org