cul_scv_hydra 0.17.2 → 0.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/cul/scv/hydra/datastreams/mods_document.rb +8 -6
  3. data/app/models/dc_document.rb +1 -1
  4. data/app/models/generic_aggregator.rb +1 -1
  5. data/app/models/generic_object.rb +1 -1
  6. data/app/models/generic_resource.rb +3 -2
  7. data/app/models/mets_structured_aggregator.rb +1 -1
  8. data/app/models/resource.rb +1 -1
  9. data/app/models/resource_aggregator.rb +1 -1
  10. data/config/fedora.yml +8 -8
  11. data/config/locales/nnc.ntriples +12 -0
  12. data/config/subs.yml +12 -0
  13. data/lib/cul_scv_hydra/version.rb +1 -1
  14. metadata +4 -4
  15. data/config/solr.yml +0 -5
  16. data/lib/cul_scv_hydra/version.rb~ +0 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6b86f1314e8420211994b03042bf8b38ba33c225
4
- data.tar.gz: dcf24feda1f3be4d339ab8510a735dda1c5d3df0
3
+ metadata.gz: bb806a3bd7153afb5496e97fdea1956154521b29
4
+ data.tar.gz: aac601a95936341428eb7b7026faf0dd02085136
5
5
  SHA512:
6
- metadata.gz: 03211fdc212e6b9e51160365211f0564286817be2d84bb4198a5150594cac265ee761fa1ecea09cd8b4586e496e57c7a29804d0a1e263542862568953be8f407
7
- data.tar.gz: 597a25e46926cebaae294dec6759b00460f4974b4a6263e975a7381be3ed7ca5b6017e0125e0b67072cae6faa65561d63877334fe29acef6fc71ef6f5f96d59d
6
+ metadata.gz: cee407b55dcf8268b31463fe2772a7d7956f6daf008704c994e6e736e9b8ff15136c2f604aa8d39a39a2656c12682f45bb07a4e8b138d85d25a09d22eb1e2fcf
7
+ data.tar.gz: 9fa94890fea894ccb0814494769b471dec643037f5222459cb1a1ea2a1be2004846f59f97d801bebb9f5ed273a69d882d65391179da4686b27f2ed8b342017e9
data/app/models/cul/scv/hydra/datastreams/mods_document.rb CHANGED
@@ -63,7 +63,8 @@ class ModsDocument < ::ActiveFedora::OmDatastream
63
63
  t.type_of_resource(:path=>"typeOfResource", :index_as=>[:displayable])
64
64
  t.physical_description(:path=>"physicalDescription", :index_as=>[]){
65
65
  t.form_marc(:path=>"form", :attributes=>{:authority=>"marcform"}, :index_as=>[:displayable])
66
- t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:displayable])
66
+ t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:displayable, :facetable])
67
+ t.form_local(:path=>"form", :attributes=>{:authority=>"local"}, :index_as=>[:displayable, :facetable])
67
68
  t.form(:attributes=>{:authority=>:none}, :index_as=>[:displayable])
68
69
  t.form_nomarc(:path=>"form[@authority !='marcform']", :index_as=>[])
69
70
  t.extent(:path=>"extent", :index_as=>[:searchable, :displayable])
@@ -84,11 +85,12 @@ class ModsDocument < ::ActiveFedora::OmDatastream
84
85
  t.top_level_location_url(:proxy=>[:mods, :location, :url])
85
86
  t.lib_repo(:proxy=>[:location, :lib_repo], :type=>:text,
86
87
  :index_as=>[:marc_code_textable])
87
- #t.lib_name(
88
- # :path=>'name',:attributes=>{:type=>'personal'},
89
- # :index_as=>[:facetable, :displayable]){
90
- # t.name_part(:path=>'namePart', :index_as=>[])
91
- #}
88
+ t.name_usage_primary(
89
+ :path=>'name',:attributes=>{:usage=>'primary'},
90
+ :index_as=>[]){
91
+ t.name_part(:path=>'namePart', :index_as=>[])
92
+ }
93
+ t.primary_name(proxy: [:name_usage_primary,:name_part], index_as: :facetable)
92
94
  #t.name_corporate(
93
95
  # :path=>'name',:attributes=>{:type=>'corporate'},
94
96
  # :index_as=>[:facetable, :displayable],
data/app/models/dc_document.rb CHANGED
@@ -2,7 +2,7 @@ require "active-fedora"
2
2
  require "active_fedora_finders"
3
3
  class DcDocument < ActiveFedora::Base
4
4
  include ::ActiveFedora::Associations
5
- include ::ActiveFedora::Finders
5
+ include ::ActiveFedora::FinderMethods::RepositoryMethods
6
6
  include ::ActiveFedora::DatastreamCollections
7
7
  include Hydra::ModelMethods
8
8
  include Cul::Scv::Hydra::Models::Common
data/app/models/generic_aggregator.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require "active-fedora"
2
2
  require "active_fedora_finders"
3
3
  class GenericAggregator < ::ActiveFedora::Base
4
- include ::ActiveFedora::Finders
4
+ include ::ActiveFedora::FinderMethods::RepositoryMethods
5
5
  include ::ActiveFedora::DatastreamCollections
6
6
  include ::Hydra::ModelMethods
7
7
  include Cul::Scv::Hydra::Models::Common
data/app/models/generic_object.rb CHANGED
@@ -2,7 +2,7 @@ require "active-fedora"
2
2
  require "active_fedora_finders"
3
3
  class GenericObject < ::ActiveFedora::Base
4
4
  extend ActiveModel::Callbacks
5
- include ::ActiveFedora::Finders
5
+ include ::ActiveFedora::FinderMethods::RepositoryMethods
6
6
  include ::ActiveFedora::DatastreamCollections
7
7
  include ::Hydra::ModelMethods
8
8
  include Cul::Scv::Hydra::Models::Common
data/app/models/generic_resource.rb CHANGED
@@ -6,7 +6,7 @@ require "tempfile"
6
6
  require "active_fedora_finders"
7
7
  class GenericResource < ::ActiveFedora::Base
8
8
  extend ActiveModel::Callbacks
9
- include ::ActiveFedora::Finders
9
+ include ::ActiveFedora::FinderMethods::RepositoryMethods
10
10
  include ::ActiveFedora::DatastreamCollections
11
11
  include ::Hydra::ModelMethods
12
12
  include Cul::Scv::Hydra::Models::Common
@@ -21,7 +21,8 @@ class GenericResource < ::ActiveFedora::Base
21
21
  LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
22
22
 
23
23
  has_datastream :name => "content", :type=>::ActiveFedora::Datastream, :versionable => true
24
-
24
+ has_metadata :name=>"RELS-INT", :type=>ActiveFedora::RelsInt::Datastream
25
+
25
26
  def assert_content_model
26
27
  super
27
28
  add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::RESOURCE_TYPE.to_s)
data/app/models/mets_structured_aggregator.rb CHANGED
@@ -2,7 +2,7 @@ require "active-fedora"
2
2
  require "active_fedora_finders"
3
3
  class METSStructuredAggregator < ::ActiveFedora::Base
4
4
  extend ActiveModel::Callbacks
5
- include ::ActiveFedora::Finders
5
+ include ::ActiveFedora::FinderMethods::RepositoryMethods
6
6
  include ::ActiveFedora::DatastreamCollections
7
7
  include ::Hydra::ModelMethods
8
8
  include Cul::Scv::Hydra::Models::Common
data/app/models/resource.rb CHANGED
@@ -4,7 +4,7 @@ require "cul_image_props"
4
4
  require "mime/types"
5
5
  require "uri"
6
6
  class Resource < ActiveFedora::Base
7
- include ::ActiveFedora::Finders
7
+ include ::ActiveFedora::FinderMethods::RepositoryMethods
8
8
  include ::ActiveFedora::DatastreamCollections
9
9
  # include ::Hydra::ModelMethods
10
10
  include Cul::Scv::Hydra::Models::Common
data/app/models/resource_aggregator.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  class ResourceAggregator < ::ActiveFedora::Base
2
- include ::ActiveFedora::Finders
2
+ include ::ActiveFedora::FinderMethods::RepositoryMethods
3
3
  include ::ActiveFedora::DatastreamCollections
4
4
  include ::Hydra::ModelMethods
5
5
  include Cul::Scv::Hydra::Models::Common
data/config/fedora.yml CHANGED
@@ -1,11 +1,11 @@
1
- development:
1
+ alcott: &alcott
2
+ :url: http://alcott.cul.columbia.edu:8080/fedora
2
3
  :user: fedoraAdmin
3
- :password: fedoraAdmin
4
- :url: http://localhost:8983/fedora-test
5
- :time_zone: "America/New_York"
6
-
7
- test:
4
+ :password: f+BULUS*^
5
+ default: &default
6
+ :url: http://127.0.0.1:8983/fedora
8
7
  :user: fedoraAdmin
9
8
  :password: fedoraAdmin
10
- :url: http://localhost:8983/fedora-test
11
- :time_zone: "America/New_York"
9
+ development: *alcott
10
+ test: *default
11
+ production: *alcott
data/config/locales/nnc.ntriples ADDED
@@ -0,0 +1,12 @@
1
+ <info:fedora/marcorg:nnc> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#CorporateName> .
2
+ <info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasReciprocalAuthority> <http://id.loc.gov/vocabulary/organizations/nnc> .
3
+ <info:fedora/marcorg:nnc> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Authority> .
4
+ <info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#code> "NNC"^^<http://id.loc.gov/datatypes/orgs/code> .
5
+ <info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#code> "nnc"^^<http://id.loc.gov/datatypes/orgs/normalized> .
6
+ <info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#authoritativeLabel> "Butler Library"@en .
7
+ <info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasAbbreviationVariant> _:bnodereponncfacet .
8
+ <info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasExpansionVariant> _:bnodereponncfull .
9
+ _:bnodereponncfacet <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Variant> .
10
+ _:bnodereponncfacet <http://www.loc.gov/mads/rdf/v1#variantLabel> "Butler Library"@en .
11
+ _:bnodereponncfull <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Variant> .
12
+ _:bnodereponncfull <http://www.loc.gov/mads/rdf/v1#variantLabel> "Butler Library, Columbia University"@en
data/config/subs.yml ADDED
@@ -0,0 +1,12 @@
1
+ development:
2
+ djatoka_server: "http://iris.cul.columbia.edu:8080"
3
+ fedora_server: "http://sayers.cul.columbia.edu:8080"
4
+ php_server: "http://bach.cul.columbia.edu/dev"
5
+ test:
6
+ djatoka_server: "http://iris.cul.columbia.edu:8080"
7
+ fedora_server: "http://sayers.cul.columbia.edu:8080"
8
+ php_server: "http://bach.cul.columbia.edu/dev"
9
+ production:
10
+ djatoka_server: "http://iris.cul.columbia.edu:8080"
11
+ fedora_server: "http://alcott.cul.columbia.edu:8080"
12
+ php_server: "http://bach.cul.columbia.edu"
data/lib/cul_scv_hydra/version.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  module Cul
3
3
  module Scv
4
4
  module Hydra
5
- VERSION = '0.17.2'
5
+ VERSION = '0.18.0'
6
6
  def self.version
7
7
  VERSION
8
8
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cul_scv_hydra
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.17.2
4
+ version: 0.18.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Benjamin Armintor
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-29 00:00:00.000000000 Z
11
+ date: 2014-09-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: blacklight
@@ -254,10 +254,11 @@ files:
254
254
  - config/fedora.yml
255
255
  - config/jetty.yml
256
256
  - config/locales/ldpd_hydra.en.yml
257
+ - config/locales/nnc.ntriples
257
258
  - config/predicate_mappings.yml
258
- - config/solr.yml
259
259
  - config/solr_mappings.yml
260
260
  - config/solr_value_maps.yml
261
+ - config/subs.yml
261
262
  - lib/cul_scv_fedora/dummy_object.rb
262
263
  - lib/cul_scv_fedora/rubydora_patch.rb
263
264
  - lib/cul_scv_fedora/url_helper_behavior.rb
@@ -293,7 +294,6 @@ files:
293
294
  - lib/cul_scv_hydra/solrizer/terminology_based_solrizer.rb
294
295
  - lib/cul_scv_hydra/solrizer/value_mapper.rb
295
296
  - lib/cul_scv_hydra/version.rb
296
- - lib/cul_scv_hydra/version.rb~
297
297
  - lib/tasks/cmodel.rake
298
298
  - lib/tasks/cul_hydra_dev.rake
299
299
  - lib/tasks/index.rake
data/config/solr.yml DELETED
@@ -1,5 +0,0 @@
1
- development:
2
- url: http://localhost:8983/solr/test
3
-
4
- test:
5
- url: http://localhost:8983/solr/test
data/lib/cul_scv_hydra/version.rb~ DELETED
@@ -1,11 +0,0 @@
1
-
2
- module Cul
3
- module Scv
4
- module Hydra
5
- VERSION = '0.17.1'
6
- def self.version
7
- VERSION
8
- end
9
- end
10
- end
11
- end