blendris 0.5 → 0.6

data.tar.gz.sig

@@ -0,0 +1,2 @@
+iq��T��)�6�/���‚C���#�hF�������Y"�t���%^���x�֦;�{�/J��]M�3���>�At*.IM�s6�'�/�:Wĩ����TSu�2�
+n��/��q��5��j�+Q��

data/Manifest

@@ -21,6 +21,7 @@ lib/blendris/utils.rb
 script/console
 script/destroy
 script/generate
+spec/integer_spec.rb
 spec/list_spec.rb
 spec/model_spec.rb
 spec/redis-tools_spec.rb
@@ -29,4 +30,3 @@ spec/set_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 spec/string_spec.rb
-tasks/rspec.rake

data/README.markdown

@@ -6,7 +6,8 @@ http://github.com/alexmchale/blendris
 
 # DESCRIPTION #
 
-Blendris is a Ruby interface to a Redis database.
+Blendris is a Ruby interface to a Redis database.  It performs no caching,
+causing all reads and writes to interact directly with Redis.
 
 
 
@@ -58,33 +59,74 @@ Let's say we want to maintain a list of employers and employees.
       ref :employer, :class => "Employer", :reverse => :employees
     end
 
+And now some examples of using them:
+
+    >> captain = Employee.create("Captain Amazing")
+    => #<Employee:0x45d18084 @key="employee:Captain_Amazing">
+
+    >> captain.address = "123 Fake Street"
+    => "123 Fake Street"
+
+    >> guild = Employer.create("The Really Fantastic Guild of Heroes")
+    => #<Employer:0x476e46f5 @key="employer:The_Really_Fantastic_Guild_of_Heroes">
+
+    >> guild.employees << captain
+    => #<Blendris::RedisReferenceSet:0x500150a0 @key="employer:The_Really_Fantastic_Guild_of_Heroes:employees", ...>
+
+    >> guild.employees.first.address
+    => "123 Fake Street"
+
+    >> guild.employees.count
+    => 1
+
+    >> guild.employees.first.employer.employees.first.name
+    => "Captain Amazing"
+
 ### key ###
 
-Key sets the base key for this object.  In the case of the employer
-"37 Signals" it would create a key "employer:37_Signals" and set its value
-to "Employer".  In the key, strings are interpreted as literals and
-symbols are interpreted as pointers to that data field.
+Key sets the base key for this object.
 
-* Note that spaces are converted to underscores, as spaces are not
-  allowed in Redis keys.  This could cause problems in some data sets.
-* Also note that the value assigned to the base key is the class name of
-  the model being used.
+* Any strings in the key will be used as literal strings.
+* Any symbols in the key will be set to the value of that field in this object.
+* In the case of the employer "37 Signals" it would create a key
+  "employer:37_Signals" and set its value to "Employer".
+* Note that spaces are converted to underscores, as spaces are not allowed in
+  Redis keys.  This could cause problems in some data sets.
+* Also note that the value assigned to the base key is the class name of the
+  model being used.
 * Only strings and integers should be used as key values.
 
+Examples of keys in use:
+
+    >> employer = Employer.create("37 Signals")
+    => #<Employer:0x169da74 @key="employer:37_Signals">
+
+    >> employer.key
+    => "employer:37_Signals"
+
+    >> employer.name
+    => "37 Signals"
+
+    >> employer[:name]
+    => #<Blendris::RedisString:0x20dbd794 @key="employer:37_Signals:name", ...>
+
+    >> employer[:name].key
+    => "employer:37_Signals:name"
+
 ### string ###
 
 String creates a string key named for the first parameter given to it.
 This means that it would generate a key "employer:37_Signals:name" with
 a value of "37 Signals".
 
-### refs ###
+### ref and refs ###
 
-Refs maintains a set of references to other objects.
+Refs maintain references to other objects.
 
 * *:class* will limit objects in this reference set to the given class.
   If a string is specified as a class, it will be constantized before
   comparing.
-* *reverse* will cause the given field to be updated on the object when
+* *:reverse* will cause the given field to be updated on the object when
   it is added to or removed from this set.
 
 ### new vs create ###
@@ -96,7 +138,77 @@ the list of symbols in your *key* field.
 Calling the *new* method will instantiate an existing object using the
 given *key* as the base key.
 
+Calling *create* on an object key that already exists is perfectly acceptable
+and only results in new Ruby objects being instantiated.  They will all read
+and write to the same Redis data.  Calling *new* however must be done on a
+Redis key that already exists and is set to the name of the requested model.
+
+    >> Employer.create("Giant Faceless Corporation")
+    => #<Employer:0x45a84b38 @key="employer:Giant_Faceless_Corporation">
+
+    >> Employer.create("Giant Faceless Corporation")
+    => #<Employer:0x12b8501d @key="employer:Giant_Faceless_Corporation">
+
+    >> Employer.create("Giant Faceless Corporation")
+    => #<Employer:0x742136c6 @key="employer:Giant_Faceless_Corporation">
+
+    >> Employer.new("Anything")
+    TypeError: Anything does not exist, not a Employer - you may want create instead of new
+            from .../blendris/lib/blendris/model.rb:25:in `initialize'
+            from (irb):32:in `new'
+            from (irb):32
+
+    >> Employer.new("employer:Giant_Faceless_Corporation")
+    => #<Employer:0x73cb4cae @key="employer:Giant_Faceless_Corporation">
+
+    >> Employee.create("Invisible Woman")
+    => #<Employee:0x5f27a49c @key="employee:Invisible_Woman">
+
+    >> Employer.new("employee:Invisible_Woman")
+    TypeError: employee:Invisible_Woman is a Employee, not a Employer
+            from /Users/amchale/Dropbox/Projects/blendris/lib/blendris/model.rb:26:in `initialize'
+            from (irb):36:in `new'
+            from (irb):36
+
+### on_change ###
+
+This keyword allows you to execute a block when one or more fields on the
+object change.  The block is executed within the context of the object.
+
+    class Dog < Blendris::Model
+      key "dog", :name
+
+      string  :name
+      string  :color
+      integer :attention
+      integer :food
+
+      on_change do
+        puts "Bark, bark!"
+      end
+
+      on_change :attention, :food do
+        puts "Woof, woof!"
+      end
+    end
+
+    >> d = Dog.create("Spot")
+    Bark, bark!
+    => #<Dog:0x000001011739e8 @key="dog:Spot">
+
+    >> d.attention = 0
+    Bark, bark!
+    Woof, woof!
+    => 0
+
+    >> d.color = "brown"
+    Bark, bark!
+    => "brown"
 
+    >> d[:attention].increment
+    Bark, bark!
+    Woof, woof!
+    => 1
 
 # LICENSE #
 

data/Rakefile

@@ -1,15 +1,15 @@
 require "rubygems"
+require "rubygems/commands/push_command"
 
 gem "echoe", ">= 4.1"
 gem "redis", ">= 0.1.2"
 
 require "echoe"
-
 require "redis"
 require "fileutils"
 require "./lib/blendris"
 
-Echoe.new("blendris", "0.5") do |p|
+Echoe.new("blendris", "0.6") do |p|
 
   p.description              = "A redis library for Ruby"
   p.url                      = "http://github.com/alexmchale/blendris"

data/blendris.gemspec

@@ -2,20 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blendris}
-  s.version = "0.5"
+  s.version = "0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex McHale"]
-  s.date = %q{2010-02-21}
+  s.cert_chain = ["/Users/alexmchale/Dropbox/Security/gem-public_cert.pem"]
+  s.date = %q{2010-02-27}
   s.description = %q{A redis library for Ruby}
   s.email = %q{alexmchale@gmail.com}
-  s.extra_rdoc_files = ["README.markdown", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb", "tasks/rspec.rake"]
-  s.files = ["History.txt", "Manifest", "PostInstall.txt", "README.markdown", "Rakefile", "autotest/discover.rb", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb", "script/console", "script/destroy", "script/generate", "spec/list_spec.rb", "spec/model_spec.rb", "spec/redis-tools_spec.rb", "spec/ref_spec.rb", "spec/set_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "tasks/rspec.rake", "blendris.gemspec"]
+  s.extra_rdoc_files = ["README.markdown", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb"]
+  s.files = ["History.txt", "Manifest", "PostInstall.txt", "README.markdown", "Rakefile", "autotest/discover.rb", "lib/blendris.rb", "lib/blendris/accessor.rb", "lib/blendris/errors.rb", "lib/blendris/integer.rb", "lib/blendris/list.rb", "lib/blendris/model.rb", "lib/blendris/node.rb", "lib/blendris/reference.rb", "lib/blendris/reference_base.rb", "lib/blendris/reference_set.rb", "lib/blendris/set.rb", "lib/blendris/string.rb", "lib/blendris/types.rb", "lib/blendris/utils.rb", "script/console", "script/destroy", "script/generate", "spec/integer_spec.rb", "spec/list_spec.rb", "spec/model_spec.rb", "spec/redis-tools_spec.rb", "spec/ref_spec.rb", "spec/set_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "blendris.gemspec"]
   s.homepage = %q{http://github.com/alexmchale/blendris}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Blendris", "--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{blendris}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
+  s.signing_key = %q{/Users/alexmchale/Dropbox/Security/gem-private_key.pem}
   s.summary = %q{A redis library for Ruby}
 
   if s.respond_to? :specification_version then

data/lib/blendris/accessor.rb

@@ -1,5 +1,47 @@
 module Blendris
 
+  class << self
+
+    attr_accessor :host, :port, :database
+
+    # Specify the host to connect to for the Redis connection.
+    def host=(host)
+      @host = host || "localhost"
+      $_redis_connection = nil
+    end
+
+    # Specify the port to connect to for the Redis connection.
+    def port=(port)
+      @port = port.to_i
+      @port = 6379 unless (1 .. 65535).include? @port
+      $_redis_connection = nil
+    end
+
+    # Specify the database number to use in the Redis database.
+    def database=(index)
+      @database = index.to_i
+      $_redis_connection = nil
+    end
+
+    # Retrieve the connection to the current Redis database.
+    def redis
+      parms =
+        {
+          :host => @host,
+          :port => @port,
+          :db   => @database
+        }
+
+      $_redis_connection ||= Redis.new(parms)
+    end
+
+    # This will delete all keys in the current database.  Dangerous!
+    def flushdb
+      redis.flushdb
+    end
+
+  end
+
   # This module serves as a gateway to the Redis library.  Any object
   # that needs to access Redis directly should include it.
 
@@ -8,11 +50,11 @@ module Blendris
     include Utils
 
     def redis
-      RedisAccessor.redis
+      Blendris.redis
     end
 
     def self.redis
-      $_redis_connection ||= Redis.new
+      Blendris.redis
     end
 
     # Generate a key for the given model class with the given values list.
@@ -28,10 +70,15 @@ module Blendris
         when Symbol
           value = values[value_index]
           value_index += 1
-
           raise ArgumentError.new("#{self.name} created without #{symbol}") unless value
 
-          klass.cast_value symbol, value
+          options = klass.redis_symbols[symbol.to_s]
+          raise ArgumentError.new("#{self.name} is missing its #{symbol}") unless options
+
+          subklass = options[:type]
+          raise ArgumentError.new("#{symbol} (#{subklass.name}) cannot be used in the key") unless subklass.respond_to? :cast_to_redis
+
+          subklass.cast_to_redis value, options
 
         else
           raise TypeError.new("only strings and symbols allowed in key definition for #{klass.name} (#{symbol.class.name})")
@@ -42,16 +89,6 @@ module Blendris
       end.compact.join(":")
     end
 
-    # Change which database we're accessing in Redis.
-    def self.database=(index)
-      $_redis_connection = Redis.new(:db => index.to_i)
-    end
-
-    # This will delete all keys in the current database.  Dangerous!
-    def self.flushdb
-      redis.flushdb
-    end
-
     # Build a new temporary set with the given contents, yielding it to
     # the passed block.  After the block exits, destroy the temporary set.
     def in_temporary_set(*contents)
@@ -59,8 +96,12 @@ module Blendris
 
       temporary_set = RedisSet.new("blendris:temporary:set:#{index}")
       temporary_set << contents
-      yield temporary_set
-      temporary_set.clear
+
+      begin
+        yield temporary_set
+      ensure
+        temporary_set.clear
+      end
 
       self
     end

data/lib/blendris/errors.rb

@@ -1,5 +1,3 @@
 module Blendris
 
-  class BlendrisCannotSetKeyValue < Exception; end
-
 end

data/lib/blendris/integer.rb

@@ -3,9 +3,7 @@ module Blendris
   # RedisInteger is a string-value in Redis wrapped up to make
   # sure that it is used as an integer.
 
-  class RedisInteger
-
-    include RedisNode
+  class RedisInteger < RedisNode
 
     def self.cast_to_redis(value, options = {})
       raise TypeError.new("#{value.class.name} is not an integer") unless value.kind_of? Fixnum
@@ -19,10 +17,14 @@ module Blendris
 
     def increment
       redis.incr key
+    ensure
+      notify_changed
     end
 
     def decrement
       redis.decr key
+    ensure
+      notify_changed
     end
 
   end

data/lib/blendris/list.rb

@@ -2,9 +2,8 @@ module Blendris
 
   # RedisList is a wrapper for the Redis LIST data type.
 
-  class RedisList
+  class RedisList < RedisNode
 
-    include RedisNode
     include Enumerable
 
     def initialize(key, options = {})
@@ -13,6 +12,18 @@ module Blendris
       @on_change = options[:on_change]
     end
 
+    def set(*values)
+      # Remove all of the old values.
+      self.clear
+
+      # Add all of the new values.
+      self << values
+
+      self
+    ensure
+      notify_changed
+    end
+
     def each
       redis.lrange(key, 0, -1).each do |value|
         yield value

data/lib/blendris/model.rb

@@ -40,34 +40,14 @@ module Blendris
       Digest::SHA1.hexdigest key
     end
 
-    # TODO: Create the methods in the initialize method instead of depending
-    # on method_missing to dispatch to the correct methods.  This will make
-    # these objects better for mocking and stubbing.
-    def method_missing(method_sym, *arguments)
-      (name, setter) = method_sym.to_s.scan(/(.*[^=])(=)?/).first
-
-      if node = redis_symbol(name)
-        if setter
-          if self.class.local_parameters.find {|p| p.kind_of?(Symbol) && p.to_s == name}
-            raise BlendrisCannotSetKeyValue.new(name)
-          end
-
-          return node.set(*arguments)
-        else
-          return node.get
-        end
-      end
-
-      super
-    end
-
     # Look up the given symbol by its name.  The list of symbols are defined
     # when the model is declared.
-    # TODO: This can also probably go away when I remove the need for method_missing.
-    def redis_symbol(name)
+    def [](name)
+      name = name.to_s
+
       subkey = self.subkey(name)
 
-      options = self.class.redis_symbols[name.to_s]
+      options = self.class.redis_symbols[name]
 
       return unless options
 
@@ -76,7 +56,6 @@ module Blendris
 
       options[:type].new subkey, options
     end
-    alias :[] :redis_symbol
 
     # Calculate the key to address the given child node.
     def subkey(child)
@@ -136,7 +115,7 @@ module Blendris
         obj = new(key, :verify => false)
 
         parameters.each_with_index do |parm, i|
-          obj.redis_symbol(parm).set args[i]
+          obj[parm].set args[i]
         end
 
         obj
@@ -156,7 +135,7 @@ module Blendris
       end
 
       def index_key
-        "index:model:#{self.name}"
+        "blendris:index:model:#{self.name}"
       end
 
       # Defines a new data type for Blendris:Model construction.
@@ -168,6 +147,18 @@ module Blendris
 
             options[:type] = klass
             redis_symbols[varname] = options
+
+            # Declare the getter for this field.
+            define_method(varname) do
+              self[varname].get
+            end
+
+            # Declare the setter for this field, if it is not a key field.
+            unless local_parameters.find {|p| p.to_s == varname}
+              define_method("#{varname}=") do |value|
+                self[varname].set value
+              end
+            end
           end
         end
       end
@@ -182,14 +173,6 @@ module Blendris
         @local_parameters ||= []
       end
 
-      # Take a value and attempt to make it fit the given field.
-      def cast_value(symbol, value)
-        options = redis_symbols[symbol.to_s]
-        raise ArgumentError.new("#{self.name} is missing its #{symbol}") unless options
-
-        options[:type].cast_to_redis value, options
-      end
-
       # Define a block to call when one of the given symbol values changes.
       def on_change(*symbols, &block)
         symbols.flatten!

data/lib/blendris/node.rb

@@ -2,12 +2,19 @@ module Blendris
 
   # RedisNode is used to compose all Redis value wrapper classes.
 
-  module RedisNode
+  class RedisNode
 
     include RedisAccessor
 
     attr_reader :key
 
+    # Initialize a new node, which represents a basic Redis data object.
+    #
+    # === Parameters ===
+    #
+    # * :on_change - Pass a block to be run within the context of this object
+    #   when its value is changed.
+    # * :default - Use the given value as a default value.
     def initialize(key, options = {})
       @key = sanitize_key(key)
       @default = options[:default]
@@ -19,6 +26,12 @@ module Blendris
       end
     end
 
+    # Set this object's value to be the given value.
+    #
+    # * The method cast_to_redis should be overridden by classes that
+    #   include this module, as it is used to determine how to convert
+    #   the given value to a redis string.
+    # * The on_change block is always called after this method.
     def set(value)
       if value
         redis.set key, self.class.cast_to_redis(value, @options)
@@ -29,14 +42,22 @@ module Blendris
       notify_changed
     end
 
+    # Retrieve the value of this object and cast it.
+    #
+    # * The method cast_from_redis should be overridden by classes that
+    #   include this module.  It is used to convert the redis string
+    #   to this specific object type.
     def get
       self.class.cast_from_redis redis.get(self.key), @options
     end
 
+    # Rename this key to the given new key name.
     def rename(newkey)
       redis.rename @key, sanitize_key(newkey)
 
       @key = newkey
+    ensure
+      notify_changed
     end
 
     def clear

data/lib/blendris/reference.rb

@@ -5,8 +5,6 @@ module Blendris
 
   class RedisReference < RedisReferenceBase
 
-    include RedisNode
-
     def ref
       @ref ||= RedisString.new(@key)
     end

data/lib/blendris/reference_base.rb

@@ -3,17 +3,15 @@ module Blendris
   # RedisReferenceBase holds the methods that are common to
   # RedisReference objects and RedisReferenceSet objects.
 
-  class RedisReferenceBase
+  class RedisReferenceBase < RedisNode
 
-    include RedisNode
     extend RedisAccessor
 
     def initialize(key, options = {})
+      super key, options
+
       @model = options[:model]
-      @key = sanitize_key(key)
       @reverse = options[:reverse]
-      @options = options
-      @on_change = options[:on_change]
 
       @klass = options[:class] || Model
       @klass = constantize(camelize @klass) if @klass.kind_of? String
@@ -25,14 +23,14 @@ module Blendris
 
     def apply_reverse_add(value)
       if @reverse && value
-        reverse = value.redis_symbol(@reverse)
+        reverse = value[@reverse]
         reverse.assign_ref(@model) if !reverse.references @model
       end
     end
 
     def apply_reverse_delete(value)
       if @reverse && value
-        reverse = value.redis_symbol(@reverse)
+        reverse = value[@reverse]
         reverse.remove_ref(@model) if reverse.references @model
       end
     end

data/lib/blendris/reference_set.rb

@@ -5,7 +5,6 @@ module Blendris
 
   class RedisReferenceSet < RedisReferenceBase
 
-    include RedisNode
     include Enumerable
 
     def refs
@@ -13,8 +12,21 @@ module Blendris
     end
 
     def set(*objs)
-      refkeys = objs.flatten.compact.map {|o| o.key}
-      self.refs.set refkeys
+      objs.flatten!
+      objs.compact!
+
+      # Delete reference keys that were removed.
+      self.each do |obj|
+        unless objs.include? obj
+          apply_reverse_delete obj
+        end
+      end
+
+      # Clear the current set.
+      self.refs.clear
+
+      # Add the new objects to the set.
+      self << objs
 
       self
     ensure

data/lib/blendris/set.rb

@@ -2,9 +2,8 @@ module Blendris
 
   # RedisSet is a wrapper to the Redis SET data type.
 
-  class RedisSet
+  class RedisSet < RedisNode
 
-    include RedisNode
     include Enumerable
 
     def initialize(key, options = {})

data/lib/blendris/string.rb

@@ -2,9 +2,7 @@ module Blendris
 
   # RedisString is a wrapper to the Redis string data type.
 
-  class RedisString
-
-    include RedisNode
+  class RedisString < RedisNode
 
     def self.cast_to_redis(value, options = {})
       raise TypeError.new("#{value.class.name} is not a string") unless value.kind_of? String

data/spec/integer_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "redis integers" do
+
+  it "should always be an integer" do
+    @onion.calories.should == 0
+    @onion.calories = 450
+    @onion.calories.should == 450
+    @onion[:calories].increment.should == 451
+    @onion.calories.should == 451
+    @onion[:calories].decrement.should == 450
+    @onion.calories.should == 450
+  end
+
+end

data/spec/list_spec.rb

@@ -14,4 +14,10 @@ describe "redis lists" do
     @onion.sales.to_a.should == %w( to-tom to-tom )
   end
 
+  it "should be able to be set to a new list" do
+    @onion.sales = %w( one two three )
+    @onion.sales.count.should == 3
+    @onion.sales.to_a.should == %w( one two three )
+  end
+
 end

data/spec/model_spec.rb

@@ -22,8 +22,11 @@ describe Model do
   end
 
   it "should not allow its key values to be changed" do
-    lambda { @onion.name = "asdf" }.should raise_exception(BlendrisCannotSetKeyValue)
-    lambda { @onion.description = "asdf" }.should_not raise_exception
+    @onion.should respond_to :name
+    @onion.should_not respond_to :name=
+
+    @onion.should respond_to :description
+    @onion.should respond_to :description=
   end
 
   it "should have a valid reference set" do
@@ -225,4 +228,8 @@ describe Model do
     lambda { o.refs << o }.should raise_exception TestEx
   end
 
+  it "should be ok when you have sets and lists in the key" do
+    lambda { WeirdKeyModel.create([ "ok" ], [ "weird" ]) }.should raise_exception(ArgumentError)
+  end
+
 end

data/spec/ref_spec.rb

@@ -35,6 +35,15 @@ describe "references" do
     @fruit.foods.count.should == 0
     @onion.category.should == @vegetable
 
+    @vegetable.foods = [ @apple, @lemon, @lemon ]
+    @vegetable.foods << @apple
+    @vegetable.foods.count.should == 2
+    @vegetable.foods.should be_include @apple
+    @vegetable.foods.should be_include @lemon
+    @apple.category.should == @vegetable
+    @lemon.category.should == @vegetable
+    @onion.category.should == nil
+
   end
 
 end

data/spec/spec_helper.rb

@@ -75,6 +75,13 @@ module TestFixtures
     on_change { raise TestEx.new }
   end
 
+  class WeirdKeyModel < Blendris::Model
+    key "setkey", :myset, "listkey", :mylist
+
+    set :myset
+    list :mylist
+  end
+
   class TestEx < Exception; end
 
 end
@@ -83,8 +90,8 @@ Spec::Runner.configure do |config|
   include TestFixtures
 
   config.before(:each) do
-    RedisAccessor.database = 11
-    RedisAccessor.flushdb
+    Blendris.database = 11
+    Blendris.flushdb
 
     @vegetable = Category.create("vegetable")
     @onion = Food.create("onion")
@@ -99,7 +106,8 @@ Spec::Runner.configure do |config|
   end
 
   config.after(:each) do
-    RedisAccessor.flushdb
+    Blendris.database = 11
+    Blendris.flushdb
   end
 end
 

metadata

@@ -1,15 +1,40 @@
 --- !ruby/object:Gem::Specification 
 name: blendris
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Alex McHale
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDAphbGV4
+  bWNoYWxlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMTAwMjExMjEyNTU4WhcNMTEwMjExMjEyNTU4WjBBMRMwEQYDVQQDDAph
+  bGV4bWNoYWxlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9mTbsd+4JqyuW
+  z/J6OxXyyzb89ydr/wKmJZMyQmD7w/Qf3V8uGW9+NlYbRMJZYqY08QhTbSX3IW6c
+  6Hj4Xo0wqR0Fd6c0Vxdt9m5LZDEo2H+2jisgDBYFUN1itg+FGZtGczISlmG34tWN
+  efWA+DgtzKD9UG13AtzxoxfqeY03v0+/1/SCtpvbZrungWND8sg9sHSxsME0xB9d
+  u6BkunOrdy7iqd105MuPHL35SLhr57GKU/hjR2+FKAauT4eu7CeQXEWCBPXizknN
+  5w/HNs311sBJmzaZwDiX98e+/X10tMxJqWo4t4Us7Ke8b/0uYbuwWoaoKWjM3UYX
+  ppWhyNNFAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBQK0Aj0bDKnLJrVNjdgNAXnVaS1qDANBgkqhkiG9w0BAQUFAAOCAQEAU/1kVZUf
+  wjl9bhqLZXgcKgIkzgVYwDcqFE0OdBXFD/N+oNBfV80iN/R8iCf6y4dymYDzWalD
+  Rho49BN531OSYbWAD0lv5/MQYDpH8uHU4cDTzV1cYkOcjFVGsO26aPM7q1SoMhf+
+  8tCJEl/PSHrV6JmgGRDy6YTnbQGSKPNmykEZep8wWEFXMSW9OmwaeyZyEuWUZIS4
+  RtAGR/Bf1/mwYLD0ZZPvsgRy0yBrTeJoaRzJXCT08cN8xBX9sa+PFsjpc267TFsv
+  b0cDNnwAzS78yK9xMdpD5l7/mqtfdQPVLfvra4sMBknSW3ukOP3S/WUOfKOz7Ohf
+  V3OoCfxVK/4Dqg==
+  -----END CERTIFICATE-----
 
-date: 2010-02-21 00:00:00 -06:00
+date: 2010-02-27 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +60,6 @@ extra_rdoc_files:
 - lib/blendris/string.rb
 - lib/blendris/types.rb
 - lib/blendris/utils.rb
-- tasks/rspec.rake
 files: 
 - History.txt
 - Manifest
@@ -60,6 +84,7 @@ files:
 - script/console
 - script/destroy
 - script/generate
+- spec/integer_spec.rb
 - spec/list_spec.rb
 - spec/model_spec.rb
 - spec/redis-tools_spec.rb
@@ -68,7 +93,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/string_spec.rb
-- tasks/rspec.rake
 - blendris.gemspec
 has_rdoc: true
 homepage: http://github.com/alexmchale/blendris
@@ -88,18 +112,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: blendris
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A redis library for Ruby

metadata.gz.sig

@@ -0,0 +1 @@
+���C:��F�E�����8���t6?��9CI�������X=�4�ƨ�[i1b���no�X�������pE�`����C��2�aօ�N�P5�~xuX�M�n|8Qڷ��iR�G�ɕ�܋fD���󌇕���bq�A��������
����iB%�OV�ެ�0DF����-
J@�}�4�-�#ū�M�8l�;^���h�7b�_�5T6)����q������K�����q^�>n�����z{�S��r
JpK����

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end