enju_subject 0.3.0.beta.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ba36d55ce3a4f2bd2b400058798a26f8e45757f2
-  data.tar.gz: 8a518d848290f831f218d51082c2078aeecf24b5
+SHA256:
+  metadata.gz: 13a77e302ed1fea49a89324f48453fc11b65714371e5d2241333a6096948f570
+  data.tar.gz: 9cd009abe585d7662c0f826aaf7618acc4b8033afa6e8974e0d60a81e6405e4e
 SHA512:
-  metadata.gz: 1d6af4ad42830f2ffe06f0ada8923c3635f0e7b14e76f5426da66aff168d1f445000d46c7fcd8b3311049af11781ec02aa9a91726c8cfd5c44b3ee68446efe65
-  data.tar.gz: d5146012d0c40b99ffebf22e49dfed9f7c4cd968081c84484eb7854b332277799b443332f794da54027c2e6a2a3136576141bb165a4f562e85a30a75d0d66cd6
+  metadata.gz: ec447e0ba0fc1b0e270f02e462adb264c5653d2083343e803ed676162ca57cb4b25826659bb6edc52c4c7f25f3cfcc40a44e8c69b7f3d9354e1510c7c2e9bef5
+  data.tar.gz: 5a0b71003ae24e8b308c29b337b03869a6e7392703399c0a57d225190724aaf41c8d72087654c7b0945f71c15a1aa4ab2fad03c4ecb76a983dbde24acb23afe8

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/classification_types_controller.rb

@@ -62,7 +62,7 @@ class ClassificationTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @classification_type.update_attributes(classification_type_params)
+      if @classification_type.update(classification_type_params)
         format.html { redirect_to @classification_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.classification_type')) }
         format.json { head :no_content }
       else

data/app/controllers/classifications_controller.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class ClassificationsController < ApplicationController
   before_action :set_classification, only: [:show, :edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]
@@ -85,7 +84,7 @@ class ClassificationsController < ApplicationController
   # PUT /classifications/1.json
   def update
     respond_to do |format|
-      if @classification.update_attributes(classification_params)
+      if @classification.update(classification_params)
         format.html { redirect_to @classification, notice: t('controller.successfully_updated', model: t('activerecord.models.classification')) }
         format.json { head :no_content }
       else

data/app/controllers/subject_heading_types_controller.rb

@@ -62,7 +62,7 @@ class SubjectHeadingTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @subject_heading_type.update_attributes(subject_heading_type_params)
+      if @subject_heading_type.update(subject_heading_type_params)
         format.html { redirect_to @subject_heading_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subject_heading_type')) }
         format.json { head :no_content }
       else

data/app/controllers/subject_types_controller.rb

@@ -62,7 +62,7 @@ class SubjectTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @subject_type.update_attributes(subject_type_params)
+      if @subject_type.update(subject_type_params)
         format.html { redirect_to @subject_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subject_type')) }
         format.json { head :no_content }
       else

data/app/controllers/subjects_controller.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class SubjectsController < ApplicationController
   before_action :set_subject, only: [:show, :edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]
@@ -53,7 +52,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
@@ -107,7 +106,7 @@ class SubjectsController < ApplicationController
   # PUT /subjects/1.json
   def update
     respond_to do |format|
-      if @subject.update_attributes(subject_params)
+      if @subject.update(subject_params)
         format.html { redirect_to @subject, notice: t('controller.successfully_updated', model: t('activerecord.models.subject')) }
         format.json { head :no_content }
       else

data/app/models/classification.rb

@@ -1,4 +1,4 @@
-class Classification < ActiveRecord::Base
+class Classification < ApplicationRecord
   belongs_to :classification_type
   belongs_to :manifestation, touch: true, optional: true
 

data/app/models/classification_type.rb

@@ -1,4 +1,4 @@
-class ClassificationType < ActiveRecord::Base
+class ClassificationType < ApplicationRecord
   include MasterModel
   has_many :classifications
   validates :name, format: { with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/ }

data/app/models/subject.rb

@@ -1,4 +1,4 @@
-class Subject < ActiveRecord::Base
+class Subject < ApplicationRecord
   belongs_to :manifestation, touch: true, optional: true
   belongs_to :subject_type
   belongs_to :subject_heading_type

data/app/models/subject_heading_type.rb

@@ -1,4 +1,4 @@
-class SubjectHeadingType < ActiveRecord::Base
+class SubjectHeadingType < ApplicationRecord
   include MasterModel
   has_many :subjects
   validates :name, format: {with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}

data/app/models/subject_type.rb

@@ -1,4 +1,4 @@
-class SubjectType < ActiveRecord::Base
+class SubjectType < ApplicationRecord
   include MasterModel
   has_many :subjects
   validates :name, format: {with: /\A[0-9A-Za-z][0-9a-z_\-]*[0-9a-z]\Z/}

data/app/views/classification_types/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name, class: 'short_name' %>
+    <%= f.text_field :name, required: true, class: 'short_name' %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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/app/views/subject_heading_types/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/subject_types/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.3.0.beta.1"
+  VERSION = "0.3.3".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/controllers/classification_types_controller_spec.rb

@@ -96,7 +96,7 @@ describe ClassificationTypesController do
       it 'assigns the requested classification_type as @classification_type' do
         get :new
         expect(assigns(:classification_type)).not_to be_valid
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -198,7 +198,7 @@ describe ClassificationTypesController do
 
         it 'should be successful' do
           post :create, params: { classification_type: @invalid_attrs }
-          expect(response).to be_success
+          expect(response).to be_successful
         end
       end
     end

data/spec/controllers/classifications_controller_spec.rb

@@ -47,7 +47,7 @@ describe ClassificationsController do
 
       it 'should get index with query' do
         get :index, params: { query: '500' }
-        response.should be_success
+        response.should be_successful
         expect(assigns(:classifications)).not_to be_empty
       end
     end

data/spec/controllers/subject_heading_types_controller_spec.rb

@@ -96,7 +96,7 @@ describe SubjectHeadingTypesController do
       it 'assigns the requested subject_heading_type as @subject_heading_type' do
         get :new
         expect(assigns(:subject_heading_type)).not_to be_valid
-        response.should be_success
+        response.should be_successful
       end
     end
 
@@ -198,7 +198,7 @@ describe SubjectHeadingTypesController do
 
         it 'should be successful' do
           post :create, params: { subject_heading_type: @invalid_attrs }
-          response.should be_success
+          response.should be_successful
         end
       end
     end

data/spec/controllers/subject_types_controller_spec.rb

@@ -98,7 +98,7 @@ describe SubjectTypesController do
       it 'assigns the requested subject_type as @subject_type' do
         get :new
         expect(assigns(:subject_type)).not_to be_valid
-        response.should be_success
+        response.should be_successful
       end
     end
 
@@ -200,7 +200,7 @@ describe SubjectTypesController do
 
         it 'should be successful' do
           post :create, params: { subject_type: @invalid_attrs }
-          response.should be_success
+          response.should be_successful
         end
       end
     end

data/spec/controllers/subjects_controller_spec.rb

@@ -42,7 +42,7 @@ describe SubjectsController do
     describe 'When not logged in' do
       it 'assigns all subjects as @subjects' do
         get :index
-        response.should be_success
+        response.should be_successful
         expect(assigns(:subjects)).not_to be_nil
       end
     end

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/config/database.yml

@@ -1,30 +1,25 @@
-sqlite: &sqlite
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
   adapter: sqlite3
-  database: db/<%= Rails.env %>.sqlite3
-
-mysql: &mysql
-  adapter: mysql2
-  username: root
-  password:
-  database: enju_<%= Rails.env %>
-
-postgresql: &postgresql
-  adapter: postgresql
-  username: postgres
-  password:
-  database: enju_<%= Rails.env %>
-
-defaults: &defaults
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
-  host: localhost
-  <<: *<%= ENV['DB'] || "sqlite" %>
 
 development:
-  <<: *defaults
+  <<: *default
+  database: db/development.sqlite3
 
+# 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:
-  <<: *defaults
+  <<: *default
+  database: db/test.sqlite3
 
 production:
-  <<: *defaults
+  <<: *default
+  database: db/production.sqlite3

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/20081027150907_create_picture_files.rb

@@ -3,9 +3,7 @@ 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