enju_ndl 0.1.0.pre17 → 0.1.0.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7440506c610a3cdc7455dde95874262a99f7fba2
-  data.tar.gz: df84a8f2a5e4e1bea8a3e7a9945b67a30cc801f9
+  metadata.gz: 67119193c2eaec7c7eff5c0d497049fe06f8c211
+  data.tar.gz: 5ca2e9a711979c33f3f57fa72c6ce5c86308519e
 SHA512:
-  metadata.gz: 0803f949b3c97530cf67512b3444ddef0466c76f7ff1a0007705ef4879f78e771d351aa0adbbd000340a7498f1331ce0e7b32bf58b2e0d9ddb4589b52c06cc36
-  data.tar.gz: 52b69f574cd8eb61fd378c6ae05491882be6b37a627745f2ea64bb3ded0ce2ef9371739eba475f969c02b25a9817fe8423e4149f341dfc42df49c52246355af5
+  metadata.gz: a989ab41f543b66d9b2ae6c2b71df1d6e4ce16ad75479c5696005d24d8521b943a6ff05d61ef08a743182bfcfa22343af402ca1f625c7a0bd12e64566df93aeb
+  data.tar.gz: e1ac2597944e71b47e5fc818470309753f79d630760a5579aaedbb3038d87df2b54b6783473949a9aac6865ebdee386633de0d8c59ca87bb3cd195ccae052cf8

data/lib/enju_ndl/ndl_search.rb

@@ -139,8 +139,8 @@ module EnjuNdl
                 subject.save!
               end
               if subject.valid?
+                subject.subject_heading_type = subject_heading_type
                 manifestation.subjects << subject
-                subject.subject_heading_types << subject_heading_type if subject.subject_heading_types.where(:id => subject_heading_type.id).empty?
               end
             end
             if classification_urls

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.1.0.pre17"
+  VERSION = "0.1.0.pre18"
 end

data/spec/dummy/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb

@@ -0,0 +1,5 @@
+class AddSubjectHeadingTypeIdToSubject < ActiveRecord::Migration
+  def change
+    add_column :subjects, :subject_heading_type_id, :integer
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130504143515) do
+ActiveRecord::Schema.define(:version => 20130504195916) do
 
   create_table "carrier_types", :force => true do |t|
     t.string   "name",         :null => false
@@ -646,16 +646,17 @@ ActiveRecord::Schema.define(:version => 20130504143515) do
     t.integer  "use_term_id"
     t.string   "term"
     t.text     "term_transcription"
-    t.integer  "subject_type_id",                   :null => false
+    t.integer  "subject_type_id",                        :null => false
     t.text     "scope_note"
     t.text     "note"
-    t.integer  "required_role_id",   :default => 1, :null => false
-    t.integer  "lock_version",       :default => 0, :null => false
+    t.integer  "required_role_id",        :default => 1, :null => false
+    t.integer  "lock_version",            :default => 0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "deleted_at"
     t.string   "url"
     t.integer  "manifestation_id"
+    t.integer  "subject_heading_type_id"
   end
 
   add_index "subjects", ["manifestation_id"], :name => "index_subjects_on_manifestation_id"

data/spec/models/ndl_book_spec.rb

@@ -34,7 +34,7 @@ describe NdlBook do
       manifestation.end_page.should eq 315
       manifestation.height.should eq 24.0
       manifestation.subjects.size.should eq 1
-      manifestation.subjects.first.subject_heading_types.first.name.should eq 'ndlsh'
+      manifestation.subjects.first.subject_heading_type.name.should eq 'ndlsh'
       manifestation.subjects.first.term.should eq 'プログラミング (コンピュータ)'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre17
+  version: 0.1.0.pre18
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre14
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre36
+        version: 0.1.0.pre37
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre36
+        version: 0.1.0.pre37
 - !ruby/object:Gem::Dependency
   name: enju_question
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +358,7 @@ files:
 - spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
 - spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb
 - spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb
+- spec/dummy/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -562,6 +563,7 @@ test_files:
 - spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
 - spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb
 - spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb
+- spec/dummy/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html