enju_subject 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3540a976601322093467b5c0415327535ee13c8f352956628bc6566117f1276
-  data.tar.gz: d5ed07dd1e3aa5e1948283c1385e4cc42ac10c444e31a851ad8dd56c15648f32
+  metadata.gz: 1eb9c394a337f1e6771f22f07cccd209cd514239be76495ed4ecfa50659ea7e0
+  data.tar.gz: b7f9d5cb3430e1e5c05f1006e78b3ad5928d54db3d239169f50be2182f427e25
 SHA512:
-  metadata.gz: c07e2cdf3deaaf575bb62ac8d11d4229a68ce08ba3f9f1c27e86f721e3946e39185f37137c6f32aedd210692bc9c186144d24d0fbd28a97b553326c4f1a67f93
-  data.tar.gz: ed378306f83e0b1ceaf393912618dd44c2fd23c6a452433b02064d9e7016b5894aba0c058a4a96720b0333d32715cbe96dcace09a66633bf29e4476fd0f4b43f
+  metadata.gz: e4c6140f3c7d72fd6a3bbe577718c588e71148b15115d9d0b300a04f8839e324c9c997410a8b88dab020beeaba0ba93ef68c639054bc52bd58585c87031799e0
+  data.tar.gz: 6f00c3852029b0b759c1d8eb9cac38c345aa8901a2e8ac36e376de596243819b83c605a75faed3df5238b66c628748e039a1dedd9c75d433df09c7d4f12791c6

data/README.md

