ad_hoc_template 0.4.0 → 0.4.1

data/lib/ad_hoc_template/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdHocTemplate
-  VERSION = "0.4.0"
+  VERSION = '0.4.1'
 end

data/output.html

@@ -0,0 +1,14 @@
+Title: Famous authors of French literature
+
+Name: Albert Camus
+Birthplace: Algeria
+Works:
+ * L'E'tranger
+ * La Peste
+
+Name: Marcel Ayme'
+Birthplace: France
+Works:
+ * Le Passe-muraille
+ * Les Contes du chat perche'
+

data/spec/command_line_interface_spec.rb

@@ -586,6 +586,37 @@ TSV
       end
     end
 
+    describe '--init-local-settings' do
+      before do
+        @config_manager = AdHocTemplate::ConfigManager
+        @settings_dir = File.expand_path(@config_manager::LOCAL_SETTINGS_DIR)
+        @setting_file_name = @config_manager::SETTINGS_FILE_NAME
+        @tag_def_file_name = @config_manager::TAG_DEF_FILE_NAME
+        @settings_path = File.expand_path(File.join(@settings_dir, @setting_file_name))
+        @settings_file = StringIO.new('', "w")
+        @tag_def_path = File.expand_path(File.join(@settings_dir, @tag_def_file_name))
+        @tag_def_file = StringIO.new('', "w")
+      end
+
+      it 'output a message indicating the directory created using this option' do
+        allow(File).to receive(:exist?).with(@settings_dir).and_return(true)
+        allow(FileUtils).to receive(:mkdir).and_return(false)
+        allow(File).to receive(:exist?).with(@settings_path).and_return(true)
+        allow(@config_manager).to receive(:open).with(@settings_path, 'wb').and_yield(@settings_file)
+        allow(File).to receive(:exist?).with(@tag_def_path).and_return(true)
+        allow(@config_manager).to receive(:open).with(@tag_def_path, 'wb').and_yield(@tag_def_file)
+
+        allow(STDOUT).to receive(:puts).with("Please edit configuration files created in #{@settings_dir}")
+
+        set_argv('--init-local-settings')
+        command_line_interface = AdHocTemplate::CommandLineInterface.new
+        command_line_interface.parse_command_line_options
+
+        expect(@settings_file.string).to be_empty
+        expect(@tag_def_file.string).to be_empty
+      end
+    end
+
     describe '--recipe-template' do
       it 'reads template files and geperates a blank recipe' do
         expected_result = <<RECIPE

data/spec/config_manager_spec.rb

@@ -114,9 +114,9 @@ YAML
         allow(File).to receive(:exist?).with(@settings_dir).and_return(false)
         allow(FileUtils).to receive(:mkdir).and_return(true)
         allow(File).to receive(:exist?).with(@settings_path).and_return(false)
-        allow(@config_manager).to receive(:open).with(@settings_path, 'w').and_yield(@settings_file)
+        allow(File).to receive(:open).with(@settings_path, 'wb').and_yield(@settings_file)
         allow(File).to receive(:exist?).with(@tag_def_path).and_return(false)
-        allow(@config_manager).to receive(:open).with(@tag_def_path, 'w').and_yield(@tag_def_file)
+        allow(File).to receive(:open).with(@tag_def_path, 'wb').and_yield(@tag_def_file)
 
         @config_manager.init_local_settings
 
@@ -128,9 +128,9 @@ YAML
         allow(File).to receive(:exist?).with(@settings_dir).and_return(true)
         allow(FileUtils).to receive(:mkdir).and_return(false)
         allow(File).to receive(:exist?).with(@settings_path).and_return(true)
-        allow(@config_manager).to receive(:open).with(@settings_path, 'w').and_yield(@settings_file)
+        allow(File).to receive(:open).with(@settings_path, 'wb').and_yield(@settings_file)
         allow(File).to receive(:exist?).with(@tag_def_path).and_return(true)
-        allow(@config_manager).to receive(:open).with(@tag_def_path, 'w').and_yield(@tag_def_file)
+        allow(File).to receive(:open).with(@tag_def_path, 'wb').and_yield(@tag_def_file)
 
         @config_manager.init_local_settings
 

data/spec/entry_format_generator_spec.rb

@@ -296,7 +296,7 @@ RECIPE
 
       template_names = %w(template1.html template2.html)
       template_names.each do |template_name|
-        allow(AdHocTemplate::EntryFormatGenerator).to receive(:open).with(File.expand_path(template_name)).and_yield(StringIO.new(@template))
+        allow(File).to receive(:open).with(File.expand_path(template_name), 'rb:BOM|UTF-8').and_yield(StringIO.new(@template))
       end
 
       result = AdHocTemplate::EntryFormatGenerator.extract_recipes_from_template_files(template_names)

data/spec/parser_spec.rb

@@ -432,7 +432,7 @@ CONFIG
         defined_tag_type = AdHocTemplate::Parser::TagType[:xml_like3]
         expect(defined_tag_type.head_of[iteration_tag_node]).to eq('<repeat>')
         expect(defined_tag_type.tail_of[iteration_tag_node]).to eq('</repeat>')
-        expect(defined_tag_type.remove_iteration_indent).to eq(true)
+        expect(defined_tag_type.strip_iteration_indent).to eq(true)
       end
 
       it "raises an error if a given definition does not contain sufficient information" do
@@ -491,6 +491,20 @@ TEMPLATE
       end
     end
 
+    describe '#contains_any_fallback_tag?' do
+      it 'returns true if a FallbackNode is contained' do
+        source = 'main start <%# <%* content in fallback_tag <%= tag node in fallback tag %> fallback end *%> optional content with <%#iterations: in iteration tag <%= item %> #%> iteration part end  #%> main end'
+        tree = AdHocTemplate::Parser.parse(source)
+        expect(tree[1].contains_any_fallback_tag?).to be_truthy
+      end
+
+      it 'returns false if no FallbackNode is contained' do
+        source = 'main start <%# <% content in non-fallback_tag <%= tag node in non-fallback tag %> fallback end %> optional content with <%#iterations: in iteration tag <%= item %> #%> iteration part end  #%> main end'
+        tree = AdHocTemplate::Parser.parse(source)
+        expect(tree[1].contains_any_fallback_tag?).to be_falsy
+      end
+    end
+
     describe "#inner_iteration_tag_labels" do
       it "returns labels of inner iteration tags" do
         template =<<TEMPLATE

data/spec/recipe_manager_spec.rb

@@ -117,7 +117,7 @@ EXPECTED_RESULT
       data_file_path = File.expand_path(block['data'])
       csv_data = StringIO.new(@csv_data)
       open_mode = ['rb', block['data_encoding']].join(':')
-      allow(reader).to receive(:open).with(data_file_path, open_mode).and_yield(csv_data)
+      allow(File).to receive(:open).with(data_file_path, open_mode).and_yield(csv_data)
       block_data = reader.prepare_block_data(block)
       expect(block_data).to eq(expected_result)
     end
@@ -158,7 +158,7 @@ RECIPE
       data_file_path = File.expand_path(block['data'])
       csv_data = StringIO.new(@csv_data)
       open_mode = ['rb', block['data_encoding']].join(':')
-      allow(reader).to receive(:open).with(data_file_path, open_mode).and_yield(csv_data)
+      allow(File).to receive(:open).with(data_file_path, open_mode).and_yield(csv_data)
       block_data = reader.prepare_block_data(block)
       expect(block_data).to eq(expected_result)
     end
@@ -176,12 +176,12 @@ RECIPE
 
       reader = AdHocTemplate::RecipeManager.new(@recipe)
       recipe = reader.recipe
-      allow(reader).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(@main_data))
+      allow(File).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(@main_data))
       recipe['blocks'].each do |block|
         data_file_path = File.expand_path(block['data'])
         csv_data = StringIO.new(@csv_data)
         open_mode = ['rb', block['data_encoding']].join(':')
-        allow(reader).to receive(:open).with(data_file_path, open_mode).and_yield(StringIO.new(@csv_data))
+        allow(File).to receive(:open).with(data_file_path, open_mode).and_yield(StringIO.new(@csv_data))
       end
       main_block = reader.load_records
       expect(main_block).to eq(expected_result)
@@ -212,7 +212,7 @@ MAIN_DATA
 
       reader = AdHocTemplate::RecipeManager.new(recipe_source)
       recipe = reader.recipe
-      allow(reader).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(main_data))
+      allow(File).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(main_data))
 
       main_block = reader.load_records
       expect(main_block).to eq(expected_result)
@@ -251,7 +251,7 @@ RECIPE
 
       reader = AdHocTemplate::RecipeManager.new(recipe_source)
       recipe = reader.recipe
-      allow(reader).to receive(:open).with(File.expand_path(recipe['blocks'][1]['data']), 'rb:iso-8859-1').and_yield(StringIO.new(@csv_data))
+      allow(File).to receive(:open).with(File.expand_path(recipe['blocks'][1]['data']), 'rb:iso-8859-1').and_yield(StringIO.new(@csv_data))
       main_block = reader.load_records
 
       expect(main_block).to eq(expected_result)
@@ -286,7 +286,7 @@ RECIPE
 
       reader = AdHocTemplate::RecipeManager.new(recipe_source)
       recipe = reader.recipe
-      allow(reader).to receive(:open).with(File.expand_path(recipe['blocks'][0]['data']), 'rb:iso-8859-1').and_yield(StringIO.new(@csv_data))
+      allow(File).to receive(:open).with(File.expand_path(recipe['blocks'][0]['data']), 'rb:iso-8859-1').and_yield(StringIO.new(@csv_data))
       main_block = reader.load_records
 
       expect(main_block).to eq(expected_result)
@@ -295,12 +295,12 @@ RECIPE
     it "the result of #load_records can be used as input of DataLoader.parse" do
       reader = AdHocTemplate::RecipeManager.new(@recipe)
       recipe = reader.recipe
-      allow(reader).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(@main_data))
+      allow(File).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(@main_data))
       recipe['blocks'].each do |block|
         data_file_path = File.expand_path(block['data'])
         csv_data = StringIO.new(@csv_data)
         open_mode = ['rb', block['data_encoding']].join(':')
-        allow(reader).to receive(:open).with(data_file_path, open_mode).and_yield(StringIO.new(@csv_data))
+        allow(File).to receive(:open).with(data_file_path, open_mode).and_yield(StringIO.new(@csv_data))
       end
 
       main_block = reader.load_records
@@ -313,7 +313,7 @@ RECIPE
       reader = AdHocTemplate::RecipeManager.new(@recipe)
       template_path = File.expand_path(reader.recipe['template'])
       open_mode = 'rb:BOM|UTF-8'
-      expect_any_instance_of(AdHocTemplate::RecipeManager).to receive(:open).with(template_path, open_mode).and_yield(StringIO.new(@template))
+      allow(File).to receive(:open).with(template_path, open_mode).and_yield(StringIO.new(@template))
 
       reader.parse_template
 
@@ -324,20 +324,20 @@ RECIPE
       reader = AdHocTemplate::RecipeManager.new(@recipe)
       recipe = reader.recipe
 
-      allow_any_instance_of(AdHocTemplate::RecipeManager).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(@main_data))
+      allow(File).to receive(:open).with(File.expand_path(recipe['data']), 'rb:BOM|UTF-8').and_yield(StringIO.new(@main_data))
       recipe['blocks'].each do |block|
         data_file_path = File.expand_path(block['data'])
         csv_data = StringIO.new(@csv_data)
         open_mode = block['data_encoding'] ? ['rb', block['data_encoding']].join(':') : 'rb:BOM|UTF-8'
-        expect_any_instance_of(AdHocTemplate::RecipeManager).to receive(:open).with(data_file_path, open_mode).and_yield(StringIO.new(@csv_data))
+        expect(File).to receive(:open).with(data_file_path, open_mode).and_yield(StringIO.new(@csv_data))
       end
 
       template_path = File.expand_path(reader.recipe['template'])
       open_mode = 'rb:BOM|UTF-8'
       output_file_path = File.expand_path(reader.recipe['output_file'])
       output_file = StringIO.new(@template)
-      expect_any_instance_of(AdHocTemplate::RecipeManager).to receive(:open).with(template_path, open_mode).and_yield(StringIO.new(@template))
-      expect_any_instance_of(AdHocTemplate::RecipeManager).to receive(:open).with(output_file_path, 'wb:UTF-8').and_yield(output_file)
+      allow(File).to receive(:open).with(template_path, open_mode).and_yield(StringIO.new(@template))
+      allow(File).to receive(:open).with(output_file_path, 'wb:UTF-8').and_yield(output_file)
 
       reader.update_output_file
       expect(output_file.string).to eq(@expected_result)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ad_hoc_template
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pseudohikiparser
@@ -44,42 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
 description: AdHocTemplate is a template processor with simple but sufficient rules
   for some ad hoc tasks.
 email:
@@ -91,6 +105,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -107,8 +122,10 @@ files:
 - lib/ad_hoc_template/pseudohiki_formatter.rb
 - lib/ad_hoc_template/recipe_manager.rb
 - lib/ad_hoc_template/record_reader.rb
+- lib/ad_hoc_template/shim.rb
 - lib/ad_hoc_template/utils.rb
 - lib/ad_hoc_template/version.rb
+- output.html
 - samples/en/inner_iteration/data.aht
 - samples/en/inner_iteration/data.csv
 - samples/en/inner_iteration/data.yaml
@@ -166,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.3
 signing_key: 
 specification_version: 4
 summary: A tiny template processor