Add capability to ignore language flattening on case by case basis

Author: xrd

README.md

@@ -144,6 +144,8 @@ if anotherVar == "anotherVar"
 If you want the default to be to flatten (avoiding setting it each
 snippet declaration), you can set that using the config method: `Oreilly::Snippets.config( flatten: true )` 
 
+At the moment, flattening does not work perfectly for Java files. You can ignore java with `Oreilly::Snippets.config( flatten: true, flatten_exceptions: { java: true } )` 
+
 #### Incompatibilities with Atlas from O'Reilly
 
 NB: This format of snippets is not currently compatible with Atlas

lib/oreilly/snippets.rb

@@ -55,7 +55,7 @@ def self.get_content_from_file( spec, identifier, language, sha=nil, numbers=nil
         rv = contents
       end
 
-      if flatten or @@_config[:flatten]
+      if ( flatten or @@_config[:flatten] ) and not flatten_exceptions( language )
         rv = flatten_it( rv )
       end
 
@@ -64,6 +64,10 @@ def self.get_content_from_file( spec, identifier, language, sha=nil, numbers=nil
       rv
     end
 
+    def self.flatten_exceptions( language )
+      @@_config[:flatten_exceptions] and @@_config[:flatten_exceptions][language.to_sym]
+    end
+
     def self.flatten_it( content ) 
       # find the smallest indent level, and then strip that off the beginning of all lines
       smallest = nil

lib/oreilly/snippets/version.rb

@@ -1,5 +1,5 @@
 module Oreilly
   module Snippets
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

spec/fixtures/factorial.java

@@ -0,0 +1,6 @@
+
+public class Factorial {
+    public static void main( String[] args ) {
+      // Do something
+    }
+}

spec/process_spec.rb

@@ -54,6 +54,14 @@
 snippet~~~~
 END
 
+DONT_USE_JAVA_FOR_FLATTENING = <<END
+[filename="spec/fixtures/factorial.java", language="java", lines="3..5"]
+snippet~~~~
+Put any descriptive text you want here. It will be replaced with the
+specified code snippet when you build ebook outputs
+snippet~~~~
+END
+
 TEMPLATE = <<END
 
 ABC
@@ -202,6 +210,17 @@ def download_test_repository
         lines[-1][0].should match /\s/ # Last line is not indented
       end
 
+      it "should not flatten if java is used and properly configured" do
+        string = <<END
+    public static void main( String[] args ) {
+      // Do something
+    }
+END
+        Oreilly::Snippets.config( flatten: true, flatten_exceptions: { java: true } )
+        output = Oreilly::Snippets.process( DONT_USE_JAVA_FOR_FLATTENING )
+        string.should eq( output )
+      end
+
       it "should support flattening with tabs" do
         output = Oreilly::Snippets.process( FLATTEN_WITH_TABS )
         output.should == @tabs_flattened