curation_concerns-models 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5660b6eec6ec27f6e8c00a1a9a001a0147a66fe6
-  data.tar.gz: e45350c36fd8061b4ef31871620eeeea5f450447
+  metadata.gz: afd415c4152d3eb3fc25a1d5d63c0261c820ae07
+  data.tar.gz: 051471568f9ab3d2d27ff62a8d8faa5d469c3139
 SHA512:
-  metadata.gz: 2c1ef86aa53fe09e26c1e800780c673b3499a50c01b528257683d3ee91baa2f8719e9dab83cd2e07a621b8f8b0ba90e7c407bf7188b434b4cbaf8144e2f0b950
-  data.tar.gz: c82db879f98a32b61da80ead6d519b3259cc4ca1ad696b2c313adb70d10854d79f1db9d9efe9643417c1a16fbe821b99392b8b7e7f3e074259dc7d8ec0f55d25
+  metadata.gz: c2607d15592fe9f7e6acb243256cc33f6b29132b201660328cb427840b3efba3453f5f5c40ce44bab48a8cc5d55cc8b1d685b62143edd0492136ee2cca310483
+  data.tar.gz: 2db872e858e8705f6af5e1060c686b80e01d595125c01492066080916b6e3bd1695bdd72cca78e063fd50c8d81c80a65dcf32ee181653526a810df6ece97964b

data/app/indexers/curation_concerns/work_indexer.rb

@@ -9,7 +9,6 @@ module CurationConcerns
         # looks just at solr
         solr_doc[Solrizer.solr_name('member_ids', :symbol)] = object.member_ids
         Solrizer.set_field(solr_doc, 'generic_type', 'Work', :facetable)
-        solr_doc['thumbnail_path_ss'] = thumbnail_path
       end
     end
   end

data/app/models/concerns/curation_concerns/basic_metadata.rb

@@ -15,33 +15,33 @@ module CurationConcerns
       property :resource_type, predicate: ::RDF::Vocab::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
-      property :creator, predicate: ::RDF::Vocab::DC.creator do |index|
+      property :creator, predicate: ::RDF::Vocab::DC11.creator do |index|
         index.as :stored_searchable, :facetable
       end
-      property :contributor, predicate: ::RDF::Vocab::DC.contributor do |index|
+      property :contributor, predicate: ::RDF::Vocab::DC11.contributor do |index|
         index.as :stored_searchable, :facetable
       end
-      property :description, predicate: ::RDF::Vocab::DC.description do |index|
+      property :description, predicate: ::RDF::Vocab::DC11.description do |index|
         index.type :text
         index.as :stored_searchable
       end
-      property :tag, predicate: ::RDF::Vocab::DC.relation do |index|
+      property :tag, predicate: ::RDF::Vocab::DC11.relation do |index|
         index.as :stored_searchable, :facetable
       end
       property :rights, predicate: ::RDF::Vocab::DC.rights do |index|
         index.as :stored_searchable
       end
-      property :publisher, predicate: ::RDF::Vocab::DC.publisher do |index|
+      property :publisher, predicate: ::RDF::Vocab::DC11.publisher do |index|
         index.as :stored_searchable, :facetable
       end
       property :date_created, predicate: ::RDF::Vocab::DC.created do |index|
         index.as :stored_searchable
       end
 
-      property :subject, predicate: ::RDF::Vocab::DC.subject do |index|
+      property :subject, predicate: ::RDF::Vocab::DC11.subject do |index|
         index.as :stored_searchable, :facetable
       end
-      property :language, predicate: ::RDF::Vocab::DC.language do |index|
+      property :language, predicate: ::RDF::Vocab::DC11.language do |index|
         index.as :stored_searchable, :facetable
       end
       property :identifier, predicate: ::RDF::Vocab::DC.identifier do |index|

data/app/models/concerns/curation_concerns/solr_document_behavior.rb

@@ -44,8 +44,9 @@ module CurationConcerns
       fetch(Solrizer.solr_name('hasRelatedMediaFragment', :symbol), []).first
     end
 
+    # Date created is indexed as a string. This allows users to enter values like: 'Circa 1840-1844'
     def date_created
-      date_field('date_created')
+      fetch(Solrizer.solr_name("date_created"), []).first
     end
 
     def date_modified

data/app/models/concerns/curation_concerns/work_behavior.rb

@@ -23,6 +23,15 @@ module CurationConcerns::WorkBehavior
     def indexer
       CurationConcerns::WorkIndexer
     end
+
+    # This governs which partial to draw when you render this type of object
+    def _to_partial_path #:nodoc:
+      @_to_partial_path ||= begin
+        element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
+        collection = ActiveSupport::Inflector.tableize(name)
+        "curation_concerns/#{collection}/#{element}".freeze
+      end
+    end
   end
 
   def to_s

data/app/services/curation_concerns/indexes_thumbnails.rb

@@ -5,8 +5,24 @@ module CurationConcerns
     included do
       class_attribute :thumbnail_path_service
       self.thumbnail_path_service = ThumbnailPathService
+      class_attribute :thumbnail_field
+      self.thumbnail_field = 'thumbnail_path_ss'.freeze
     end
 
+    # Adds thumbnail indexing to the solr document
+    def generate_solr_document
+      super.tap do |solr_doc|
+        index_thumbnails(solr_doc)
+      end
+    end
+
+    # Write the thumbnail paths into the solr_document
+    # @params [Hash] solr_document the solr document to add the field to
+    def index_thumbnails(solr_document)
+      solr_document[thumbnail_field] = thumbnail_path
+    end
+
+    # Returns the value for the thumbnail path to put into the solr document
     def thumbnail_path
       self.class.thumbnail_path_service.call(object)
     end

data/curation_concerns-models.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-collections', '~> 8.0'
+  spec.add_dependency 'hydra-collections', '~> 8.1'
   spec.add_dependency 'hydra-head', '~> 9.3'
   spec.add_dependency 'hydra-works', '~> 0.7'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'

data/lib/curation_concerns/models/version.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
   module Models
-    VERSION = "0.9.0".freeze
+    VERSION = "0.10.0".freeze
   end
 end

data/lib/generators/curation_concerns/models/templates/app/models/collection.rb

@@ -1,4 +1,6 @@
 # Generated by curation_concerns:models:install
 class Collection < ActiveFedora::Base
   include ::CurationConcerns::CollectionBehavior
+  # You can replace these metadata if they're not suitable
+  include Hydra::Collections::BasicMetadata
 end

data/lib/generators/curation_concerns/models/templates/config/redis_config.rb

@@ -7,21 +7,22 @@ if defined?(PhusionPassenger)
       config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
 
       # The important two lines
-      $redis.client.disconnect if $redis
-      $redis = begin
-                 Redis.new(host: config[:host], port: config[:port], thread_safe: true)
-               rescue
-                 nil
-               end
-      Resque.redis = $redis
+      Redis.current.disconnect!
+      Redis.current = begin
+                        Redis.new(config.merge(thread_safe: true))
+                      rescue
+                        nil
+                      end
+      Resque.redis = Redis.current
       Resque.redis.namespace = "#{CurationConcerns.config.redis_namespace}:#{Rails.env}"
       Resque.redis.client.reconnect if Resque.redis
     end
   end
 else
   config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-  $redis = begin
-             Redis.new(host: config[:host], port: config[:port], thread_safe: true)
+  require 'redis'
+  Redis.current = begin
+             Redis.new(config.merge(thread_safe: true))
            rescue
              nil
            end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns-models
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement