enju_oai 0.1.1 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1376dbd6746c4368f9ed53617eec78f623f8acb
-  data.tar.gz: e16ab98de0488f0629f1afef7ed4799c9b93e429
+  metadata.gz: fb55730b99dfbe398f5f1f5f40cb66767744a2fa
+  data.tar.gz: 08c8795cfce91ea8d562657fed024029c005dbc2
 SHA512:
-  metadata.gz: 53c4ea6338d93f41fc4635721ecd8a95826362feb2caa1fac44aef2d9f10fa141522b084095c06721aed499d22adaa9e94e7615aa6e10d5b77b8a9e639ca918a
-  data.tar.gz: 73f0b4f7c43ea8f725b892e7e728f7b1137fb4ad5a762404a4ea8f79430c0d0917bd357627c49ea768fdd6db4749239dfc52e0a6b5e161d040281d3f848db218
+  metadata.gz: bc821e1cd95b764e92b26212cf0973608b8d901c46fd7c709649f59bcb87bcf5aef69a6cdd51d775a9b059b28fec2eedfb89a16d6efc25f7198cbce8893e008e
+  data.tar.gz: b0728234f814a5ee37d879b5ab4ef91fd79af850e4314fea837a74a8f53995dd85fdaeb2a44cd8cc94fda344af0599f138c01ab8ca0e3b5d56d7cda1e7b68c52

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuOai
-{<img src="https://travis-ci.org/next-l/enju_oai.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_oai]
-{<img src="https://coveralls.io/repos/next-l/enju_oai/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_oai?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_oai/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_oai/1.1]
+{<img src="https://travis-ci.org/next-l/enju_oai.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_oai]
+{<img src="https://coveralls.io/repos/next-l/enju_oai/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_oai?branch=1.2]
+{<img src="https://hakiri.io/github/next-l/enju_oai/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_oai/1.2]
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/oai_controller.rb

@@ -1,4 +1,6 @@
 class OaiController < ApplicationController
+  before_action :check_policy, only: :provider
+
   def provider
     @oai = check_oai_params(params)
     if params[:verb] == 'GetRecord'
@@ -8,42 +10,21 @@ class OaiController < ApplicationController
       from_time = @from_time = from_and_until_times[:from]
       until_time = @until_time = from_and_until_times[:until]
 
-      # OAI-PMHのデフォルトの件数
-      oai_per_page = 200
-      search = Manifestation.search do
-        order_by :updated_at, :desc
-        paginate page: 1, per_page: oai_per_page
-      end
-      @count = {query_result: search.execute!.total}
-
       if params[:resumptionToken]
-        token = params[:resumptionToken].split(',')
-        if token.size == 3
-          @cursor = token.reverse.first.to_i
-          if @cursor <= @count[:query_result]
-            page = (@cursor.to_i + oai_per_page).div(oai_per_page)
-          else
-            @oai[:errors] << 'badResumptionToken'
-          end
-        else
-          @oai[:errors] << 'badResumptionToken'
-        end
+        token = params[:resumptionToken]
+      else
+        token = '*'
       end
-      page ||= 1
 
-      search.build do
+      # OAI-PMHのデフォルトの件数
+      oai_per_page = 500
+      search = Manifestation.search do
         order_by :updated_at, :desc
-        paginate page: page, per_page: oai_per_page
+        paginate cursor: token, per_page: oai_per_page
       end
       @manifestations = search.execute!.results
 
-      unless @manifestations.empty?
-        @resumption = set_resumption_token(
-          params[:resumptionToken],
-          @from_time || Manifestation.order(:updated_at).first.updated_at,
-          @until_time || Manifestation.order(:updated_at).last.updated_at
-        )
-      else
+      if @manifestations.empty?
         @oai[:errors] << 'noRecordsMatch'
       end
     end
@@ -74,6 +55,10 @@ class OaiController < ApplicationController
   end
 
   private
+  def check_policy
+    authorize Oai
+  end
+
   def get_record
     if params[:identifier]
       begin

data/app/models/concerns/enju_oai/oai_model.rb

@@ -0,0 +1,15 @@
+module EnjuOai
+  module OaiModel
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def find_by_oai_identifier(identifier)
+        self.find(identifier.to_s.split(":").last.split("-").last)
+      end
+    end
+  
+    def oai_identifier
+      "oai:#{::Addressable::URI.parse(LibraryGroup.site_config.url).host}:#{self.class.to_s.tableize}-#{self.id}"
+    end
+  end
+end

data/app/models/oai.rb

@@ -0,0 +1,2 @@
+class Oai
+end

data/app/policies/oai_policy.rb

@@ -0,0 +1,5 @@
+class OaiPolicy < ApplicationPolicy
+  def provider?
+    true
+  end
+end

data/app/views/oai/_record_dcndl.xml.builder

@@ -0,0 +1,85 @@
+xml_builder.tag! "rdf:RDF",
+  "xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+  "xmlns:dcterms": "http://purl.org/dc/terms/",
+  "xmlns:dcndl": "http://ndl.go.jp/dcndl/terms/",
+  "xmlns:dc": "http://purl.org/dc/elements/1.1/",
+  "xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+  "xmlns:owl": "http://www.w3.org/2002/07/owl#",
+  "xmlns:foaf": "http://xmlns.com/foaf/0.1/" do
+  get_record_url = manifestations_url format: "oai", verb: 'GetRecord', metadataPrefix: 'dcndl', identifier: manifestation.oai_identifier
+  xml_builder.tag! "dcndl:BibAdminResource", "rdf:about": get_record_url do
+    xml_builder.tag! "dcndl:record", "rdf:resource": get_record_url
+    xml_builder.tag! "dcndl:bibRecordCategory", ENV['DCNDL_BIBRECORDCATEGORY']
+  end
+  xml_builder.tag! "dcndl:BibResource", "rdf:about": get_record_url + "#material" do
+    manifestation.identifiers.each do |identifier|
+      case identifier.identifier_type.try(:name)
+      when 'isbn'
+        xml_builder.tag! "rdfs:seeAlso", "rdf:resource": "http://iss.ndl.go.jp/isbn/#{ identifier.body }"
+        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype": "http://ndl.go.jp/dcndl/terms/ISBN"
+      when 'issn'
+        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype": "http://ndl.go.jp/dcndl/terms/ISSN"
+      when 'ncid'
+        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype": "http://ndl.go.jp/dcndl/terms/NIIBibID"
+      end
+    end
+    xml_builder.tag! "dcterms:title", manifestation.original_title
+    xml_builder.tag! "dc:title" do
+      xml_builder.tag! "rdf:Description" do
+        xml_builder.tag! "rdf:value", manifestation.original_title
+        if manifestation.title_transcription?
+          xml_builder.tag! "dcndl:transcription", manifestation.title_transcription
+        end
+      end
+    end
+    xml_builder.tag! "dcterms:creator" do
+      manifestation.creators.each do |creator|
+        xml_builder.tag! "foaf:Agent" do
+          xml_builder.tag! "foaf:name", creator.full_name
+        end
+      end
+      xml_builder.tag! "dc:creator", manifestation.statement_of_responsibility
+    end
+    xml_builder.tag! "dcterms:publisher" do
+      manifestation.publishers.each do |publisher|
+        xml_builder.tag! "foaf:Agent" do
+          xml_builder.tag! "foaf:name", publisher.full_name
+        end
+      end
+    end
+    xml_builder.tag! "dcterms:issued", manifestation.pub_date, "rdf:datatype": "http://purl.org/dc/terms/W3CDTF"
+    xml_builder.tag! "dcndl:materialType", "rdf:resource": "http://ndl.go.jp/ndltype/Book"
+  end
+  unless manifestation.attachment.blank?
+    xml_builder.fulltextURL manifestation_url(id: manifestation.id, format: :download)
+  end
+  %w( ISBN ISSN NCID ).each do |identifier|
+    manifestation.identifier_contents(identifier.downcase).each do |val|
+      xml_builder.tag! identifier, val
+    end
+  end
+  if manifestation.root_series_statement
+    xml_builder.jtitle manifestation.root_series_statement.original_title
+  end
+  xml_builder.volume manifestation.volume_number_string
+  xml_builder.issue manifestation.issue_number_string
+  xml_builder.spage manifestation.start_page
+  xml_builder.epage manifestation.end_page
+  xml_builder.dateofissued manifestation.pub_date
+  #TODO: junii2: source
+  if manifestation.language.blank? or manifestation.language.name == 'unknown'
+    xml_builder.language "und"
+  else
+    xml_builder.language manifestation.language.iso_639_2
+  end
+  %w( pmid doi NAID ichushi ).each do |identifier|
+    manifestation.identifier_contents(identifier.downcase).each do |val|
+      xml_builder.tag! identifier, val
+    end
+  end
+  #TODO: junii2: isVersionOf, hasVersion, isReplaceBy, replaces, isRequiredBy, requires, isPartOf, hasPart, isReferencedBy, references, isFormatOf, hasFormat
+  #TODO: junii2: coverage, spatial, NIIspatial, temporal, NIItemporal
+  #TODO: junii2: rights
+  #TODO: junii2: textversion
+  #TODO: junii2: grantid, dateofgranted, degreename, grantor
+end

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

@@ -19,6 +19,8 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
           render 'record_oai_dc', manifestation: @manifestation, xml_builder: xml
         when 'junii2'
           render 'record_junii2', manifestation: @manifestation, xml_builder: xml
+        when 'dcndl'
+          render 'record_dcndl', manifestation: @manifestation, xml_builder: xml
         end
       end
     end

data/app/views/oai/list_identifiers.xml.builder

@@ -19,13 +19,10 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
         end
       end
     end
-    if @resumption.present?
-      if @resumption[:cursor].to_i <= @count[:query_result]
-        token = @resumption[:token]
-      else
-        token = nil
-      end
-      xml.resumptionToken token, completeListSize: @count[:query_result], cursor: @cursor.to_i
+    if @manifestations.last_page?
+      xml.resumptionToken nil, completeListSize: @manifestations.total_count
+    else
+      xml.resumptionToken CGI.escape(@manifestations.next_page_cursor), completeListSize: @manifestations.total_count
     end
   end
 end

data/app/views/oai/list_metadata_formats.xml.builder

@@ -15,5 +15,10 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
       xml.schema "http://irdb.nii.ac.jp/oai/junii2-3-1.xsd"
       xml.metadataNamespace "http://irdb.nii.ac.jp/oai"
     end
+    xml.metadataFormat do
+      xml.metadataPrefix "dcndl"
+      xml.schema nil
+      xml.metadataNamespace "http://ndl.go.jp/dcndl/terms/"
+    end
   end
 end

data/app/views/oai/list_records.xml.builder

@@ -21,18 +21,17 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
               render 'record_oai_dc', manifestation: manifestation, xml_builder: xml
             when 'junii2'
               render 'record_junii2', manifestation: manifestation, xml_builder: xml
+            when 'dcndl'
+              render 'record_dcndl', manifestation: manifestation, xml_builder: xml
             end
           end
         end
       end
     end
-    if @resumption.present?
-      if @resumption[:cursor].to_i <= @count[:query_result]
-        token = @resumption[:token]
-      else
-        token = nil
-      end
-      xml.resumptionToken token, completeListSize: @count[:query_result], cursor: @cursor.to_i
+    if @manifestations.last_page?
+      xml.resumptionToken nil, completeListSize: @manifestations.total_count
+    else
+      xml.resumptionToken CGI.escape(@manifestations.next_page_cursor), completeListSize: @manifestations.total_count
     end
   end
 end

data/lib/enju_oai/oai_controller.rb

@@ -42,7 +42,7 @@ module EnjuOai
   
       def valid_metadata_format?(format)
         if format.present?
-          if ['oai_dc', 'junii2'].include?(format)
+          if ['oai_dc', 'junii2', 'dcndl'].include?(format)
             true
           else
             false

data/lib/enju_oai/version.rb

@@ -1,3 +1,3 @@
 module EnjuOai
-  VERSION = "0.1.1"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/enju_oai.rb

@@ -1,5 +1,4 @@
 require "enju_oai/engine"
-require 'enju_oai/oai_model'
 require 'enju_oai/oai_controller'
 
 module EnjuOai

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,8 +1,10 @@
-# -*- encoding: utf-8 -*-
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  enju_leaf
-  enju_biblio
-  enju_library
-  enju_subject
+  include EnjuLeaf::Controller
+  include EnjuBiblio::Controller
+  include EnjuLibrary::Controller
+  include EnjuSubject::Controller
+  after_action :verify_authorized
+
+  include Pundit
 end

data/spec/dummy/app/models/user.rb

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  enju_leaf_user_model
+  include EnjuLeaf::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -2,8 +2,10 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
-require "enju_oai"
+Bundler.require(*Rails.groups)
+require 'enju_oai'
+require 'enju_nii'
+require 'enju_leaf'
 
 module Dummy
   class Application < Rails::Application
@@ -11,16 +13,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,30 +21,8 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    #config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 
-require 'enju_leaf'
-require 'enju_nii'

data/spec/dummy/config/environments/development.rb

@@ -1,37 +1,41 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 
-  # Expands the lines which load the assets
-  config.assets.debug = true
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

data/spec/dummy/config/environments/production.rb

@@ -1,67 +1,79 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end

data/spec/dummy/config/environments/test.rb

@@ -1,5 +1,5 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,31 +7,38 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  #config.active_record.mass_assignment_sanitizer = :strict
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 end

data/spec/dummy/config/initializers/enju_leaf.rb

@@ -0,0 +1,2 @@
+Item.include(EnjuLibrary::EnjuItem)
+Manifestation.include(EnjuOai::OaiModel)

data/spec/support/devise.rb

@@ -1,4 +1,4 @@
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, :type => :controller
-  config.include Devise::TestHelpers, :type => :view
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :view
 end

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

@@ -29,4 +29,16 @@ describe "oai/show.xml.builder" do
       rendered.should match /<title>manifestation_title/
     end
   end
+
+  describe "When metadataPrefix is 'dcndl'" do
+    before(:each) do
+      assign(:oai, metadataPrefix: 'dcndl')
+    end
+    it "renders the XML template" do
+      render
+      rendered.should match /<metadata\b/
+      rendered.should match /<dcndl\b/
+      rendered.should match /<dcterms:title>manifestation_title/
+    end
+  end
 end

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

@@ -7,9 +7,6 @@ describe "oai/identify.xml.builder" do
   before(:each) do
     assign(:library_group, LibraryGroup.site_config)
     view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders the XML template" do

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

@@ -6,7 +6,10 @@ describe "oai/list_identifiers.xml.builder" do
   before(:each) do 
     view.stub(:current_user_role_name).and_return('Guest')
     assign(:oai, { :errors => [] })
-    assign(:manifestations, [ FactoryGirl.create(:manifestation) ])
+    manifestations = [ FactoryGirl.create(:manifestation) ]
+    manifestations.stub(:last_page?){true}
+    manifestations.stub(:total_count){manifestations.size}
+    assign(:manifestations, manifestations)
   end
   it "renders the XML template" do
     render

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

@@ -15,4 +15,8 @@ describe "oai/list_metadata_formats.xml.builder" do
     render
     expect(rendered).to match /junii2/
   end
+  it "supports dcndl metadata format" do
+    render
+    expect(rendered).to match /dcndl/
+  end
 end

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

@@ -7,7 +7,10 @@ describe "oai/list_records.xml.builder" do
   before(:each) do
     view.stub(:current_user_role_name).and_return('Guest')
     assign(:oai, { :errors => [] })
-    assign(:manifestations, [FactoryGirl.create(:manifestation)])
+    manifestations = [ FactoryGirl.create(:manifestation) ]
+    manifestations.stub(:last_page?){true}
+    manifestations.stub(:total_count){manifestations.size}
+    assign(:manifestations, manifestations)
   end
 
   it "renders the XML template" do
@@ -16,7 +19,10 @@ describe "oai/list_records.xml.builder" do
   end
 
   it "renders dc:date" do
-    assign(:manifestations, [FactoryGirl.create(:manifestation, pub_date: '2015-08-15')])
+    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
@@ -40,7 +46,10 @@ describe "oai/list_records.xml.builder" do
       expect(rendered).to match /<junii2/
     end
     it "renders NIItype" do
-      assign(:manifestations, [FactoryGirl.create(:manifestation, nii_type_id: 1)])
+      manifestations = [FactoryGirl.create(:manifestation, nii_type_id: 1)]
+      manifestations.stub(:last_page?){true}
+      manifestations.stub(:total_count){manifestations.size}
+      assign(:manifestations, manifestations)
       render
       expect(rendered).to match /<NIItype>Journal Article<\/NIItype>/
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_oai
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.beta.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,58 +16,100 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.2.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: enju_manifestation_viewer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_subject
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_nii
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,33 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: enju_leaf
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: enju_nii
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -203,6 +245,10 @@ files:
 - README.rdoc
 - Rakefile
 - app/controllers/oai_controller.rb
+- app/models/concerns/enju_oai/oai_model.rb
+- app/models/oai.rb
+- app/policies/oai_policy.rb
+- app/views/oai/_record_dcndl.xml.builder
 - app/views/oai/_record_junii2.xml.builder
 - app/views/oai/_record_oai_dc.xml.builder
 - app/views/oai/get_record.xml.builder
@@ -217,7 +263,6 @@ files:
 - lib/enju_oai.rb
 - lib/enju_oai/engine.rb
 - lib/enju_oai/oai_controller.rb
-- lib/enju_oai/oai_model.rb
 - lib/enju_oai/version.rb
 - lib/tasks/enju_oai_tasks.rake
 - spec/controllers/oai_controller_spec.rb
@@ -236,7 +281,6 @@ files:
 - spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -245,6 +289,7 @@ files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -528,12 +573,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: enju_oai plugin
@@ -551,7 +596,6 @@ test_files:
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -560,6 +604,7 @@ test_files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb

data/lib/enju_oai/oai_model.rb

@@ -1,25 +0,0 @@
-module EnjuOai
-  module ActsAsMethods
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_oai
-        include InstanceMethods
-      end
-
-      def find_by_oai_identifier(identifier)
-        self.find(identifier.to_s.split(":").last.split("-").last)
-      end
-    end
-  
-    module InstanceMethods
-      def oai_identifier
-        "oai:#{::Addressable::URI.parse(LibraryGroup.site_config.url).host}:#{self.class.to_s.tableize}-#{self.id}"
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, EnjuOai::ActsAsMethods

data/spec/dummy/config/application.yml

@@ -1,42 +0,0 @@
-defaults: &defaults
-  enju:
-    web_hostname: localhost
-    web_port_number: 3000
-
-  family_name_first: true
-  max_number_of_results: 500
-  write_search_log_to_file: true
-  csv_charset_conversion: true
-
-# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
-#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
-  amazon:
-    aws_hostname: ecs.amazonaws.jp
-    hostname: www.amazon.co.jp
-    access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
-    secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
-
-# :google, :amazon
-  book_jacket:
-    source: :google
-    unknown_resource:
-
-# :mozshot, :simpleapi, :heartrails, :thumbalizr
-  screenshot:
-    generator: :mozshot
-
-  uploaded_file:
-    storage: :local
-
-  manifestation:
-    facet:
-      pub_year_range_interval: 10
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults