enju_nii 0.3.2 → 0.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fcbb5dd79539409af40efb05c0a021a7479ded88514a5349db0e4030ef505d
-  data.tar.gz: 9261f0263245fe76c77e4ce34e914090f9a8dc858a40546a75d25d48cff9a698
+  metadata.gz: f93db49ecdf3d0679db81972256c2dca7117fdaa9e35a7a9cd7ec075fac3e853
+  data.tar.gz: f3a470f7da35009bc1e6792d9581d055e1d378e2c1e7dc923d4dbff51f6a6b8f
 SHA512:
-  metadata.gz: f42e3beab9b8ad6135a802c56432051fec8740b3867f1c28805060dd8a7569c34c62586b055c174b03243bd732ff2fadb8b2345366717b27885b6dc2e1035296
-  data.tar.gz: 9a1ddd6174c8a144c9818b3a25336b879ce5928b26d8bd69d1ce11493a3b2846a2ef2e77177905a1155c4d79c096cd19e8766d5709a164c4da252c16370ee49c
+  metadata.gz: ea58b4f3a7c200ddea937bb347d131d193085cebb1e0c19f2a187a1b112b9786aa720a4cc3d9a296b6097b7a19a11f3da226c333fc6f8d8e5b3568a281a78883
+  data.tar.gz: 5fd3256f5b23797132e14abfb17a409e932bddf2eea65d69f86577f5c3968fdeef26bb48b6d6d3c67e68bebe74e301f783fbf0cbaa59bfab60394caf44ef7af0

data/README.md

@@ -1,11 +1,6 @@
 # EnjuNii
-[<img src="https://travis-ci.com/next-l/enju_nii.svg?branch=1.3" alt="Build
-Status" />](https://travis-ci.com/next-l/enju_nii) [<img
-src="https://coveralls.io/repos/next-l/enju_nii/badge.svg?branch=1.3&service=g
-ithub" alt="Coverage Status"
-/>](https://coveralls.io/github/next-l/enju_nii?branch=1.3) [<img
-src="https://hakiri.io/github/next-l/enju_nii/1.3.svg" alt="security"
-/>](https://hakiri.io/github/next-l/enju_nii/1.3)
+[![CircleCI](https://circleci.com/gh/next-l/enju_nii/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_nii/tree/2.x)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_nii/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_nii?branch=2.x)
 
 CiNii Booksから書誌をインポートするための Enju プラグインです。
 
@@ -13,7 +8,7 @@ CiNii Booksから書誌をインポートするための Enju プラグインで
 
 お使いのenju_leafのGemfile に以下の行を追加してください。
 
-    gem 'enju_nii', github: "next-l/enju_nii", branch: '1.3'
+    gem 'enju_nii', github: "next-l/enju_nii", branch: '2.x'
 
 gemをインストールします。
 
@@ -39,3 +34,4 @@ This project rocks and uses MIT-LICENSE.
 ## 製作者・貢献者 (Authors and contributors)
 * [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
 * [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
+

data/{lib/enju_nii/cinii_book.rb → app/models/concerns/enju_nii/enju_manifestation.rb}

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module EnjuNii
-  module CiNiiBook
-    def self.included(base)
-      base.extend ClassMethods
-    end
+  module EnjuManifestation
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :nii_type, optional: true
 
-    module ClassMethods
-      def import_from_cinii_books(options)
+      def self.import_from_cinii_books(options)
         # if options[:isbn]
         lisbn = Lisbn.new(options[:isbn])
         raise EnjuNii::InvalidIsbn unless lisbn.valid?
@@ -20,7 +22,7 @@ module EnjuNii
         import_record_from_cinii_books(doc)
       end
 
-      def import_record_from_cinii_books(doc)
+      def self.import_record_from_cinii_books(doc)
         # http://ci.nii.ac.jp/info/ja/api/api_outline.html#cib_od
         # return nil
 
@@ -118,7 +120,7 @@ module EnjuNii
         manifestation
       end
 
-      def search_cinii_book(query, options = {})
+      def self.search_cinii_book(query, options = {})
         options = {p: 1, count: 10, raw: false}.merge(options)
         doc = nil
         results = {}
@@ -136,7 +138,7 @@ module EnjuNii
         end
       end
 
-      def return_rdf(isbn)
+      def self.return_rdf(isbn)
         rss = self.search_cinii_by_isbn(isbn)
         if rss.channel.totalResults.to_i == 0
           rss = self.search_cinii_by_isbn(cinii_normalize_isbn(isbn))
@@ -150,7 +152,7 @@ module EnjuNii
         end
       end
 
-      def search_cinii_by_isbn(isbn)
+      def self.search_cinii_by_isbn(isbn)
         url = "https://ci.nii.ac.jp/books/opensearch/search?isbn=#{isbn}&format=rss"
         RSS::RDF::Channel.install_text_element("opensearch:totalResults", "http://a9.com/-/spec/opensearch/1.1/", "?", "totalResults", :text, "opensearch:totalResults")
         RSS::BaseListener.install_get_text_element("http://a9.com/-/spec/opensearch/1.1/", "totalResults", "totalResults=")
@@ -158,7 +160,7 @@ module EnjuNii
       end
 
       private
-      def cinii_normalize_isbn(isbn)
+      def self.cinii_normalize_isbn(isbn)
         if isbn.length == 10
           Lisbn.new(isbn).isbn13
         else
@@ -166,7 +168,7 @@ module EnjuNii
         end
       end
 
-      def get_cinii_creator(doc)
+      def self.get_cinii_creator(doc)
         doc.xpath("//foaf:maker/foaf:Person").map{|e|
           {
             full_name: e.at("./foaf:name").content,
@@ -176,11 +178,11 @@ module EnjuNii
         }
       end
 
-      def get_cinii_publisher(doc)
+      def self.get_cinii_publisher(doc)
         doc.xpath("//dc:publisher").map{|e| {full_name: e.content}}
       end
 
-      def get_cinii_title(doc)
+      def self.get_cinii_title(doc)
         {
           original_title: doc.at("//dc:title[not(@xml:lang)]").children.first.content,
           title_transcription: doc.xpath("//dc:title[@xml:lang]", 'dc': 'http://purl.org/dc/elements/1.1/').map{|e| e.try(:content)}.join("\n"),
@@ -188,7 +190,7 @@ module EnjuNii
         }
       end
 
-      def get_cinii_language(doc)
+      def self.get_cinii_language(doc)
         language = doc.at("//dc:language").try(:content)
         if language.size > 3
           language[0..2]
@@ -197,7 +199,7 @@ module EnjuNii
         end
       end
 
-      def get_cinii_subjects(doc)
+      def self.get_cinii_subjects(doc)
         subjects = []
         doc.xpath('//foaf:topic').each do |s|
           subjects << { term: s["dc:title"] }
@@ -205,7 +207,7 @@ module EnjuNii
         subjects
       end
 
-      def create_cinii_series_statements(doc, manifestation)
+      def self.create_cinii_series_statements(doc, manifestation)
         series = doc.at("//dcterms:isPartOf")
         if series and parent_url = series["rdf:resource"]
           ptbl = series["dc:title"]

data/app/models/nii_type.rb

@@ -1,4 +1,4 @@
-class NiiType < ApplicationRecord
+class NiiType < ActiveRecord::Base
   include MasterModel
   has_many :manifestations
 end

data/lib/enju_nii/engine.rb

@@ -1,5 +1,5 @@
 require 'enju_subject'
-require 'rss/1.0'
+require 'rss'
 require 'faraday_middleware'
 
 module EnjuNii

data/lib/enju_nii/version.rb

@@ -1,3 +1,3 @@
 module EnjuNii
-  VERSION = "0.3.2".freeze
+  VERSION = "0.4.0.beta.1"
 end

data/lib/enju_nii.rb

@@ -1,31 +1,10 @@
-require "enju_nii/engine"
+require 'enju_nii/engine'
 require 'open-uri'
-require 'enju_nii/cinii_book'
 
 module EnjuNii
-  module ActsAsMethods
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_nii_cinii_books
-        include EnjuNii::CiNiiBook
-        belongs_to :nii_type, optional: true
-      end
-
-      def import_isbn(isbn)
-        manifestation = Manifestation.import_from_cinii_books(isbn: isbn)
-        manifestation
-      end
-    end
-  end
-
   class RecordNotFound < StandardError
   end
 
   class InvalidIsbn < StandardError
   end
 end
-
-ActiveRecord::Base.send :include, EnjuNii::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
@@ -6,4 +6,5 @@ class User < ApplicationRecord
   include EnjuSeed::EnjuUser
 end
 
+Manifestation.include(EnjuNii::EnjuManifestation)
 Manifestation.include(EnjuSubject::EnjuManifestation)

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

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

data/spec/dummy/config/database.yml

@@ -1,25 +1,86 @@
-# SQLite version 3.x
-#   gem install sqlite3
+# PostgreSQL. Versions 9.1 and up are supported.
 #
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
 #
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  timeout: 5000
+  username: postgres
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: enju_nii_dummy_development
+
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: enju_nii_dummy
+
+  # The password associated with the postgres role (username).
+  #password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: enju_nii_dummy_test
 
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= ENV['DATABASE_URL'] %>
+#
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: enju_nii_dummy_production
+  username: enju_nii_dummy
+  password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>

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

@@ -39,7 +39,4 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
-
-  config.action_mailer.default_url_options = {host: 'localhost:3000'}
-  config.active_job.queue_adapter = :inline
 end

data/spec/dummy/db/migrate/029_create_subjects.rb

@@ -1,24 +1,21 @@
 class CreateSubjects < ActiveRecord::Migration[4.2]
   def self.up
     create_table :subjects do |t|
-      t.integer :parent_id
+      t.references :parent, index: true
       t.integer :use_term_id
       t.string :term
       t.text :term_transcription
-      t.integer :subject_type_id, null: false
+      t.references :subject_type, index: true, null: false
       t.text :scope_note
       t.text :note
-      t.integer :required_role_id, default: 1, null: false
+      t.references :required_role, index: true, default: 1, null: false
       t.integer :lock_version, default: 0, null: false
       t.datetime :created_at
       t.datetime :updated_at
       t.datetime :deleted_at
     end
     add_index :subjects, :term
-    add_index :subjects, :parent_id
     add_index :subjects, :use_term_id
-    add_index :subjects, :subject_type_id
-    add_index :subjects, :required_role_id
   end
 
   def self.down

data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb

@@ -3,7 +3,9 @@ class CreatePictureFiles < ActiveRecord::Migration[4.2]
     create_table :picture_files do |t|
       t.integer :picture_attachable_id
       t.string :picture_attachable_type
+      t.string :content_type
       t.text :title
+      t.string :thumbnail
       t.integer :position
 
       t.timestamps

data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb

@@ -1,12 +1,10 @@
 class CreateUserHasRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :user_has_roles do |t|
-      t.integer :user_id
-      t.integer :role_id
+      t.references :user, index: true, foreign_key: true, null: false
+      t.references :role, index: true, foreign_key: true, null: false
 
       t.timestamps
     end
-    add_index :user_has_roles, :user_id
-    add_index :user_has_roles, :role_id
   end
 end

data/spec/dummy/db/migrate/20140122054321_create_profiles.rb

@@ -1,20 +1,19 @@
 class CreateProfiles < ActiveRecord::Migration[4.2]
   def change
     create_table :profiles do |t|
-      t.integer :user_id
-      t.integer :user_group_id
-      t.integer :library_id
+      t.references :user, index: true, foreign_key: true
+      t.references :user_group, index: true
+      t.references :library, index: true
       t.string :locale
       t.string :user_number
       t.text :full_name
       t.text :note
       t.text :keyword_list
-      t.integer :required_role_id
+      t.references :required_role, index: false
 
       t.timestamps
     end
 
-    add_index :profiles, :user_id
     add_index :profiles, :user_number, unique: true
   end
 end

data/spec/dummy/db/migrate/20150923173139_add_url_to_classification.rb

@@ -0,0 +1,5 @@
+class AddUrlToClassification < ActiveRecord::Migration[4.2]
+  def change
+    add_column :classifications, :url, :string
+  end
+end

data/spec/dummy/db/migrate/20150925092505_add_label_to_classification.rb

@@ -0,0 +1,5 @@
+class AddLabelToClassification < ActiveRecord::Migration[4.2]
+  def change
+    add_column :classifications, :label, :string
+  end
+end

data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb

@@ -0,0 +1,11 @@
+class CreateIssnRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :issn_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.string :issn_type
+      t.string :source
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb

@@ -0,0 +1,11 @@
+class CreateIsbnRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :isbn_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.string :isbn_type
+      t.string :source
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb

@@ -0,0 +1,11 @@
+class CreateIssnRecordAndManifestations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :issn_record_and_manifestations do |t|
+      t.references :issn_record, foreign_key: true, on_delete: :cascade, null: false
+      t.references :manifestation, foreign_key: true, on_delete: :cascade, null: false
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb

@@ -0,0 +1,11 @@
+class CreateIsbnRecordAndManifestations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :isbn_record_and_manifestations do |t|
+      t.references :isbn_record, foreign_key: true, on_delete: :cascade, null: false
+      t.references :manifestation, foreign_key: true, null: false, on_delete: :cascade
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb

@@ -0,0 +1,12 @@
+class AddDisplayNameTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :budget_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :libraries, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :library_groups, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_status_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :search_engines, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :shelves, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :user_groups, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/spec/dummy/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb

@@ -0,0 +1,6 @@
+class AddLoginBannerTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :library_groups, :login_banner_translations, :jsonb, default: {}, null: false
+    add_column :library_groups, :footer_banner_translations, :jsonb, default: {}, null: false
+  end
+end

data/spec/dummy/db/migrate/20190630151446_add_display_name_translations_to_role.rb

@@ -0,0 +1,5 @@
+class AddDisplayNameTranslationsToRole < ActiveRecord::Migration[5.2]
+  def change
+    add_column :roles, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/spec/dummy/db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb

@@ -0,0 +1,21 @@
+class AddDisplayNameTranslationsToCarrierType < ActiveRecord::Migration[5.2]
+  def change
+    [
+      :agent_relationship_types,
+      :agent_types,
+      :carrier_types,
+      :content_types,
+      :create_types,
+      :form_of_works,
+      :frequencies,
+      :languages,
+      :licenses,
+      :manifestation_relationship_types,
+      :medium_of_performances,
+      :produce_types,
+      :realize_types
+    ].each do |table|
+      add_column table, :display_name_translations, :jsonb, default: {}, null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20190713114940_add_profile_id_to_user.rb

@@ -0,0 +1,5 @@
+class AddProfileIdToUser < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :users, :profile, foreign_key: true
+  end
+end

data/spec/dummy/db/migrate/20190713115451_add_full_name_translations_to_profile.rb

@@ -0,0 +1,5 @@
+class AddFullNameTranslationsToProfile < ActiveRecord::Migration[5.2]
+  def change
+    add_column :profiles, :full_name_translations, :jsonb, default: {}, null: false
+  end
+end