enju_subject 0.1.0.pre19 → 0.1.0.pre20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b71b54c99dc5f9923a5d198026d154df1deb93
-  data.tar.gz: 5ac207ebdcbdd906688b1805b5e1783e17527cb7
+  metadata.gz: f3a150b753e79d512ae60ec836caffa4e06cd332
+  data.tar.gz: 27c137118e8c78bfcc4b301d1311efb072294dd6
 SHA512:
-  metadata.gz: c5cf0f6b344a5863a4d7d744672f7e106255754895a0c373b9ea4d1a6a0777488e6da9ded9f51d95b17bc3339e0a43b0752b0dabc54ab67e6ff7cca981609dcd
-  data.tar.gz: 573401ef7304640a5fb0e844eb780cc481b4c9533610ffb4538714ffd0c15420d3154a62dec42400954cd81bb1bad1e3aecfafb74a85ff7ba70512cf3058389b
+  metadata.gz: d16a2629e846183decf3c67e938a77b44d06d77d63532dc10f9825475ab06cd973832ba3e0adc01cb1568a000533abbc9f4ca955c57708e5f39691cddbc8c412
+  data.tar.gz: 7783d1a8313c2a236475af93020cd871632d95bd54d5e4c8c3967fc813dd8928e432a96a2bf3befe0bf25c6be75d686872f6f230f0622ffdbe264702f61dbbff

data/app/models/subject.rb

@@ -25,20 +25,21 @@ end
 #
 # Table name: subjects
 #
-#  id                 :integer          not null, primary key
-#  parent_id          :integer
-#  use_term_id        :integer
-#  term               :string(255)
-#  term_transcription :text
-#  subject_type_id    :integer          not null
-#  scope_note         :text
-#  note               :text
-#  required_role_id   :integer          default(1), not null
-#  lock_version       :integer          default(0), not null
-#  created_at         :datetime
-#  updated_at         :datetime
-#  deleted_at         :datetime
-#  url                :string(255)
-#  manifestation_id   :integer
+#  id                      :integer          not null, primary key
+#  parent_id               :integer
+#  use_term_id             :integer
+#  term                    :string(255)
+#  term_transcription      :text
+#  subject_type_id         :integer          not null
+#  scope_note              :text
+#  note                    :text
+#  required_role_id        :integer          default(1), not null
+#  lock_version            :integer          default(0), not null
+#  created_at              :datetime
+#  updated_at              :datetime
+#  deleted_at              :datetime
+#  url                     :string(255)
+#  manifestation_id        :integer
+#  subject_heading_type_id :integer
 #
 

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre19"
+  VERSION = "0.1.0.pre20"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,47 +1,8 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
 
+  enju_leaf
   enju_biblio
+  enju_library
   enju_subject
-
-  private
-  def render_403
-    return if performed?
-    if user_signed_in?
-      respond_to do |format|
-        format.html {render :file => "#{Rails.root}/public/404", :status => 403}
-        format.xml
-        format.json
-      end
-    else
-      respond_to do |format|
-        format.html {redirect_to new_user_session_url}
-        format.xml  {render :status => 403}
-        format.json
-      end
-    end
-  end
-
-  def render_404
-    return if performed?
-    respond_to do |format|
-      format.html {render :file => "#{Rails.root}/public/404", :status => 404}
-      format.xml
-      format.json
-    end
-  end
-
-  def solr_commit
-    Sunspot.commit
-  end
-
-  def move_position(resource, direction)
-    if ['higher', 'lower'].include?(direction)
-      resource.send("move_#{direction}")
-      redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
-      return
-    end
-  end
 end

data/spec/dummy/config/application.rb

@@ -43,5 +43,4 @@ module Dummy
   end
 end
 
-require 'enju_biblio'
-require 'enju_library'
+require 'enju_leaf'

data/spec/dummy/db/migrate/20111201155456_create_users.rb

@@ -1,10 +1,6 @@
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.integer :user_group_id
-      t.integer :required_role_id
-      t.string :username
-      t.text :note
 
       t.timestamps
     end

data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb

@@ -19,22 +19,19 @@ class AddDeviseToUsers < ActiveRecord::Migration
       t.string   :current_sign_in_ip
       t.string   :last_sign_in_ip
 
-      ## Encryptable
-      t.string :password_salt
-
       ## Confirmable
-      t.string   :confirmation_token
-      t.datetime :confirmed_at
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
       t.datetime :confirmation_sent_at
       t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable
-      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
-      t.string   :unlock_token # Only if unlock strategy is :email or :both
-      t.datetime :locked_at
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
 
       # Token authenticatable
-      t.string :authentication_token
+      # t.string :authentication_token
     end
 
     add_index :users, :email #,                :unique => true

data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -0,0 +1,26 @@
+class AddAdditionalAttributesToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :username, :string
+    add_column :users, :user_number, :string
+    add_column :users, :state, :string
+    add_column :users, :locale, :string
+    add_column :users, :deleted_at, :datetime
+    add_column :users, :expired_at, :datetime
+    add_column :users, :library_id, :integer, :default => 1, :null => false
+    add_column :users, :required_role_id, :integer, :default => 1, :null => false
+    add_column :users, :user_group_id, :integer, :default => 1, :null => false
+    add_column :users, :note, :text
+    add_column :users, :keyword_list, :text
+
+    add_column :users, :failed_attempts, :integer
+    add_column :users, :unlock_token, :string
+    add_column :users, :locked_at, :datetime
+
+    add_column :users, :confirmed_at, :datetime
+
+    add_index :users, :username, :unique => true
+    add_index :users, :user_group_id
+    add_index :users, :user_number, :unique => true
+    add_index :users, :unlock_token,         :unique => true
+  end
+end

data/spec/dummy/db/schema.rb

@@ -847,10 +847,6 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
   end
 
   create_table "users", :force => true do |t|
-    t.integer  "user_group_id"
-    t.integer  "required_role_id"
-    t.string   "username"
-    t.text     "note"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
     t.string   "email",                  :default => "", :null => false
@@ -863,19 +859,31 @@ ActiveRecord::Schema.define(:version => 20130509185724) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.string   "password_salt"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",        :default => 0
+    t.string   "username"
+    t.string   "user_number"
+    t.string   "state"
+    t.string   "locale"
+    t.datetime "deleted_at"
+    t.datetime "expired_at"
+    t.integer  "library_id",             :default => 1,  :null => false
+    t.integer  "required_role_id",       :default => 1,  :null => false
+    t.integer  "user_group_id",          :default => 1,  :null => false
+    t.text     "note"
+    t.text     "keyword_list"
+    t.integer  "failed_attempts"
     t.string   "unlock_token"
     t.datetime "locked_at"
-    t.string   "authentication_token"
+    t.datetime "confirmed_at"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email"
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+  add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
+  add_index "users", ["user_group_id"], :name => "index_users_on_user_group_id"
+  add_index "users", ["user_number"], :name => "index_users_on_user_number", :unique => true
+  add_index "users", ["username"], :name => "index_users_on_username", :unique => true
 
   create_table "versions", :force => true do |t|
     t.string   "item_type",  :null => false

data/spec/fixtures/subjects.yml

@@ -60,20 +60,21 @@ subject_00005:
 #
 # Table name: subjects
 #
-#  id                 :integer          not null, primary key
-#  parent_id          :integer
-#  use_term_id        :integer
-#  term               :string(255)
-#  term_transcription :text
-#  subject_type_id    :integer          not null
-#  scope_note         :text
-#  note               :text
-#  required_role_id   :integer          default(1), not null
-#  lock_version       :integer          default(0), not null
-#  created_at         :datetime
-#  updated_at         :datetime
-#  deleted_at         :datetime
-#  url                :string(255)
-#  manifestation_id   :integer
+#  id                      :integer          not null, primary key
+#  parent_id               :integer
+#  use_term_id             :integer
+#  term                    :string(255)
+#  term_transcription      :text
+#  subject_type_id         :integer          not null
+#  scope_note              :text
+#  note                    :text
+#  required_role_id        :integer          default(1), not null
+#  lock_version            :integer          default(0), not null
+#  created_at              :datetime
+#  updated_at              :datetime
+#  deleted_at              :datetime
+#  url                     :string(255)
+#  manifestation_id        :integer
+#  subject_heading_type_id :integer
 #
 

data/spec/models/subject_spec.rb

@@ -13,20 +13,21 @@ end
 #
 # Table name: subjects
 #
-#  id                 :integer          not null, primary key
-#  parent_id          :integer
-#  use_term_id        :integer
-#  term               :string(255)
-#  term_transcription :text
-#  subject_type_id    :integer          not null
-#  scope_note         :text
-#  note               :text
-#  required_role_id   :integer          default(1), not null
-#  lock_version       :integer          default(0), not null
-#  created_at         :datetime
-#  updated_at         :datetime
-#  deleted_at         :datetime
-#  url                :string(255)
-#  manifestation_id   :integer
+#  id                      :integer          not null, primary key
+#  parent_id               :integer
+#  use_term_id             :integer
+#  term                    :string(255)
+#  term_transcription      :text
+#  subject_type_id         :integer          not null
+#  scope_note              :text
+#  note                    :text
+#  required_role_id        :integer          default(1), not null
+#  lock_version            :integer          default(0), not null
+#  created_at              :datetime
+#  updated_at              :datetime
+#  deleted_at              :datetime
+#  url                     :string(255)
+#  manifestation_id        :integer
+#  subject_heading_type_id :integer
 #
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre19
+  version: 0.1.0.pre20
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -109,33 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: enju_biblio
+  name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 1.1.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
-- !ruby/object:Gem::Dependency
-  name: enju_library
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
+        version: 1.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -377,6 +363,7 @@ files:
 - spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
+- spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
 - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
 - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
 - spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
@@ -403,7 +390,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1zn
+- spec/dummy/solr/data/test/index/segments_22n
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml
@@ -468,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: enju_subject plugin
@@ -605,6 +592,7 @@ test_files:
 - spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
+- spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
 - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
 - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
 - spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
@@ -631,7 +619,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1zn
+- spec/dummy/solr/data/test/index/segments_22n
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml