RubyGems - modsulator - Versions diffs - 1.3.0 → 2.0.0 - Mend

modsulator 1.3.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

checksums.yaml +4 -4
data/LICENSE +1 -2
data/README.md +28 -7
data/Rakefile +10 -36
data/app/controllers/about_controller.rb +6 -0
data/app/controllers/application_controller.rb +2 -0
data/app/controllers/modsulator_controller.rb +10 -0
data/app/controllers/normalizer_controller.rb +9 -0
data/app/controllers/spreadsheet_controller.rb +5 -0
data/{lib/modsulator → app/models}/modsulator_sheet.rb +0 -0
data/{lib/modsulator → app/services}/mods-3-6.xsd +0 -0
data/{lib/modsulator → app/services}/modsulator.xsd +0 -0
data/{lib/modsulator → app/services}/validator.rb +2 -4
data/bin/modsulator +4 -7
data/lib/modsulator.rb +0 -9
data/spec/controllers/about_controller_spec.rb +14 -0
data/spec/controllers/modsulator_controller_spec.rb +28 -0
data/spec/controllers/normalizer_controller_spec.rb +19 -0
data/spec/controllers/spreadsheet_controller_spec.rb +16 -0
data/spec/features/process_template_spec.rb +0 -11
data/spec/features/validator_unit_spec.rb +8 -5
data/spec/fixtures/denormalized.xml +26 -0
data/spec/fixtures/normalized.xml +25 -0
data/spec/integration_tests/integration_spec.rb +4 -11
data/spec/rails_helper.rb +53 -0
data/spec/spec_helper.rb +41 -38
metadata +36 -86

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d919f061e61679be249145800d5854f129164a995ec0f4e24de12b65af323d8e
-  data.tar.gz: dfee74e48ac27d66ae748eff40b38cc3af99ced8530fadc17194a04ccb93ab00
+  metadata.gz: 02c82a3c015b15fa442a3c5e7fb44cc8cc2a6fd7aec0065343850d1dbdae8f5e
+  data.tar.gz: 229b82a390cf791610e9d8b179cf6ded1f6e3ec6d585277615150e59a926241f
 SHA512:
-  metadata.gz: 4113eeba77103b91e02f76266d3e98c200edc5b38561c5961eda60658c9bb639fac8fa84763c5985faeecacca61178212890c092168d290c744aab0b02541591
-  data.tar.gz: dc5de2130ca399902ad086a55e8a510490cdc5643333e563396be84c8f20f54a5a4711d010ff3ee571ed4122d0414954bca8ebf8d397962c01a8e917adbc84c8
+  metadata.gz: b34f3f166332f8e75f0d4337ada4e1e4f8ed311856e7b81c36577b60e36f84f9767a53f1ee7c4a219e54bb1082a846472c8b00bfb988a5ec4475c226161e1220
+  data.tar.gz: 7882f6d3c20a018463c3fadde0081131f3eb22cc982fd90da7d7b7d933c80e10be317ff0f7bd6f62a6c2388beb0ef81456dc27ec0ef826cd9d8b4e34ae268262

data/LICENSE CHANGED

@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,4 +199,3 @@ Apache License
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.

data/README.md CHANGED

@@ -1,11 +1,32 @@
-[![Build Status](https://travis-ci.org/sul-dlss/modsulator.svg?branch=master)](https://travis-ci.org/sul-dlss/modsulator) [![Coverage Status](https://coveralls.io/repos/sul-dlss/modsulator/badge.png)](https://coveralls.io/r/sul-dlss/modsulator) [![Gem Version](https://badge.fury.io/rb/modsulator.svg)](http://badge.fury.io/rb/modsulator) [![Code Climate](https://codeclimate.com/github/sul-dlss/modsulator/badges/gpa.svg)](https://codeclimate.com/github/sul-dlss/modsulator)
+[![Build Status](https://travis-ci.org/sul-dlss/modsulator-app-rails.svg?branch=master)](https://travis-ci.org/sul-dlss/modsulator-app-rails)
+[![Coverage Status](https://coveralls.io/repos/sul-dlss/modsulator-app-rails/badge.svg)](https://coveralls.io/r/sul-dlss/modsulator-app-rails)
+[![GitHub version](https://badge.fury.io/gh/sul-dlss%2Fmodsulator-app-rails.svg)](https://badge.fury.io/gh/sul-dlss%2Fmodsulator-app-rails)
-# modsulator
-Produce Stanford MODS from spreadsheets.
+# modsulator-app-rails
-Note that only .xlsx and .csv formats work with the latest template, which has more columns than
-.xls allows (> 256).
+A Rails API for the [MODSulator](https://github.com/sul-dlss/modsulator). This API is used by Argo for spreadsheet bulk upload.
-# Running on the console
-  bin/console
+Provides the following endpoints:
+```
+GET  /v1/spreadsheet
+POST /v1/modsulator
+POST /v1/normalizer
+```
+## Installing
+```shell
+git checkout https://github.com/sul-dlss/modsulator-app-rails.git
+cd modsulator-rails-app
+bundle install
+```
+## Command line tool
+You can transform a spreadsheet using the command line tool by doing:
+```shell
+./bin/modsulator spec/fixtures/M1463_AV_manifest.xlsx > output.xml
+```

data/Rakefile CHANGED

@@ -1,43 +1,17 @@
-require 'rspec/core/rake_task'
-require 'yard'
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.exclude_pattern = 'spec/integration_tests/**/*_spec.rb'
-end
-# Larger integration/acceptance style tests (take several minutes to complete)
-RSpec::Core::RakeTask.new(:integration_tests) do |spec|
-  spec.pattern = 'spec/integration_tests/**/*_spec.rb'
-end
-YARD::Rake::YardocTask.new(:yard) do |t|
-  t.files   = ['lib/**/*.rb']                # optional
-  t.stats_options = ['--list-undoc']         # optional
-end
+require_relative 'config/application'
-task :lint do
-  sh "ruby-lint lib/ bin/"
-end
+Rails.application.load_tasks
-task :default  => :spec     # Default task is to just run shorter (unit) tests
+Rake::Task['spec'].clear
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
-task :all do
-  Rake::Task["spec"].invoke
-  Rake::Task["yard"].invoke
-  Rake::Task["integration_tests"].invoke
-  Rake::Task["lint"].invoke
+  # The modsulator integration_tests are very slow
+  t.exclude_pattern = 'spec/integration_tests/*_spec.rb'
 end
-# Set up default Rake tasks for cutting gems etc.
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+# This gives us task for managing the gem (e.g.: rake release)
 Bundler::GemHelper.install_tasks

data/app/controllers/about_controller.rb ADDED

@@ -0,0 +1,6 @@
+class AboutController < ApplicationController
+  def index
+    @version ||= IO.readlines('VERSION').first
+    render plain: "modsulator-api version #{@version}"
+  end
+end

data/app/controllers/application_controller.rb ADDED

	@@ -0,0 +1,2 @@
1	+ class ApplicationController < ActionController::API
2	+ end

data/app/controllers/modsulator_controller.rb ADDED

@@ -0,0 +1,10 @@
+class ModsulatorController < ApplicationController
+  def create
+    mods_converter = Modsulator.new(File.new(params[:file].tempfile), params[:filename])
+    render xml: mods_converter.convert_rows()
+  end
+  def version
+    render plain: '2.0.0'
+  end
+end

data/app/controllers/normalizer_controller.rb ADDED

@@ -0,0 +1,9 @@
+class NormalizerController < ApplicationController
+  def create
+    input_file = File.open(File.new(params[:file].tempfile))
+    xml = input_file.read
+    input_file.close
+    normalizer = Stanford::Mods::Normalizer.new
+    render xml: normalizer.normalize_xml_string(xml)
+  end
+end

data/app/controllers/spreadsheet_controller.rb ADDED

@@ -0,0 +1,5 @@
+class SpreadsheetController < ApplicationController
+  def index
+    send_file Modsulator.template_spreadsheet_path
+  end
+end

data/{lib/modsulator → app/models}/modsulator_sheet.rb RENAMED

File without changes

data/{lib/modsulator → app/services}/mods-3-6.xsd RENAMED

File without changes

data/{lib/modsulator → app/services}/modsulator.xsd RENAMED

File without changes

data/{lib/modsulator → app/services}/validator.rb RENAMED

@@ -1,5 +1,3 @@
-require 'nokogiri'
 # Validates XML against the MODSulator schema.
 class Validator
   # The Nokogiri::XML::Schema instance used for validation.
@@ -13,7 +11,7 @@ class Validator
     @schema = Nokogiri::XML::Schema(File.open(schema_file))
   end
   # Validates an XML string.
   #
   # @param xml   An XML document as a string.
@@ -23,7 +21,7 @@ class Validator
     return validate_xml_doc(xml_doc)
   end
   # Validates an XML document.
   #
   # @param doc   An instance of Nokogiri::XML::Document

data/bin/modsulator CHANGED

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
 # This is a command line script that generates <xmlDocs> using the modsulator methods.
-require 'modsulator'
-abort 'Usage: modsulator <spreadsheet>' unless ARGV.length == 1
+abort 'Usage: bin/modsulator <spreadsheet>' unless ARGV.length == 1
 unless File.exist?(ARGV[0]) && File.readable?(ARGV[0])
   abort "*** The file #{ARGV[0]} does not exist or is not readable to the current user? - Terminating."
 end
-modsulator = Modsulator.new(File.new(ARGV[0]), File.basename(ARGV[0]))
-xml_string = modsulator.convert_rows()
+require_relative '../config/environment'
-puts xml_string
+modsulator = Modsulator.new(File.new(ARGV[0]), File.basename(ARGV[0]))
+puts modsulator.convert_rows

data/lib/modsulator.rb CHANGED

@@ -1,15 +1,6 @@
 # File "modsulator.rb" - defines the Modsulator class, providing the main part of the API that lets you work
 # with metadata spreadsheets and MODS XML.
-require 'active_support/core_ext/hash/indifferent_access'   # Required for indifferent access to hashes
-require 'active_support/core_ext/object/blank'              # Required for template calls to blank?()
-require 'erb'                                               # Rails templating engine
-require 'nokogiri'
-require 'roo'
-require 'stanford/mods/normalizer'
-require 'modsulator/modsulator_sheet'
-require 'deprecation'
 # The main class for the MODSulator API, which lets you work with metadata spreadsheets and MODS XML.
 # @see https://consul.stanford.edu/display/chimera/MODS+bulk+loading Requirements (Stanford Consul page)
 class Modsulator

data/spec/controllers/about_controller_spec.rb ADDED

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'rails_helper'
+RSpec.describe AboutController, type: :controller do
+  describe 'GET #index' do
+    it 'handles simple ping requests to /about' do
+      get :index
+      expect(response).to have_http_status(:success)
+      expected_version = File.read(File.expand_path('../../../VERSION', __FILE__))
+      expect(response.body).to eq(String.new('modsulator-api version ' + expected_version))
+    end
+  end
+end

data/spec/controllers/modsulator_controller_spec.rb ADDED

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'rails_helper'
+RSpec.describe ModsulatorController, type: :controller do
+  describe 'GET #version' do
+    it 'returns http success' do
+      get :version
+      expect(response).to have_http_status(:success)
+      expect(response.body).to match(/\d.\d.\d$/)
+    end
+  end
+  describe 'POST #create' do
+    it 'returns the response with an xml content type' do
+      post :create, params: {file: Rack::Test::UploadedFile.new(File.join(FIXTURES_DIR, 'crowdsourcing_bridget_1.xlsx'), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"), filename: 'crowdsourcing_bridget_1.xlsx' }
+      expect(response.headers['Content-Type']).to eq 'application/xml; charset=utf-8'
+      expect(response).to have_http_status(:success)
+    end
+    it 'returns correct XML for a known spreadsheet' do
+      post :create, params: { file: Rack::Test::UploadedFile.new(File.join(FIXTURES_DIR, 'crowdsourcing_bridget_1.xlsx'), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"), filename: 'crowdsourcing_bridget_1.xlsx' }
+      returned_xml = Nokogiri::XML(response.body)
+      expected_xml = Nokogiri::XML(File.read(File.join(FIXTURES_DIR, 'crowdsourcing_bridget_1.xml')))
+      expect(EquivalentXml.equivalent?(returned_xml, expected_xml, opts = { :ignore_attr_values => 'datetime'})).to be_truthy
+    end
+  end
+end

data/spec/controllers/normalizer_controller_spec.rb ADDED

@@ -0,0 +1,19 @@
+require 'rails_helper'
+RSpec.describe NormalizerController, type: :controller do
+  describe 'POST #create' do
+    it 'returns the response with an xml content type' do
+      post :create, params: { file: Rack::Test::UploadedFile.new(File.join(FIXTURES_DIR, 'denormalized.xml')) }
+      expect(response.headers['Content-Type']).to eq 'application/xml; charset=utf-8'
+      expect(response).to have_http_status(:success)
+    end
+    it 'returns normalized MODS XML given ugly MODS XML' do
+      post :create, params: {file: Rack::Test::UploadedFile.new(File.join(FIXTURES_DIR, 'denormalized.xml')) }
+      returned_xml = response.body
+      expected_xml = File.read(File.join(FIXTURES_DIR, 'normalized.xml'))
+      expect(returned_xml.to_s).to eq(expected_xml.to_s)
+    end
+  end
+end

data/spec/controllers/spreadsheet_controller_spec.rb ADDED

@@ -0,0 +1,16 @@
+require 'rails_helper'
+RSpec.describe SpreadsheetController, type: :controller do
+  describe 'GET #index' do
+    before do
+      allow(Modsulator).to receive(:template_spreadsheet_path).and_return('send/file.xlsx')
+    end
+    it 'returns the spreadsheet template' do
+      expect(controller).to receive(:send_file).with('send/file.xlsx')
+      get :index
+      expect(response).to have_http_status(:success)
+    end
+  end
+end

data/spec/features/process_template_spec.rb CHANGED

@@ -1,11 +1,4 @@
 RSpec.describe Modsulator do
-  before :all do
-    # Create common variables shared across tests and clear out temp directory
-    @tmp_dir      = File.expand_path("../../../tmp", __FILE__)
-    Dir.mkdir(@tmp_dir) unless Dir.exist?(@tmp_dir)
-    Dir.foreach(@tmp_dir) {|f| fn = File.join(@tmp_dir, f); File.delete(fn) if f != '.' && f != '..' && !File.directory?(fn)}
-  end
   describe "initialized" do
     {
       'edition_physLoc_intmediatype.xlsx' => 'Excel Workbook',
@@ -18,8 +11,4 @@ RSpec.describe Modsulator do
       end
     end
   end
-  after :all do
-    Dir.foreach(@tmp_dir) {|f| File.delete(File.join(@tmp_dir, f)) if f != '.' && f != '..' && !File.directory?(f)}
-  end
 end

data/spec/features/validator_unit_spec.rb CHANGED

@@ -1,9 +1,12 @@
+require 'rails_helper'
 RSpec.describe Validator do
+  let(:service_path) { Rails.root.join('app', 'services') }
   describe "initialize" do
     it "validates a valid XML file using the internal XML Schema Definition file" do
       # Nokogiri won't load the imported schema unless we explicitly set the current dir. This only seems to be a problem from within RSpec, though.
-      Dir.chdir(File.expand_path("lib/modsulator/")) do
+      Dir.chdir(service_path) do
         validator = Validator.new("modsulator.xsd")
         error_list = validator.validate_xml_string(File.read(File.join(FIXTURES_DIR, 'crowdsourcing_bridget_1.xml')))
         expect(error_list).to be_empty()
@@ -11,7 +14,7 @@ RSpec.describe Validator do
     end
     it "lists errors for an invalid XML file using the internal XML Schema Definition file" do
-      Dir.chdir(File.expand_path("lib/modsulator/")) do
+      Dir.chdir(service_path) do
         validator = Validator.new("modsulator.xsd")
         error_list = validator.validate_xml_string(File.read(File.join(FIXTURES_DIR, 'invalid_crowdsourcing_bridget_1.xml')))
         expect(error_list.length()).to eq(3)
@@ -21,7 +24,7 @@ RSpec.describe Validator do
     it "validates a valid XML file by automatically picking up the internal XML Schema Definition file" do
       # Nokogiri won't load the imported schema unless we explicitly set the current dir. This only seems to be a problem from within RSpec, though.
-      Dir.chdir(File.expand_path("lib/modsulator/")) do
+      Dir.chdir(service_path) do
         validator = Validator.new()
         error_list = validator.validate_xml_string(File.read(File.join(FIXTURES_DIR, 'crowdsourcing_bridget_1.xml')))
         expect(error_list).to be_empty()
@@ -29,12 +32,12 @@ RSpec.describe Validator do
     end
     it "lists errors for an invalid XML file when automatically picking up the internal XML Schema Definition file" do
-      Dir.chdir(File.expand_path("lib/modsulator/")) do
+      Dir.chdir(service_path) do
         validator = Validator.new("modsulator.xsd")
         error_list = validator.validate_xml_string(File.read(File.join(FIXTURES_DIR, 'invalid_crowdsourcing_bridget_1.xml')))
         expect(error_list.length()).to eq(3)
       end
     end
   end
 end

data/spec/fixtures/denormalized.xml ADDED

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<mods xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.5" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-5.xsd">
+  <titleInfo>
+    <title>      Cesar Chavez at various rallies and marches 1972-1973</title>
+  </titleInfo>
+  <name authority="  ">
+    <namePart>Fitch, Bob               </namePart>
+    <role>
+      <roleTerm type="text">creator</roleTerm>
+    </role>
+  </name>
+  <typeOfResource>still image</typeOfResource>
+  <typeOfResource> </typeOfResource>
+  <originInfo>
+    <dateCreated keyDate="yes" point="start">1972</dateCreated>
+    <dateIssued keyDate="yes" point="start">1976</dateIssued>
+  </originInfo>
+  <language>
+    <languageTerm type="text">English</languageTerm>
+  </language>
+  <subject>
+    <name authority="http://lccn.loc.gov/n50038304">
+      <namePart>Chavez, Cesar, 1927-1993</namePart>
+    </name>
+  </subject>
+</mods>

data/spec/fixtures/normalized.xml ADDED

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<mods xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.5" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-5.xsd">
+  <titleInfo>
+    <title>Cesar Chavez at various rallies and marches 1972-1973</title>
+  </titleInfo>
+  <name>
+    <namePart>Fitch, Bob</namePart>
+    <role>
+      <roleTerm type="text">creator</roleTerm>
+    </role>
+  </name>
+  <typeOfResource>still image</typeOfResource>
+  <originInfo>
+    <dateCreated keyDate="yes" point="start">1972</dateCreated>
+    <dateIssued keyDate="yes" point="start">1976</dateIssued>
+  </originInfo>
+  <language>
+    <languageTerm type="text">English</languageTerm>
+  </language>
+  <subject>
+    <name authority="http://lccn.loc.gov/n50038304">
+      <namePart>Chavez, Cesar, 1927-1993</namePart>
+    </name>
+  </subject>
+</mods>

data/spec/integration_tests/integration_spec.rb CHANGED

@@ -1,10 +1,6 @@
-RSpec.describe Modsulator do
-  before :all do
-    @tmp_dir      = File.expand_path("../../../tmp", __FILE__)
-    Dir.mkdir(@tmp_dir) unless Dir.exist?(@tmp_dir)
-    Dir.foreach(@tmp_dir) {|f| fn = File.join(@tmp_dir, f); File.delete(fn) if f != '.' && f != '..' && !File.directory?(fn)}
-  end
+require 'rails_helper'
+RSpec.describe Modsulator do
   describe "generates and validates" do
     {
       'Fitch_Chavez.xlsx' => 'Fitch_Chavez.xml',
@@ -26,8 +22,9 @@ RSpec.describe Modsulator do
     }.each do |testfile, results_file|
       puts '.'
       generated_xml_string = Modsulator.new(File.join(FIXTURES_DIR, testfile), testfile).convert_rows()
       it "converts #{testfile} to valid XML" do
-        error_list = Validator.new(File.expand_path("lib/modsulator/modsulator.xsd")).validate_xml_string(generated_xml_string)
+        error_list = Validator.new(Rails.root.join('app', 'services', 'modsulator.xsd')).validate_xml_string(generated_xml_string)
         expect(error_list.length()).to eq(0)
       end
       it "generates same XML from #{testfile} as previous modsulator version" do
@@ -37,8 +34,4 @@ RSpec.describe Modsulator do
       end
     end
   end
-  after :all do
-    Dir.foreach(@tmp_dir) {|f| File.delete(File.join(@tmp_dir, f)) if f != '.' && f != '..' && !File.directory?(f)}
-  end
 end

data/spec/rails_helper.rb ADDED

@@ -0,0 +1,53 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'spec_helper'
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+end

data/spec/spec_helper.rb CHANGED

@@ -1,34 +1,28 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
 #
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
 # will add to the boot time of your test suite on EVERY test run, even for an
 # individual file that may not need all of that loaded. Instead, consider making
 # a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need it.
+# the additional setup, and require it from the spec files that actually need
+# it.
 #
 # The `.rspec` file also contains a few flags that are not defaults but that
 # users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+FIXTURES_DIR = File.expand_path("../fixtures", __FILE__)
 require 'coveralls'
 Coveralls.wear!
-require 'rspec'
-require 'modsulator'
-require "modsulator/validator"
-require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
-FIXTURES_DIR = File.expand_path('fixtures', __dir__)
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -37,10 +31,10 @@ RSpec.configure do |config|
     # This option will default to `true` in RSpec 4. It makes the `description`
     # and `failure_message` of custom matchers include text for helper methods
     # defined using `chain`, e.g.:
-    # be_bigger_than(2).and_smaller_than(4).description
-    #   # => "be bigger than 2 and smaller than 4"
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
     # ...rather than:
-    #   # => "be bigger than 2"
+    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
@@ -53,27 +47,35 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
-  # The settings below are suggested to provide a good initial experience
-  # with RSpec, but feel free to customize to your heart's content.
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-  # Limits the available syntax to the non-monkey patched syntax that is recommended.
-  # For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
   config.disable_monkey_patching!
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
@@ -100,4 +102,5 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
+=end
 end

metadata CHANGED

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: modsulator
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tommy Ingulfsen
+- Justin Coyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -42,30 +43,30 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: stanford-mods-normalizer
   requirement: !ruby/object:Gem::Requirement
@@ -94,78 +95,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Tools and libraries for working with metadata spreadsheets and MODS.
-email: tommyi@stanford.edu
+email: jcoyne85@stanford.edu
 executables:
 - modsulator
 extensions: []
@@ -174,14 +105,23 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/about_controller.rb
+- app/controllers/application_controller.rb
+- app/controllers/modsulator_controller.rb
+- app/controllers/normalizer_controller.rb
+- app/controllers/spreadsheet_controller.rb
+- app/models/modsulator_sheet.rb
+- app/services/mods-3-6.xsd
+- app/services/modsulator.xsd
+- app/services/validator.rb
 - bin/modsulator
 - lib/modsulator.rb
-- lib/modsulator/mods-3-6.xsd
-- lib/modsulator/modsulator.xsd
-- lib/modsulator/modsulator_sheet.rb
 - lib/modsulator/modsulator_template.xlsx
 - lib/modsulator/modsulator_template.xml
-- lib/modsulator/validator.rb
+- spec/controllers/about_controller_spec.rb
+- spec/controllers/modsulator_controller_spec.rb
+- spec/controllers/normalizer_controller_spec.rb
+- spec/controllers/spreadsheet_controller_spec.rb
 - spec/features/modsulator_sheet_unit_spec.rb
 - spec/features/process_template_spec.rb
 - spec/features/validator_unit_spec.rb
@@ -222,6 +162,7 @@ files:
 - spec/fixtures/crowdsourcing_bridget_1.xml
 - spec/fixtures/crowdsourcing_bridget_2.xlsx
 - spec/fixtures/crowdsourcing_bridget_2.xml
+- spec/fixtures/denormalized.xml
 - spec/fixtures/edition_physLoc_intmediatype.xlsx
 - spec/fixtures/edition_physLoc_intmediatype.xml
 - spec/fixtures/filled_template_20160711.xlsx
@@ -231,6 +172,7 @@ files:
 - spec/fixtures/location_url.xml
 - spec/fixtures/manifest_v0174.csv
 - spec/fixtures/manifest_v0174.xml
+- spec/fixtures/normalized.xml
 - spec/fixtures/point_coord_test.xlsx
 - spec/fixtures/point_coord_test.xml
 - spec/fixtures/roman_coins_mods.xlsx
@@ -239,8 +181,9 @@ files:
 - spec/fixtures/test_002.xlsx
 - spec/integration_tests/integration_spec.rb
 - spec/lib/modsulator_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
-homepage: https://github.com/sul-dlss/modsulator
+homepage: https://github.com/sul-dlss/modsulator-app-rails
 licenses:
 - Apache-2.0
 metadata: {}
@@ -285,12 +228,14 @@ test_files:
 - spec/fixtures/crowdsourcing_bridget_2.xml
 - spec/fixtures/36_Matter_manifest.xml
 - spec/fixtures/Fitch_King.xlsx
+- spec/fixtures/normalized.xml
 - spec/fixtures/36_filled_template_20160711.xml
 - spec/fixtures/manifest_v0174.csv
 - spec/fixtures/crowdsourcing_bridget_1.xml
 - spec/fixtures/M1463_AV_manifest.xml
 - spec/fixtures/roman_coins_mods.xlsx
 - spec/fixtures/36_Fitch_King.xml
+- spec/fixtures/denormalized.xml
 - spec/fixtures/Fitch_Chavez.xml
 - spec/fixtures/36_point_coord_test.xml
 - spec/fixtures/ars0056_manifest.xml
@@ -323,3 +268,8 @@ test_files:
 - spec/fixtures/Matter_manifest.xml
 - spec/fixtures/crowdsourcing_bridget_1.xlsx
 - spec/fixtures/point_coord_test.xlsx
+- spec/controllers/spreadsheet_controller_spec.rb
+- spec/controllers/about_controller_spec.rb
+- spec/controllers/modsulator_controller_spec.rb
+- spec/controllers/normalizer_controller_spec.rb
+- spec/rails_helper.rb