@@ -0,0 +1,10 @@
+# EnjuSubject
+[![Travis CI](https://travis-ci.com/next-l/enju_subject.svg?branch=1.3)](https://travis-ci.com/next-l/enju_subject)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_subject/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_subject?branch=1.3)
+[![security](https://hakiri.io/github/next-l/enju_subject/1.3.svg)](https://hakiri.io/github/next-l/enju_subject/1.3)
+
+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/Rakefile

@@ -16,7 +16,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'EnjuSubject'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

data/app/controllers/subjects_controller.rb

@@ -53,7 +53,7 @@ class SubjectsController < ApplicationController
   # GET /subjects/1.json
   def show
     if params[:term]
-      subject = Subject.where(term: params[:term]).first
+      subject = Subject.find_by(term: params[:term])
       redirected_to subject
       return
     end

data/app/views/manifestations/_subject_facet.html.erb

@@ -2,7 +2,7 @@
 <%- unless @subject_facet.blank? -%>
 <ul>
   <%- @subject_facet[0..19].each do |facet| -%>
-    <%- subject = Subject.where(id: facet.value).first -%>
+    <%- subject = Subject.find_by(id: facet.value) -%>
     <%- if subject -%>
       <li>
         <%= link_to "#{subject.term} (#{facet.count})", url_for(params.permit.merge(page: nil, subject: "\"#{subject.term}\"", view: nil, only_path: true)) -%>

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.3.1"
+  VERSION = "0.3.2".freeze
 end

data/lib/generators/enju_subject/setup/setup_generator.rb

@@ -3,7 +3,6 @@ class EnjuSubject::SetupGenerator < Rails::Generators::Base
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_subject")
-    rake("enju_subject_engine:install:migrations")
     inject_into_file 'app/controllers/application_controller.rb',
       "  include EnjuSubject::Controller\n", after: "EnjuLibrary::Controller\n"
     append_to_file("app/models/user.rb") do

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/config/application.rb

@@ -9,7 +9,7 @@ require "enju_leaf"
 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

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,7 +1,7 @@
 class CreateLibraries < ActiveRecord::Migration[4.2]
   def change
     create_table :libraries do |t|
-      t.string :name, null: false
+      t.string :name, index: true, null: false
       t.text :display_name
       t.string :short_display_name, null: false
       t.string :zip_code
@@ -14,15 +14,13 @@ class CreateLibraries < ActiveRecord::Migration[4.2]
       t.text :note
       t.integer :call_number_rows, default: 1, null: false
       t.string :call_number_delimiter, default: "|", null: false
-      t.integer :library_group_id, default: 1, null: false
+      t.references :library_group, index: true, null: false
       t.integer :users_count, default: 0, null: false
       t.integer :position
-      t.integer :country_id
+      t.references :country
 
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :library_group_id
-    add_index :libraries, :name, unique: true
   end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -4,12 +4,11 @@ class CreateShelves < ActiveRecord::Migration[4.2]
       t.string :name, null: false
       t.text :display_name
       t.text :note
-      t.integer :library_id, default: 1, null: false
+      t.references :library, index: true, null: false
       t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :shelves, :library_id
   end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -3,7 +3,7 @@ class CreateLibraryGroups < ActiveRecord::Migration[4.2]
     create_table :library_groups do |t|
       t.string :name, null: false
       t.text :display_name
-      t.string :short_name, null: false
+      t.string :short_name, index: true, null: false
       t.text :my_networks
       t.text :login_banner
       t.text :note
@@ -12,6 +12,5 @@ class CreateLibraryGroups < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :library_groups, :short_name
   end
 end

data/spec/dummy/db/migrate/120_create_baskets.rb

@@ -1,12 +1,11 @@
 class CreateBaskets < ActiveRecord::Migration[4.2]
   def change
     create_table :baskets do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
       t.integer :lock_version, default: 0, null: false
 
       t.timestamps
     end
-    add_index :baskets, :user_id
   end
 end

data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb

@@ -3,15 +3,12 @@ class CreateSubscriptions < ActiveRecord::Migration[4.2]
     create_table :subscriptions do |t|
       t.text :title, null: false
       t.text :note
-      #t.integer :subscription_list_id, :integer
-      t.integer :user_id
-      t.integer :order_list_id
+      t.references :user, index: true
+      t.references :order_list, index: true
       t.datetime :deleted_at
       t.integer :subscribes_count, default: 0, null: false
 
       t.timestamps
     end
-    add_index :subscriptions, :user_id
-    add_index :subscriptions, :order_list_id
   end
 end

data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb

@@ -1,14 +1,13 @@
 class CreateSubscribes < ActiveRecord::Migration[4.2]
   def change
     create_table :subscribes do |t|
-      t.integer :subscription_id, null: false
+      t.references :subscription, index: true, null: false
       t.integer :work_id, null: false
       t.datetime :start_at, null: false
       t.datetime :end_at, null: false
 
       t.timestamps
     end
-    add_index :subscribes, :subscription_id
     add_index :subscribes, :work_id
   end
 end

data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -8,7 +8,7 @@ class AddDcndlSchema < ActiveRecord::Migration[4.2]
     add_column :manifestations, :valid_until, :timestamp
     add_column :manifestations, :date_submitted, :timestamp
     add_column :manifestations, :date_accepted, :timestamp
-    add_column :manifestations, :date_caputured, :timestamp
+    add_column :manifestations, :date_captured, :timestamp
     rename_column :manifestations, :copyright_date, :date_copyrighted
   end
 
@@ -21,7 +21,7 @@ class AddDcndlSchema < ActiveRecord::Migration[4.2]
     remove_column :manifestations, :valid_until
     remove_column :manifestations, :date_submitted
     remove_column :manifestations, :date_accepted
-    remove_column :manifestations, :date_caputured
+    remove_column :manifestations, :date_captured
     rename_column :manifestations, :date_copyrighted, :copyright_date
   end
 end

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/20120319173203_create_accepts.rb

@@ -1,14 +1,11 @@
 class CreateAccepts < ActiveRecord::Migration[4.2]
   def change
     create_table :accepts do |t|
-      t.integer :basket_id
-      t.integer :item_id
-      t.integer :librarian_id
+      t.references :basket, index: true
+      t.references :item, index: true
+      t.references :librarian, index: true
 
       t.timestamps
     end
-
-    add_index :accepts, :basket_id
-    add_index :accepts, :item_id
   end
 end

data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb

@@ -1,7 +1,7 @@
 class CreateUserImportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :user_import_files do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
       t.datetime :executed_at
       t.string :user_import_file_name

data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb

@@ -1,8 +1,8 @@
 class CreateUserImportResults < ActiveRecord::Migration[4.2]
   def change
     create_table :user_import_results do |t|
-      t.integer :user_import_file_id
-      t.integer :user_id
+      t.references :user_import_file, index: true
+      t.references :user, index: true
       t.text :body
 
       t.timestamps

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/20140524074813_create_user_import_file_transitions.rb

@@ -8,11 +8,10 @@ class CreateUserImportFileTransitions < ActiveRecord::Migration[4.2]
         t.text :metadata, default: "{}"
       end
       t.integer :sort_key
-      t.integer :user_import_file_id
+      t.references :user_import_file, index: true
       t.timestamps
     end
 
-    add_index :user_import_file_transitions, :user_import_file_id
     add_index :user_import_file_transitions, [:sort_key, :user_import_file_id], unique: true, name: "index_user_import_file_transitions_on_sort_key_and_file_id"
   end
 end

data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb

@@ -1,7 +1,7 @@
 class CreateUserExportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :user_export_files do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.attachment :user_export
       t.datetime :executed_at
 

data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -8,7 +8,7 @@ class CreateUserExportFileTransitions < ActiveRecord::Migration[4.2]
         t.text :metadata, default: "{}"
       end
       t.integer :sort_key
-      t.integer :user_export_file_id
+      t.references :user_export_file, index: true
       t.timestamps
     end
 

data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration[4.2]
   def change
-    add_column :user_import_files, :default_library_id, :integer
+    add_reference :user_import_files, :default_library
   end
 end

data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration[4.2]
   def change
-    add_column :user_import_files, :default_user_group_id, :integer
+    add_reference :user_import_files, :default_user_group
   end
 end

data/spec/dummy/db/migrate/20140821151023_create_colors.rb

@@ -1,14 +1,12 @@
 class CreateColors < ActiveRecord::Migration[4.2]
   def change
     create_table :colors do |t|
-      t.integer :library_group_id
+      t.references :library_group, index: true
       t.string :property
       t.string :code
       t.integer :position
 
       t.timestamps
     end
-
-    add_index :colors, :library_group_id
   end
 end

data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToItemsReferencingManifestations < ActiveRecord::Migration[4.2]
+  def change
+    add_foreign_key :items, :manifestations
+  end
+end

data/spec/dummy/db/migrate/20150421023923_create_identities.rb

@@ -0,0 +1,14 @@
+class CreateIdentities < ActiveRecord::Migration[4.2]
+  def change
+    create_table :identities do |t|
+      t.string :name
+      t.string :email
+      t.string :password_digest
+      t.references :profile, index: true
+
+      t.timestamps null: false
+    end
+    add_index :identities, :name
+    add_index :identities, :email
+  end
+end

data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb

@@ -1,13 +1,11 @@
 class CreateWithdraws < ActiveRecord::Migration[4.2]
   def change
     create_table :withdraws do |t|
-      t.integer :basket_id
-      t.integer :item_id
-      t.integer :librarian_id
+      t.references :basket, index: true
+      t.references :item, index: true
+      t.references :librarian, index: true
 
       t.timestamps null: false
     end
-    add_index :withdraws, :basket_id
-    add_index :withdraws, :item_id
   end
 end

data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb

@@ -0,0 +1,6 @@
+class AddProfileIdToAgent < ActiveRecord::Migration[4.2]
+  def change
+    add_column :agents, :profile_id, :integer
+    add_index :agents, :profile_id
+  end
+end

data/spec/dummy/db/migrate/20151126005552_add_provider_to_identity.rb

@@ -0,0 +1,5 @@
+class AddProviderToIdentity < ActiveRecord::Migration[4.2]
+  def change
+    add_column :identities, :provider, :string
+  end
+end

data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb

@@ -1,13 +1,18 @@
+# This migration comes from enju_library_engine (originally 20151213070943)
 class AddTranslationTableToLibraryGroup < ActiveRecord::Migration[4.2]
   def up
-    LibraryGroup.create_translation_table!({
-      login_banner: :text
-    }, {
-      migrate_data: true
-    })
+    if defined?(Globalize)
+      LibraryGroup.create_translation_table!({
+        login_banner: :text
+      }, {
+        migrate_data: true
+      })
+    end
   end
 
   def down
-    LibraryGroup.drop_translation_table! migrate_data: true
+    if defined?(Globalize)
+      LibraryGroup.drop_translation_table! migrate_data: true
+    end
   end
 end