enju_oai 0.2.0.beta.2 → 0.3.1

data/spec/factories/manifestation.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation do |f|
     f.sequence(:original_title){|n| "manifestation_title_#{n}"}
     f.carrier_type_id{CarrierType.find(1).id}

data/spec/factories/user.rb

@@ -1,37 +1,28 @@
-FactoryGirl.define do
-  factory :admin, :class => User do |f|
+FactoryBot.define do
+  factory :admin, class: User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
     f.role {Role.find_by_name('Administrator')}
-    f.password 'adminpassword'
-    f.password_confirmation 'adminpassword'
-    f.user_group {UserGroup.first}
-    f.required_role {Role.find_by_name('User')}
-    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.password { 'adminpassword' }
+    f.password_confirmation { 'adminpassword' }
   end
 
-  factory :librarian, :class => User do |f|
+  factory :librarian, class: User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
     f.role {Role.find_by_name('Librarian')}
-    f.password 'librarianpassword'
-    f.password_confirmation 'librarianpassword'
-    f.user_group {UserGroup.first}
-    f.required_role {Role.find_by_name('User')}
-    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.password { 'librarianpassword' }
+    f.password_confirmation { 'librarianpassword' }
   end
 
-  factory :user, :class => User do |f|
+  factory :user, class: User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
     f.role {Role.find_by_name('User')}
-    f.password 'userpassword'
-    f.password_confirmation 'userpassword'
-    f.user_group {UserGroup.first}
-    f.required_role {Role.find_by_name('User')}
-    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.password { 'userpassword' }
+    f.password_confirmation { 'userpassword' }
   end
 
-  factory :invalid_user, :class => User do |f|
+  factory :invalid_user, class: User do |f|
   end
 end

data/spec/fixtures/library_groups.yml

@@ -7,12 +7,7 @@ one:
   note: 
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
-  settings: <% if Rails::VERSION::MAJOR > 3 %>
-    "{\"max_number_of_results\":200,\"family_name_first\":true}"
-  <% else %>
-    "---\n:max_number_of_results: 200\n:family_name_first: true\n"
-  <% end %>
-
+  user_id: 1
 
 # == Schema Information
 #

data/spec/rails_helper.rb

@@ -0,0 +1,53 @@
+require 'simplecov'
+require 'coveralls'
+SimpleCov.start 'rails'
+Coveralls.wear!
+
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../dummy/config/environment", __FILE__)
+require 'rspec/rails'
+require 'factory_bot'
+require 'vcr'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  # 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
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  config.extend ControllerMacros, type: :controller
+
+  config.infer_spec_type_from_file_location!
+end
+
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/cassette_library'
+  c.hook_into :webmock
+  c.configure_rspec_metadata!
+  c.allow_http_connections_when_no_cassette = true
+  c.ignore_localhost = true
+end

data/spec/spec_helper.rb

@@ -1,57 +1,92 @@
-require 'simplecov'
-require 'coveralls'
-SimpleCov.start 'rails'
-Coveralls.wear!
-
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-require 'rspec/rails'
-require 'factory_girl'
-require 'sunspot-rails-tester'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
+# 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.
+#
+# 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 `.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
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/../../spec/fixtures"
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # 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"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-  # 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-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = false
+  end
 
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
-  config.infer_base_class_for_anonymous_controllers = false
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # 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
 
-  config.extend ControllerMacros, :type => :controller
+  # 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"
 
-  $original_sunspot_session = Sunspot.session
+  # 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://www.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
+  config.disable_monkey_patching!
 
-  config.before do
-    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
+  # 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.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
   end
 
-  config.before :each, :solr => true do
-    Sunspot::Rails::Tester.start_original_sunspot_session
-    Sunspot.session = $original_sunspot_session
-    Sunspot.remove_all!
-  end
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
 
-  config.infer_spec_type_from_file_location!
-end
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
 
-FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryGirl.find_definitions
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

data/spec/support/controller_macros.rb

@@ -2,14 +2,14 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:admin]
-      sign_in FactoryGirl.create(:admin)
+      sign_in FactoryBot.create(:admin)
     end
   end
 
   def login_librarian
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryGirl.create(:librarian)
+      user = FactoryBot.create(:librarian)
       sign_in user
     end
   end
@@ -17,7 +17,7 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryGirl.create(:user)
+      user = FactoryBot.create(:user)
       sign_in user
     end
   end

data/spec/views/oai/get_record.xml.builder

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe "oai/show.xml.builder" do
   describe "When metadataPrefix is 'oai_dc'" do
     before(:each) do
-      assign(:manifestation, FactoryGirl.create(:manifestation))
+      assign(:manifestation, FactoryBot.create(:manifestation))
       assign(:oai, metadataPrefix: 'oai_dc')
     end
 
@@ -18,7 +18,7 @@ describe "oai/show.xml.builder" do
 
   describe "When metadataPrefix is 'junii2'" do
     before(:each) do
-      assign(:manifestation, FactoryGirl.create(:manifestation))
+      assign(:manifestation, FactoryBot.create(:manifestation))
       assign(:oai, metadataPrefix: 'junii2')
     end
 

data/spec/views/oai/identify.xml.builder_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe "oai/identify.xml.builder" do
   fixtures :all

data/spec/views/oai/list_identifiers.xml.builder_spec.rb

@@ -1,18 +1,25 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe "oai/list_identifiers.xml.builder" do
   fixtures :all
   before(:each) do 
     view.stub(:current_user_role_name).and_return('Guest')
