couch 0.1.2 → 0.2.0

data/Rakefile

@@ -36,7 +36,7 @@ begin
     gem.add_dependency "rest-client", ">= 1.4.1"
     gem.add_dependency "json_pure", ">= 1.2.2"
     gem.add_dependency "activesupport", ">= 3.0.0.beta"
-    # gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/couch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes J. Schmidt"]
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
      "lib/couch/generators/application/templates/README",
      "lib/couch/generators/application/templates/_attachments/index.html",
      "lib/couch/generators/application/templates/_attachments/stylesheets/application.css",
-     "lib/couch/generators/application/templates/_id.js",
+     "lib/couch/generators/application/templates/_id",
      "lib/couch/generators/application/templates/couchrc",
      "lib/couch/generators/application/templates/gitignore",
      "lib/couch/generators/application/templates/lib/mustache.js",
@@ -65,7 +65,11 @@ Gem::Specification.new do |s|
      "lib/couch/generators/view/USAGE",
      "lib/couch/generators/view/templates/map.js",
      "lib/couch/generators/view/view_generator.rb",
-     "lib/couch/version.rb"
+     "lib/couch/version.rb",
+     "spec/couch/design_document_spec.rb",
+     "spec/couch_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/jo/couch}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -73,6 +77,11 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{couch}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Standalone CouchDB Application Development Suite}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/couch/design_document_spec.rb",
+     "spec/couch_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -83,17 +92,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rest-client>, [">= 1.4.1"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<thor>, [">= 0.13.4"])
       s.add_dependency(%q<rest-client>, [">= 1.4.1"])
       s.add_dependency(%q<json_pure>, [">= 1.2.2"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.13.4"])
     s.add_dependency(%q<rest-client>, [">= 1.4.1"])
     s.add_dependency(%q<json_pure>, [">= 1.2.2"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end
 

data/lib/couch.rb

@@ -10,15 +10,23 @@ module Couch
   end
 
   def self.database
-    config["database"]
+    @database ||= config["database"]
   end
 
-  def self.config
-    @config ||= YAML.load(File.open config_file)
+  def self.id
+    @id ||= File.read(File.join(root, '_id')).strip
+  end
+
+  def self.rev
+    @rev ||= File.read(File.join(root, '_rev')).strip rescue nil
   end
 
   private
 
+  def self.config
+    @config ||= YAML.load(File.open config_file)
+  end
+
   def self.config_file
     File.join root, CONFIG_FILENAME
   end

data/lib/couch/actions/pull.rb

@@ -9,10 +9,11 @@ module Couch
       add_runtime_options!
 
       def pull
-        say "Pulling from %s" % DesignDocument.url
+        doc = DesignDocument.new
+        say "Pulling %s" % doc.url
 
-        resp = RestClient.get DesignDocument.url(:attachments => true)
-        doc = DesignDocument.build_from_json(resp.body)
+        resp = RestClient.get doc.url(:attachments => true)
+        doc.json = resp.body
 
         doc.write do |filename, content|
           create_file filename, content
@@ -20,7 +21,7 @@ module Couch
 
         say "Checked out %s" % doc.rev
       rescue RestClient::ResourceNotFound
-        say "Error: Document %s does not exist!" % DesignDocument.id
+        say "Error: Document %s does not exist!" % doc.id
       end
     end
   end

data/lib/couch/actions/push.rb

@@ -1,31 +1,46 @@
 require 'couch/actions/base'
 require 'couch/design_document'
 
+require 'pathname'
 require "rest_client"
 
 module Couch
   module Actions
     class Push < Base
+      def initialize(*args)
+        super
+        @doc = DesignDocument.new
+      end
+
       def create_database_unless_exists
-        RestClient.put DesignDocument.database, nil
-        say "Created database %s" % DesignDocument.database
+        RestClient.put @doc.database, nil
+        say "Created database %s" % @doc.database
       rescue RestClient::PreconditionFailed
       end
 
       def push
-        doc = DesignDocument.build_from_filesystem(destination_root)
-        say "Pushing to %s" % DesignDocument.url
+        root = Pathname.new(destination_root)
+        filenames = Dir[root.join "**/*"]
+        filenames.map! { |file| Pathname.new file }
+        filenames.map! { |path| path.relative_path_from root }
+        filenames.delete_if { |path| !path.file? }
+        filenames.map!(&:to_s)
+        @doc.read(filenames) do |filename|
+          File.read File.join(destination_root, filename)
+        end
+
+        say "Pushing to %s" % @doc.url
 
-        resp = RestClient.put DesignDocument.url, doc.to_json
+        resp = RestClient.put @doc.url, @doc.json
         response = JSON.parse(resp.body)
 
         if response["ok"]
-          rev = response["rev"]
-          File.open File.join(destination_root, "_rev.js"), "w" do |file|
-           file << "#{rev}\n"
+          @doc.rev = response["rev"]
+          File.open File.join(destination_root, "_rev"), "w" do |file|
+           file << @doc.rev
           end
 
-          say "Pushed %s" % rev
+          say "Pushed %s" % @doc.rev
         else
           say "Error occured: %s" % response.inspect
         end

data/lib/couch/actions/routes.rb

@@ -10,14 +10,14 @@ module Couch
         end
 
         say 'Lists:'
-        Dir.glob(File.join(destination_root, "lists/*.js")).each do |list|
+        Dir.glob(File.join(destination_root, "lists/*")).each do |list|
           Dir.glob(File.join(destination_root, "views/*")).each do |view|
             say '  %s' % list_url(list, view)
           end
         end
 
         say 'Shows:'
-        Dir.glob(File.join(destination_root, "shows/*.js")).each do |show|
+        Dir.glob(File.join(destination_root, "shows/*")).each do |show|
           say '  %s' % show_url(show)
           say '  %s' % show_url(show, '/:id')
         end

data/lib/couch/design_document.rb

@@ -2,227 +2,313 @@ require 'uri'
 
 module Couch
   class DesignDocument
-    EXT_MIME_MAPPING = {
+    # Mime type mapping from extensions
+    MIME_TYPE_MAPPING = {
       ".html" => "text/html",
       ".js" => "text/javascript",
       ".css" => "text/css",
     }
 
-    # initialize with a hash
-    def initialize(hash = {})
-      @hash = hash
-    end
+    # Files that should have a .js extension
+    JAVASCRIPT_FILES = %w[
+      validate_doc_update
+      lists/*
+      shows/*
+      updates/*
+      views/*/*
+    ]
 
-    # returns the id of the design document
-    def id
-      @hash["_id"]
-    end
+    # Files that should not be included in document
+    EXCLUDE_FILES = %w[
+      README
+    ]
 
-    # returns the rev of the design document
-    def rev
-      @hash["_rev"]
-    end
+    attr_accessor :hash
 
-    # converts to json
-    def to_json
-      hash_with_injected_makros.to_json
+    def initialize
+      @hash = {}
     end
 
-    # write to filesystem
-    def write(&block)
-      write_doc @hash, nil, block
-    end
+    # Read document from a filesystem.
+    #
+    # Takes a filename,
+    # many filenames,
+    # or an array of filenames
+    # and assign the return value of a yielded block to the hash.
+    #
+    # Nested hashes
+    # like { "hash" => { "key" => "value" } }
+    # can be constructed if the filename contains a slash (/),
+    # eg "hash/key".
+    #
+    def read(*filenames, &block)
+      filenames.flatten.uniq.each do |filename|
+        # skip exclude files
+        next if EXCLUDE_FILES.include?(filename)
 
-    class << self
-      # returns new design document object from filesystem
-      def build_from_filesystem(root)
-        new map(root)
-      end
+        key = filename.dup
+        # strip extname from javascript files
+        key.sub!(/\.js$/, '') if filename =~ /#{JAVASCRIPT_FILES.join('|')}/
 
-      # returns new design document object from json string
-      def build_from_json(json)
-        new reject_makros(JSON.parse(json))
+        set_hash_at key, block.call(filename)
       end
 
-      # returns the database used to store design document
-      def database
-        @database ||= Couch.database
-      end
+      map_attachments!
+      inject_makros!
+    end
 
-      # returns the id for design document
-      def id
-        @id ||= File.read(File.join(Couch.root, '_id.js')).strip
-      end
+    # Write document to a filesystem
+    #
+    # Takes a directoy as startpoint (default is nil),
+    # a document hash (default is the design documents hash)
+    # and recursively yields all keys and values to the given block.
+    #
+    # Nested hashes
+    # like { "hash" => { "key" => "value" } }
+    # will result in the yielded filename
+    # "hash/key".
+    #
+    # The key "_attachments" has a special meaning:
+    # the value holds base64 encoded data as well as other metadata.
+    # This data will gets decoded and used as value for the key.
+    # 
+    def write(directory = nil, doc = nil, &block)
+      reduce_attachments!
+      reject_makros!
 
-      # returns the url for design document
-      def url(options = {})
-        File.join(database, id) << build_options_string(options)
+      doc ||= hash
+      doc.each do |key, value|
+        filename = directory ? File.join(directory, key) : key.dup
+        if value.is_a?(Hash)
+          write(filename, value, &block)
+        else
+          # append extname to javascript files
+          filename << '.js' if filename =~ /#{JAVASCRIPT_FILES.join('|')}/
+          block.call(filename, value)
+        end
       end
+    end
 
-      private
+    # Returns a JSON string representation of the documents hash
+    #
+    def json
+      hash.to_json
+    end
 
-      def reject_makros(doc)
-        # TODO: recursive walk libs
-        libs = doc["lib"]
-        return doc if libs.nil? || libs.empty?
-        # Attention: replace json makros first!
-        doc = reject_json_makros(doc, libs)
-        doc = reject_code_makros(doc, libs)
-      end
+    # Build the documents hash from a JSON string
+    #
+    def json=(json)
+      self.hash = JSON.parse(json)
+    end
 
-      def reject_code_makros(doc, libs)
-        doc = doc.dup
-        doc.each do |key, value|
-          next if key == "lib"
-          if value.is_a?(String)
-            libs.each do |name, content|
-              # only substitute strings
-              next unless content.is_a?(String)
-              next unless value.include?(content.strip)
-              doc[key] = value.gsub(content.strip, "// !code #{name}.js")
-            end
-          elsif value.is_a?(Hash)
-            doc[key] = reject_code_makros(value, libs)
-          end
-        end
-        doc
-      end
 
-      def reject_json_makros(doc, libs)
-        doc.each do |key, value|
-          next if key == "lib"
-          if value.is_a?(String)
-            libs.each do |name, content|
-              # only substitute strings
-              next unless content.is_a?(String)
-              json = 'var %s = %s;' % [name.sub(/\..*$/, ''), content.to_json]
-              next unless value.include?(json)
-              doc[key] = value.gsub(json, "// !json #{name}")
-            end
-          elsif value.is_a?(Hash)
-            doc[key] = reject_json_makros(value, libs)
-          end
-        end
-        doc
-      end
+    # Accessor for id
+    def id
+      hash["_id"] || Couch.id
+    end
 
-      def build_options_string(options)
-        return '' if options.empty?
-        options_array = []
-        options.each do |key, value|
-          options_array << URI.escape([key, value].join('='))
-        end
-        '?' + options_array.join("&")
-      end
+    # Accessor for rev
+    def rev
+      hash["_rev"] || Couch.rev
+    end
 
-      def map(dirname, hash = {})
-        Dir.entries(dirname).each do |file|
-          next if file =~ /^\./
-          filename = File.join(dirname, file)
-          if file == "_attachments"
-            hash['_attachments'] = map_attachments(filename)
-          elsif File.directory?(filename)
-            hash[file] = map(filename)
-          elsif File.extname(filename) =~ /^\.(js|html)$/
-            # only .js and .html files are mapped
-            # but .js is stripped off the key
-            key = file.sub(/\.js$/, '')
-            hash[key] = File.read(filename).strip
-          end
-        end
-        hash
-      end
+    # Updates rev in documents hash
+    def rev=(new_rev)
+      hash["_rev"] = new_rev
+    end
 
-      def map_attachments(dirname, hash = {}, keys = [])
-        Dir.entries(dirname).each do |file|
-          next if file =~ /^\./
-          filename = File.join(dirname, file)
-          base = keys + [file]
-          if File.directory?(filename)
-            map_attachments filename, hash, base
-          else
-            hash[base.join('/')] = {
-              "content_type" => mime_type(filename),
-              "data" => base64(File.read(filename)),
-            }
-          end
-        end
-        hash
-      end
 
-      # CouchDB needs base64 encodings without spaces
-      def base64(data)
-        [data].pack("m").gsub(/\s/,'')
-      end
+    # Accessor for couch database
+    def database
+      @database ||= Couch.database
+    end
 
-      # detect mime type from filename extension
-      def mime_type(filename)
-        ext = File.extname(filename)
-        EXT_MIME_MAPPING[ext] || 'text/plain'
-      end
+    # Base URL for document
+    def base_url
+      @base_url ||= File.join(database, id)
+    end
+
+    # URL for accessing design document
+    # 
+    # Takes an optional options hash
+    # which gets converted to url encoded options
+    # and appended to the documents base url
+    #
+    def url(options = {})
+      base_url + build_options_string(options)
     end
 
     private
 
-    def write_doc(doc, dirname, block)
-      doc.each do |key, value|
-        next if key == "_attachments"
-        filename = dirname ? File.join(dirname, key) : key.dup
-        if value.is_a?(String)
-          filename << ".js" unless File.extname(filename) == ".html"
-          block.call filename, "#{value}\n"
-        else
-          write_doc value, filename, block
-        end
+    def hash_at(path)
+      current_hash = hash
+
+      parts = path.split('/')
+      key = parts.pop
+
+      parts.each do |part|
+        current_hash[part] ||= {}
+        current_hash = current_hash[part]
       end
-      write_attachments doc["_attachments"], dirname, block if doc["_attachments"]
+
+      current_hash[key]
     end
 
-    def write_attachments(doc, dirname, block)
-      dirname = dirname ? File.join(dirname, "_attachments") : "_attachments"
-      
-      doc.each do |key, value|
-        next unless value["data"]
+    def set_hash_at(path, value)
+      current_hash = hash
+
+      parts = path.split('/')
+      key = parts.pop
+
+      parts.each do |part|
+        current_hash[part] ||= {}
+        current_hash = current_hash[part]
+      end
+
+      current_hash[key] = value
+    end
 
-        block.call File.join(dirname, key), value["data"].unpack("m")
+    def build_options_string(options)
+      return '' if options.empty?
+      options_array = []
+      options.each do |key, value|
+        options_array << URI.escape([key, value].join('='))
       end
+      '?' + options_array.join("&")
     end
 
-    def hash_with_injected_makros
-      hash = inject_code_makros(@hash)
-      inject_json_makros(hash)
+    def inject_makros!
+      self.hash = inject_code_makro(hash)
+      self.hash = inject_json_makro(hash)
     end
 
-    def inject_code_makros(doc)
+    def inject_code_makro(doc)
       doc.each do |key, value|
         doc[key] = if value.is_a?(String)
                     value.gsub(/\/\/\s*!code.*$/) do |match|
                       filename = match.sub(/^.*!code\s*(\S+).*$/, '\1')
-                      File.read(File.join(Couch.root, 'lib', filename)).strip
+                      hash_at File.join('lib', filename)
                     end
                   elsif value.is_a?(Hash)
-                    inject_code_makros(value)
+                    inject_code_makro(value)
                   else
                     value
                   end
       end
+
       doc
     end
 
-    def inject_json_makros(doc)
+    def inject_json_makro(doc)
       doc.each do |key, value|
         doc[key] = if value.is_a?(String)
                     value.gsub(/\/\/\s*!json.*$/) do |match|
                       filename = match.sub(/^.*!json\s*(\S+).*$/, '\1')
-                      'var %s = %s;' % [filename.sub(/\..*$/, ''), File.read(File.join(Couch.root, 'lib', filename)).strip.to_json]
+                      'var %s = %s;' % [filename.sub(/\..*$/, ''), hash_at(File.join('lib', filename)).to_json]
                     end
                   elsif value.is_a?(Hash)
-                    inject_json_makros(value)
+                    inject_json_makro(value)
                   else
                     value
                   end
       end
+
+      doc
+    end
+
+    def reject_makros!
+      # TODO: recursive walk libs
+      libs = hash["lib"]
+      return if libs.nil? || libs.empty?
+      # Attention: replace json makros first!
+      self.hash = reject_json_makro(hash, libs)
+      self.hash = reject_code_makro(hash, libs)
+    end
+
+    def reject_code_makro(doc, libs)
+      doc = doc.dup
+      doc.each do |key, value|
+        next if key == "lib"
+
+        if value.is_a?(String)
+          libs.each do |name, content|
+            # only try substituting strings
+            next unless content.is_a?(String)
+            next unless value.include?(content)
+            doc[key] = value.gsub(content, "// !code #{name}")
+          end
+        elsif value.is_a?(Hash)
+          doc[key] = reject_code_makro(value, libs)
+        end
+      end
+      doc
+    end
+
+    def reject_json_makro(doc, libs)
+      doc.each do |key, value|
+        next if key == "lib"
+        if value.is_a?(String)
+          libs.each do |name, content|
+            # only try substituting strings
+            next unless content.is_a?(String)
+            json = 'var %s = %s;' % [name.sub(/\..*$/, ''), content.to_json]
+            next unless value.include?(json)
+            doc[key] = value.gsub(json, "// !json #{name}")
+          end
+        elsif value.is_a?(Hash)
+          doc[key] = reject_json_makro(value, libs)
+        end
+      end
       doc
     end
+
+    def reduce_attachments!
+      return hash unless hash["_attachments"]
+      attachments = {}
+      hash["_attachments"].each do |key, value|
+        data = value["data"]
+        next unless data
+        attachments.update key => decode_attachment(data)
+      end
+      hash.update "_attachments" => attachments
+    end
+
+    def map_attachments!
+      return unless hash["_attachments"]
+      attachments = {}
+      flatten_attachements(hash["_attachments"]).each do |key, value|
+        attachments.update key => {
+          "data" => encode_attachment(value),
+          "content_type" => mime_type_for(key)
+        }
+      end
+      self.hash.update "_attachments" => attachments
+    end
+
+    def flatten_attachements(doc, base = nil)
+      result = {}
+      doc.each do |key, value|
+        new_base = base ? [base, key].join('/') : key
+        if value.is_a?(Hash)
+          result.update flatten_attachements(value, new_base)
+        else
+          result.update new_base => value
+        end
+      end
+      result
+    end
+
+    def decode_attachment(data)
+      data.unpack("m").first
+    end
+
+    def encode_attachment(data)
+      [data].pack("m").gsub(/\s+/,'')
+    end
+
+    def mime_type_for(filename)
+      ext = File.extname(filename)
+      MIME_TYPE_MAPPING[ext] || 'text/plain'
+    end
   end
 end

data/lib/couch/generators/application/application_generator.rb

@@ -13,7 +13,7 @@ module Couch::Generators
       template "couchrc", ".couchrc"
       copy_file "README"
       copy_file "gitignore", ".gitignore" unless options[:skip_git]
-      template "_id.js"
+      template "_id"
       copy_file "validate_doc_update.js"
       empty_directory "lists"
       empty_directory "shows"

data/lib/couch/version.rb

@@ -1,3 +1,3 @@
 module Couch
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/couch/design_document_spec.rb

@@ -0,0 +1,313 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'couch/design_document'
+
+describe "DesignDocument" do
+  before do
+    @doc = Couch::DesignDocument.new
+  end
+
+  describe "read" do
+    it "should assign key-value pair" do
+      @doc.read("key") do |filename|
+        "value"
+      end
+      @doc.hash.should == { "key" => "value" }
+    end
+
+    it "should assign two key-value pairs" do
+      @doc.read("key1", "key2") do |filename|
+        "value"
+      end
+      @doc.hash.should == { "key1" => "value", "key2" => "value" }
+    end
+
+    it "should assign an array of two key-value pairs" do
+      @doc.read(["key1", "key2"]) do |filename|
+        "value"
+      end
+      @doc.hash.should == { "key1" => "value", "key2" => "value" }
+    end
+
+    it "should assign nested hash" do
+      @doc.read("hash/key") do |filename|
+        "value"
+      end
+      @doc.hash.should == { "hash" => { "key" => "value" } }
+    end
+
+    it "should assign deep nested hash" do
+      @doc.read("hash/hash/key") do |filename|
+        "value"
+      end
+      @doc.hash.should == { "hash" => { "hash" => { "key" => "value" } } }
+    end
+
+    describe "_attachments encoding and content_type" do
+      it "should proper encode and add plain text content type" do
+        @doc.read("_attachments/key") do |filename|
+          "value"
+        end
+        @doc.hash.should == { "_attachments" => { "key" => { "data" => "dmFsdWU=", "content_type" => "text/plain" } } }
+      end
+
+      it "should proper encode and add html content type" do
+        @doc.read("_attachments/key.html") do |filename|
+          "value"
+        end
+        @doc.hash.should == { "_attachments" => { "key.html" => { "data" => "dmFsdWU=", "content_type" => "text/html" } } }
+      end
+
+      it "should proper encode nested keys" do
+        @doc.read("_attachments/hash/key") do |filename|
+          "value"
+        end
+        @doc.hash.should == { "_attachments" => { "hash/key" => { "data" => "dmFsdWU=", "content_type" => "text/plain" } } }
+      end
+    end
+
+    describe "exclude files should not be mapped" do
+      it "should not map README" do
+        @doc.read("README") do |filename|
+          "value"
+        end
+        @doc.hash.should == {}
+      end
+    end
+
+    describe "javascript files should be stripped off extension" do
+      it "should strip validate_doc_update extension" do
+        @doc.read("validate_doc_update.js") do |filename|
+          "value"
+        end
+        @doc.hash.should == { "validate_doc_update" => "value" }
+      end
+
+      it "should strip lists/my_list.js" do
+        @doc.read("lists/my_list.js") do |filename|
+          "value"
+        end
+        @doc.hash.should == { "lists" => { "my_list" => "value" } }
+      end
+
+      it "should strip views/my_view/map.js" do
+        @doc.read("views/my_view/map.js") do |filename|
+          "value"
+        end
+        @doc.hash.should == { "views" => { "my_view" => { "map" => "value" } } }
+      end
+    end
+
+    describe "code makro" do
+      it "should expand code" do
+        idx = 0
+        @doc.read("key", "lib/code.js") do |filename|
+          case idx += 1
+          when 1
+            "// !code code.js"
+          when 2
+            "value"
+          end
+        end
+        @doc.hash.should == { "key" => "value", "lib" => { "code.js" => "value" } }
+      end
+    end
+
+    describe "json makro" do
+      it "should expand json" do
+        idx = 0
+        @doc.read("key", "lib/json.json") do |filename|
+          case idx += 1
+          when 1
+            "// !json json.json"
+          when 2
+            "value"
+          end
+        end
+        @doc.hash.should == { "key" => "var json = \"value\";", "lib" => { "json.json" => "value" } }
+      end
+    end
+  end
+
+  describe "write" do
+    it "should return key-value pair" do
+      @doc.hash = { "key" => "value" }
+      filename, content = nil, nil
+      @doc.write do |key, value|
+        filename, content = key, value 
+      end
+      filename.should == "key"
+      content.should == "value"
+    end
+
+    it "should return subdirectory for nested hash" do
+      @doc.hash = { "hash" => { "key" => "value" } }
+      filename, content = nil, nil
+      @doc.write do |key, value|
+        filename, content = key, value 
+      end
+      filename.should == "hash/key"
+      content.should == "value"
+    end
+
+    it "should return subdirectory for nested hash" do
+      @doc.hash = { "hash" => { "hash" => { "key" => "value" } } }
+      filename, content = nil, nil
+      @doc.write do |key, value|
+        filename, content = key, value 
+      end
+      filename.should == "hash/hash/key"
+      content.should == "value"
+    end
+
+    it "should return decoded _attachments data" do
+      @doc.hash = { "_attachments" => { "key" => { "data" => "dmFsdWU=" } } }
+      filename, content = nil, nil
+      @doc.write do |key, value|
+        filename, content = key, value 
+      end
+      filename.should == "_attachments/key"
+      content.should == "value"
+    end
+
+    describe "javascript extensions" do
+      it "should append validate_doc_update" do
+        @doc.hash = { "validate_doc_update" => "value" }
+        filename = nil
+        @doc.write do |key, value|
+          filename = key
+        end
+        filename.should == "validate_doc_update.js"
+      end
+
+      it "should append lists/my_list" do
+        @doc.hash = { "lists" => { "my_list" => "value" } }
+        filename = nil
+        @doc.write do |key, value|
+          filename = key
+        end
+        filename.should == "lists/my_list.js"
+      end
+
+      it "should append views/my_view/map" do
+        @doc.hash = { "views" => { "my_view" => { "map" => "value" } } }
+        filename = nil
+        @doc.write do |key, value|
+          filename = key
+        end
+        filename.should == "views/my_view/map.js"
+      end
+    end
+
+    describe "code makro" do
+      it "should reject code" do
+        @doc.hash = { "key" => "value", "lib" => { "code.js" => "value" } }
+        content = nil
+        @doc.write do |key, value|
+          content = value 
+        end
+        @doc.hash.should == { "key" => "// !code code.js", "lib" => { "code.js" => "value" } }
+        content.should == "// !code code.js"
+      end
+    end
+
+    describe "json makro" do
+      it "should reject json" do
+        @doc.hash = { "key" => "var json = \"value\";", "lib" => { "json.json" => "value" } }
+        content = nil
+        @doc.write do |key, value|
+          content = value 
+        end
+        @doc.hash.should == { "key" => "// !json json.json", "lib" => { "json.json" => "value" } }
+        content.should == "// !json json.json"
+      end
+    end
+  end
+
+  describe "json" do
+    it "should convert key-value pair" do
+      @doc.hash = { "key" => "value" }
+      @doc.json.should == '{"key":"value"}'
+    end
+
+    it "should convert nested hash" do
+      @doc.hash = { "hash" => { "key" => "value" } }
+      @doc.json.should == '{"hash":{"key":"value"}}'
+    end
+  end
+
+  describe "json=" do
+    it "should read key-value pair" do
+      @doc.json = '{"key":"value"}'
+      @doc.hash.should == { "key" => "value" }
+    end
+
+    it "should read nested hash" do
+      @doc.json = '{"hash":{"key":"value"}}'
+      @doc.hash.should == { "hash" => { "key" => "value" } }
+    end
+  end
+
+  describe "id accessor" do
+    it "should return id from hash" do
+      @doc.hash = { "_id" => "my_id" }
+      @doc.id.should == "my_id"
+    end
+
+    it "should return id from couch" do
+      Couch.stub!(:id).and_return("my_id")
+      @doc.hash = {}
+      @doc.id.should == "my_id"
+    end
+  end
+
+  describe "rev accessor" do
+    it "should return rev from hash" do
+      @doc.hash = { "_rev" => "my_rev" }
+      @doc.rev.should == "my_rev"
+    end
+
+    it "should return rev from couch" do
+      Couch.stub!(:rev).and_return("my_rev")
+      @doc.hash = {}
+      @doc.rev.should == "my_rev"
+    end
+
+    it "should update rev in hash" do
+      @doc.hash = {}
+      @doc.rev = "my_rev"
+      @doc.hash.should == { "_rev" => "my_rev" }
+    end
+  end
+
+  describe "database accessor" do
+    it "should return database couch" do
+      Couch.stub!(:database).and_return("my_db")
+      @doc.database.should == "my_db"
+    end
+  end
+
+  describe "base url" do
+    it "should combine database and id" do
+      @doc.should_receive(:id).and_return("my_id")
+      @doc.should_receive(:database).and_return("my_db")
+      @doc.base_url.should == "my_db/my_id"
+    end
+  end
+
+  describe "url" do
+    it "should return base_url without options" do
+      @doc.should_receive(:base_url).and_return("my_base_url")
+      @doc.url.should == "my_base_url"
+    end
+
+    it "should return base_url with options string" do
+      @doc.should_receive(:base_url).and_return("my_base_url")
+      @doc.url(:key => :value).should == "my_base_url?key=value"
+    end
+
+    it "should return base_url with properly escaped options string" do
+      @doc.should_receive(:base_url).and_return("my_base_url")
+      @doc.url(:key => "value value").should == "my_base_url?key=value%20value"
+    end
+  end
+end

data/spec/couch_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Couch" do
+  it "should return .couchrc as config filename" do
+    Couch::CONFIG_FILENAME.should == '.couchrc'
+  end
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'couch'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -74,6 +74,20 @@ dependencies:
         version: 3.0.0.beta
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id005
 description: With Couch you can easy build a standalone CouchDB application.
 email: schmidt@netzmerk.com
 executables: 
@@ -109,7 +123,7 @@ files:
 - lib/couch/generators/application/templates/README
 - lib/couch/generators/application/templates/_attachments/index.html
 - lib/couch/generators/application/templates/_attachments/stylesheets/application.css
-- lib/couch/generators/application/templates/_id.js
+- lib/couch/generators/application/templates/_id
 - lib/couch/generators/application/templates/couchrc
 - lib/couch/generators/application/templates/gitignore
 - lib/couch/generators/application/templates/lib/mustache.js
@@ -131,6 +145,10 @@ files:
 - lib/couch/generators/view/templates/map.js
 - lib/couch/generators/view/view_generator.rb
 - lib/couch/version.rb
+- spec/couch/design_document_spec.rb
+- spec/couch_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jo/couch
 licenses: []
@@ -161,5 +179,7 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Standalone CouchDB Application Development Suite
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/couch/design_document_spec.rb
+- spec/couch_spec.rb