rid 0.3.0 → 0.3.1

data/README.rdoc

@@ -9,12 +9,12 @@ Currently Rid supports Rails style Generators you will love, using the same awes
 
 == Why?
 
-Why do we need a new Couchdb Application Development Suite? We already have the powerful {RidApp}[http://github.com/ridapp/ridapp].
+Why do we need a new Couchdb Application Development Suite? We already have the powerful {CouchApp}[http://github.com/couchapp/couchapp].
 
-I miss some beauty. I miss some elegance on the command line.
+I need more beauty. I want some elegance on the command line.
 
 I know my attempt is almost a small little step towards the beauty I aspire.
-I try to pilfer the most of now: From RidApp and Ruby on Rails.
+I try to pilfer the most of now: From CouchApp and Ruby on Rails.
 So here we go:
 
 <em>Rid is designed to structure standalone Couchdb application development for maximum application portability.</em>
@@ -32,7 +32,7 @@ Building standalone Couchdb applications according to correct principles affords
 == What comes next
 
 At the moment, Rid supports generating a scaffold application, pushing to a Couchdb server and pulling from a Couchdb.
-Rid injects the !code and !json makros introduced by RidApp.
+Rid injects the !code and !json makros introduced by CouchApp.
 
 The next big steps are:
 

data/lib/rid/attachments.rb

@@ -7,42 +7,51 @@ module Rid
       ".css" => "text/css",
     }
 
-    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
 
+    # encode attachments and add meta data
+    #
     def map_attachments!
-      return unless hash["_attachments"]
-      attachments = {}
-      flatten_attachements(hash["_attachments"]).each do |key, value|
-        attachments.update key => {
+      return if attachments.empty?
+
+      doc = {}
+      attachments.flatten.each do |key, value|
+        doc[key] = {
           "data" => encode_attachment(value),
           "content_type" => mime_type_for(key)
         }
       end
-      self.hash.update "_attachments" => attachments
+
+      self.attachments = doc
     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
+    # decode attachments and flatten meta data hash
+    #
+    def reduce_attachments!
+      return if attachments.empty?
+
+      doc = {}
+      attachments.each do |key, value|
+        data = value["data"]
+        next unless data
+        doc[key] = decode_attachment(data)
       end
-      result
+
+      self.attachments = doc
     end
 
+    private
+
+    # accessor for attachments hash
+    #
+    def attachments
+      hash["_attachments"] || {}
+    end
+
+    def attachments=(value)
+      self.hash["_attachments"] = value
+    end
+
+
     def decode_attachment(data)
       data.unpack("m").first
     end

data/lib/rid/core_ext/hash.rb

@@ -0,0 +1,57 @@
+class Hash
+  DEFAULT_SEPERATOR = '/'
+
+  def flatten(seperator = DEFAULT_SEPERATOR, prefix = nil)
+    new_hash = {}
+
+    each do |key, value|
+      new_key = [prefix, key].compact.join(seperator)
+      if value.is_a?(self.class)
+        new_hash.update value.flatten(seperator, new_key)
+      else
+        new_hash.update new_key => value
+      end
+    end
+
+    new_hash
+  end
+
+  def flatten!(*args)
+    replace flatten(*args)
+  end
+
+  def at(path, seperator = DEFAULT_SEPERATOR)
+    current = self
+    
+    parts = path.split(DEFAULT_SEPERATOR)
+    key = parts.pop
+
+    return unless key
+
+    parts.each do |part|
+      current = current[part]
+      
+      return unless current.is_a?(self.class)
+    end
+
+    current[key]
+  end
+
+  def update_at(path, value, seperator = DEFAULT_SEPERATOR)
+    current = self
+    
+    parts = path.split(DEFAULT_SEPERATOR)
+    key = parts.pop
+
+    return self unless key
+
+    parts.each do |part|
+      current[part] ||= {}
+      current = current[part]
+      
+      raise 'updating value at %s failed!' % inspect unless current.is_a?(self.class)
+    end
+
+    current[key] = value
+  end
+end

data/lib/rid/design_document.rb

@@ -1,3 +1,4 @@
+require 'rid/core_ext/hash'
 require 'rid/attachments'
 require 'rid/makros'
 
@@ -49,7 +50,7 @@ module Rid
         # strip extname from javascript files
         key.sub!(/\.js$/, '') if filename =~ /#{JAVASCRIPT_FILES.join('|')}/
 
-        set_hash_at key, block.call(filename)
+        hash.update_at key, block.call(filename)
       end
 
       map_attachments!
@@ -71,20 +72,16 @@ module Rid
     # 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)
+    def write(&block)
       reduce_attachments!
       reject_makros!
 
-      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
+      hash.flatten.each do |key, value|
+        filename = key.dup
+        # append extname to javascript files
+        filename << '.js' if filename =~ /#{JAVASCRIPT_FILES.join('|')}/
+
+        block.call(filename, value)
       end
     end
 
@@ -137,35 +134,8 @@ module Rid
       base_url + build_options_string(options)
     end
 
-    private
-
-    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
-
-      current_hash[key]
-    end
-
-    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
+    private
 
     def build_options_string(options)
       return '' if options.empty?

data/lib/rid/makros.rb

@@ -1,105 +1,94 @@
 module Rid
   module Makros
+    # inject makros, that is:
+    # replace makro with content from libs
+    #
     def inject_makros!
-      self.hash = inject_code_makro(hash)
-      self.hash = inject_json_makro(hash)
+      inject_makro! "code" do |filename|
+        value = libs.at(filename)
+        raise "code makro injection failed!\nNo lib available for %s" % filename unless value
+
+        value
+      end
+      
+      inject_makro! "json" do |filename|
+        value = libs.at(filename)
+        raise "json makro injection failed!\nNo lib available for %s" % filename unless value
+
+        expand_json_makro filename, value
+      end
     end
 
+    # reject makros, that is:
+    # replace makro generated content with makro
+    #
     def reject_makros!
-      return if libs.empty?
-      # Attention: replace json makros first!
-      self.hash = reject_json_makro(hash, libs)
-      self.hash = reject_code_makro(hash, libs)
-    end
+      return if injections.empty?
 
-    def libs
-      @libs ||= flatten_libs
-    end
+      injections.reverse.each do |inj|
+        makro, target, lib, start, size = inj["makro"], inj["target"], inj["lib"], inj["start"], inj["size"] 
 
-    def flatten_libs(libs = hash["lib"] || {}, key = nil)
-      result = {}
-      libs.each do |name, value|
-        new_key = key ? File.join(key, name) : name
-        if value.is_a?(Hash)
-          result.update flatten_libs(value, new_key)
-        else
-          result.update new_key => value
-        end
+        value = hash.at(target)
+        value[start, size] = "// !#{makro} #{lib}"
       end
-      result
     end
 
 
-    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')
-                      libs[filename]
-                    end
-                  elsif value.is_a?(Hash)
-                    inject_code_makro(value)
-                  else
-                    value
-                  end
-      end
+    private
+
+    # provide access to lib hash
+    #
+    def libs
+      hash["lib"] || {}
+    end
 
-      doc
+    # provide access to injections array
+    #
+    def injections
+      hash["injections"] || []
     end
 
-    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(/\..*$/, ''), libs[filename].to_json]
-                    end
-                  elsif value.is_a?(Hash)
-                    inject_json_makro(value)
-                  else
-                    value
-                  end
-      end
 
-      doc
+    # builds a javascript variable assignment line for filename with value
+    def expand_json_makro(filename, value)
+      'var %s = %s;' % [filename.split(/[\.\/]/).join('_'), value.to_json]
     end
 
+    # injects a makro and yields block with the filenames for found makros
+    #
+    def inject_makro!(makro, &block)
+      hash.flatten.each do |key, value|
+        next unless value.is_a?(String)
+
+        # do not try to inject makros in attachments, libs and injections array
+        next if key =~ /^_attachments|libs|injections/
+
+        new_value = value.gsub(/\/\/\s*!#{makro}\s+[\S]+$/) do |match|
+          start = Regexp.last_match.begin(0)
+          filename = match.sub(/^.*!#{makro}\s*(\S+).*$/, '\1')
 
-    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)
+          value = block.call(filename)
+
+          store_injection makro, key, filename, start, value.size
+
+          value
         end
+
+        self.hash.update_at key, new_value
       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
+    # Store injection values in injections array
+    #
+    def store_injection(makro, target, lib, start, size)
+      hash["injections"] ||= []
+      hash["injections"] << {
+        "makro"  => makro,
+        "target" => target,
+        "lib"    => lib,
+        "start" => start,
+        "size" => size
+      }
     end
   end
 end

data/lib/rid/version.rb

@@ -1,3 +1,3 @@
 module Rid
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/rid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rid}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes J. Schmidt"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-03-12}
   s.default_executable = %q{rid}
   s.description = %q{With Couch you can easy build a standalone CouchDB application. Couch aims to bring some of the Rails beauty to CouchDB. Currently Couch supports Rails style Generators you will love, using the same awesome Thor library used in Rails3.}
   s.email = %q{schmidt@netzmerk.com}
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "lib/rid/commands/pull.rb",
      "lib/rid/commands/push.rb",
      "lib/rid/commands/routes.rb",
+     "lib/rid/core_ext/hash.rb",
      "lib/rid/design_document.rb",
      "lib/rid/generators.rb",
      "lib/rid/generators/application/USAGE",
@@ -68,7 +69,10 @@ Gem::Specification.new do |s|
      "lib/rid/makros.rb",
      "lib/rid/version.rb",
      "rid.gemspec",
+     "spec/rid/attachments_spec.rb",
+     "spec/rid/core_ext/hash_spec.rb",
      "spec/rid/design_document_spec.rb",
+     "spec/rid/makros_spec.rb",
      "spec/rid_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -82,6 +86,9 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/rid_spec.rb",
+     "spec/rid/core_ext/hash_spec.rb",
+     "spec/rid/makros_spec.rb",
+     "spec/rid/attachments_spec.rb",
      "spec/rid/design_document_spec.rb"
   ]
 

data/spec/rid/attachments_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'rid/design_document'
+
+describe "Attachments" do
+  before do
+    @doc = Rid::DesignDocument.new
+  end
+
+  describe "map" do
+    describe "_attachments encoding and content_type" do
+      it "should proper encode and add plain text content type" do
+        @doc.hash = { "_attachments" => { "key" => "value" } }
+        @doc.map_attachments!
+        @doc.hash.should == { "_attachments" => { "key" => { "data" => "dmFsdWU=", "content_type" => "text/plain" } } }
+      end
+
+      it "should proper encode and add html content type" do
+        @doc.hash = { "_attachments" => { "key.html" => "value" } }
+        @doc.map_attachments!
+        @doc.hash.should == { "_attachments" => { "key.html" => { "data" => "dmFsdWU=", "content_type" => "text/html" } } }
+      end
+
+      it "should proper map nested attachments" do
+        @doc.hash = { "_attachments" => { "hash" => { "key" => "value" } } }
+        @doc.map_attachments!
+        @doc.hash.should == { "_attachments" => { "hash/key" => { "data" => "dmFsdWU=", "content_type" => "text/plain" } } }
+      end
+    end
+  end
+
+  describe "reduce" do
+    it "should decode _attachments data" do
+      @doc.hash = { "_attachments" => { "key" => { "data" => "dmFsdWU=" } } }
+      @doc.reduce_attachments!
+      @doc.hash.should == { "_attachments" => { "key" => "value" } }
+    end
+  end
+end

data/spec/rid/core_ext/hash_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'rid/core_ext/hash'
+
+describe "Hash" do
+  describe "flatten" do
+    it "should untouch flat hash" do
+      hash = { "a" => 1, "b" => 2 }
+      hash.flatten.should == hash
+    end
+
+    it "should flaten simple nested hash" do
+      hash = { "a" => { "b" => 1 } }
+      hash.flatten.should == { "a/b" => 1 }
+    end
+
+    it "should flaten deep nested hash" do
+      hash = { "a" => { "b" => { "c" => 1 } } }
+      hash.flatten.should == { "a/b/c" => 1 }
+    end
+  end
+
+  describe "flatten!" do
+    it "should change receiver" do
+      hash = { "a" => { "b" => 1 } }
+      hash.flatten!
+      hash.should == { "a/b" => 1 }
+    end
+  end
+
+  describe "at" do
+    it "should retrieve value at top level" do
+      hash = { "a" => 1 }
+      hash.at("a").should == 1
+    end
+
+    it "should retrieve value at nested level" do
+      hash = { "a" => { "b" => 1 } }
+      hash.at("a/b").should == 1
+    end
+
+    it "should retrieve value at deep nested level" do
+      hash = { "a" => { "b" => { "c" => 1 } } }
+      hash.at("a/b/c").should == 1
+    end
+
+    it "should return nil if not present" do
+      hash = { "a" => { "c" => { "c" => 1 } } }
+      hash.at("a/b/c").should == nil
+    end
+  end
+
+  describe "update_at" do
+    it "should insert value at top level" do
+      hash = { }
+      hash.update_at "a", 1
+      hash.should == { "a" => 1 }
+    end
+
+    it "should insert value at nested level" do
+      hash = { }
+      hash.update_at "a/b", 1
+      hash.should == { "a" => { "b" => 1 } }
+    end
+
+    it "should insert value at deep nested level" do
+      hash = { }
+      hash.update_at "a/b/c", 1
+      hash.should == { "a" => { "b" => { "c" => 1 } } }
+    end
+  end
+end

data/spec/rid/design_document_spec.rb

@@ -6,6 +6,7 @@ describe "DesignDocument" do
     @doc = Rid::DesignDocument.new
   end
 
+
   describe "read" do
     it "should assign key-value pair" do
       @doc.read("key") do |filename|
@@ -42,28 +43,6 @@ describe "DesignDocument" do
       @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
@@ -96,149 +75,59 @@ describe "DesignDocument" do
         @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 
+        key.should == "key"
+        value.should == "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 
+        key.should == "hash/key"
+        value.should == "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 
+        key.should == "hash/hash/key"
+        value.should == "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
+          key.should == "validate_doc_update.js"
         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
+          key.should == "lists/my_list.js"
         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
-        content.should == "// !code code.js"
-      end
-
-      it "should reject nested code" do
-        @doc.hash = { "key" => "value", "lib" => { "hash" => { "code.js" => "value" } } }
-        content = nil
         @doc.write do |key, value|
-          content = value 
+          key.should == "views/my_view/map.js"
         end
-        content.should == "// !code hash/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
-        content.should == "// !json json.json"
-      end
-
-      it "should reject nested json" do
-        @doc.hash = { "key" => "var json = \"value\";", "lib" => { "hash" => { "json.json" => "value" } } }
-        content = nil
-        @doc.write do |key, value|
-          content = value 
-        end
-        content.should == "// !json hash/json.json"
       end
     end
   end
 
+
   describe "json" do
     it "should convert key-value pair" do
       @doc.hash = { "key" => "value" }
@@ -263,6 +152,7 @@ describe "DesignDocument" do
     end
   end
 
+
   describe "id accessor" do
     it "should return id from hash" do
       @doc.hash = { "_id" => "my_id" }
@@ -302,6 +192,7 @@ describe "DesignDocument" do
     end
   end
 
+
   describe "base url" do
     it "should combine database and id" do
       @doc.should_receive(:id).and_return("my_id")

data/spec/rid/makros_spec.rb

@@ -0,0 +1,84 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'rid/design_document'
+
+describe "Makros" do
+  before do
+    @doc = Rid::DesignDocument.new
+  end
+
+  describe "inject" do
+    describe "code makro" do
+      it "should expand code" do
+        @doc.hash = { "hash" => { "key" => "// !code code.js" }, "lib" => { "code.js" => "value" } }
+        @doc.inject_makros!
+        @doc.hash["hash"]["key"].should == "value"
+      end
+
+      it "should not remove code that follows" do
+        @doc.hash = { "hash" => { "key" => "// !code code.js\nvalue" }, "lib" => { "code.js" => "value" } }
+        @doc.inject_makros!
+        @doc.hash["hash"]["key"].should == "value\nvalue"
+      end
+
+      it "should store injection" do
+        @doc.hash = { "hash" => { "key" => "// !code code.js" }, "lib" => { "code.js" => "value" } }
+        @doc.inject_makros!
+        @doc.hash["injections"].should == [{ "makro" => "code", "target" => "hash/key", "lib" => "code.js", "start" => 0, "size" => 5 }]
+      end
+    end
+
+    describe "json makro" do
+      it "should expand json" do
+        @doc.hash = { "hash" => { "key" => "// !json json.json" }, "lib" => { "json.json" => "value" } }
+        @doc.inject_makros!
+        @doc.hash["hash"]["key"].should == 'var json_json = "value";'
+      end
+
+      it "should not remove code that follows" do
+        @doc.hash = { "hash" => { "key" => "// !json json.json\nvalue" }, "lib" => { "json.json" => "value" } }
+        @doc.inject_makros!
+        @doc.hash["hash"]["key"].should == "var json_json = \"value\";\nvalue"
+      end
+
+      it "should store injection" do
+        @doc.hash = { "hash" => { "key" => "// !json json.json" }, "lib" => { "json.json" => "value" } }
+        @doc.inject_makros!
+        @doc.hash["injections"].should == [{ "makro" => "json", "target" => "hash/key", "lib" => "json.json", "start" => 0, "size" => 24 }]
+      end
+    end
+  end
+
+  describe "reject" do
+    describe "code makro" do
+      it "should reject code" do
+        @doc.hash = { "lib" => { "code.js" => "value" }, "key" => "// !code code.js" }
+        @doc.inject_makros!
+        @doc.reject_makros!
+        @doc.hash["key"].should == "// !code code.js"
+      end
+
+      it "should reject nested code" do
+        @doc.hash = { "lib" => { "hash" => { "code.js" => "value" } }, "key" => "// !code hash/code.js" }
+        @doc.inject_makros!
+        @doc.reject_makros!
+        @doc.hash["key"].should == "// !code hash/code.js"
+      end
+    end
+
+    describe "json makro" do
+      it "should reject json" do
+        @doc.hash = { "lib" => { "json.json" => "value" }, "key" => "// !json json.json" }
+        @doc.inject_makros!
+        @doc.reject_makros!
+        @doc.hash["key"].should == "// !json json.json"
+      end
+
+      it "should reject nested json" do
+        @doc.hash = { "lib" => { "hash" => { "json.json" => "value" } }, "key" => "// !json hash/json.json" }
+        @doc.inject_makros!
+        @doc.reject_makros!
+        @doc.hash["key"].should == "// !json hash/json.json"
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 +01:00
+date: 2010-03-12 00:00:00 +01:00
 default_executable: rid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
 - lib/rid/commands/pull.rb
 - lib/rid/commands/push.rb
 - lib/rid/commands/routes.rb
+- lib/rid/core_ext/hash.rb
 - lib/rid/design_document.rb
 - lib/rid/generators.rb
 - lib/rid/generators/application/USAGE
@@ -147,7 +148,10 @@ files:
 - lib/rid/makros.rb
 - lib/rid/version.rb
 - rid.gemspec
+- spec/rid/attachments_spec.rb
+- spec/rid/core_ext/hash_spec.rb
 - spec/rid/design_document_spec.rb
+- spec/rid/makros_spec.rb
 - spec/rid_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -184,4 +188,7 @@ summary: Standalone Couchdb Application Development Suite
 test_files: 
 - spec/spec_helper.rb
 - spec/rid_spec.rb
+- spec/rid/core_ext/hash_spec.rb
+- spec/rid/makros_spec.rb
+- spec/rid/attachments_spec.rb
 - spec/rid/design_document_spec.rb