blendris 0.0.1 → 0.0.2

data/Manifest

@@ -1,9 +1,10 @@
 History.txt
 Manifest
 PostInstall.txt
-README.rdoc
+README.markdown
 Rakefile
 autotest/discover.rb
+blendris.gemspec
 lib/blendris.rb
 lib/blendris/accessor.rb
 lib/blendris/errors.rb

data/{README.rdoc → README.markdown}

@@ -1,59 +1,73 @@
-= blendris
+# Blendris #
 
 * http://github.com/alexmchale/blendris
 
-== DESCRIPTION:
+
+
+# DESCRIPTION #
 
 Blendris is a Ruby interface to a Redis database.
 
-== FEATURES/PROBLEMS:
 
-== SYNOPSIS:
 
-== REQUIREMENTS:
+# FEATURES/PROBLEMS #
+
+BLENDRIS IS IN VERY EARLY ALPHA!!!
+
+PLEASE DON'T USE IT FOR ANYTHING IMPORTANT YET!!!
+
+
+
+# REQUIREMENTS #
 
 * Blendris uses the redis RubyGem.
 
-== INSTALL:
+
+
+# INSTALL #
 
 * gem install blendris
 
-== EXAMPLES:
+
+
+# EXAMPLES #
 
 The following would create a Website model that knows its url and
 paths within the website.
 
-  class Website < Blendris::Model
-    key "website", :title
+    class Website < Blendris::Model
+      key "website", :title
 
-    string :title
-    string :url
-    set    :paths
-  end
+      string :title
+      string :url
+      set    :paths
+    end
 
-  website = Website.create("One Fake Website")
-  website.url = "http://fakewebsite.com"
-  website.paths << "/blog/index"
-  website.paths << "/admin/index"
+    website = Website.create("One Fake Website")
+    website.url = "http://fakewebsite.com"
+    website.paths << "/blog/index"
+    website.paths << "/admin/index"
 
 The above would create the following Redis keys:
 
-  website:One_Fake_Website       => "Website" (This identifies the model type)
-  website:One_Fake_Website:name  => "One Fake Website"
-  website:One_Fake_Website:url   => "http://fakewebsite.com"
-  website:One_Fake_Website:paths => [ "/blog/index", "/admin/index" ]
+    website:One_Fake_Website       => "Website" (This identifies the model type)
+    website:One_Fake_Website:name  => "One Fake Website"
+    website:One_Fake_Website:url   => "http://fakewebsite.com"
+    website:One_Fake_Website:paths => [ "/blog/index", "/admin/index" ]
 
 Now suppose we want to open the Website model back up to add a concept of sister sites:
 
-  class Website
-    refs :sister_sites, :class => Website, :reverse => :sister_sites
-  end
+    class Website
+      refs :sister_sites, :class => Website, :reverse => :sister_sites
+    end
 
 This will cause the website to maintain a set of other websites.  The reverse tag
 causes the other website's sister_sites set to be updated when it is added or removed
 from this site's list.
 
-== LICENSE:
+
+
+# LICENSE #
 
 (The MIT License)
 

data/Rakefile

@@ -5,10 +5,11 @@ gem "redis", ">= 0.1.2"
 
 require "echoe"
 
-require 'fileutils'
-require './lib/blendris'
+require "redis"
+require "fileutils"
+require "./lib/blendris"
 
-Echoe.new("blendris", "0.0.1") do |p|
+Echoe.new("blendris", "0.0.2") do |p|
 
   p.description              = "A redis library for Ruby"
   p.url                      = "http://github.com/alexmchale/blendris"

data/blendris.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blendris}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex McHale"]
@@ -10,10 +10,10 @@ Gem::Specification.new do |s|
   s.date = %q{2010-02-11}
   s.description = %q{A redis library for Ruby}
   s.email = %q{alexmchale@gmail.com}
-  s.extra_rdoc_files = ["README.rdoc", "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.rdoc", "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", "tasks/rspec.rake"]
+  s.files = ["History.txt", "Manifest", "PostInstall.txt", "README.markdown", "Rakefile", "autotest/discover.rb", "blendris.gemspec", "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"]
   s.homepage = %q{http://github.com/alexmchale/blendris}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Blendris", "--main", "README.rdoc"]
+  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}

data/lib/blendris.rb

@@ -5,6 +5,8 @@ module Blendris
   VERSION = '0.0.1'
 end
 
+require "redis"
+
 require "blendris/errors"
 require "blendris/utils"
 

data/lib/blendris/accessor.rb

@@ -1,5 +1,3 @@
-require 'redis'
-
 module Blendris
 
   module RedisAccessor

data/lib/blendris/model.rb

@@ -108,10 +108,12 @@ module Blendris
       # Defines a new data type for Blendris:Model construction.
       def type(name, klass)
         (class << self; self; end).instance_eval do
-          define_method name do |varname, options|
-            options ||= {}
+          define_method(name) do |*args|
+            varname = args.shift.to_s
+            options = args.shift || {}
+
             options[:type] = klass
-            redis_symbols[varname.to_s] = options
+            redis_symbols[varname] = options
           end
         end
       end

data/spec/redis-tools_spec.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe "redis connection accessor" do
 
   it "should connect for reading and writing" do
+    extend RedisAccessor
+
     testkey = prefix + "test-string"
 
     redis.get(testkey).should == nil

data/spec/spec_helper.rb

@@ -7,7 +7,9 @@ rescue LoadError
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'blendris'
+
+require "rubygems"
+require "./lib/blendris"
 
 include Blendris
 
@@ -59,10 +61,9 @@ module TestFixtures
 end
 
 Spec::Runner.configure do |config|
-  config.before(:each) do
-    extend RedisAccessor
-    extend TestFixtures
+  include TestFixtures
 
+  config.before(:each) do
     RedisAccessor.prefix = "blendris-spec:"
     RedisAccessor.flush_keys
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blendris
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alex McHale
@@ -41,7 +41,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.markdown
 - lib/blendris.rb
 - lib/blendris/accessor.rb
 - lib/blendris/errors.rb
@@ -61,9 +61,10 @@ files:
 - History.txt
 - Manifest
 - PostInstall.txt
-- README.rdoc
+- README.markdown
 - Rakefile
 - autotest/discover.rb
+- blendris.gemspec
 - lib/blendris.rb
 - lib/blendris/accessor.rb
 - lib/blendris/errors.rb
@@ -90,7 +91,6 @@ files:
 - spec/spec_helper.rb
 - spec/string_spec.rb
 - tasks/rspec.rake
-- blendris.gemspec
 has_rdoc: true
 homepage: http://github.com/alexmchale/blendris
 licenses: []
@@ -102,7 +102,7 @@ rdoc_options:
 - --title
 - Blendris
 - --main
-- README.rdoc
+- README.markdown
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement