Better error checking when language not specified

Author: xrd

lib/oreilly/snippets.rb

@@ -55,8 +55,9 @@ def self.get_content_from_file( spec, identifier, language, sha=nil, numbers=nil
         rv = contents
       end
 
+      # puts "Should we skip flattening? #{language}"
       unless skip_flattening( language )
-        if ( flatten or @@_config[:flatten] )
+        if flatten or @@_config[:flatten]
           rv = flatten_it( rv )
         end
       end
@@ -67,7 +68,8 @@ def self.get_content_from_file( spec, identifier, language, sha=nil, numbers=nil
     end
 
     def self.skip_flattening( language )
-      rv = ( !!@@_config[:skip_flattening] and !!@@_config[:skip_flattening][language.to_sym] ) 
+      rv = ( !!@@_config[:skip_flattening] and language and !!@@_config[:skip_flattening][language.to_sym] ) 
+      # rv = ( !!@@_config[:skip_flattening] and !!@@_config[:skip_flattening][language.to_sym] ) 
       # puts "Skipping flattening for #{language} / #{@@_config[:skip_flattening][language.to_sym]} / #{rv} / (#{@@_config[:skip_flattening].inspect})" if rv
       rv
     end

spec/process_spec.rb

@@ -62,6 +62,14 @@
 snippet~~~~
 END
 
+NO_LANGUAGE_FOR_FLATTENING = <<END
+[filename="spec/fixtures/factorial.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
@@ -221,6 +229,13 @@ def download_test_repository
         string.should eq( output )
       end
 
+      it "should not crash when flattening if no language is specified" do
+        Oreilly::Snippets.config( flatten: true, skip_flattening: { java: true } )
+        lambda {
+          Oreilly::Snippets.process( NO_LANGUAGE_FOR_FLATTENING )
+        }.should_not raise_error()
+      end
+
       it "should support flattening with tabs" do
         output = Oreilly::Snippets.process( FLATTEN_WITH_TABS )
         output.should == @tabs_flattened