sander6-daijobu 0.1.1 → 0.2.0

data/lib/daijobu.rb

@@ -1,12 +1,14 @@
 $:.unshift(File.dirname(__FILE__))
 require 'daijobu/errors'
 require 'daijobu/client'
+require 'daijobu/namespace_proxy'
 require 'daijobu/scheme_set'
 require 'daijobu/scheme'
-require 'daijobu/schemes/marshal'
+require 'daijobu/schemes/eval'
 require 'daijobu/schemes/json'
+require 'daijobu/schemes/marshal'
+require 'daijobu/schemes/raw'
 require 'daijobu/schemes/yaml'
-require 'daijobu/schemes/eval'
 require 'daijobu/adapter'
 require 'daijobu/adapters/mem_cache'
 require 'daijobu/adapters/tokyo_cabinet'

data/lib/daijobu/adapters/mem_cache.rb

@@ -8,12 +8,24 @@ module Daijobu
         @store = store
       end
       
-      def get(key)
-        @store.get(key, true)
+      def get(*keys)
+        if keys.size == 0
+          nil
+        elsif keys.size == 1
+          get_one(keys.first)
+        else
+          keys.inject({}) { |agg, key| agg.merge(key => get_one(key)) } 
+        end
       end
       
       def set(key, value)
-        @store.set(key, value, 0, true)
+        @store.add(key, value, 0, true)
+      end
+      
+      private
+      
+      def get_one(key)
+        @store.get(key, true)
       end
       
     end

data/lib/daijobu/adapters/tokyo_cabinet.rb

@@ -8,8 +8,14 @@ module Daijobu
         @store = store
       end
       
-      def get(key)
-        @store[key]
+      def get(*keys)
+        if keys.size == 0
+          nil
+        elsif keys.size == 1
+          @store[keys.first]
+        else
+          @store.lget(keys)
+        end
       end
       
       def set(key, value)

data/lib/daijobu/adapters/tokyo_tyrant.rb

@@ -8,8 +8,14 @@ module Daijobu
         @store = store
       end
       
-      def get(key)
-        @store[key]
+      def get(*keys)
+        if keys.size == 0
+          nil
+        elsif keys.size == 1
+          @store[keys.first]
+        else
+          @store.lget(keys)
+        end
       end
       
       def set(key, value)

data/lib/daijobu/client.rb

@@ -1,27 +1,32 @@
 module Daijobu
   class Client
 
-    def initialize(casket, *schemes)
-      @adapter      = Daijobu::Adapter.get(casket)
-      @schemes      = Daijobu::SchemeSet.new(*schemes)
+    def initialize(casket, options = {})
+      @adapter        = Daijobu::Adapter.get(casket)
+      @read_schemes   = Daijobu::SchemeSet.new(options[:schemes] || options[:read])
+      @write_schemes  = Daijobu::SchemeSet.new(options[:schemes] || options[:write])
     end
 
-    def [](key)
-      parse(@adapter.get(key))
+    def [](*keys)
+      __parse__(@adapter.get(*keys.collect { |key| key.to_s }))
     end
 
     def []=(key, value)
-      @adapter.set(key, unparse(value))
+      @adapter.set(key.to_s, __unparse__(value))
+    end
+
+    def method_missing(name, *args)
+      args.empty? ? Daijobu::NamespaceProxy.new(self, name) : Daijobu::NamespaceProxy.new(self, name)[*args]
     end
 
     private
 
-    def parse(str)
-      @schemes.parse(str)
+    def __parse__(str)
+      @read_schemes.parse(str)
     end
 
-    def unparse(obj)
-      @schemes.unparse(obj)
+    def __unparse__(obj)
+      @write_schemes.unparse(obj)
     end
 
   end

data/lib/daijobu/namespace_proxy.rb

@@ -0,0 +1,32 @@
+module Daijobu
+  class NamespaceProxy
+    
+    @@default_separator = ':'
+    def self.default_separator
+      @@default_separator
+    end
+    
+    def self.default_separator=(separator)
+      @@default_separator = separator
+    end
+    
+    def initialize(owner, namespace, separator = @@default_separator)
+      @owner = owner
+      @namespace = namespace.to_s
+      @separator = separator
+    end
+    
+    def [](key)
+      @owner["#{@namespace}#{@separator}#{key}"]
+    end
+    
+    def []=(key, value)
+      @owner["#{@namespace}#{@separator}#{key}"] = value
+    end
+    
+    def method_missing(namespace, *args)
+      separator = args.shift || @@default_separator
+      Daijobu::NamespaceProxy.new(@owner, "#{@namespace}#{@separator}#{namespace}", separator)
+    end
+  end
+end

data/lib/daijobu/scheme_set.rb

@@ -5,8 +5,10 @@ module Daijobu
     
     attr_reader :current
     
-    def initialize(*schemes)
-      @schemes = (schemes.empty? ? DEFAULT : schemes).collect { |scheme| Daijobu::Scheme.get(scheme) }
+    def initialize(schemes = nil)
+      schemes = Array(schemes)
+      schemes = DEFAULT if schemes.empty?
+      @schemes = schemes.collect { |scheme| Daijobu::Scheme.get(scheme) }
       @current = 0
     end
   

data/lib/daijobu/schemes/raw.rb

@@ -0,0 +1,15 @@
+module Daijobu
+  module Scheme
+    class Raw
+      
+      def parse(str)
+        str
+      end
+      
+      def unparse(obj)
+        obj
+      end
+      
+    end
+  end
+end

data/spec/daijobu/adapter_spec.rb

@@ -6,9 +6,6 @@ describe Daijobu::Adapter do
     
     before do
       Daijobu::Adapter.stubs(:defined?).returns(true)
-      MemCache              = Class.new unless defined?(MemCache)
-      Rufus::Tokyo::Cabinet = Class.new unless defined?(Rufus::Tokyo::Cabinet)
-      Rufus::Tokyo::Tyrant  = Class.new unless defined?(Rufus::Tokyo::Tyrant)
       @casket = stub("fake casket")
     end
     

data/spec/daijobu/adapters/mem_cache_spec.rb

@@ -12,11 +12,29 @@ describe Daijobu::Adapter::MemCacheAdapter do
       @stubby.expects(:get).with('key', true)
       @adapter.get('key')
     end
+    
+    describe "with no arguments" do
+      it "should return nil" do
+        @adapter.get.should be_nil
+      end
+    end
+    
+    describe "with multiple arguments" do
+      it "should call #get for each key" do
+        @stubby.expects(:get).times(3)
+        @adapter.get('key1', 'key2', 'key3')
+      end
+      
+      it "should return a hash" do
+        @stubby.stubs(:get)
+        @adapter.get('key1', 'key2', 'key3').should be_an_instance_of(Hash)
+      end
+    end
   end
   
   describe "set" do
-    it "should call #set on the store and write as raw" do
-      @stubby.expects(:set).with('key', 'value', 0, true)
+    it "should call #add on the store and write as raw" do
+      @stubby.expects(:add).with('key', 'value', 0, true)
       @adapter.set('key', 'value')
     end
   end

data/spec/daijobu/adapters/tokyo_cabinet_spec.rb

@@ -12,6 +12,19 @@ describe Daijobu::Adapter::TokyoCabinetAdapter do
       @stubby.expects(:[]).with('key')
       @adapter.get('key')
     end
+    
+    describe "with no arguments" do
+      it "should return nil" do
+        @adapter.get.should be_nil
+      end
+    end
+    
+    describe "with multiple arguments" do
+      it "should call #lget on all the keys" do
+        @stubby.expects(:lget).with(['key1', 'key2', 'key3'])
+        @adapter.get('key1', 'key2', 'key3')
+      end      
+    end
   end
   
   describe "set" do

data/spec/daijobu/adapters/tokyo_tyrant_spec.rb

@@ -12,6 +12,19 @@ describe Daijobu::Adapter::TokyoTyrantAdapter do
       @stubby.expects(:[]).with('key')
       @adapter.get('key')
     end
+    
+    describe "with no arguments" do
+      it "should return nil" do
+        @adapter.get.should be_nil
+      end
+    end
+    
+    describe "with multiple arguments" do
+      it "should call #lget on all the keys" do
+        @stubby.expects(:lget).with(['key1', 'key2', 'key3'])
+        @adapter.get('key1', 'key2', 'key3')
+      end      
+    end
   end
   
   describe "set" do

data/spec/daijobu/client_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Daijobu::Client do
   
   before do
-    @casket = Rufus::Tokyo::Cabinet.new('*')
+    @casket = Rufus::Tokyo::Cabinet.new # not a real Rufus::Tokyo::Cabinet. See spec_helper.
   end
   
   describe "initialization" do
@@ -13,11 +13,23 @@ describe Daijobu::Client do
       Daijobu::Client.new(@casket)
     end
     
-    it "should set the schemes based on the scheme list given" do
-      Daijobu::SchemeSet.expects(:new).with(:json, :yaml)
-      Daijobu::Client.new(@casket, :json, :yaml)
+    it "should set the read and write schemes based on the :schemes scheme list given" do
+      Daijobu::SchemeSet.expects(:new).with([:json, :yaml]).twice
+      Daijobu::Client.new(@casket, :schemes => [:json, :yaml])
     end
-
+    
+    it "should set the read schemes based on the :read scheme list given" do
+      Daijobu::SchemeSet.expects(:new).with([:json, :yaml]).once
+      Daijobu::SchemeSet.expects(:new).with(nil).once
+      Daijobu::Client.new(@casket, :read => [:json, :yaml])
+    end
+    
+    it "should set the write schemes based on the :write scheme list given" do
+      Daijobu::SchemeSet.expects(:new).with(nil).once
+      Daijobu::SchemeSet.expects(:new).with([:json, :yaml]).once
+      Daijobu::Client.new(@casket, :write => [:json, :yaml])
+    end
+    
   end
 
   describe "methods" do
@@ -31,43 +43,84 @@ describe Daijobu::Client do
         @stringy = "woohoo!"
       end
       
-      describe "#[]" do            
+      describe " #[]" do            
         it "should call #get on the adapter" do
           @adapter.expects(:get).with('key')
           @daijobu['key']
         end
+        
+        it "should be indifferent to strings and symbols" do
+          @adapter.expects(:get).with('key')
+          @daijobu[:key]
+        end
+        
+        it "should be indifferent to integers or strings" do
+          @adapter.expects(:get).with('123')
+          @daijobu[123]
+        end
+        
+        it "should allow you to get multiple keys at once" do
+          @adapter.expects(:get).with('key1', 'key2', 'key3')
+          @daijobu['key1', 'key2', 'key3']
+        end
       end
 
-      describe "#[]=" do
+      describe " #[]=" do
         before do
-          @daijobu.stubs(:unparse).returns(@stringy)
+          @daijobu.stubs(:__unparse__).returns(@stringy)
         end
         
         it "should call set on the adapter" do
           @adapter.expects(:set).with('key', @stringy)
           @daijobu['key'] = @stringy
         end
+
+        it "should be indifferent to strings and symbols" do
+          @adapter.expects(:set).with('key', @stringy)
+          @daijobu[:key] = @stringy
+        end
       end
     end
     
 
     describe "for parsing and unparsing" do
       before do
-        @schemes = @daijobu.instance_variable_get(:@schemes)
-        @stringy = "woohoo!"
+        @read_schemes   = @daijobu.instance_variable_get(:@read_schemes)
+        @write_schemes  = @daijobu.instance_variable_get(:@write_schemes)
+        @stringy        = "woohoo!"
       end
       
-      describe "#parse" do
-        it "should call parse on the schemes" do
-          @schemes.expects(:parse).with(@stringy)
-          @daijobu.__send__(:parse, @stringy)
+      describe " #__parse__" do
+        it "should call parse on the read schemes" do
+          @read_schemes.expects(:parse).with(@stringy)
+          @daijobu.__send__(:__parse__, @stringy)
+        end
+      end
+    
+      describe " #__unparse__" do
+        it "should call unparse on the write schemes" do
+          @write_schemes.expects(:unparse).with(@stringy)
+          @daijobu.__send__(:__unparse__, @stringy)
         end
       end
+    end
     
-      describe "#unparse" do
-        it "should call unparse on the schemes" do
-          @schemes.expects(:unparse).with(@stringy)
-          @daijobu.__send__(:unparse, @stringy)
+    describe "method_missing" do
+      
+      describe "with no arguments" do
+        it "should return a namespace proxy with namespace as the missing method" do
+          proxy = @daijobu.prefix
+          proxy.should be_an_instance_of(Daijobu::NamespaceProxy)
+          proxy.instance_variable_get(:@namespace).should == 'prefix'
+        end
+      end
+      
+      describe "with arguments" do
+        it "should call #[] on the proxy with the arguments" do
+          proxy = stub('fake-daijobu-proxy!')
+          Daijobu::NamespaceProxy.expects(:new).with(@daijobu, :prefix).returns(proxy)
+          proxy.expects(:[]).with('key')
+          @daijobu.prefix('key')
         end
       end
     end

data/spec/daijobu/namespace_proxy_spec.rb

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Daijobu::NamespaceProxy do
+  
+  before do
+    @daijobu = stub('fake-daijobu-client!')
+  end
+  
+  describe "initialization" do
+
+    it "should set the owner as the given owner" do
+      Daijobu::NamespaceProxy.new(@daijobu, 'prefix').instance_variable_get(:@owner).should == @daijobu
+    end
+    
+    it "should set the namespace as the given namespace" do
+      Daijobu::NamespaceProxy.new(@daijobu, 'prefix').instance_variable_get(:@namespace).should == 'prefix'
+    end
+    
+    it "should be indifferent to strings or symbols as the namespace" do
+      Daijobu::NamespaceProxy.new(@daijobu, :prefix).instance_variable_get(:@namespace).should == 'prefix'
+    end
+    
+    it "should initialize with the class-level default separator" do
+      Daijobu::NamespaceProxy.new(@daijobu, 'prefix').instance_variable_get(:@separator).should == Daijobu::NamespaceProxy.default_separator
+    end
+    
+    it "should set the separator as the given separator" do
+      Daijobu::NamespaceProxy.new(@daijobu, 'prefix', '/').instance_variable_get(:@separator).should == '/'
+    end
+    
+  end
+
+  describe "methods" do
+    before do
+      @proxy = Daijobu::NamespaceProxy.new(@daijobu, 'prefix')
+    end
+    
+    describe "#[]" do
+      it "should send #[] with the namespaced key to the owner" do
+        @daijobu.expects(:[]).with('prefix:key')
+        @proxy['key']
+      end
+    end
+    
+    describe "#[]=" do
+      it "should send #[]= with the namespaced key to the owner" do
+        @daijobu.expects(:[]=).with('prefix:key', 'value')
+        @proxy['key'] = 'value'
+      end
+    end
+    
+    describe "method_missing" do
+      it "should return a new proxy with compounded namespace" do
+        new_proxy = @proxy.another_prefix
+        new_proxy.should be_an_instance_of(Daijobu::NamespaceProxy)
+        new_proxy.instance_variable_get(:@namespace).should == 'prefix:another_prefix'
+      end
+    end
+  end
+end

data/spec/daijobu/scheme_set_spec.rb

@@ -19,11 +19,18 @@ describe Daijobu::SchemeSet do
       schemes[3].should be_an_instance_of(Daijobu::Scheme::Eval)
     end
     
+    it "should accept an array of schemes" do
+      lambda { Daijobu::SchemeSet.new([:json, :yaml]) }.should_not raise_error
+    end
+    
+    it "should accept a single scheme" do
+      lambda { Daijobu::SchemeSet.new(:json) }.should_not raise_error
+    end
   end
 
   describe "initialization with a specified scheme pattern" do
     before do
-      @scheme_set = Daijobu::SchemeSet.new(:eval, :yaml)
+      @scheme_set = Daijobu::SchemeSet.new([:eval, :yaml])
     end
     
     it "should have the proper schemes in the given order" do
@@ -82,7 +89,7 @@ describe Daijobu::SchemeSet do
   
   describe "#parse" do
     before do
-      @scheme_set = Daijobu::SchemeSet.new(:json)
+      @scheme_set = Daijobu::SchemeSet.new([:json])
       @stringy    = '{ "thing" : 10 }'
       @hashy      = { "thing" => 10 }
     end
@@ -118,7 +125,7 @@ describe Daijobu::SchemeSet do
       @stringy    = '{ "thing" : 10 }'
       @hashy      = { "thing" => 10 }
 
-      @scheme_set     = Daijobu::SchemeSet.new(:marshal, :yaml, :json)
+      @scheme_set     = Daijobu::SchemeSet.new([:marshal, :yaml, :json])
       @schemes        = @scheme_set.instance_variable_get(:@schemes)
       @marshal_scheme = @schemes[0]
       @yaml_scheme    = @schemes[1]
@@ -136,7 +143,7 @@ describe Daijobu::SchemeSet do
   
   describe "#unparse" do
     before do
-      @scheme_set = Daijobu::SchemeSet.new(:json)
+      @scheme_set = Daijobu::SchemeSet.new([:json])
       @stringy    = '{ "thing" : 10 }'
       @hashy      = { "thing" => 10 }
     end
@@ -172,7 +179,7 @@ describe Daijobu::SchemeSet do
       @stringy    = '{ "thing" : 10 }'
       @hashy      = { "thing" => 10 }
 
-      @scheme_set     = Daijobu::SchemeSet.new(:marshal, :yaml, :json)
+      @scheme_set     = Daijobu::SchemeSet.new([:marshal, :yaml, :json])
       @schemes        = @scheme_set.instance_variable_get(:@schemes)
       @marshal_scheme = @schemes[0]
       @yaml_scheme    = @schemes[1]

data/spec/daijobu/schemes/raw_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Daijobu::Scheme::Raw do
+  
+  before do
+    @scheme = Daijobu::Scheme::Raw.new
+  end
+  
+  describe "#parse" do
+    before do
+      @stringy = '{ "thing" => 10 }'
+    end
+    
+    it "should do nothing to the given string" do
+      @scheme.parse(@stringy).should == @stringy
+    end
+    
+    describe "when the input string is nil" do
+      it "should return nil" do
+        @scheme.parse(nil).should be_nil
+      end
+    end
+  end
+  
+  describe "#unparse" do
+    before do
+      @hashy = { "thing" => 10 }
+    end
+    
+    it "should do nothing to the given object" do
+      @scheme.unparse(@hashy).should == @hashy
+    end    
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,12 +1,18 @@
 require 'rubygems'
 require 'spec'
 require 'mocha'
-require 'rufus/tokyo'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'daijobu'
 
+# Some fake contants for the classes and stuff referred to.
+MemCache              = Class.new unless defined?(MemCache)
+Rufus                 = Module.new unless defined?(Rufus)
+Rufus::Tokyo          = Module.new unless defined?(Rufus::Tokyo)
+Rufus::Tokyo::Cabinet = Class.new unless defined?(Rufus::Tokyo::Cabinet)
+Rufus::Tokyo::Tyrant  = Class.new unless defined?(Rufus::Tokyo::Tyrant)
+
 Spec::Runner.configure do |config|
   config.mock_with :mocha
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sander6-daijobu
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sander Hartlage
@@ -30,6 +30,7 @@ files:
 - lib/daijobu/adapter.rb
 - lib/daijobu/client.rb
 - lib/daijobu/errors.rb
+- lib/daijobu/namespace_proxy.rb
 - lib/daijobu/scheme.rb
 - lib/daijobu/scheme_set.rb
 - lib/daijobu/adapters/mem_cache.rb
@@ -38,6 +39,7 @@ files:
 - lib/daijobu/schemes/eval.rb
 - lib/daijobu/schemes/json.rb
 - lib/daijobu/schemes/marshal.rb
+- lib/daijobu/schemes/raw.rb
 - lib/daijobu/schemes/yaml.rb
 has_rdoc: false
 homepage: http://github.com/sander6/daijobu
@@ -72,10 +74,12 @@ test_files:
 - spec/daijobu/adapters/tokyo_tyrant_spec.rb
 - spec/daijobu/client_spec.rb
 - spec/daijobu/errors_spec.rb
+- spec/daijobu/namespace_proxy_spec.rb
 - spec/daijobu/scheme_set_spec.rb
 - spec/daijobu/scheme_spec.rb
 - spec/daijobu/schemes/eval_spec.rb
 - spec/daijobu/schemes/json_spec.rb
 - spec/daijobu/schemes/marshal_spec.rb
+- spec/daijobu/schemes/raw_spec.rb
 - spec/daijobu/schemes/yaml_spec.rb
 - spec/spec_helper.rb