oreilly-snippets 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTliMzUzMGVmN2RhZjA2MWNmNTVmODMxZGYzYzEwOTNiYzhhNGQzMg==
+    YTI1MTRhNzZiNmZiN2U1NWQ5ODJkMDRjNDEwNmE0MTllMGI3MGRmMg==
   data.tar.gz: !binary |-
-    ODE2MTBiM2Y0OTJmMjRlY2FjYzA2MDFkNzBjNTYzYWJjZjgwNzM0NQ==
+    YzkwMmViMjc3ZjJlNDA3Y2ZjMTUxNWEzYzI0NDVjMGUwN2ZmMzc3Zg==
 SHA512:
   metadata.gz: !binary |-
-    M2QzODEyOWI5NzI5NmFkNDQ5ZGUzZTE2ZDViOWQ4ZDRjNzgxYmMwYTUzZTkx
-    MTQyOWU4Y2JkNWQ4YzA2NGU0M2IxNTNjMzc0MTY3NzQ4ZTYyYzg3MjQ5MTU4
-    YzNjMWY0YTc5NDg3MDIzYWExN2Q3OWMxZjJkNmQzMTQ2ODdmNjE=
+    MmFiNzAzMzEzNDk4MmJhMzg2MTMyNTIxOWU3Y2I0OGMwYmZjZWI5Njc5YzVk
+    YWMzNzNjNDgzMzg0Nzc3NTZhYTg4ODI4NGNiYzlmOTk4NGYxYjQ4NWQ5NzM2
+    ZGVkOTU0N2I3NDk0MTMwNzY1ZDhiN2FhNDliZWU2ZTNlMGZmZDE=
   data.tar.gz: !binary |-
-    Y2NkYzAxYzYyYWMxOWY4ODc2NWVjZTNlNzk0ZDUzZGMxNTMxM2ZiZWM3NmFh
-    Mjk3YjRjNTU5OTYyZTA0NmNlMzBmNWIyOWVlYjNkMDEzOTAyMzI2YTg3ZjIz
-    MmQxMDZkZmM3MzFiNDY4OWZmODYzOWZhMTlhOThkNjBlMDBkZDk=
+    NTljZmQxNDI2NzAxZTVlMjBhMThiM2U2ZDM2OGU5YWY0NzAxNjYwOTRiMGRl
+    NmM2OGVjZWVhNjcyZTczMDMwMTMxNmJjZWFjMGNkOTNkMGFlOWNkYjIyNzA4
+    ZDFjOGMyNmEyMTI5OTQyNjk4ZDM1ZGY1NjQxYTBkMjhmMjU1ZTg=

data/lib/oreilly/snippets.rb

@@ -55,8 +55,9 @@ module Oreilly
         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 @@ module Oreilly
     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

data/lib/oreilly/snippets/version.rb

@@ -1,5 +1,5 @@
 module Oreilly
   module Snippets
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/spec/process_spec.rb

@@ -62,6 +62,14 @@ specified code snippet when you build ebook outputs
 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 @@ END
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oreilly-snippets
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Chris Dawson