borrower 0.5.0 → 0.6.0

data/lib/borrower/merge.rb

@@ -3,7 +3,7 @@ module Borrower
 
     def initialize content, options={}
       @content = content
-      @comment_symbol = options.fetch(:comment) { default_comment_symbol }
+      @comment_symbol = pick_comment_symbol options
     end
 
     def output
@@ -12,8 +12,10 @@ module Borrower
 
     private
 
-      def default_comment_symbol
-        "#"
+      def pick_comment_symbol options
+        options.fetch(:comment) do
+          CommentSymbol.find_symbol_for options.fetch(:type) { "default" }
+        end
       end
 
       def merge_borrow_statements
@@ -26,5 +28,30 @@ module Borrower
         Content.get(path)
       end
 
+      module CommentSymbol
+        class << self
+
+          def find_symbol_for type
+            symbols.fetch(type) { default }
+          end
+
+          private
+
+            def default
+              "#"
+            end
+
+            def symbols
+              {
+                'js'          => '//',
+                'javascript'  => '//',
+                'css'         => '//',
+                'stylesheet'  => '//'
+              }
+            end
+
+        end
+      end
+
   end
 end

data/lib/borrower/version.rb

@@ -1,3 +1,3 @@
 module Borrower
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/borrower.rb

@@ -36,7 +36,7 @@ module Borrower::DSL
   def borrow path, options={}, &block
     destination = options.delete(:to) { raise ArgumentError, "missing 'to:' argument" }
     content = Borrower.take(path)
-    content = Borrower.merge(content) if options.fetch(:merge) { false }
+    content = Borrower.merge(content, options) if options.fetch(:merge) { false }
     if block_given?
       content = yield content
     end

data/spec/borrower/merge_spec.rb

@@ -21,6 +21,11 @@ describe "moving files with a merge" do
     Borrower.merge("//= borrow 'foo.txt'", comment: "//" ).should == "hello I'm merged text"
   end
 
+  it "lets you pass file types to change the comment symbol" do
+    Borrower.merge( "//= borrow 'foo.txt'", type: 'js' ).should == "hello I'm merged text"
+    Borrower.merge( "//= borrow 'foo.txt'", type: 'css' ).should == "hello I'm merged text"
+  end
+
   it "handles multiple files to merge with" do
     given_file "woo.txt", "woo"
     given_file "multiple.txt", <<-content

data/spec/borrower_spec.rb

@@ -5,6 +5,7 @@ describe Borrower do
   before :each do
     given_file "file.txt", "Hi I'm a file"
     given_file "merge.txt", "#= borrow '#{File.join( TMP, 'file.txt')}'"
+    given_file "merge.js", "//= borrow '#{File.join( TMP, 'file.txt')}'"
   end
 
   after :each do
@@ -13,6 +14,7 @@ describe Borrower do
 
   let (:local_file)       { File.join( TMP, 'file.txt' ) }
   let (:merge_file)       { File.join( TMP, 'merge.txt' ) }
+  let (:js_merge_file)    { File.join( TMP, 'merge.js' ) }
   let (:remote_file)      { "https://gist.github.com/stevenosloan/5578606/raw/97ab1305184bdeac33472f9f1fcc1c9e278a1bb3/dummy.txt" }
   let (:file_destination) { File.join( TMP, 'destination/file.txt' ) }
 
@@ -48,6 +50,11 @@ describe Borrower do
     Borrower.take( file_destination ).should == "Hi I'm a file"
   end
 
+  it "merges files with the file type it is passed" do
+    borrow js_merge_file, to: file_destination, merge: true, type: 'js'
+    Borrower.take( file_destination ).should == "Hi I'm a file"
+  end
+
   it "raises an error if missing arg with key 'to'" do
     expect{ borrow( "foo", away: "bar" )}.to raise_error(ArgumentError)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borrower
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors: