enju_subject 0.1.0.pre3 → 0.1.0.pre4

data/app/models/classification.rb

@@ -27,16 +27,15 @@ class Classification < ActiveRecord::Base
   end
 end
 
-
 # == Schema Information
 #
 # Table name: classifications
 #
-#  id                     :integer         not null, primary key
+#  id                     :integer          not null, primary key
 #  parent_id              :integer
-#  category               :string(255)     not null
+#  category               :string(255)      not null
 #  note                   :text
-#  classification_type_id :integer         not null
+#  classification_type_id :integer          not null
 #  created_at             :datetime
 #  updated_at             :datetime
 #  lft                    :integer

data/app/models/classification_type.rb

@@ -9,8 +9,8 @@ end
 #
 # Table name: classification_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/app/models/subject.rb

@@ -33,19 +33,18 @@ 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
-#  work_has_subjects_count :integer         default(0), not null
-#  lock_version            :integer         default(0), not null
-#  created_at              :datetime
-#  updated_at              :datetime
-#  deleted_at              :datetime
+#  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
 #
 

data/app/models/subject_has_classification.rb

@@ -27,10 +27,10 @@ end
 #
 # Table name: subject_has_classifications
 #
-#  id                :integer         not null, primary key
+#  id                :integer          not null, primary key
 #  subject_id        :integer
 #  subject_type      :string(255)
-#  classification_id :integer         not null
+#  classification_id :integer          not null
 #  created_at        :datetime
 #  updated_at        :datetime
 #

data/app/models/subject_heading_type.rb

@@ -10,8 +10,8 @@ end
 #
 # Table name: subject_heading_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/app/models/subject_heading_type_has_subject.rb

@@ -12,10 +12,10 @@ end
 #
 # Table name: subject_heading_type_has_subjects
 #
-#  id                      :integer         not null, primary key
-#  subject_id              :integer         not null
+#  id                      :integer          not null, primary key
+#  subject_id              :integer          not null
 #  subject_type            :string(255)
-#  subject_heading_type_id :integer         not null
+#  subject_heading_type_id :integer          not null
 #  created_at              :datetime
 #  updated_at              :datetime
 #

data/app/models/subject_type.rb

@@ -9,8 +9,8 @@ end
 #
 # Table name: subject_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/app/models/work_has_subject.rb

@@ -21,12 +21,12 @@ end
 #
 # Table name: work_has_subjects
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  subject_id   :integer
 #  subject_type :string(255)
 #  work_id      :integer
+#  position     :integer
 #  created_at   :datetime
 #  updated_at   :datetime
-#  position     :integer
 #
 

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre3"
+  VERSION = "0.1.0.pre4"
 end

data/spec/dummy/solr/conf/schema.xml

@@ -84,14 +84,11 @@
     <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
-
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
   </types>
   <fields>
     <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the
+     type: mandatory - the name of a previously defined type from the 
        <types> section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -226,17 +223,8 @@
     <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
     <!-- *** This dynamicField is used by Sunspot! *** -->
     <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
-
-    <!-- Type used to index the lat and lon components for the "location" FieldType -->
-    <dynamicField name="*_coordinate"  type="tdouble" indexed="true"  stored="false" multiValued="false"/>
-    <dynamicField name="*_p" type="location" indexed="true" stored="true" multiValued="false"/>
-
-    <dynamicField name="*_ll" stored="false" type="location" multiValued="false" indexed="true"/>
-    <dynamicField name="*_llm" stored="false" type="location" multiValued="true" indexed="true"/>
-    <dynamicField name="*_lls" stored="true" type="location" multiValued="false" indexed="true"/>
-    <dynamicField name="*_llms" stored="true" type="location" multiValued="true" indexed="true"/>
   </fields>
-  <!-- Field to use to determine and enforce document uniqueness.
+  <!-- Field to use to determine and enforce document uniqueness. 
       Unless this field is marked with required="false", it will be a required field
    -->
   <uniqueKey>id</uniqueKey>

data/spec/fixtures/classification_types.yml

@@ -52,8 +52,8 @@ classification_type_00002:
 #
 # Table name: classification_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/fixtures/classifications.yml

@@ -100,16 +100,15 @@ classification_00005:
   lft: 9
   rgt: 10
 
-
 # == Schema Information
 #
 # Table name: classifications
 #
-#  id                     :integer         not null, primary key
+#  id                     :integer          not null, primary key
 #  parent_id              :integer
-#  category               :string(255)     not null
+#  category               :string(255)      not null
 #  note                   :text
-#  classification_type_id :integer         not null
+#  classification_type_id :integer          not null
 #  created_at             :datetime
 #  updated_at             :datetime
 #  lft                    :integer

data/spec/fixtures/subject_has_classifications.yml

@@ -64,10 +64,10 @@ subject_has_classification_00010:
 #
 # Table name: subject_has_classifications
 #
-#  id                :integer         not null, primary key
+#  id                :integer          not null, primary key
 #  subject_id        :integer
 #  subject_type      :string(255)
-#  classification_id :integer         not null
+#  classification_id :integer          not null
 #  created_at        :datetime
 #  updated_at        :datetime
 #

data/spec/fixtures/subject_heading_type_has_subjects.yml

@@ -14,10 +14,10 @@ two:
 #
 # Table name: subject_heading_type_has_subjects
 #
-#  id                      :integer         not null, primary key
-#  subject_id              :integer         not null
+#  id                      :integer          not null, primary key
+#  subject_id              :integer          not null
 #  subject_type            :string(255)
-#  subject_heading_type_id :integer         not null
+#  subject_heading_type_id :integer          not null
 #  created_at              :datetime
 #  updated_at              :datetime
 #

data/spec/fixtures/subject_heading_types.yml

@@ -20,8 +20,8 @@ subject_heading_type_00002:
 #
 # Table name: subject_heading_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/fixtures/subject_types.yml

@@ -26,3 +26,17 @@ subject_type_00004:
   display_name: Place
   note: 
   position: 4
+
+# == Schema Information
+#
+# Table name: subject_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+

data/spec/fixtures/subjects.yml

@@ -54,19 +54,18 @@ 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
-#  work_has_subjects_count :integer         default(0), not null
-#  lock_version            :integer         default(0), not null
-#  created_at              :datetime
-#  updated_at              :datetime
-#  deleted_at              :datetime
+#  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
 #
 

data/spec/fixtures/work_has_subjects.yml

@@ -22,12 +22,12 @@ work_has_subject_00003:
 #
 # Table name: work_has_subjects
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  subject_id   :integer
 #  subject_type :string(255)
 #  work_id      :integer
+#  position     :integer
 #  created_at   :datetime
 #  updated_at   :datetime
-#  position     :integer
 #
 

data/spec/models/classification_spec.rb

@@ -6,16 +6,15 @@ describe Classification do
 
 end
 
-
 # == Schema Information
 #
 # Table name: classifications
 #
-#  id                     :integer         not null, primary key
+#  id                     :integer          not null, primary key
 #  parent_id              :integer
-#  category               :string(255)     not null
+#  category               :string(255)      not null
 #  note                   :text
-#  classification_type_id :integer         not null
+#  classification_type_id :integer          not null
 #  created_at             :datetime
 #  updated_at             :datetime
 #  lft                    :integer

data/spec/models/classification_type_spec.rb

@@ -10,8 +10,8 @@ end
 #
 # Table name: classification_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/models/subject_has_classification_spec.rb

@@ -10,10 +10,10 @@ end
 #
 # Table name: subject_has_classifications
 #
-#  id                :integer         not null, primary key
+#  id                :integer          not null, primary key
 #  subject_id        :integer
 #  subject_type      :string(255)
-#  classification_id :integer         not null
+#  classification_id :integer          not null
 #  created_at        :datetime
 #  updated_at        :datetime
 #

data/spec/models/subject_heading_type_has_subject_spec.rb

@@ -10,10 +10,10 @@ end
 #
 # Table name: subject_heading_type_has_subjects
 #
-#  id                      :integer         not null, primary key
-#  subject_id              :integer         not null
+#  id                      :integer          not null, primary key
+#  subject_id              :integer          not null
 #  subject_type            :string(255)
-#  subject_heading_type_id :integer         not null
+#  subject_heading_type_id :integer          not null
 #  created_at              :datetime
 #  updated_at              :datetime
 #

data/spec/models/subject_heading_type_spec.rb

@@ -10,8 +10,8 @@ end
 #
 # Table name: subject_heading_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/models/subject_spec.rb

@@ -13,19 +13,18 @@ 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
-#  work_has_subjects_count :integer         default(0), not null
-#  lock_version            :integer         default(0), not null
-#  created_at              :datetime
-#  updated_at              :datetime
-#  deleted_at              :datetime
+#  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
 #
 

data/spec/models/subject_type_spec.rb

@@ -10,8 +10,8 @@ end
 #
 # Table name: subject_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/models/work_has_subject_spec.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: work_has_subjects
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  subject_id   :integer
 #  subject_type :string(255)
 #  work_id      :integer
+#  position     :integer
 #  created_at   :datetime
 #  updated_at   :datetime
-#  position     :integer
 #
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0.pre13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0.pre13
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -341,6 +341,7 @@ files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/fixtures/roles.yml
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
@@ -440,7 +441,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_u
+- spec/dummy/solr/data/test/index/segments_46
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml
@@ -450,7 +451,6 @@ files:
 - spec/dummy/test/unit/user_group_test.rb
 - spec/dummy/test/unit/user_has_role_test.rb
 - spec/dummy/test/unit/user_test.rb
-- spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/factories/classification.rb
 - spec/factories/classification_type.rb
 - spec/factories/manifestation.rb
@@ -506,6 +506,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4551511806052952502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -558,6 +561,7 @@ test_files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/fixtures/roles.yml
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
@@ -657,7 +661,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_u
+- spec/dummy/solr/data/test/index/segments_46
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml
@@ -667,7 +671,6 @@ test_files:
 - spec/dummy/test/unit/user_group_test.rb
 - spec/dummy/test/unit/user_has_role_test.rb
 - spec/dummy/test/unit/user_test.rb
-- spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/factories/classification.rb
 - spec/factories/classification_type.rb
 - spec/factories/manifestation.rb