rid 0.5.1 → 0.5.2

data/lib/rid/makros.rb

@@ -73,24 +73,28 @@ module Rid
     # injects a makro and yields block with the filenames for found makros
     #
     def inject_makro!(makro, &block)
+      matcher = /\/\/\s*!#{makro}\s+[\S]+$/
+
       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')
+        while value =~ matcher do
+          value = value.sub(matcher) do |match|
+            start = Regexp.last_match.begin(0)
+            filename = match.sub(/^.*!#{makro}\s*(\S+).*$/, '\1')
 
-          value = block.call(filename)
+            value = block.call(filename)
 
-          store_injection makro, key, filename, start, value.size
+            store_injection makro, key, filename, start, value.size
 
-          value
+            value
+          end
         end
 
-        self.hash.update_at key, new_value
+        self.hash.update_at key, value
       end
     end
 

data/lib/rid/version.rb

@@ -1,3 +1,3 @@
 module Rid
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/rid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rid}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   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-16}
+  s.date = %q{2010-03-17}
   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}

data/spec/rid/makros_spec.rb

@@ -80,5 +80,15 @@ describe "Makros" do
         @doc.hash["key"].should == "// !json hash/json.json"
       end
     end
+
+    describe "many makros" do
+      it "should reject properly" do
+        @doc.hash = { "lib" => { "code.js" => "value", "other.js" => "value" }, "key" => "// !code code.js\n// !code other.js" }
+        @doc.inject_makros!
+        @doc.hash["injections"].should == [{"makro"=>"code", "size"=>5, "lib"=>"code.js", "start"=>0, "target"=>"key"}, {"makro"=>"code", "size"=>5, "lib"=>"other.js", "start"=>6, "target"=>"key"}]
+        @doc.reject_makros!
+        @doc.hash["key"].should == "// !code code.js\n// !code other.js"
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +01:00
+date: 2010-03-17 00:00:00 +01:00
 default_executable: rid
 dependencies: 
 - !ruby/object:Gem::Dependency