blombo 0.3 → 0.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4. Redis list commands
+
 v0.3. Enable multi-threading
 
 v0.2. Couple of utility new methods

data/README

@@ -1,4 +1,4 @@
-Blombo
+kBlombo
 -------
 
 Treat redis-server like a deep ruby hash.
@@ -47,23 +47,30 @@ range of ruby hash methods:
 
 Blombo only saves the object back into redis if the []= method is used. 
 Assignment must always be used to save to db.  This means you should
-maintain ruby objects like arrays carefully:
+maintain ruby objects carefully:
+
+  $blombo[:servers] = {:name => 'web1'}
+  $blombo[:servers].merge!(:ip => '10.0.0.1')
+  $blombo[:servers]  # => {:name=>"web1"}   # oops
+
+
+Redis List types
+----------------
+
+Treat blombo like an array and it'll marshal data to a redis list type.
+
+  $blombo.servers = [1,2]
+  $blombo.servers << 3
+  $blombo.servers.shift   # => 1
+  $blombo.servers.last    # => 3
 
-  $blombo.servers[:list] = ["web1"]
-  $blombo.servers[:list] << "web2"
-  $blombo.servers[:list]
-  #=> ["web1"]               #oops
 
-  $blombo.servers[:list] += ["web2"]
-  $blombo.servers[:list]
-  #=> ["web1", "web2"]       #ahh!
-  
 
 Other Redis types
 -----------------
 
-What if I don't want a Redis hash?  Thats OK - Blombo passes through redis
-commands curried with the key as the first parameter:
+What if I need a specific redis command?  Thats OK - Blombo passes through
+redis commands curried with the key as the first parameter:
 
 This:    $blombo.joblist.rpush('job1')
 Equals:  $redis.rpush('blombo:ServerApp:joblist', 'job1')

data/blombo.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "blombo"
-  s.version = "0.3"
+  s.version = "0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2012-02-19"
+  s.date = "2012-04-05"
   s.description = "Blombo: Treat redis-server like a deep ruby hash"
   s.email = "andrew@modulus.org"
   s.extra_rdoc_files = ["CHANGELOG", "README", "lib/blombo.rb"]

data/lib/blombo.rb

@@ -76,20 +76,11 @@ class Blombo
     @name
   end
 
-  def []=(key, val)
-    redis.hset(blombo_key, key.to_s, self.class.to_redis_val(val))
-  end
   
   def defined?(key)
     redis.exists(key.to_s)
   end
 
-  def [](key)
-    if(val = redis.hget(blombo_key, key.to_s))
-      self.class.from_redis_val(val)
-    end
-  end
-
   def nil?
     empty?
   end
@@ -99,23 +90,31 @@ class Blombo
   end
 
   def to_hash
-    redis.hgetall(blombo_key)
+    keys.inject({}) {|h,k| h.merge!(k => self[k]) }
   end
 
   def each(*args, &bl)
-    to_hash.each(*args, &bl)
+    if(type == 'list')
+      lrange(0, -1).map {|va| each(*args, &bl) }
+    else
+      to_hash.each(*args, &bl)
+    end
   end
 
   def to_a
-    redis.hgetall(blombo_key).to_a
+    if(type == 'list')
+      lrange(0, -1).map {|val| self.class.from_redis_val(val) }
+    else
+      to_hash.to_a
+    end
   end
 
   def keys
-    self.class.redis.hkeys(blombo_key)
+    hkeys
   end
 
   def values
-    self.class.redis.hvals(blombo_key).map {|v| self.class.from_redis_val(v) }
+    hvals.map {|v| self.class.from_redis_val(v) }
   end
   
   def clear
@@ -130,14 +129,96 @@ class Blombo
     if Blombo.redis.respond_to?(meth)
       Blombo.redis.send(meth, blombo_key, *params, &bl)
     elsif params.empty? && meth =~ /^[a-z_][a-z0-9_]*$/i
-      Blombo.new("#{@name}:#{meth}", self)
+      key(meth)
+    elsif params.length == 1 && meth =~ /^(.*)=$/
+      if Hash === params[0]
+        key($1).del
+        params[0].each {|k,val| key($1)[k] = val }
+      elsif Enumerable === params[0]
+        key($1).del
+        params[0].each {|val| key($1).push(val) }
+      else
+        raise TypeError.new('Blombo setters must be sent a Hash or Array')
+      end
     else
       super(meth, *params, &bl)
     end
   end