-    assign(:oai, { :errors => [] })
-    manifestations = [ FactoryGirl.create(:manifestation) ]
-    manifestations.stub(:last_page?){true}
-    manifestations.stub(:total_count){manifestations.size}
-    assign(:manifestations, manifestations)
+    assign(:oai, { errors: [] })
+    @manifestations = Manifestation.all
+    @manifestations.stub(:next_page_cursor){'11223344=='}
+    @manifestations.stub(:last_page?){false}
+    @manifestations.stub(:total_count){@manifestations.size}
+    assign(:manifestations, @manifestations)
   end
+
   it "renders the XML template" do
     render
     expect(rendered).to match /<ListIdentifiers>/
   end
+
+  it "renders resumptionToken" do
+    render
+    expect(Nokogiri::XML(rendered).remove_namespaces!.at('//resumptionToken').content).to eq '11223344%3D%3D'
+  end
 end

data/spec/views/oai/list_metadata_formats.xml.builder_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe "oai/list_metadata_formats.xml.builder" do
   fixtures :all

data/spec/views/oai/list_records.xml.builder_spec.rb

@@ -1,16 +1,16 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe "oai/list_records.xml.builder" do
   fixtures :all
 
   before(:each) do
     view.stub(:current_user_role_name).and_return('Guest')
-    assign(:oai, { :errors => [] })
-    manifestations = [ FactoryGirl.create(:manifestation) ]
-    manifestations.stub(:last_page?){true}
-    manifestations.stub(:total_count){manifestations.size}
-    assign(:manifestations, manifestations)
+    assign(:oai, { errors: [] })
+    @manifestations = [FactoryBot.create(:manifestation, pub_date: '2015-08-15')]
+    @manifestations.stub(:next_page_cursor){nil}
+    @manifestations.stub(:last_page?){true}
+    @manifestations.stub(:total_count){@manifestations.size}
+    assign(:manifestations, @manifestations)
   end
 
   it "renders the XML template" do
@@ -19,18 +19,20 @@ describe "oai/list_records.xml.builder" do
   end
 
   it "renders dc:date" do
-    manifestations = [FactoryGirl.create(:manifestation, pub_date: '2015-08-15')]
-    manifestations.stub(:last_page?){true}
-    manifestations.stub(:total_count){manifestations.size}
-    assign(:manifestations, manifestations)
     render
     expect(rendered).to match /2015-08-15/
   end
 
   describe "when metadataPrefix is oai_dc" do
     before(:each) do
-      assign(:oai, { :errors => [], :metadataPrefix => 'oai_dc' } )
+      assign(:oai, { errors: [], metadataPrefix: 'oai_dc' } )
+      @manifestations = [FactoryBot.create(:manifestation, nii_type_id: 1)]
+      @manifestations.stub(:next_page_cursor){nil}
+      @manifestations.stub(:last_page?){true}
+      @manifestations.stub(:total_count){@manifestations.size}
+      assign(:manifestations, @manifestations)
     end
+
     it "renders the XML template" do
       render
       expect(rendered).to match /<oai_dc/
@@ -39,19 +41,57 @@ describe "oai/list_records.xml.builder" do
 
   describe "when metadataPrefix is junii2" do
     before(:each) do
-      assign(:oai, { :errors => [], :metadataPrefix => 'junii2' } )
+      assign(:oai, { errors: [], metadataPrefix: 'junii2' } )
+      @manifestations = [FactoryBot.create(:manifestation, nii_type_id: 1)]
+      @manifestations.stub(:next_page_cursor){nil}
+      @manifestations.stub(:last_page?){true}
+      @manifestations.stub(:total_count){@manifestations.size}
     end
+
     it "renders the XML template" do
+      assign(:manifestations, @manifestations)
       render
       expect(rendered).to match /<junii2/
     end
+
     it "renders NIItype" do
-      manifestations = [FactoryGirl.create(:manifestation, nii_type_id: 1)]
-      manifestations.stub(:last_page?){true}
-      manifestations.stub(:total_count){manifestations.size}
-      assign(:manifestations, manifestations)
+      assign(:manifestations, @manifestations)
       render
       expect(rendered).to match /<NIItype>Journal Article<\/NIItype>/
     end
   end
+
+  describe "when metadataPrefix is dcndl" do
+    before(:each) do
+      assign(:oai, { errors: [], metadataPrefix: 'dcndl' } )
+      @manifestations = Manifestation.all
+      @manifestations.stub(:next_page_cursor){'11223344=='}
+      @manifestations.stub(:last_page?){false}
+      @manifestations.stub(:total_count){@manifestations.size}
+      assign(:manifestations, @manifestations)
+    end
+
+    it "renders the XML template" do
+      render
+      expect(rendered).to match /dcndl/
+    end
+
+    it "renders well-formed XML", vcr: true do
+      NdlBook.import_from_sru_response('R100000002-I000008369884-00')
+      render
+      doc = Nokogiri::XML(rendered)
+      expect(doc.errors).to be_empty
+    end
+
+    it "renders extent and dimensions" do
+      FactoryBot.create(:manifestation, extent: "123p", dimensions: "23cm")
+      render
+      expect(rendered).to include "<dcterms:extent>123p ; 23cm</dcterms:extent>"
+    end
+
+    it "renders resumptionToken" do
+      render
+      expect(Nokogiri::XML(rendered).remove_namespaces!.at('//resumptionToken').content).to eq '11223344%3D%3D'
+    end
+  end
 end