enju_ndl 0.3.3 → 0.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 586f0ffdb7eacfe137720880c478a3c86e068262b9cba5b2933cf5492474bafe
-  data.tar.gz: a60c3c48ba901aff7bb1eae1ab5167e00131036ef215f561f0fa1064c74523fe
+  metadata.gz: 4d0f49eaefad35b92b61f8faea93f689ec9d62868edf983f4a95ebc3c9a58e57
+  data.tar.gz: 76890bbede710e50747b69687b5bdfaa67856a1e7ad7aafe80faf8a67e38b9e9
 SHA512:
-  metadata.gz: 8d9e7a4b62b5a67aa82c78fa38b58651ebb38ca534333028c71971abe0904af852a130ab8f6d7c9ff1d09bf943add81737011cb9da4ad7482b88e414286e1118
-  data.tar.gz: e7af12849e5d0fdd0e8d38dc245ebb6fab2adb79171f4778c5b1967e6dda30269742ae1e41beda368ff4583507d3c65ae19d54adf279a6e83d23d54dd6192bc9
+  metadata.gz: 45050db6983fc8e30525fe1006170f43da82a6aae370bd4194461eb7a7f80523827f8426a876803ba8ba300f25d775e6d3690b6adeefde45d85793e1e6742e9d
+  data.tar.gz: b105f3c85470fb0cc08c1396906cff0d1d6a397741a95441d0b368fb8c231ace97e678193619917e403cc8e5adf241c6cb07b925cde1fe8e9f2d6b9328bd9dd6

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 Project Next-L
+Copyright 2012 Kosuke Tanabe
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,11 +1,6 @@
 # EnjuNdl
-[<img src="https://travis-ci.com/next-l/enju_ndl.svg?branch=1.3" alt="Build
-Status" />](https://travis-ci.com/next-l/enju_ndl) [<img
-src="https://coveralls.io/repos/next-l/enju_ndl/badge.svg?branch=1.3&service=g
-ithub" alt="Coverage Status"
-/>](https://coveralls.io/github/next-l/enju_ndl?branch=1.3) [<img
-src="https://hakiri.io/github/next-l/enju_ndl/1.3.svg" alt="security"
-/>](https://hakiri.io/github/next-l/enju_ndl/1.3)
+[![CircleCI](https://circleci.com/gh/next-l/enju_ndl/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_ndl/tree/2.x)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_ndl/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_ndl?branch=2.x)
 
 This project rocks and uses MIT-LICENSE.
 

data/Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -23,13 +17,30 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+load 'rails/tasks/statistics.rake'
+
+
+
+require 'bundler/gem_tasks'
+
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+rescue LoadError
+  # no rspec available
 end
 
 task :default => :spec

data/app/models/concerns/enju_ndl/enju_agent.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module EnjuNdl
+  module EnjuAgent
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :ndla_record
+    end
+  end
+end
+

data/{lib/enju_ndl/ndl_search.rb → app/models/concerns/enju_ndl/enju_manifestation.rb}

@@ -1,24 +1,31 @@
+# frozen_string_literal: true
 
 module EnjuNdl
-  module NdlSearch
-    def self.included(base)
-      base.extend ClassMethods
-    end
+  module EnjuManifestation
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :jpno_record
+      has_one :ndl_bib_id_record
+      searchable do
+        string :jpno do
+          jpno_record.try(:body)
+        end
+      end
 
-    module ClassMethods
-      def import_isbn(isbn)
+      def self.import_isbn(isbn)
         manifestation = Manifestation.import_from_ndl_search(isbn: isbn)
         manifestation
       end
 
       # Use http://www.ndl.go.jp/jp/dlib/standards/opendataset/aboutIDList.txt
-      def import_ndl_bib_id(ndl_bib_id)
+      def self.import_ndl_bib_id(ndl_bib_id)
         url = "https://iss.ndl.go.jp/books/R100000002-I#{ndl_bib_id}-00.rdf"
         doc = Nokogiri::XML(Faraday.get(url).body)
         import_record(doc)
       end
 
-      def import_from_ndl_search(options)
+      def self.import_from_ndl_search(options)
         # if options[:isbn]
         lisbn = Lisbn.new(options[:isbn])
         raise EnjuNdl::InvalidIsbn unless lisbn.valid?
@@ -33,11 +40,10 @@ module EnjuNdl
         import_record(doc)
       end
 
-      def import_record(doc)
+      def self.import_record(doc)
         iss_itemno = URI.parse(doc.at('//dcndl:BibAdminResource[@rdf:about]').values.first).path.split('/').last
-        identifier_type = IdentifierType.where(name: 'iss_itemno').first
-        identifier_type ||= IdentifierType.where(name: 'iss_itemno').create!
-        identifier = Identifier.where(body: iss_itemno, identifier_type_id: identifier_type.id).first
+        identifier_type = IdentifierType.where(name: 'iss_itemno').first_or_create!
+        identifier = Identifier.find_by(body: iss_itemno, identifier_type_id: identifier_type.id)
         return identifier.manifestation if identifier
 
         jpno = doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/JPNO"]').try(:content)
@@ -59,7 +65,7 @@ module EnjuNdl
                  end
         end
 
-        language = Language.where(iso_639_2: get_language(doc)).first
+        language = Language.find_by(iso_639_2: get_language(doc))
         language_id = if language
                         language.id
                       else
@@ -75,8 +81,8 @@ module EnjuNdl
         doc.xpath('//dcndl:materialType[@rdf:resource]').each do |d|
           case d.attributes['resource'].try(:content)
           when 'http://ndl.go.jp/ndltype/Book'
-            carrier_type = CarrierType.where(name: 'print').first
-            content_type = ContentType.where(name: 'text').first
+            carrier_type = CarrierType.find_by(name: 'print')
+            content_type = ContentType.find_by(name: 'text')
           when 'http://ndl.go.jp/ndltype/Braille'
             content_type = ContentType.where(name: 'tactile_text').first
           # when 'http://ndl.go.jp/ndltype/ComputerProgram'
@@ -148,19 +154,19 @@ module EnjuNdl
           identifier = {}
           if isbn
             identifier[:isbn] = Identifier.new(body: isbn)
-            identifier[:isbn].identifier_type = IdentifierType.find_by(name: 'isbn') || IdnetifierType.create!(name: 'isbn')
+            identifier[:isbn].identifier_type = IdentifierType.where(name: 'isbn').first || IdnetifierType.create!(name: 'isbn')
           end
           if iss_itemno
             identifier[:iss_itemno] = Identifier.new(body: iss_itemno)
-            identifier[:iss_itemno].identifier_type = IdentifierType.find_by(name: 'iss_itemno') || IdentifierType.create!(name: 'iss_itemno')
+            identifier[:iss_itemno].identifier_type = IdentifierType.where(name: 'iss_itemno').first || IdentifierType.create!(name: 'iss_itemno')
           end
           if jpno
             identifier[:jpno] = Identifier.new(body: jpno)
-            identifier[:jpno].identifier_type = IdentifierType.find_by(name: 'jpno') || IdentifierType.create!(name: 'jpno')
+            identifier[:jpno].identifier_type = IdentifierType.where(name: 'jpno').first || IdentifierType.create!(name: 'jpno')
           end
           if issn
             identifier[:issn] = Identifier.new(body: issn)
-            identifier[:issn].identifier_type = IdentifierType.find_by(name: 'issn') || IdentifierType.create!(name: 'issn')
+            identifier[:issn].identifier_type = IdentifierType.where(name: 'issn').first || IdentifierType.create!(name: 'issn')
           end
           if issn_l
             identifier[:issn_l] = Identifier.new(body: issn_l)
@@ -194,7 +200,7 @@ module EnjuNdl
         manifestation
       end
 
-      def create_additional_attributes(doc, manifestation)
+      def self.create_additional_attributes(doc, manifestation)
         title = get_title(doc)
         creators = get_creators(doc).uniq
         subjects = get_subjects(doc).uniq
@@ -227,7 +233,7 @@ module EnjuNdl
             if classification_urls
               classification_urls.each do |url|
                 begin
-                  ndc_url = URI.parse(url)
+                  ndc_url = URI.parse(URI.escape(url))
                 rescue URI::InvalidURIError
                 end
                 next unless ndc_url
@@ -251,7 +257,7 @@ module EnjuNdl
         end
       end
 
-      def search_ndl(query, options = {})
+      def self.search_ndl(query, options = {})
         options = { dpid: 'iss-ndl-opac', item: 'any', idx: 1, per_page: 10, raw: false, mediatype: 1 }.merge(options)
         doc = nil
         results = {}
@@ -267,7 +273,7 @@ module EnjuNdl
         end
       end
 
-      def normalize_isbn(isbn)
+      def self.normalize_isbn(isbn)
         if isbn.length == 10
           Lisbn.new(isbn).isbn13
         else
@@ -275,7 +281,7 @@ module EnjuNdl
         end
       end
 
-      def return_xml(isbn)
+      def self.return_xml(isbn)
         rss = search_ndl(isbn, dpid: 'iss-ndl-opac', item: 'isbn')
         if rss.channel.totalResults.to_i == 0
           isbn = normalize_isbn(isbn)
@@ -288,7 +294,7 @@ module EnjuNdl
 
       private
 
-      def get_title(doc)
+      def self.get_title(doc)
         title = {
           manifestation: doc.xpath('//dc:title/rdf:Description/rdf:value').collect(&:content).join(' '),
           transcription: doc.xpath('//dc:title/rdf:Description/dcndl:transcription').collect(&:content).join(' '),
@@ -302,7 +308,7 @@ module EnjuNdl
         title
       end
 
-      def get_creators(doc)
+      def self.get_creators(doc)
         creators = []
         doc.xpath('//dcterms:creator/foaf:Agent').each do |creator|
           creators << {
@@ -314,7 +320,7 @@ module EnjuNdl
         creators
       end
 
-      def get_subjects(doc)
+      def self.get_subjects(doc)
         subjects = []
         doc.xpath('//dcterms:subject/rdf:Description').each do |subject|
           subjects << {
@@ -325,7 +331,7 @@ module EnjuNdl
         subjects
       end
 
-      def get_classifications(doc)
+      def self.get_classifications(doc)
         classifications = []
         doc.xpath('//dcterms:subject[@rdf:resource]').each do |classification|
           classifications << {
@@ -335,13 +341,13 @@ module EnjuNdl
         classifications
       end
 
-      def get_language(doc)
+      def self.get_language(doc)
         # TODO: 言語が複数ある場合
         language = doc.at('//dcterms:language[@rdf:datatype="http://purl.org/dc/terms/ISO639-2"]').try(:content)
         language.downcase if language
       end
 
-      def get_publishers(doc)
+      def self.get_publishers(doc)
         publishers = []
         doc.xpath('//dcterms:publisher/foaf:Agent').each do |publisher|
           publishers << {
@@ -353,7 +359,7 @@ module EnjuNdl
         publishers
       end
 
-      def get_extent(doc)
+      def self.get_extent(doc)
         extent = doc.at('//dcterms:extent').try(:content)
         value = { start_page: nil, end_page: nil, height: nil }
         if extent
@@ -371,7 +377,7 @@ module EnjuNdl
         value
       end
 
-      def create_series_statement(doc, manifestation)
+      def self.create_series_statement(doc, manifestation)
         series = series_title = {}
         series[:title] = doc.at('//dcndl:seriesTitle/rdf:Description/rdf:value').try(:content)
         series[:title_transcription] = doc.at('//dcndl:seriesTitle/rdf:Description/dcndl:transcription').try(:content)
@@ -398,8 +404,8 @@ module EnjuNdl
         manifestation
       end
 
-      def format_query(query)
-        Addressable::URI.encode(query.to_s.tr('　', ' '))
+      def self.format_query(query)
+        URI.escape(query.to_s.tr('　', ' '))
       end
     end
 

data/{lib/enju_ndl/crd.rb → app/models/concerns/enju_ndl/enju_question.rb}

@@ -1,23 +1,26 @@
+# frozen_string_literal: true
 
 module EnjuNdl
-  module Crd
-    def self.included(base)
-      base.extend ClassMethods
-    end
+  module EnjuQuestion
+    extend ActiveSupport::Concern
+
+    included do
+      def self.crd_per_page
+        5
+      end
 
-    module ClassMethods
-      def get_crd_response(options)
+      def self.get_crd_response(options)
         params = { query_logic: 1, results_get_position: 1, results_num: 200, sort: 10 }.merge(options)
         query = []
         query << "01_#{params[:query_01].to_s.tr('　', ' ')}" if params[:query_01]
         query << "02_#{params[:query_02].to_s.tr('　', ' ')}" if params[:query_02]
         delimiter = '.'
-        url = "http://crd.ndl.go.jp/refapi/servlet/refapi.RSearchAPI?query=#{Addressable::URI.encode(query.join(delimiter))}&query_logic=#{params[:query_logic]}&results_get_position=#{params[:results_get_position]}&results_num=#{params[:results_num]}&sort=#{params[:sort]}"
+        url = "http://crd.ndl.go.jp/refapi/servlet/refapi.RSearchAPI?query=#{URI.escape(query.join(delimiter))}&query_logic=#{params[:query_logic]}&results_get_position=#{params[:results_get_position]}&results_num=#{params[:results_num]}&sort=#{params[:sort]}"
 
-        xml = open(url).read.to_s
+        open(url).read.to_s
       end
 
-      def search_crd(options)
+      def self.search_crd(options)
         params = { page: 1 }.merge(options)
         crd_page = params[:page].to_i
         crd_page = 1 if crd_page <= 0

data/app/models/jpno_record.rb

@@ -0,0 +1,14 @@
+class JpnoRecord < ApplicationRecord
+  belongs_to :manifestation
+end
+
+# == Schema Information
+#
+# Table name: jpno_records
+#
+#  id               :bigint           not null, primary key
+#  body             :string           not null
+#  manifestation_id :bigint           not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#

data/app/models/ndl_bib_id_record.rb

@@ -0,0 +1,14 @@
+class NdlBibIdRecord < ApplicationRecord
+  belongs_to :manifestation
+end
+
+# == Schema Information
+#
+# Table name: ndl_bib_id_records
+#
+#  id               :bigint           not null, primary key
+#  body             :string           not null
+#  manifestation_id :bigint           not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#

data/app/models/ndl_book.rb

@@ -66,9 +66,9 @@ class NdlBook
   end
 
   def self.import_from_sru_response(itemno)
-    identifier_type = IdentifierType.find_by(name: 'iss_itemno')
+    identifier_type = IdentifierType.where(name: 'iss_itemno').first
     identifier_type ||= IdentifierType.create!(name: 'iss_itemno')
-    identifier = Identifier.find_by(body: itemno, identifier_type_id: identifier_type.id)
+    identifier = Identifier.where(body: itemno, identifier_type_id: identifier_type.id).first
     return if identifier
     url = "https://iss.ndl.go.jp/api/sru?operation=searchRetrieve&recordSchema=dcndl&maximumRecords=1&query=%28itemno=#{itemno}%29&onlyBib=true"
     xml = Faraday.get(url).body

data/app/models/ndla_record.rb

@@ -0,0 +1,14 @@
+class NdlaRecord < ApplicationRecord
+  belongs_to :agent
+end
+
+# == Schema Information
+#
+# Table name: ndla_records
+#
+#  id         :bigint           not null, primary key
+#  agent_id   :bigint
+#  body       :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/db/migrate/20170116150432_create_jpno_records.rb

@@ -0,0 +1,10 @@
+class CreateJpnoRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :jpno_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.references :manifestation, foreign_key: true, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20171126072934_create_ndla_records.rb

@@ -0,0 +1,10 @@
+class CreateNdlaRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ndla_records do |t|
+      t.references :agent, foreign_key: true
+      t.string :body, null: false, index: {unique: true}
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190501043418_create_ndl_bib_id_records.rb

@@ -0,0 +1,10 @@
+class CreateNdlBibIdRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ndl_bib_id_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.references :manifestation, foreign_key: true, null: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.3.3".freeze
+  VERSION = '0.4.0.beta.1'.freeze
 end

data/lib/enju_ndl.rb

@@ -1,30 +1,10 @@
-require "enju_ndl/engine"
+require 'enju_ndl/engine'
 require 'open-uri'
-require 'enju_ndl/ndl_search'
-require 'enju_ndl/crd'
 
 module EnjuNdl
-  module ActsAsMethods
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_ndl_ndl_search
-        include EnjuNdl::NdlSearch
-      end
-
-      def enju_ndl_crd
-        include EnjuNdl::Crd
-      end
-    end
-  end
-
   class RecordNotFound < StandardError
   end
 
   class InvalidIsbn < StandardError
   end
 end
-
-ActiveRecord::Base.send :include, EnjuNdl::ActsAsMethods

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

@@ -1,4 +1,4 @@
-class User < ApplicationRecord
+class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
@@ -7,3 +7,7 @@ class User < ApplicationRecord
 end
 
 Manifestation.include(EnjuSubject::EnjuManifestation)
+ImportRequest.include(EnjuNdl::EnjuManifestation)
+Manifestation.include(EnjuNdl::EnjuManifestation)
+Agent.include(EnjuNdl::EnjuAgent)
+Question.include(EnjuNdl::EnjuQuestion)

data/spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/setup

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
-
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

data/spec/dummy/bin/update

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
 

data/spec/dummy/bin/yarn

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
   begin
-    exec "yarnpkg #{ARGV.join(" ")}"
+    exec "yarnpkg", *ARGV
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

data/spec/dummy/config/application.rb

@@ -5,11 +5,12 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 require "enju_ndl"
 require "enju_question"
+require "enju_subject"
 
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers