couch-quilt 0.2.3 → 0.3.0

data/Rakefile

@@ -8,7 +8,7 @@ task :default => :spec
 
 desc "Run all examples"
 Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
+  t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = ["--color"]
 end
 

data/couch-quilt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch-quilt}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes J\303\266rg Schmidt"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-02-26}
   s.default_executable = %q{couchquilt}
   s.description = %q{Access CouchDB JSON documents from filesystem.}
   s.email = %q{schmidt@netzmerk.com}
@@ -28,8 +28,10 @@ Gem::Specification.new do |s|
      "lib/couchquilt/couch_client.rb",
      "lib/couchquilt/debugged_fs.rb",
      "lib/couchquilt/fs.rb",
+     "lib/couchquilt/mapper.rb",
      "lib/couchquilt/version.rb",
-     "spec/couchquilt_spec.rb",
+     "spec/couchquilt/fs_spec.rb",
+     "spec/couchquilt/mapper_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://jo.github.com/quilt}
@@ -39,8 +41,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Access CouchDB from filesystem.}
   s.test_files = [
-    "spec/couchquilt_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/couchquilt/fs_spec.rb",
+     "spec/couchquilt/mapper_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/couchquilt.rb

@@ -28,6 +28,7 @@ $:.unshift File.dirname(__FILE__) unless
   $:.include?(File.dirname(__FILE__)) ||
     $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'couchquilt/mapper'
 require 'couchquilt/couch_client'
 require 'couchquilt/fs'
 

data/lib/couchquilt/fs.rb

@@ -3,6 +3,8 @@ require 'uri'
 
 module Couchquilt
   class FS
+    include Mapper
+
     # initializes Quilt FS with the database server name
     def initialize(server_name)
       @couch = CouchClient.new(server_name)
@@ -101,13 +103,13 @@ module Couchquilt
   
       content case named_path(path)
               when :database_info
-                @couch.get(database)[remove_extname(id)]
+                @couch.get(database)[key_for(id)]
               when :show_function_result
                 parts.shift
-                @couch.get(remove_extname(File.join(database, id, "_show", *parts)))
+                @couch.get(key_for(File.join(database, id, "_show", *parts)))
               when :list_function_result
                 parts.shift
-                @couch.get(remove_extname(File.join(database, id, "_list", *parts)))
+                @couch.get(key_for(File.join(database, id, "_list", *parts)))
               when :view_function_result
                 get_view_result_part(database, id, parts)
               when :uuid
@@ -134,11 +136,12 @@ module Couchquilt
   
     # writes content str to path
     def write_to(path, str)
+      str.strip!
       database, id, *parts = extract_parts(path)
       # fetch document
       doc = @couch.get("#{database}/#{id}")
       # update the value that the file at path holds
-      update_value(doc, parts, str)
+      map_fs(doc, parts, str)
       # save document
       @couch.put("#{database}/#{id}", doc)
     end
@@ -163,7 +166,7 @@ module Couchquilt
       # fetch document
       doc = @couch.get("#{database}/#{id}")
       # remove object
-      remove_object(doc, parts)
+      map_fs(doc, parts, nil)
       # save document
       @couch.put("#{database}/#{id}", doc)
     end
@@ -197,7 +200,7 @@ module Couchquilt
         # fetch document
         doc = @couch.get("#{database}/#{id}")
         # insert empty object
-        update_value(doc, parts, {})
+        map_fs(doc, parts)
         # save document
         @couch.put("#{database}/#{id}", doc)
       end
@@ -223,7 +226,7 @@ module Couchquilt
       # fetch document
       doc = @couch.get("#{database}/#{id}")
       # remove object
-      update_value(doc, parts, nil)
+      map_fs(doc, parts, nil)
       # save document
       @couch.put("#{database}/#{id}", doc)
     end
@@ -316,21 +319,10 @@ module Couchquilt
       end
     end
   
-    # maps json contents into contents array
-    def map_json(doc)
-      case doc
-      when Hash
-        # Hash is mapped to directory
-        doc.keys.sort.map { |k| append_extname(k, doc[k]) }
-      when Array
-        # Array is mapped to directory
-        doc.map { |k| append_extname(doc.index(k), k) }
-      end
-    end
-  
     # fetch part of document
     def get_document_part(database, id, parts = [])
       doc = @couch.get("#{database}/#{id}")
+      parts.map! { |p| key_for p }
       get_part(doc, parts)
     end
   
@@ -339,76 +331,21 @@ module Couchquilt
       a, view_function_name, *rest = parts
       view = [id.sub("_design/", ""), "_view", view_function_name].join("/")
       doc = @couch.get("#{database}/_design/#{view}")
+      rest.map! { |p| key_for p }
       get_part(doc, rest)
     end
   
     # get a part of the document
     # eg: get_part({ :a => { :b => :c}}, [:a, :b]) #=> :c
-    # also removes the file extension and gets index of arrays
-    def get_part(doc, parts)
+    def get_part(doc, keys = [])
       return if doc.nil?
       doc = doc.dup
-      parts.each do |part|
-        case doc
-        when Hash
-          doc = doc[remove_extname(part)]
-        when Array
-          doc = doc[part.to_i]
-        end
+      keys.each do |key|
+        doc = doc[key]
       end
       doc
     end
   
-    # updates a part of a hash
-    # Example:
-    #  update_value({:a => { :b => 'c'}}, [:a, :b], 'cis') #=> {:a => { :b => 'cis'}}
-    def update_value(hash, keys, value)
-      key = remove_extname(keys.shift)
-      if keys.empty?
-        hash[key] = value
-      else
-        hash[key] = update_value(hash[key], keys, value)
-      end
-      hash
-    end
-  
-    # removes an object from a hash
-    # Example:
-    #  remove_object({:a => { :b => 'c'}}, [:a, :b]) #=> {:a => { }}
-    def remove_object(hash, keys)
-      key = remove_extname(keys.shift)
-      if keys.empty?
-        hash.delete(key)
-      else
-        hash[key] = remove_object(hash[key], keys)
-      end
-      hash
-    end
-  
-    # remove extname to get the id
-    def remove_extname(filename)
-      filename.sub(/((\.(f|i|b))?\.js|\.html)\z/, "")
-    end
-  
-    # Appends extname, that is: builds a filename from key and value.
-    # Note: values are casted by extension.
-    def append_extname(key, value)
-      basename = key.is_a?(Integer) ? "%di" % key : key
-  
-      case value
-      when Float
-        "#{basename}.f.js"
-      when Integer
-        "#{basename}.i.js"
-      when nil, String
-        "#{basename}.js"
-      when true, false
-        "#{basename}.b.js"
-      else
-        basename
-      end
-    end
-
     # escapes the value for using as filename
     def list(array)
       return [] if array.nil?

data/lib/couchquilt/mapper.rb

@@ -0,0 +1,75 @@
+module Couchquilt
+  module Mapper
+    # regexp to check wheather a key should be mapped as part of an array
+    ARRAY_MAPPING = /\A\d+i(\.js)?\z/
+
+    # maps json contents into contents array
+    def map_json(json = {})
+      case json
+      when Hash
+        json.keys.sort.map { |k| name_for(k, json[k]) }
+      when Array
+        # using zip for backwards compatibily:
+        # in Ruby 1.9 (and 1.8.7) we could simply use
+        # json.each_with_index.map { |k,i| ... }
+        json.zip((0..json.size).to_a).map { |v,i| name_for(i, v) }
+      end
+    end
+
+    # recursively updates a part of a json hash from fs
+    def map_fs(json, keys = [], value = :empty)
+      return {} if keys.empty?
+
+      insert_as_array = keys.last =~ /.+\.array\Z/
+      key = key_for(keys.shift)
+      if keys.empty?
+        if value.nil? && json.is_a?(Hash)
+          json.delete key
+        elsif value.nil? && json.is_a?(Array)
+          json.delete_at key
+        elsif value == :empty && insert_as_array
+          json[key] = []
+        elsif value == :empty
+          json[key] = {}
+        else
+          json[key] = value
+        end
+      else
+        json[key] = map_fs(json[key], keys, value)
+      end
+
+      json
+    end
+
+    # remove fs mapping extnames
+    # and converts array entry mappings
+    def key_for(name)
+      if name =~ ARRAY_MAPPING
+        name.to_i
+      else
+        name.sub(/((\.(f|i|b))?\.js|\.html|\.array)\z/, "")
+      end
+    end
+
+    # Appends extname, that is: builds a filename from key and value.
+    # Note: values are casted by extension.
+    def name_for(key, value = nil)
+      basename = key.is_a?(Integer) ? "%di" % key : key.to_s
+
+      case value
+      when Array
+        "#{basename}.array"
+      when Float
+        "#{basename}.f.js"
+      when Integer
+        "#{basename}.i.js"
+      when nil, String
+        "#{basename}.js"
+      when true, false
+        "#{basename}.b.js"
+      else
+        basename
+      end
+    end
+  end
+end

data/lib/couchquilt/version.rb

@@ -1,3 +1,3 @@
 module Couchquilt
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/spec/{couchquilt_spec.rb → couchquilt/fs_spec.rb}

@@ -1,7 +1,7 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
 # Note: databases, documents and keys with slashes are not supported by now
-describe "Quilt" do
+describe Couchquilt::FS do
   before :all do
     RestClient.put(File.join(SERVER_NAME, TESTDB), nil)
 
@@ -171,7 +171,7 @@ describe "Quilt" do
           @quilt.file?("/#{TESTDB}/document_id").should be_false
         end
         it "contents should list documents content" do
-          @quilt.contents("/#{TESTDB}/document_id").should == ["_id.js", "_rev.js", "array", "boolean.b.js", "empty", "float.f.js", "integer.i.js", "name.js", "object"]
+          @quilt.contents("/#{TESTDB}/document_id").should == ["_id.js", "_rev.js", "array.array", "boolean.b.js", "empty", "float.f.js", "integer.i.js", "name.js", "object"]
         end
         it "can_mkdir? should return false" do
           @quilt.can_mkdir?("/#{TESTDB}/document_id").should be_false
@@ -265,7 +265,7 @@ describe "Quilt" do
           it "write_to should update document" do
             @quilt.write_to("/#{TESTDB}/document_id/boolean.b.js", "value").should be_true
           end
-          it "can_delete? should return false" do
+          it "can_delete? should return true" do
             @quilt.can_delete?("/#{TESTDB}/document_id/boolean.b.js").should be_true
           end
           it "delete should update document" do
@@ -295,21 +295,45 @@ describe "Quilt" do
         end
         
         # /database_id/document_id/array
-        describe "array/" do
+        describe "array.array/" do
           it "directory? should return true" do
-            @quilt.directory?("/#{TESTDB}/document_id/array").should be_true
+            @quilt.directory?("/#{TESTDB}/document_id/array.array").should be_true
           end
           it "file? should return false" do
-            @quilt.file?("/#{TESTDB}/document_id/array").should be_false
+            @quilt.file?("/#{TESTDB}/document_id/array.array").should be_false
           end
           it "contents should list array content" do
-            @quilt.contents("/#{TESTDB}/document_id/array").should == ["0i.js"]
+            @quilt.contents("/#{TESTDB}/document_id/array.array").should == ["0i.js"]
           end
           it "can_mkdir? should return false" do
-            @quilt.can_mkdir?("/#{TESTDB}/document_id/array").should be_false
+            @quilt.can_mkdir?("/#{TESTDB}/document_id/array.array").should be_false
           end
           it "can_rmdir? should return false when not empty" do
-            @quilt.can_rmdir?("/#{TESTDB}/document_id/array").should be_false
+            @quilt.can_rmdir?("/#{TESTDB}/document_id/array.array").should be_false
+          end
+          describe "0i.js" do
+            it "directory? should return false" do
+              @quilt.directory?("/#{TESTDB}/document_id/array.array/0i.js").should be_false
+            end
+            it "file? should return true" do
+              @quilt.file?("/#{TESTDB}/document_id/array.array/0i.js").should be_true
+            end
+            it "read_file should return contents" do
+              @quilt.read_file("/#{TESTDB}/document_id/array.array/0i.js").should == @document["array"].first
+            end
+            it "can_write? should return true" do
+              @quilt.can_write?("/#{TESTDB}/document_id/array.array/0i.js").should be_true
+            end
+            it "write_to should update document" do
+              @quilt.write_to("/#{TESTDB}/document_id/array.array/0i.js", "value").should be_true
+            end
+            it "can_delete? should return true" do
+              @quilt.can_delete?("/#{TESTDB}/document_id/array.array/0i.js").should be_true
+            end
+            it "delete should update document" do
+              @quilt.delete("/#{TESTDB}/document_id/array.array/0i.js").should be_true
+              @quilt.file?("/#{TESTDB}/document_id/array.array/0i.js").should be_false
+            end
           end
         end
         
@@ -570,7 +594,7 @@ describe "Quilt" do
                 @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name").should be_false
               end
               it "contents should list view result document contents" do
-                @quilt.contents("/#{TESTDB}/_design/design_document_id/_view/view_function_name").should == ["offset.i.js", "rows", "total_rows.i.js"]
+                @quilt.contents("/#{TESTDB}/_design/design_document_id/_view/view_function_name").should == ["offset.i.js", "rows.array", "total_rows.i.js"]
               end
               it "can_mkdir? should return false" do
                 @quilt.can_mkdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name").should be_false
@@ -600,87 +624,87 @@ describe "Quilt" do
                   @quilt.can_delete?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/total_rows.i.js").should be_false
                 end
               end
-              describe "rows/" do
+              describe "rows.array/" do
                 it "directory? should return true" do
-                  @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows").should be_true
+                  @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array").should be_true
                 end
                 it "file? should return false" do
-                  @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows").should be_false
+                  @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array").should be_false
                 end
                 it "contents should list view rows" do
-                  @quilt.contents("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows").should == ["0i"]
+                  @quilt.contents("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array").should == ["0i"]
                 end
                 it "can_mkdir? should return false" do
-                  @quilt.can_mkdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows").should be_false
+                  @quilt.can_mkdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array").should be_false
                 end
                 it "can_rmdir? should return false" do
-                  @quilt.can_rmdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows").should be_false
+                  @quilt.can_rmdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array").should be_false
                 end
                 describe "0i/" do
                   it "directory? should return true" do
-                    @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i").should be_true
+                    @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i").should be_true
                   end
                   it "file? should return false" do
-                    @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i").should be_false
+                    @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i").should be_false
                   end
                   it "contents should list view result row content" do
-                    @quilt.contents("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i").should == ["id.js", "key.js", "value.js"]
+                    @quilt.contents("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i").should == ["id.js", "key.js", "value.js"]
                   end
                   it "can_mkdir? should return false" do
-                    @quilt.can_mkdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i").should be_false
+                    @quilt.can_mkdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i").should be_false
                   end
                   it "can_rmdir? should return false" do
-                    @quilt.can_rmdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i").should be_false
+                    @quilt.can_rmdir?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i").should be_false
                   end
                   describe "id.js" do
                     it "directory? should return false" do
-                      @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/id.js").should be_false
+                      @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/id.js").should be_false
                     end
                     it "file? should return true" do
-                      @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/id.js").should be_true
+                      @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/id.js").should be_true
                     end
                     it "read_file should return contents" do
-                      @quilt.read_file("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/id.js").should == "document_id"
+                      @quilt.read_file("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/id.js").should == "document_id"
                     end
                     it "can_write? should return false" do
-                      @quilt.can_write?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/id.js").should be_false
+                      @quilt.can_write?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/id.js").should be_false
                     end
                     it "can_delete? should return false" do
-                      @quilt.can_delete?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/id.js").should be_false
+                      @quilt.can_delete?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/id.js").should be_false
                     end
                   end
                   describe "key.js" do
                     it "directory? should return false" do
-                      @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/key.js").should be_false
+                      @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/key.js").should be_false
                     end
                     it "file? should return true" do
-                      @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/key.js").should be_true
+                      @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/key.js").should be_true
                     end
                     it "read_file should return contents" do
-                      @quilt.read_file("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/key.js").should == "This is a name"
+                      @quilt.read_file("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/key.js").should == "This is a name"
                     end
                     it "can_write? should return false" do
-                      @quilt.can_write?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/key.js").should be_false
+                      @quilt.can_write?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/key.js").should be_false
                     end
                     it "can_delete? should return false" do
-                      @quilt.can_delete?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/key.js").should be_false
+                      @quilt.can_delete?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/key.js").should be_false
                     end
                   end
                   describe "value.js" do
                     it "directory? should return false" do
-                      @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/value.js").should be_false
+                      @quilt.directory?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/value.js").should be_false
                     end
                     it "file? should return true" do
-                      @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/value.js").should be_true
+                      @quilt.file?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/value.js").should be_true
                     end
                     it "read_file should return contents" do
-                      @quilt.read_file("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/value.js").should == ""
+                      @quilt.read_file("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/value.js").should == ""
                     end
                     it "can_write? should return false" do
-                      @quilt.can_write?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/value.js").should be_false
+                      @quilt.can_write?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/value.js").should be_false
                     end
                     it "can_delete? should return false" do
-                      @quilt.can_delete?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows/0i/value.js").should be_false
+                      @quilt.can_delete?("/#{TESTDB}/_design/design_document_id/_view/view_function_name/rows.array/0i/value.js").should be_false
                     end
                   end
                 end

data/spec/couchquilt/mapper_spec.rb

@@ -0,0 +1,184 @@
+require File.join(File.dirname(__FILE__), '../spec_helper.rb')
+
+describe Couchquilt::Mapper do
+  include Couchquilt::Mapper
+
+  describe "map_json" do
+    describe "value mapping" do
+      it "should map string value" do
+        result = map_json({ "key" => "value" })
+        result.should == ["key.js"]
+      end
+
+      it "should map integer value" do
+        result = map_json({ "key" => 1 })
+        result.should == ["key.i.js"]
+      end
+
+      it "should map float value" do
+        result = map_json({ "key" => 1.1 })
+        result.should == ["key.f.js"]
+      end
+
+      it "should map false value" do
+        result = map_json({ "key" => false })
+        result.should == ["key.b.js"]
+      end
+
+      it "should map true value" do
+        result = map_json({ "key" => true })
+        result.should == ["key.b.js"]
+      end
+
+      it "should map an array value" do
+        result = map_json(["value"])
+        result.should == ["0i.js"]
+      end
+
+      it "should map hash value" do
+        result = map_json({ "key" => {}})
+        result.should == ["key"]
+      end
+
+      it "should map array value" do
+        result = map_json({ "key" => []})
+        result.should == ["key.array"]
+      end
+    end
+
+    describe "nested mapping" do
+      it "should map only keys" do
+        result = map_json("key" => { "key" => "value" })
+        result.should == ["key"]
+      end
+    end
+
+    describe "array mapping" do
+      it "should map uniq array values" do
+        result = map_json(["value1", "value2"])
+        result.should == ["0i.js", "1i.js"]
+      end
+
+      it "should map equal array values" do
+        result = map_json(["value", "value"])
+        result.should == ["0i.js", "1i.js"]
+      end
+    end
+  end
+
+  describe "map_fs" do
+    before do
+      @json = { :a => 1, :b => 2}
+    end
+
+    it "should remove all contents for empty keys" do
+      result = map_fs(@json)
+      result.should == {}
+    end
+    
+    # TODO: really spec this
+  end
+
+  describe "key_for" do
+    it "should return parsed integer value for 1i" do
+      result = key_for("1i")
+      result.should == 1
+    end
+
+    it "should return parsed integer value for 1i.js" do
+      result = key_for("1i.js")
+      result.should == 1
+    end
+
+    it "should remove js extension" do
+      result = key_for("key.js")
+      result.should == "key"
+    end
+
+    it "should remove f.js extension" do
+      result = key_for("key.f.js")
+      result.should == "key"
+    end
+
+    it "should remove i.js extension" do
+      result = key_for("key.i.js")
+      result.should == "key"
+    end
+
+    it "should remove b.js extension" do
+      result = key_for("key.b.js")
+      result.should == "key"
+    end
+
+    it "should remove html extension" do
+      result = key_for("key.html")
+      result.should == "key"
+    end
+  end
+
+  describe "name_for" do
+    describe "with integer key" do
+      it "should append i.js for nil value" do
+        result = name_for(1)
+        result.should == "1i.js"
+      end
+
+      it "should append i.js for string value" do
+        result = name_for(1, "value")
+        result.should == "1i.js"
+      end
+
+      it "should append i.f.js for float value" do
+        result = name_for(1, 1.1)
+        result.should == "1i.f.js"
+      end
+
+      it "should append i.i.js for integer value" do
+        result = name_for(1, 1)
+        result.should == "1i.i.js"
+      end
+
+      it "should append i.b.js for true value" do
+        result = name_for(1, true)
+        result.should == "1i.b.js"
+      end
+
+      it "should append i.b.js for false value" do
+        result = name_for(1, false)
+        result.should == "1i.b.js"
+      end
+    end
+
+    describe "with other key" do
+      it "should append js for nil value" do
+        result = name_for("key")
+        result.should == "key.js"
+      end
+
+      it "should append js for string value" do
+        result = name_for("key", "value")
+        result.should == "key.js"
+      end
+
+      it "should append f.js for float value" do
+        result = name_for("key", 1.1)
+        result.should == "key.f.js"
+      end
+
+      it "should append i.js for integer value" do
+        result = name_for("key", 1)
+        result.should == "key.i.js"
+      end
+
+      it "should append b.js for true value" do
+        result = name_for("key", true)
+        result.should == "key.b.js"
+      end
+
+      it "should append b.js for false value" do
+        result = name_for("key", false)
+        result.should == "key.b.js"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch-quilt
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Johannes J\xC3\xB6rg Schmidt"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +01:00
+date: 2010-02-26 00:00:00 +01:00
 default_executable: couchquilt
 dependencies: []
 
@@ -32,8 +32,10 @@ files:
 - lib/couchquilt/couch_client.rb
 - lib/couchquilt/debugged_fs.rb
 - lib/couchquilt/fs.rb
+- lib/couchquilt/mapper.rb
 - lib/couchquilt/version.rb
-- spec/couchquilt_spec.rb
+- spec/couchquilt/fs_spec.rb
+- spec/couchquilt/mapper_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://jo.github.com/quilt
@@ -64,5 +66,6 @@ signing_key:
 specification_version: 3
 summary: Access CouchDB from filesystem.
 test_files: 
-- spec/couchquilt_spec.rb
 - spec/spec_helper.rb
+- spec/couchquilt/fs_spec.rb
+- spec/couchquilt/mapper_spec.rb