enju_subject 0.2.3 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f5eed054b9d32b37e8f53d27d63748dbcf3c361
-  data.tar.gz: 6909661f3f8151b8e0518faca0299a07d43105ae
+  metadata.gz: ba36d55ce3a4f2bd2b400058798a26f8e45757f2
+  data.tar.gz: 8a518d848290f831f218d51082c2078aeecf24b5
 SHA512:
-  metadata.gz: 4ac7658a6fb976945d1fcf2d1ae3eac44d4c2981e6d0e9a160eeb92a2fc95c1f753023543f0df90a20b74bfb606d38d1be48049a6e3fd05c388d72a4f18d4399
-  data.tar.gz: 72160d8830e588973ef34c5bcc58814931d57ec51cba9d06bed7f4705429243a6d8fd42c7116e4ac9aa740a2f159933897a07888756847e6ad198c866e502d66
+  metadata.gz: 1d6af4ad42830f2ffe06f0ada8923c3635f0e7b14e76f5426da66aff168d1f445000d46c7fcd8b3311049af11781ec02aa9a91726c8cfd5c44b3ee68446efe65
+  data.tar.gz: d5146012d0c40b99ffebf22e49dfed9f7c4cd968081c84484eb7854b332277799b443332f794da54027c2e6a2a3136576141bb165a4f562e85a30a75d0d66cd6

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuSubject
-{<img src="https://travis-ci.org/next-l/enju_subject.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_subject]
-{<img src="https://coveralls.io/repos/next-l/enju_subject/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_subject?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_subject/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_subject/1.2]
+{<img src="https://travis-ci.org/next-l/enju_subject.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_subject]
+{<img src="https://coveralls.io/repos/next-l/enju_subject/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_subject?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_subject/1.3.svg" alt="security" />}[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}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/models/classification.rb

@@ -1,6 +1,6 @@
 class Classification < ActiveRecord::Base
   belongs_to :classification_type
-  belongs_to :manifestation, touch: true
+  belongs_to :manifestation, touch: true, optional: true
 
   validates_associated :classification_type
   validates_presence_of :category, :classification_type

data/app/models/subject.rb

@@ -1,5 +1,5 @@
 class Subject < ActiveRecord::Base
-  belongs_to :manifestation, touch: true
+  belongs_to :manifestation, touch: true, optional: true
   belongs_to :subject_type
   belongs_to :subject_heading_type
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'

data/app/views/subjects/index.rss.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
@@ -15,14 +15,14 @@ xml.rss('version' => "2.0",
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @subjects.offset + 1
       xml.tag! "opensearch:itemsPerPage", @subjects.per_page
-      xml.tag! "opensearch:Query", :role => 'request', :searchTerms => h(params[:query]), :startPage => (h(params[:page]) || 1)
+      xml.tag! "opensearch:Query", role: 'request', searchTerms: h(params[:query]), startPage: (h(params[:page]) || 1)
     end
     @subjects.each do |subject|
       xml.item do
         xml.title subject.term
         xml.pubDate subject.created_at.utc.rfc822
         xml.link subject_url(subject)
-        xml.guid subject_url(subject), :isPermaLink => "true"
+        xml.guid subject_url(subject), isPermaLink: "true"
       end
     end
   }

data/db/migrate/029_create_subjects.rb

@@ -1,4 +1,4 @@
-class CreateSubjects < ActiveRecord::Migration
+class CreateSubjects < ActiveRecord::Migration[4.2]
   def self.up
     create_table :subjects do |t|
       t.references :parent, index: true

data/db/migrate/142_create_classifications.rb

@@ -1,10 +1,10 @@
-class CreateClassifications < ActiveRecord::Migration
+class CreateClassifications < ActiveRecord::Migration[4.2]
   def self.up
     create_table :classifications do |t|
       t.integer :parent_id
-      t.string :category, :null => false
+      t.string :category, null: false
       t.text :note
-      t.integer :classification_type_id, :null => false
+      t.integer :classification_type_id, null: false
 
       t.timestamps
     end

data/db/migrate/144_create_classification_types.rb

@@ -1,7 +1,7 @@
-class CreateClassificationTypes < ActiveRecord::Migration
+class CreateClassificationTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :classification_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/145_create_subject_heading_types.rb

@@ -1,7 +1,7 @@
-class CreateSubjectHeadingTypes < ActiveRecord::Migration
+class CreateSubjectHeadingTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :subject_heading_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/146_create_subject_types.rb

@@ -1,7 +1,7 @@
-class CreateSubjectTypes < ActiveRecord::Migration
+class CreateSubjectTypes < ActiveRecord::Migration[4.2]
   def self.up
     create_table :subject_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb

@@ -1,4 +1,4 @@
-class AddLftAndRgtToClassification < ActiveRecord::Migration
+class AddLftAndRgtToClassification < ActiveRecord::Migration[4.2]
   def self.up
     add_column :classifications, :lft, :integer
     add_column :classifications, :rgt, :integer

data/db/migrate/20120406020752_add_url_to_subject.rb

@@ -1,4 +1,4 @@
-class AddUrlToSubject < ActiveRecord::Migration
+class AddUrlToSubject < ActiveRecord::Migration[4.2]
   def change
     add_column :subjects, :url, :string
   end

data/db/migrate/20130504133816_add_manifestation_id_to_subject.rb

@@ -1,4 +1,4 @@
-class AddManifestationIdToSubject < ActiveRecord::Migration
+class AddManifestationIdToSubject < ActiveRecord::Migration[4.2]
   def change
     add_column :subjects, :manifestation_id, :integer
     add_index :subjects, :manifestation_id

data/db/migrate/20130504143515_add_manifestation_id_to_classification.rb

@@ -1,4 +1,4 @@
-class AddManifestationIdToClassification < ActiveRecord::Migration
+class AddManifestationIdToClassification < ActiveRecord::Migration[4.2]
   def change
     add_column :classifications, :manifestation_id, :integer
     add_index :classifications, :manifestation_id

data/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb

@@ -1,4 +1,4 @@
-class AddSubjectHeadingTypeIdToSubject < ActiveRecord::Migration
+class AddSubjectHeadingTypeIdToSubject < ActiveRecord::Migration[4.2]
   def change
     add_column :subjects, :subject_heading_type_id, :integer
   end

data/db/migrate/20150923173139_add_url_to_classification.rb

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

data/db/migrate/20150925092505_add_label_to_classification.rb

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

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.2.3"
+  VERSION = "0.3.0.beta.1"
 end

data/lib/tasks/enju_subject_tasks.rake

@@ -4,7 +4,7 @@ require 'tasks/subject_heading_type'
 
 desc "create initial records for enju_subject"
 namespace :enju_subject do
-  task :setup => :environment do
+  task setup: :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_subject/*.yml').each do |file|
       ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_subject', File.basename(file, '.*'))
     end

data/spec/controllers/classification_types_controller_spec.rb

@@ -55,7 +55,7 @@ describe ClassificationTypesController do
 
       it 'assigns the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :show, id: classification_type.id
+        get :show, params: { id: classification_type.id }
         expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
@@ -65,7 +65,7 @@ describe ClassificationTypesController do
 
       it 'assigns the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :show, id: classification_type.id
+        get :show, params: { id: classification_type.id }
         expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
@@ -75,7 +75,7 @@ describe ClassificationTypesController do
 
       it 'assigns the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :show, id: classification_type.id
+        get :show, params: { id: classification_type.id }
         expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
@@ -83,7 +83,7 @@ describe ClassificationTypesController do
     describe 'When not logged in' do
       it 'assigns the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :show, id: classification_type.id
+        get :show, params: { id: classification_type.id }
         expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
@@ -135,7 +135,7 @@ describe ClassificationTypesController do
 
       it 'assigns the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :edit, id: classification_type.id
+        get :edit, params: { id: classification_type.id }
         expect(assigns(:classification_type)).to eq(classification_type)
       end
     end
@@ -145,7 +145,7 @@ describe ClassificationTypesController do
 
       it 'assigns the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :edit, id: classification_type.id
+        get :edit, params: { id: classification_type.id }
         expect(response).to be_forbidden
       end
     end
@@ -155,7 +155,7 @@ describe ClassificationTypesController do
 
       it 'assigns the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :edit, id: classification_type.id
+        get :edit, params: { id: classification_type.id }
         expect(response).to be_forbidden
       end
     end
@@ -163,7 +163,7 @@ describe ClassificationTypesController do
     describe 'When not logged in' do
       it 'should not assign the requested classification_type as @classification_type' do
         classification_type = FactoryBot.create(:classification_type)
-        get :edit, id: classification_type.id
+        get :edit, params: { id: classification_type.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -180,24 +180,24 @@ describe ClassificationTypesController do
 
       describe 'with valid params' do
         it 'assigns a newly created classification_type as @classification_type' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(assigns(:classification_type)).to be_valid
         end
 
         it 'redirects to the created agent' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(response).to redirect_to(assigns(:classification_type))
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved classification_type as @classification_type' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(assigns(:classification_type)).not_to be_valid
         end
 
         it 'should be successful' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(response).to be_success
         end
       end
@@ -208,24 +208,24 @@ describe ClassificationTypesController do
 
       describe 'with valid params' do
         it 'assigns a newly created classification_type as @classification_type' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(assigns(:classification_type)).to be_nil
         end
 
         it 'should be forbidden' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(response).to be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved classification_type as @classification_type' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(assigns(:classification_type)).to be_nil
         end
 
         it 'should be forbidden' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
@@ -236,24 +236,24 @@ describe ClassificationTypesController do
 
       describe 'with valid params' do
         it 'assigns a newly created classification_type as @classification_type' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(assigns(:classification_type)).to be_nil
         end
 
         it 'should be forbidden' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(response).to be_forbidden
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved classification_type as @classification_type' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(assigns(:classification_type)).to be_nil
         end
 
         it 'should be forbidden' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
@@ -262,24 +262,24 @@ describe ClassificationTypesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'assigns a newly created classification_type as @classification_type' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(assigns(:classification_type)).to be_nil
         end
 
         it 'should be forbidden' do
-          post :create, classification_type: @attrs
+          post :create, params: { classification_type: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved classification_type as @classification_type' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(assigns(:classification_type)).to be_nil
         end
 
         it 'should be forbidden' do
-          post :create, classification_type: @invalid_attrs
+          post :create, params: { classification_type: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
@@ -298,23 +298,23 @@ describe ClassificationTypesController do
 
       describe 'with valid params' do
         it 'updates the requested classification_type' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
         end
 
         it 'assigns the requested classification_type as @classification_type' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
           expect(assigns(:classification_type)).to eq(@classification_type)
         end
 
         it 'moves its position when specified' do
-          put :update, id: @classification_type.id, classification_type: @attrs, move: 'lower'
+          put :update, params: { id: @classification_type.id, classification_type: @attrs, move: 'lower' }
           expect(response).to redirect_to(classification_types_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested classification_type as @classification_type' do
-          put :update, id: @classification_type.id, classification_type: @invalid_attrs
+          put :update, params: { id: @classification_type.id, classification_type: @invalid_attrs }
           expect(response).to render_template('edit')
         end
       end
@@ -325,11 +325,11 @@ describe ClassificationTypesController do
 
       describe 'with valid params' do
         it 'updates the requested classification_type' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
         end
 
         it 'assigns the requested classification_type as @classification_type' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
           expect(assigns(:classification_type)).to eq(@classification_type)
           expect(response).to be_forbidden
         end
@@ -337,7 +337,7 @@ describe ClassificationTypesController do
 
       describe 'with invalid params' do
         it 'assigns the requested classification_type as @classification_type' do
-          put :update, id: @classification_type.id, classification_type: @invalid_attrs
+          put :update, params: { id: @classification_type.id, classification_type: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
@@ -348,11 +348,11 @@ describe ClassificationTypesController do
 
       describe 'with valid params' do
         it 'updates the requested classification_type' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
         end
 
         it 'assigns the requested classification_type as @classification_type' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
           expect(assigns(:classification_type)).to eq(@classification_type)
           expect(response).to be_forbidden
         end
@@ -360,7 +360,7 @@ describe ClassificationTypesController do
 
       describe 'with invalid params' do
         it 'assigns the requested classification_type as @classification_type' do
-          put :update, id: @classification_type.id, classification_type: @invalid_attrs
+          put :update, params: { id: @classification_type.id, classification_type: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
@@ -369,18 +369,18 @@ describe ClassificationTypesController do
     describe 'When not logged in' do
       describe 'with valid params' do
         it 'updates the requested classification_type' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
         end
 
         it 'should be forbidden' do
-          put :update, id: @classification_type.id, classification_type: @attrs
+          put :update, params: { id: @classification_type.id, classification_type: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the requested classification_type as @classification_type' do
-          put :update, id: @classification_type.id, classification_type: @invalid_attrs
+          put :update, params: { id: @classification_type.id, classification_type: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
@@ -396,11 +396,11 @@ describe ClassificationTypesController do
       login_admin
 
       it 'destroys the requested classification_type' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
       end
 
       it 'redirects to the classification_types list' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
         expect(response).to redirect_to(classification_types_url)
       end
     end
@@ -409,11 +409,11 @@ describe ClassificationTypesController do
       login_librarian
 
       it 'destroys the requested classification_type' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
         expect(response).to be_forbidden
       end
     end
@@ -422,22 +422,22 @@ describe ClassificationTypesController do
       login_user
 
       it 'destroys the requested classification_type' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
         expect(response).to be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested classification_type' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @classification_type.id
+        delete :destroy, params: { id: @classification_type.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end