graphql-docs 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42cef7fe385194286416914af8452a76ccf6a5f1
-  data.tar.gz: ee5a5c551ed610f354946967535ac72f421e8d67
+  metadata.gz: bd333b3b4214ce691d4f8f64645c706280a068ff
+  data.tar.gz: 1dc7d2814ce8ecd1d5751a8acda770ecfc8cddf7
 SHA512:
-  metadata.gz: 664c2cbb744f49cc720181d751ae61c2169dae6fc803a2d48c2a27a74e9f61f3db768e87dc723dadb76edb153191e4c04d65381833563bc048db5dc27ac8711b
-  data.tar.gz: 872c42d23f62fe7c4ed07e1eb421c360a96c6e37643d500a20f4e33e7cb4cc79aa6cfcf20923dc078ee3af521cac1b9af539959837f2df35d58a34f6d1ffead1
+  metadata.gz: 6704934871fee571da7c31c4f00e18f8ff06d27ba3ef8e079825e3939eff1176df70c63f0d1287de89ebfd2b28401305b3efe8c6e4eb45ffaacc74b00571b030
+  data.tar.gz: b710e45e461dc202921b7ee78ccbdaf2022f282bb92d26fc144edf666a6c41c11d15518051671addaadf2de98cb40c3f89d2018c23617ae71bba25a972afebe2

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.3.4
-  - 2.4.0
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 
 git:
   depth: 10
@@ -23,4 +24,4 @@ addons:
 matrix:
   include:
     - script: bundle exec rake rubocop
-      rvm: 2.4.0
+      rvm: 2.5.0

data/lib/graphql-docs/generator.rb

@@ -13,14 +13,14 @@ module GraphQLDocs
 
       @renderer = @options[:renderer].new(@parsed_schema, @options)
 
-      @graphql_operation_template = ERB.new(File.read(@options[:templates][:operations]), nil, '>')
-      @graphql_object_template = ERB.new(File.read(@options[:templates][:objects]), nil, '>')
-      @graphql_mutations_template = ERB.new(File.read(@options[:templates][:mutations]), nil, '>')
-      @graphql_interfaces_template = ERB.new(File.read(@options[:templates][:interfaces]), nil, '>')
-      @graphql_enums_template = ERB.new(File.read(@options[:templates][:enums]), nil, '>')
-      @graphql_unions_template = ERB.new(File.read(@options[:templates][:unions]), nil, '>')
-      @graphql_input_objects_template = ERB.new(File.read(@options[:templates][:input_objects]), nil, '>')
-      @graphql_scalars_template = ERB.new(File.read(@options[:templates][:scalars]), nil, '>')
+      @graphql_operation_template = ERB.new(File.read(@options[:templates][:operations]))
+      @graphql_object_template = ERB.new(File.read(@options[:templates][:objects]))
+      @graphql_mutations_template = ERB.new(File.read(@options[:templates][:mutations]))
+      @graphql_interfaces_template = ERB.new(File.read(@options[:templates][:interfaces]))
+      @graphql_enums_template = ERB.new(File.read(@options[:templates][:enums]))
+      @graphql_unions_template = ERB.new(File.read(@options[:templates][:unions]))
+      @graphql_input_objects_template = ERB.new(File.read(@options[:templates][:input_objects]))
+      @graphql_scalars_template = ERB.new(File.read(@options[:templates][:scalars]))
     end
 
     def generate
@@ -36,35 +36,35 @@ module GraphQLDocs
       create_graphql_scalar_pages
 
       unless @options[:landing_pages][:index].nil?
-        write_file('static', 'index', File.read(@options[:landing_pages][:index]))
+        write_file('static', 'index', File.read(@options[:landing_pages][:index]), trim: false)
       end
 
       unless @options[:landing_pages][:object].nil?
-        write_file('static', 'object', File.read(@options[:landing_pages][:object]))
+        write_file('static', 'object', File.read(@options[:landing_pages][:object]), trim: false)
       end
 
       unless @options[:landing_pages][:mutation].nil?
-        write_file('operation', 'mutation', File.read(@options[:landing_pages][:mutation]))
+        write_file('operation', 'mutation', File.read(@options[:landing_pages][:mutation]), trim: false)
       end
 
       unless @options[:landing_pages][:interface].nil?
-        write_file('static', 'interface', File.read(@options[:landing_pages][:interface]))
+        write_file('static', 'interface', File.read(@options[:landing_pages][:interface]), trim: false)
       end
 
       unless @options[:landing_pages][:enum].nil?
-        write_file('static', 'enum', File.read(@options[:landing_pages][:enum]))
+        write_file('static', 'enum', File.read(@options[:landing_pages][:enum]), trim: false)
       end
 
       unless @options[:landing_pages][:union].nil?
-        write_file('static', 'union', File.read(@options[:landing_pages][:union]))
+        write_file('static', 'union', File.read(@options[:landing_pages][:union]), trim: false)
       end
 
       unless @options[:landing_pages][:input_object].nil?
-        write_file('static', 'input_object', File.read(@options[:landing_pages][:input_object]))
+        write_file('static', 'input_object', File.read(@options[:landing_pages][:input_object]), trim: false)
       end
 
       unless @options[:landing_pages][:scalar].nil?
-        write_file('static', 'scalar', File.read(@options[:landing_pages][:scalar]))
+        write_file('static', 'scalar', File.read(@options[:landing_pages][:scalar]), trim: false)
       end
 
       if @options[:use_default_styles]
@@ -172,7 +172,7 @@ module GraphQLDocs
       @options.merge(opts).merge(helper_methods)
     end
 
-    def write_file(type, name, contents)
+    def write_file(type, name, contents, trim: true)
       if type == 'static'
         if name == 'index'
           path = @options[:output_dir]
@@ -191,6 +191,12 @@ module GraphQLDocs
         @options = @options.merge(meta)
       end
 
+      if trim
+        # normalize spacing so that CommonMarker doesn't treat it as `pre`
+        contents.gsub!(/^\s+$/, '')
+        contents.gsub!(/^\s{4}/m, '  ')
+      end
+
       contents = @renderer.render(contents, type: type, name: name)
       File.write(File.join(path, 'index.html'), contents) unless contents.nil?
     end

data/lib/graphql-docs/helpers.rb

@@ -87,7 +87,7 @@ module GraphQLDocs
 
       contents = File.read(File.join(@options[:templates][:includes], filename))
 
-      @templates[filename] = ERB.new(contents, nil, '>')
+      @templates[filename] = ERB.new(contents)
     end
 
     def helper_methods

data/lib/graphql-docs/version.rb

@@ -1,3 +1,3 @@
 module GraphQLDocs
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-docs
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql