cul_scv_hydra 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b86f1314e8420211994b03042bf8b38ba33c225
-  data.tar.gz: dcf24feda1f3be4d339ab8510a735dda1c5d3df0
+  metadata.gz: bb806a3bd7153afb5496e97fdea1956154521b29
+  data.tar.gz: aac601a95936341428eb7b7026faf0dd02085136
 SHA512:
-  metadata.gz: 03211fdc212e6b9e51160365211f0564286817be2d84bb4198a5150594cac265ee761fa1ecea09cd8b4586e496e57c7a29804d0a1e263542862568953be8f407
-  data.tar.gz: 597a25e46926cebaae294dec6759b00460f4974b4a6263e975a7381be3ed7ca5b6017e0125e0b67072cae6faa65561d63877334fe29acef6fc71ef6f5f96d59d
+  metadata.gz: cee407b55dcf8268b31463fe2772a7d7956f6daf008704c994e6e736e9b8ff15136c2f604aa8d39a39a2656c12682f45bb07a4e8b138d85d25a09d22eb1e2fcf
+  data.tar.gz: 9fa94890fea894ccb0814494769b471dec643037f5222459cb1a1ea2a1be2004846f59f97d801bebb9f5ed273a69d882d65391179da4686b27f2ed8b342017e9

data/app/models/cul/scv/hydra/datastreams/mods_document.rb

@@ -63,7 +63,8 @@ class ModsDocument < ::ActiveFedora::OmDatastream
     t.type_of_resource(:path=>"typeOfResource", :index_as=>[:displayable])
     t.physical_description(:path=>"physicalDescription", :index_as=>[]){
       t.form_marc(:path=>"form", :attributes=>{:authority=>"marcform"}, :index_as=>[:displayable])
-      t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:displayable])
+      t.form_aat(:path=>"form", :attributes=>{:authority=>"aat"}, :index_as=>[:displayable, :facetable])
+      t.form_local(:path=>"form", :attributes=>{:authority=>"local"}, :index_as=>[:displayable, :facetable])
       t.form(:attributes=>{:authority=>:none}, :index_as=>[:displayable])
       t.form_nomarc(:path=>"form[@authority !='marcform']", :index_as=>[])
       t.extent(:path=>"extent", :index_as=>[:searchable, :displayable])
@@ -84,11 +85,12 @@ class ModsDocument < ::ActiveFedora::OmDatastream
     t.top_level_location_url(:proxy=>[:mods, :location, :url])
     t.lib_repo(:proxy=>[:location, :lib_repo], :type=>:text,
      :index_as=>[:marc_code_textable])
-    #t.lib_name(
-    #  :path=>'name',:attributes=>{:type=>'personal'},
-    #  :index_as=>[:facetable, :displayable]){
-    #  t.name_part(:path=>'namePart', :index_as=>[])
-    #}
+    t.name_usage_primary(
+      :path=>'name',:attributes=>{:usage=>'primary'},
+      :index_as=>[]){
+      t.name_part(:path=>'namePart', :index_as=>[])
+    }
+    t.primary_name(proxy: [:name_usage_primary,:name_part], index_as: :facetable)
     #t.name_corporate(
     #  :path=>'name',:attributes=>{:type=>'corporate'},
     #  :index_as=>[:facetable, :displayable],

data/app/models/dc_document.rb

@@ -2,7 +2,7 @@ require "active-fedora"
 require "active_fedora_finders"
 class DcDocument < ActiveFedora::Base
   include ::ActiveFedora::Associations
-  include ::ActiveFedora::Finders
+  include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common

data/app/models/generic_aggregator.rb

@@ -1,7 +1,7 @@
 require "active-fedora"
 require "active_fedora_finders"
 class GenericAggregator < ::ActiveFedora::Base
-  include ::ActiveFedora::Finders
+  include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common

data/app/models/generic_object.rb

@@ -2,7 +2,7 @@ require "active-fedora"
 require "active_fedora_finders"
 class GenericObject < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
+  include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common

data/app/models/generic_resource.rb

@@ -6,7 +6,7 @@ require "tempfile"
 require "active_fedora_finders"
 class GenericResource < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
+  include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common
@@ -21,7 +21,8 @@ class GenericResource < ::ActiveFedora::Base
   LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
 
   has_datastream :name => "content", :type=>::ActiveFedora::Datastream, :versionable => true
-
+  has_metadata :name=>"RELS-INT", :type=>ActiveFedora::RelsInt::Datastream
+  
   def assert_content_model
     super
     add_relationship(:rdf_type, Cul::Scv::Hydra::ActiveFedora::RESOURCE_TYPE.to_s)

data/app/models/mets_structured_aggregator.rb

@@ -2,7 +2,7 @@ require "active-fedora"
 require "active_fedora_finders"
 class METSStructuredAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
-  include ::ActiveFedora::Finders
+  include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common

data/app/models/resource.rb

@@ -4,7 +4,7 @@ require "cul_image_props"
 require "mime/types"
 require "uri"
 class Resource < ActiveFedora::Base
-  include ::ActiveFedora::Finders
+  include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
 #  include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common

data/app/models/resource_aggregator.rb

@@ -1,5 +1,5 @@
 class ResourceAggregator < ::ActiveFedora::Base
-  include ::ActiveFedora::Finders
+  include ::ActiveFedora::FinderMethods::RepositoryMethods
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
   include Cul::Scv::Hydra::Models::Common

data/config/fedora.yml

@@ -1,11 +1,11 @@
-development:
+alcott: &alcott
+  :url: http://alcott.cul.columbia.edu:8080/fedora
   :user: fedoraAdmin
-  :password: fedoraAdmin
-  :url: http://localhost:8983/fedora-test
-  :time_zone: "America/New_York"
-
-test:
+  :password: f+BULUS*^
+default: &default
+  :url: http://127.0.0.1:8983/fedora
   :user: fedoraAdmin
   :password: fedoraAdmin
-  :url: http://localhost:8983/fedora-test
-  :time_zone: "America/New_York"
+development: *alcott
+test: *default
+production: *alcott

data/config/locales/nnc.ntriples

@@ -0,0 +1,12 @@
+<info:fedora/marcorg:nnc> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#CorporateName> . 
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasReciprocalAuthority> <http://id.loc.gov/vocabulary/organizations/nnc> . 
+<info:fedora/marcorg:nnc> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Authority> . 
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#code> "NNC"^^<http://id.loc.gov/datatypes/orgs/code> . 
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#code> "nnc"^^<http://id.loc.gov/datatypes/orgs/normalized> .
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#authoritativeLabel> "Butler Library"@en .
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasAbbreviationVariant> _:bnodereponncfacet .
+<info:fedora/marcorg:nnc> <http://www.loc.gov/mads/rdf/v1#hasExpansionVariant> _:bnodereponncfull .
+_:bnodereponncfacet <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Variant> .
+_:bnodereponncfacet <http://www.loc.gov/mads/rdf/v1#variantLabel> "Butler Library"@en .
+_:bnodereponncfull <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.loc.gov/mads/rdf/v1#Variant> .
+_:bnodereponncfull <http://www.loc.gov/mads/rdf/v1#variantLabel> "Butler Library, Columbia University"@en

data/config/subs.yml

@@ -0,0 +1,12 @@
+development:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+test:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://sayers.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu/dev"
+production:
+  djatoka_server: "http://iris.cul.columbia.edu:8080"
+  fedora_server: "http://alcott.cul.columbia.edu:8080"
+  php_server: "http://bach.cul.columbia.edu"

data/lib/cul_scv_hydra/version.rb

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.17.2'
+        VERSION = '0.18.0'
         def self.version
           VERSION
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -254,10 +254,11 @@ files:
 - config/fedora.yml
 - config/jetty.yml
 - config/locales/ldpd_hydra.en.yml
+- config/locales/nnc.ntriples
 - config/predicate_mappings.yml
-- config/solr.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
+- config/subs.yml
 - lib/cul_scv_fedora/dummy_object.rb
 - lib/cul_scv_fedora/rubydora_patch.rb
 - lib/cul_scv_fedora/url_helper_behavior.rb
@@ -293,7 +294,6 @@ files:
 - lib/cul_scv_hydra/solrizer/terminology_based_solrizer.rb
 - lib/cul_scv_hydra/solrizer/value_mapper.rb
 - lib/cul_scv_hydra/version.rb
-- lib/cul_scv_hydra/version.rb~
 - lib/tasks/cmodel.rake
 - lib/tasks/cul_hydra_dev.rake
 - lib/tasks/index.rake

data/config/solr.yml

@@ -1,5 +0,0 @@
-development:
-  url: http://localhost:8983/solr/test
-  
-test:
-  url: http://localhost:8983/solr/test

data/lib/cul_scv_hydra/version.rb~

@@ -1,11 +0,0 @@
-
-module Cul
-  module Scv
-    module Hydra
-        VERSION = '0.17.1'
-        def self.version
-          VERSION
-        end
-    end
-  end
-end