enju_nii 0.2.1 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1965c95d16b013701f47eb09c96bfefc977a9186
-  data.tar.gz: 6afa5537d99e60ffcf4c8a604bc682855342bafe
+  metadata.gz: fe3e3ba9ed38ea9f8ee558a537ca49d2b4c971fc
+  data.tar.gz: c114aed15d40b7d646dfae1d84377f572a633118
 SHA512:
-  metadata.gz: 798990954d9110bfbe29e686e0d701df9f4848f84f51272131f45dcfc8044630e429d151d7ed062abf01bead5776c82fc10b776058358ea13cc8345f94f6787d
-  data.tar.gz: 314b6ab57c2b61561ca1c1cdc204d05957e3074884b5cb0bfe428157f73c9be29d802380445b55a13115b4127810b7b7097b6c4ebe16c986a1637f871cbec8f5
+  metadata.gz: e6566bb794eab7d70565666432e900dc4dfff0253e9e32313f1c69ab861565eec602724f7edfc2df59328cba3c5430030e9eb6f8c1f6a83021d01a408690a74b
+  data.tar.gz: 84fd2f9ca8af67fc8e5bd6f33ad514fd91186a8a910c6539e8caa3dcf97454a5207acaa4ad23dd92be454ab894618f11c00206f1572b93be5b40eb4a174ab332

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuNii
-{<img src="https://travis-ci.org/next-l/enju_nii.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_nii]
-{<img src="https://coveralls.io/repos/next-l/enju_nii/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_nii?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_nii/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_nii/1.2]
+{<img src="https://travis-ci.org/next-l/enju_nii.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_nii]
+{<img src="https://coveralls.io/repos/next-l/enju_nii/badge.svg?branch=1.3&service=github" 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]
 
 CiNii Booksから書誌をインポートするための Enju プラグインです。
 
@@ -9,7 +9,7 @@ CiNii Booksから書誌をインポートするための Enju プラグインで
 
 お使いのenju_leafのGemfile に以下の行を追加してください。
 
-  gem 'enju_nii', github: "next-l/enju_nii", branch: '1.2'
+  gem 'enju_nii', github: "next-l/enju_nii", branch: '1.3'
 
 gemをインストールします。
 
@@ -35,4 +35,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}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/Rakefile

@@ -44,4 +44,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 
-task :default => :spec
+task default: :spec

data/app/controllers/cinii_books_controller.rb

@@ -10,7 +10,7 @@ class CiniiBooksController < ApplicationController
     @query = params[:query].to_s.strip
     books = CiniiBook.search(params[:query], page)
     @books = Kaminari.paginate_array(
-      books[:items], :total_count => books[:total_entries], :page => page
+      books[:items], total_count: books[:total_entries]
     ).page(page).per(10)
 
     respond_to do |format|
@@ -23,7 +23,7 @@ class CiniiBooksController < ApplicationController
       @manifestation = CiniiBook.import_ncid(params[:book][:ncid])
       respond_to do |format|
         if @manifestation.try(:save)
-          flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.manifestation'))
+          flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.manifestation'))
           format.html { redirect_to manifestation_url(@manifestation) }
         else
           flash[:notice] = t('enju_nii.record_not_found')

data/app/controllers/nii_types_controller.rb

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

data/app/helpers/cinii_books_helper.rb

@@ -4,9 +4,9 @@ module CiniiBooksHelper
     if ncid.blank?
       t('enju_nii.not_available')
     else
-      identifier_type = IdentifierType.where(:name => 'ncid').first
+      identifier_type = IdentifierType.where(name: 'ncid').first
       if identifier_type
-        manifestation = Identifier.where(:body => ncid, :identifier_type_id => identifier_type.id).first.try(:manifestation)
+        manifestation = Identifier.where(body: ncid, identifier_type_id: identifier_type.id).first.try(:manifestation)
       end
       unless manifestation
         button_to t('enju_nii.add'), cinii_books_path(book: {ncid: ncid}), method: :post, data: {disable_with: t('page.saving')}

data/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
   resources :nii_types
-  resources :cinii_books, :only => [:index, :create]
+  resources :cinii_books, only: [:index, :create]
 end

data/db/migrate/20090913173236_create_nii_types.rb

@@ -1,13 +1,13 @@
-class CreateNiiTypes < ActiveRecord::Migration
+class CreateNiiTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :nii_types do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position
 
       t.timestamps
     end
-    add_index :nii_types, :name, :unique => true
+    add_index :nii_types, :name, unique: true
   end
 end

data/db/migrate/20090913185239_add_nii_type_id_to_manifestation.rb

@@ -1,4 +1,4 @@
-class AddNiiTypeIdToManifestation < ActiveRecord::Migration
+class AddNiiTypeIdToManifestation < ActiveRecord::Migration[4.2]
   def self.up
     add_column :manifestations, :nii_type_id, :integer
     add_index :manifestations, :nii_type_id

data/db/migrate/20121113163717_add_ncid_to_manifestation.rb

@@ -1,4 +1,4 @@
-class AddNcidToManifestation < ActiveRecord::Migration
+class AddNcidToManifestation < ActiveRecord::Migration[4.2]
   def change
     add_column :manifestations, :ncid, :string
     add_index :manifestations, :ncid

data/db/migrate/20141115051741_remove_ncid_from_manifestations.rb

@@ -1,4 +1,4 @@
-class RemoveNcidFromManifestations < ActiveRecord::Migration
+class RemoveNcidFromManifestations < ActiveRecord::Migration[4.2]
   def change
     remove_column :manifestations, :ncid
   end

data/lib/enju_nii.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require "enju_nii/engine"
 require 'open-uri'
 require 'enju_nii/cinii_book'
@@ -12,7 +11,7 @@ module EnjuNii
     module ClassMethods
       def enju_nii_cinii_books
         include EnjuNii::CiNiiBook
-        belongs_to :nii_type
+        belongs_to :nii_type, optional: true
       end
 
       def import_isbn(isbn)

data/lib/enju_nii/cinii_book.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module EnjuNii
   module CiNiiBook
     def self.included(base)
@@ -7,23 +6,23 @@ module EnjuNii
 
     module ClassMethods
       def import_from_cinii_books(options)
-        #if options[:isbn]
+        # if options[:isbn]
         lisbn = Lisbn.new(options[:isbn])
         raise EnjuNii::InvalidIsbn unless lisbn.valid?
-        #end
+        # end
 
         manifestation = Manifestation.find_by_isbn(lisbn.isbn)
         return manifestation if manifestation.present?
 
         doc = return_rdf(lisbn.isbn)
         raise EnjuNii::RecordNotFound unless doc
-        #raise EnjuNii::RecordNotFound if doc.at('//openSearch:totalResults').content.to_i == 0
+        # raise EnjuNii::RecordNotFound if doc.at('//openSearch:totalResults').content.to_i == 0
         import_record_from_cinii_books(doc)
       end
 
       def import_record_from_cinii_books(doc)
         # http://ci.nii.ac.jp/info/ja/api/api_outline.html#cib_od
-        #return nil
+        # return nil
 
         ncid = doc.at('//cinii:ncid').try(:content)
         identifier_type = IdentifierType.where(name: 'ncid').first
@@ -54,7 +53,7 @@ module EnjuNii
         manifestation.extent = doc.at('//dcterms:extent').try(:content)
         manifestation.dimensions = doc.at('//cinii:size').try(:content)
 
-        language = Language.where(:iso_639_3 => get_cinii_language(doc)).first
+        language = Language.where(iso_639_3: get_cinii_language(doc)).first
         if language
           manifestation.language_id = language.id
         else
@@ -102,7 +101,7 @@ module EnjuNii
               subject_heading_type = SubjectHeadingType.where(name: 'bsh').first
               subject_heading_type = SubjectHeadingType.create!(name: 'bsh') unless subject_heading_type
               subjects.each do |term|
-                subject = Subject.where(:term => term[:term]).first
+                subject = Subject.where(term: term[:term]).first
                 unless subject
                   subject = Subject.new(term)
                   subject.subject_heading_type = subject_heading_type
@@ -120,7 +119,7 @@ module EnjuNii
       end
 
       def search_cinii_book(query, options = {})
-        options = {:p => 1, :count => 10, :raw => false}.merge(options)
+        options = {p: 1, count: 10, raw: false}.merge(options)
         doc = nil
         results = {}
         startrecord = options[:idx].to_i
@@ -133,7 +132,7 @@ module EnjuNii
         else
           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=")
-          feed = RSS::Parser.parse(url, false)
+          RSS::Parser.parse(url, false)
         end
       end
 
@@ -155,7 +154,7 @@ module EnjuNii
         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=")
-        rss = RSS::Parser.parse(url, false)
+        RSS::Parser.parse(url, false)
       end
 
       private
@@ -170,22 +169,22 @@ module EnjuNii
       def get_cinii_creator(doc)
         doc.xpath("//foaf:maker/foaf:Person").map{|e|
           {
-            :full_name => e.at("./foaf:name").content,
-            :full_name_transcription => e.xpath("./foaf:name[@xml:lang]").map{|n| n.content}.join("\n"),
-            :patron_identifier => e.attributes["about"].try(:content)
+            full_name: e.at("./foaf:name").content,
+            full_name_transcription: e.xpath("./foaf:name[@xml:lang]").map{|n| n.content}.join("\n"),
+            patron_identifier: e.attributes["about"].try(:content)
           }
         }
       end
 
       def get_cinii_publisher(doc)
-        doc.xpath("//dc:publisher").map{|e| {:full_name => e.content}}
+        doc.xpath("//dc:publisher").map{|e| {full_name: e.content}}
       end
 
       def 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"),
-          :title_alternative => doc.xpath("//dcterms:alternative").map{|e| e.try(:content)}.join("\n")
+          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"),
+          title_alternative: doc.xpath("//dcterms:alternative").map{|e| e.try(:content)}.join("\n")
         }
       end
 
@@ -201,7 +200,7 @@ module EnjuNii
       def get_cinii_subjects(doc)
         subjects = []
         doc.xpath('//foaf:topic').each do |s|
-          subjects << { :term => s["dc:title"] }
+          subjects << { term: s["dc:title"] }
         end
         subjects
       end
@@ -225,9 +224,9 @@ module EnjuNii
               title, volume_number, = part.split(/ ; /)
               original_title, title_transcription, = title.split(/\|\|/)
               series_statement = SeriesStatement.new(
-                :original_title => original_title,
-                :title_transcription => title_transcription,
-                :volume_number_string => volume_number,
+                original_title: original_title,
+                title_transcription: title_transcription,
+                volume_number_string: volume_number,
               )
               manifestation.series_statements << series_statement
             end

data/lib/enju_nii/version.rb

@@ -1,3 +1,3 @@
 module EnjuNii
-  VERSION = "0.2.1"
+  VERSION = "0.3.0.beta.1"
 end

data/lib/tasks/enju_nii_tasks.rake

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

data/spec/controllers/cinii_books_controller_spec.rb

@@ -10,12 +10,12 @@ describe CiniiBooksController do
   describe "GET index" do
     login_fixture_admin
 
-    it "should get index", :vcr => true do
-      get :index, :query => 'library'
+    it "should get index", vcr: true do
+      get :index, params: { query: 'library' }
       assigns(:books).should_not be_empty
     end
 
-    it "should be empty if a query is not set", :vcr => true do
+    it "should be empty if a query is not set", vcr: true do
       get :index
       assigns(:books).should be_empty
     end

data/spec/controllers/nii_types_controller_spec.rb

@@ -40,7 +40,7 @@ describe NiiTypesController do
   describe "GET show" do
     it "assigns the requested nii_type as @nii_type" do
       nii_type = NiiType.create! valid_attributes
-      get :show, :id => nii_type.id
+      get :show, params: { id: nii_type.id }
       expect(assigns(:nii_type)).to eq(nii_type)
     end
   end
@@ -55,7 +55,7 @@ describe NiiTypesController do
   describe "GET edit" do
     it "assigns the requested nii_type as @nii_type" do
       nii_type = NiiType.create! valid_attributes
-      get :edit, :id => nii_type.id
+      get :edit, params: { id: nii_type.id }
       expect(assigns(:nii_type)).to eq(nii_type)
     end
   end
@@ -63,19 +63,19 @@ describe NiiTypesController do
   describe "POST create" do
     describe "with valid params" do
       it "creates a new NiiType" do
-        expect {
-          post :create, :nii_type => valid_attributes
-        }.to change(NiiType, :count).by(1)
+        expect do
+          post :create, params: { nii_type: valid_attributes }
+        end.to change(NiiType, :count).by(1)
       end
 
       it "assigns a newly created nii_type as @nii_type" do
-        post :create, :nii_type => valid_attributes
+        post :create, params: { nii_type: valid_attributes }
         expect(assigns(:nii_type)).to be_a(NiiType)
         expect(assigns(:nii_type)).to be_persisted
       end
 
       it "redirects to the created nii_type" do
-        post :create, :nii_type => valid_attributes
+        post :create, params: { nii_type: valid_attributes }
         expect(response).to redirect_to(NiiType.last)
       end
     end
@@ -84,14 +84,14 @@ describe NiiTypesController do
       it "assigns a newly created but unsaved nii_type as @nii_type" do
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        post :create, :nii_type => {name: "test"}
+        post :create, params: { nii_type: {name: "test"} }
         expect(assigns(:nii_type)).to be_a_new(NiiType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        post :create, :nii_type => {name: "test"}
+        post :create, params: { nii_type: {name: "test"} }
         expect(response).to render_template("new")
       end
     end
@@ -105,26 +105,26 @@ describe NiiTypesController do
         # specifies that the NiiType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        NiiType.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
-        put :update, :id => nii_type.id, :nii_type => {'name' => 'test'}
+        NiiType.any_instance.should_receive(:update).with('name' => 'test')
+        put :update, params: { id: nii_type.id, nii_type: {'name' => 'test'} }
       end
 
       it "assigns the requested nii_type as @nii_type" do
         nii_type = NiiType.create! valid_attributes
-        put :update, :id => nii_type.id, :nii_type => valid_attributes
+        put :update, params: { id: nii_type.id, nii_type: valid_attributes }
         expect(assigns(:nii_type)).to eq(nii_type)
       end
 
       it "redirects to the nii_type" do
         nii_type = NiiType.create! valid_attributes
-        put :update, :id => nii_type.id, :nii_type => valid_attributes
+        put :update, params: { id: nii_type.id, nii_type: valid_attributes }
         expect(response).to redirect_to(nii_type)
       end
 
       it "moves its position when specified" do
         nii_type = NiiType.create! valid_attributes
         position = nii_type.position
-        put :update, :id => nii_type.id, :move => 'higher'
+        put :update, params: { id: nii_type.id, move: 'higher' }
         expect(response).to redirect_to nii_types_url
         assigns(:nii_type).reload.position.should eq position - 1
       end
@@ -135,7 +135,7 @@ describe NiiTypesController do
         nii_type = NiiType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        put :update, :id => nii_type.id, :nii_type => {name: "test"}
+        put :update, params: { id: nii_type.id, nii_type: {name: "test"} }
         expect(assigns(:nii_type)).to eq(nii_type)
       end
 
@@ -143,7 +143,7 @@ describe NiiTypesController do
         nii_type = NiiType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        put :update, :id => nii_type.id, :nii_type => {name: "test"}
+        put :update, params: { id: nii_type.id, nii_type: {name: "test"} }
         expect(response).to render_template("edit")
       end
     end
@@ -152,16 +152,15 @@ describe NiiTypesController do
   describe "DELETE destroy" do
     it "destroys the requested nii_type" do
       nii_type = NiiType.create! valid_attributes
-      expect {
-        delete :destroy, :id => nii_type.id
-      }.to change(NiiType, :count).by(-1)
+      expect do
+        delete :destroy, params: { id: nii_type.id }
+      end.to change(NiiType, :count).by(-1)
     end
 
     it "redirects to the nii_types list" do
       nii_type = NiiType.create! valid_attributes
-      delete :destroy, :id => nii_type.id
+      delete :destroy, params: { id: nii_type.id }
       expect(response).to redirect_to(nii_types_url)
     end
   end
-
 end

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

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
-    :lockable, :lock_strategy => :none, :unlock_strategy => :none
+    :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuSeed::EnjuUser
 end