enju_subject 0.1.0.pre28 → 0.1.0.pre29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b1cedd55fd1965984d3d805c1da038a09ceee5
-  data.tar.gz: fbb78976e497cdfa186125ca56a7471089452479
+  metadata.gz: 0503ad173d3bdd8b7a4d0b50d9eb0cbdc76e2863
+  data.tar.gz: 74e8d352a546599f2846929da4557b91a49a9a4b
 SHA512:
-  metadata.gz: 71182abc88a3fe014facbf64b9f50c941f5bb1c6d6e44f285b1c8e2da5ea57c97379e82d641f74e08827f558e1c55059fc2b46295778b427e4314db06f403020
-  data.tar.gz: aa4e989f8c95c9038ca7109b8def5140add32dfaa500fccc45f7026ef6c1d80bb593071457d443c813476d6728f5e1d902afa140470b95b1405f76fc1efff8a3
+  metadata.gz: 0b1dd11a610e7ddf09c162abb76d50f045b9faf2fe242013f04f3e5e8f354c4b0d19f00d70caace0c236916b4fb90a0accf0402f67ff5d4e30ca0d55cb14ebeb
+  data.tar.gz: c4e31de69a2f590e97400492e4cb6eb021d805ec3f2d1806da60f61d86cb4c8b33f366818ed92d7220320907acf0707ef455c3dd3fa2fc414c7bb646425d02bb

data/README.rdoc

@@ -1,3 +1,10 @@
-= EnjuSubject {<img src="https://secure.travis-ci.org/nabeta/enju_subject.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nabeta/enju_subject]
+= EnjuSubject
+{<img src="https://secure.travis-ci.org/next-l/enju_subject.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_subject]
+{<img src="https://coveralls.io/repos/next-l/enju_subject/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_subject?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_subject/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_subject/1.1]
 
 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])

data/app/controllers/classification_types_controller.rb

@@ -38,7 +38,7 @@ class ClassificationTypesController < ApplicationController
   # POST /classification_types
   # POST /classification_types.json
   def create
-    @classification_type = ClassificationType.new(params[:classification_type])
+    @classification_type = ClassificationType.new(classification_type_params)
 
     respond_to do |format|
       if @classification_type.save
@@ -60,7 +60,7 @@ class ClassificationTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @classification_type.update_attributes(params[:classification_type])
+      if @classification_type.update_attributes(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
@@ -80,4 +80,9 @@ class ClassificationTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def classification_type_params
+    params.require(:classification_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/classifications_controller.rb

@@ -67,7 +67,7 @@ class ClassificationsController < ApplicationController
   # POST /classifications
   # POST /classifications.json
   def create
-    @classification = Classification.new(params[:classification])
+    @classification = Classification.new(classification_params)
 
     respond_to do |format|
       if @classification.save
@@ -85,7 +85,7 @@ class ClassificationsController < ApplicationController
   # PUT /classifications/1.json
   def update
     respond_to do |format|
-      if @classification.update_attributes(params[:classification])
+      if @classification.update_attributes(classification_params)
         format.html { redirect_to @classification, notice: t('controller.successfully_updated', model: t('activerecord.models.classification')) }
         format.json { head :no_content }
       else
@@ -109,6 +109,12 @@ class ClassificationsController < ApplicationController
   end
 
   private
+  def classification_params
+    params.require(:classification).permit(
+      :parent_id, :category, :note, :classification_type_id
+    )
+  end
+
   def get_classification_type
     @classification_type = ClassificationType.find(params[:classification_type_id]) rescue nil
   end

data/app/controllers/subject_heading_types_controller.rb

@@ -38,7 +38,7 @@ class SubjectHeadingTypesController < ApplicationController
   # POST /subject_heading_types
   # POST /subject_heading_types.json
   def create
-    @subject_heading_type = SubjectHeadingType.new(params[:subject_heading_type])
+    @subject_heading_type = SubjectHeadingType.new(subject_heading_type_params)
 
     respond_to do |format|
       if @subject_heading_type.save
@@ -60,7 +60,7 @@ class SubjectHeadingTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @subject_heading_type.update_attributes(params[:subject_heading_type])
+      if @subject_heading_type.update_attributes(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
@@ -80,4 +80,9 @@ class SubjectHeadingTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def subject_heading_type_params
+    params.require(:subject_heading_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/subject_types_controller.rb

@@ -38,7 +38,7 @@ class SubjectTypesController < ApplicationController
   # POST /subject_types
   # POST /subject_types.json
   def create
-    @subject_type = SubjectType.new(params[:subject_type])
+    @subject_type = SubjectType.new(subject_type_params)
 
     respond_to do |format|
       if @subject_type.save
@@ -60,7 +60,7 @@ class SubjectTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @subject_type.update_attributes(params[:subject_type])
+      if @subject_type.update_attributes(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
@@ -80,4 +80,9 @@ class SubjectTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def subject_type_params
+    params.require(:subject_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/subjects_controller.rb

@@ -90,7 +90,7 @@ class SubjectsController < ApplicationController
   # POST /subjects
   # POST /subjects.json
   def create
-    @subject = Subject.new(params[:subject])
+    @subject = Subject.new(subject_params)
 
     respond_to do |format|
       if @subject.save
@@ -108,7 +108,7 @@ class SubjectsController < ApplicationController
   # PUT /subjects/1.json
   def update
     respond_to do |format|
-      if @subject.update_attributes(params[:subject])
+      if @subject.update_attributes(subject_params)
         format.html { redirect_to @subject, notice: t('controller.successfully_updated', model: t('activerecord.models.subject')) }
         format.json { head :no_content }
       else
@@ -131,6 +131,13 @@ class SubjectsController < ApplicationController
   end
 
   private
+  def subject_params
+    params.require(:subject).permit(
+      :parent_id, :use_term_id, :term, :term_transcription,
+      :subject_type_id, :note, :required_role_id, :subject_heading_type_id
+    )
+  end
+
   def prepare_options
     @subject_heading_types = SubjectHeadingType.select([:id, :display_name, :position])
     @subject_types = SubjectType.select([:id, :display_name, :position])

data/app/models/classification.rb

@@ -1,5 +1,4 @@
 class Classification < ActiveRecord::Base
-  attr_accessible :parent_id, :category, :note, :classification_type_id
   belongs_to :classification_type
   belongs_to :manifestation, touch: true
 

data/app/models/classification_type.rb

@@ -1,5 +1,4 @@
 class ClassificationType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order('classification_types.position') }
   has_many :classifications

data/app/models/subject.rb

@@ -1,7 +1,4 @@
 class Subject < ActiveRecord::Base
-  attr_accessible :parent_id, :use_term_id, :term, :term_transcription,
-    :subject_type_id, :note, :required_role_id, :subject_heading_type_id
-
   belongs_to :manifestation, touch: true
   belongs_to :subject_type
   belongs_to :subject_heading_type

data/app/models/subject_heading_type.rb

@@ -1,5 +1,4 @@
 class SubjectHeadingType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order("subject_heading_types.position") }
   has_many :subjects

data/app/models/subject_type.rb

@@ -1,5 +1,4 @@
 class SubjectType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope { order("subject_types.position") }
   has_many :subjects

data/lib/enju_subject/engine.rb

@@ -1,4 +1,3 @@
-require 'enju_seed'
 require 'dynamic_form'
 
 module EnjuSubject

data/lib/enju_subject/manifestation.rb

@@ -7,7 +7,6 @@ module EnjuSubject
     module ClassMethods
       def enju_subject_manifestation_model
         include InstanceMethods
-        attr_accessible :subjects_attributes, :classifications_attributes
         has_many :subjects
         has_many :classifications
         accepts_nested_attributes_for :subjects, :allow_destroy => true, :reject_if => :all_blank

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre28"
+  VERSION = "0.1.0.pre29"
 end

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config/database.yml

@@ -1,25 +1,30 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/development.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
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
 
-# 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:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :access_address
       t.integer :language_id, :default => 1, :null => false
       t.integer :carrier_type_id, :default => 1, :null => false
-      t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
       t.integer :height

data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateResourceImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :resource_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :resource_import_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb

@@ -2,7 +2,11 @@ class CreateImportRequestTransitions < ActiveRecord::Migration
   def change
     create_table :import_request_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :import_request_id
       t.timestamps

data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateAgentImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :agent_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :agent_import_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateUserImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :user_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_import_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateResourceExportFileTransitions < ActiveRecord::Migration
   def change
     create_table :resource_export_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :resource_export_file_id
       t.timestamps

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

@@ -2,7 +2,11 @@ class CreateUserExportFileTransitions < ActiveRecord::Migration
   def change
     create_table :user_export_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_export_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToResourceImportResult < ActiveRecord::Migration
+  def change
+    add_column :resource_import_results, :error_message, :text
+  end
+end

data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddExtentToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :extent, :text
+  end
+end

data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddDimensionsToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :dimensions, :text
+  end
+end

data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb

@@ -0,0 +1,9 @@
+class RenameManifestationPeriodicalToSerial < ActiveRecord::Migration
+  def up
+    rename_column :manifestations, :periodical, :serial
+  end
+
+  def down
+    rename_column :manifestations, :serial, :periodical
+  end
+end

data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb

@@ -0,0 +1,5 @@
+class AddFullNameTranscriptionToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :full_name_transcription, :text
+  end
+end

data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb

@@ -0,0 +1,5 @@
+class AddDateOfBirthToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :date_of_birth, :datetime
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140813182425) do
+ActiveRecord::Schema.define(version: 20141003182825) do
 
   create_table "accepts", force: true do |t|
     t.integer  "basket_id"
@@ -510,7 +510,6 @@ ActiveRecord::Schema.define(version: 20140813182425) do
     t.string   "access_address"
     t.integer  "language_id",                     default: 1,     null: false
     t.integer  "carrier_type_id",                 default: 1,     null: false
-    t.integer  "extent_id",                       default: 1,     null: false
     t.integer  "start_page"
     t.integer  "end_page"
     t.integer  "height"
@@ -552,9 +551,11 @@ ActiveRecord::Schema.define(version: 20140813182425) do
     t.integer  "month_of_publication"
     t.boolean  "fulltext_content"
     t.string   "doi"
-    t.boolean  "periodical"
+    t.boolean  "serial"
     t.text     "statement_of_responsibility"
     t.text     "publication_place"
+    t.text     "extent"
+    t.text     "dimensions"
   end
 
   add_index "manifestations", ["access_address"], name: "index_manifestations_on_access_address"
@@ -636,6 +637,8 @@ ActiveRecord::Schema.define(version: 20140813182425) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "expired_at"
+    t.text     "full_name_transcription"
+    t.datetime "date_of_birth"
   end
 
   add_index "profiles", ["user_id"], name: "index_profiles_on_user_id"
@@ -745,6 +748,7 @@ ActiveRecord::Schema.define(version: 20140813182425) do
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "error_message"
   end
 
   add_index "resource_import_results", ["item_id"], name: "index_resource_import_results_on_item_id"

data/spec/fixtures/users.yml

@@ -48,4 +48,4 @@ user4:
   username: user4
   email: user4@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  locked_at: <%= 1.day.ago %>
+  locked_at: <%= 1.day.ago.to_s(:db) %>

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'simplecov'
+require 'coveralls'
 SimpleCov.start 'rails'
+Coveralls.wear!
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'