+  
+  def key(*args)
+    Blombo.new("#{@name}:#{args.join(':')}", self)
+  end
 
   def blombo_children
-    self.class.redis.keys("#{blombo_key}:*").map {|k| Blombo.new(k.gsub(/^blombo:/,''), self) }
+    blombo_children_names.map {|k| Blombo.new(k, self) }
+  end
+
+  def blombo_children_names
+    self.class.redis.keys("#{blombo_key}:*").map {|k| k.gsub(/^blombo:/,'') }
+  end
+  
+  
+  def <<(x)
+    push(x)
+  end
+  
+  def push(*x)
+    rpush(*(x.map {|val| self.class.to_redis_val(val) }))
+  end
+  
+  def unshift(*x)
+    lpush(*(x.map {|val| self.class.to_redis_val(val) }))
+  end
+  
+  def first
+    if type == 'list'
+      self[0]
+    elsif(k = keys.first)
+      [k, self[k]]
+    end
+  end  
+
+  def last
+    if type == 'list'
+      self[-1]
+    elsif(k = keys.last)
+      [k, self[k]]
+    end
+  end  
+  
+  def length
+    llen
+  end
+  
+  def []=(key, val)
+    if type == 'list'
+      lset(key.to_i, self.class.to_redis_val(val))
+    else
+      hset(key.to_s, self.class.to_redis_val(val))
+    end
+  end
+
+  def [](key)
+    val = if(type == 'list')
+      lindex(key.to_i)
+    else
+      hget(key.to_s)
+    end
+    self.class.from_redis_val(val) if val
+  end
+
+  def shift
+    val = lpop
+    self.class.from_redis_val(val) if val
+  end
+
+  def pop
+    val = rpop
+    self.class.from_redis_val(val) if val
+  end
+  
+  def to_s
+    "#<#{blombo_key}>"
   end
   
 end

data/test/test_all.rb

@@ -11,7 +11,7 @@ class TestBlombo < Test::Unit::TestCase
     @blombo[:flibble] = "test123"
     @blombo['derp'] = 'test321'
     @blombo.deep[:firstname] = 'Herp'
-    @blombo.deep[:lastname] = 'Derpington'
+    @blombo.key('deep')[:lastname] = 'Derpington'
   end
   
   def test_defined
@@ -86,11 +86,21 @@ class TestBlombo < Test::Unit::TestCase
     assert_equal nil, @blombo.marshaltest[:nil]
   end
   
-  def test_redis_ops
-    @blombo.listy.rpush('job1')
-    @blombo.listy.rpush('job2')
-    assert_equal 2, $redis.llen('blombo:test:listy')
-    assert_equal ['job1', 'job2'], @blombo.listy.lrange(0, -1)
+  def test_redis_list_ops
+    @blombo.listy.push('job2')
+    @blombo.listy << 'job3'
+    @blombo.listy.unshift('job1')
+    assert_equal 3, $redis.llen('blombo:test:listy')
+    assert_equal ['job1', 'job2', 'job3'], @blombo.listy.to_a
+    assert_equal 'job1', @blombo.listy.first
+    assert_equal 'job3', @blombo.listy.last
+    assert_equal 'job1', @blombo.listy.shift
+    assert_equal 'job3', @blombo.listy.pop
+    assert_equal 1, @blombo.listy.length
+    
+    x = {['a', 'complex'] => 'type'}
+    @blombo.listy[0] = x
+    assert_equal x, @blombo.listy[0]
   end
   
   def test_redis_list_type
@@ -106,4 +116,21 @@ class TestBlombo < Test::Unit::TestCase
     assert_equal Blombo.asdf, Blombo.asdf
   end
   
+  def test_to_s
+    assert_equal '#<blombo:test>', @blombo.to_s
+  end
+  
+  def test_hash_setter
+
+    @blombo.myhash = {:a => 1}
+    assert_equal 1, @blombo.myhash[:a]
+  end
+  
+  def test_array_setter
+    @blombo.myarray << 'test'
+    @blombo.myarray = [:one, :two]
+    assert_equal :one, @blombo.myarray.first
+    assert_equal :two, @blombo.myarray.last
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blombo
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &78225710 !ruby/object:Gem::Requirement
+  requirement: &79947130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78225710
+  version_requirements: *79947130
 description: ! 'Blombo: Treat redis-server like a deep ruby hash'
 email: andrew@modulus.org
 executables: []