sufia-models 4.0.0.beta3 → 4.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a65dabcbadf31012b903126436b9a24b8ee4ea
-  data.tar.gz: cab66737a44fe6bea825acdfbc8a38c4fbd679c8
+  metadata.gz: 26e357f1f6b832085b27631a3f0b27a6965e5e5d
+  data.tar.gz: 1848e22539c05d4fc6e65c4caf95dbb5bae3853d
 SHA512:
-  metadata.gz: a82f963bd402cac50068911c17d906578534710f39a5b070fae36fec7db886f2511b8d564eedcc3a2573472abeef10298e6c21464d8676b0bed4503744b30074
-  data.tar.gz: fb673e84039480923a9d400814a48c59fd7d55bcd6bc3ea13e1db30a6269ee677544e23d84a9d73d5997c58dccb429cdb3e941d6d160dc7bade36d1bb2a619f3
+  metadata.gz: 46eef68b1e122d8a97d163b8af48276506129800d77713866097738d1f41930f93f1ca9d01f098ffc295bc2d964ca9c3f373edfb8983089d1507907637609b1d
+  data.tar.gz: 692a11e6afe0f3fe8545eb12600f50233dc72b7de3fbee2e5bde078ed200e8d03497be4beb12354aaf666e36e651fd35243c3276870476566a9bb60cb51c679d

data/app/models/concerns/sufia/generic_file.rb

@@ -97,11 +97,6 @@ module Sufia
       end
     end
 
-    # Redefine this for more intuitive keys in Redis
-    def to_param
-      noid
-    end
-
     def label=(new_label)
       @inner_object.label = new_label
       if self.title.empty?

data/app/models/concerns/sufia/generic_file/metadata.rb

@@ -9,14 +9,21 @@ module Sufia
         has_file_datastream "content", type: FileContentDatastream
         has_file_datastream "thumbnail"
 
-
         has_attributes :relative_path, :depositor, :import_url, datastream: :properties, multiple: false
-        has_attributes :date_uploaded, :date_modified, datastream: :descMetadata, multiple: false 
+        has_attributes :date_uploaded, :date_modified, datastream: :descMetadata, multiple: false
         has_attributes :related_url, :based_near, :part_of, :creator,
                                     :contributor, :title, :tag, :description, :rights,
                                     :publisher, :date_created, :subject,
                                     :resource_type, :identifier, :language, datastream: :descMetadata, multiple: true
       end
+
+      # Add a schema.org itemtype
+      def itemtype
+        # Look up the first non-empty resource type value in a hash from the config
+        Sufia.config.resource_types_to_schema[resource_type.to_a.reject { |type| type.empty? }.first] || 'http://schema.org/CreativeWork'
+      rescue
+        'http://schema.org/CreativeWork'
+      end
     end
   end
 end

data/app/models/concerns/sufia/generic_file/web_form.rb

@@ -16,7 +16,7 @@ module Sufia
       # override this method if you need to initialize more complex RDF assertions (b-nodes)
       def initialize_fields
         terms_for_editing.each do |key|
-          # if value is empty, we create an one element array to loop over for output 
+          # if value is empty, we create an one element array to loop over for output
           self[key] = [''] if self[key].empty?
         end
       end
@@ -34,7 +34,7 @@ module Sufia
       module ClassMethods
         def terms_for_display
           [:resource_type, :title, :creator, :contributor, :description, :tag, :rights, :publisher, :date_created,
-           :date_uploaded, :date_modified, :subject, :language, :identifier, :based_near, :related_url]
+           :subject, :language, :identifier, :based_near, :related_url]
         end
       end
 

data/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -4,7 +4,7 @@ class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
     index.as :stored_searchable, :facetable
   end
   property :title, predicate: RDF::DC.title do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
   property :creator, predicate: RDF::DC.creator do |index|
     index.as :stored_searchable, :facetable

data/app/services/sufia/noid.rb

@@ -1,28 +1,33 @@
 module Sufia
   module Noid
-    def Noid.noidify(identifier)
-      String(identifier).split(":").last
-    end
-
-    def Noid.namespaceize(identifier)
-      if identifier.start_with?(Noid.namespace)
-        identifier
-      else
-        "#{Noid.namespace}:#{identifier}"
-      end
-    end
 
     def noid
       Noid.noidify(self.pid)
     end
 
-    def normalize_identifier
-      params[:id] = Noid.namespaceize(params[:id])
+    # Redefine this for more intuitive keys in Redis
+    def to_param
+      noid
     end
 
-    protected
-    def Noid.namespace
-      Sufia.config.id_namespace
+    class << self
+      def noidify(identifier)
+        String(identifier).split(":").last
+      end
+
+      def namespaceize(identifier)
+        if identifier.start_with?(namespace)
+          identifier
+        else
+          "#{namespace}:#{identifier}"
+        end
+      end
+
+      protected
+
+      def namespace
+        Sufia.config.id_namespace
+      end
     end
   end
 end

data/lib/generators/sufia/models/install_generator.rb

@@ -13,9 +13,8 @@ This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Adds user behavior to the user model
  3. Creates the sufia.rb configuration file
- 4. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
- 5. Generates mailboxer
- 6. Generates usage stats config
+ 4. Generates mailboxer
+ 5. Generates usage stats config
        """
 
   # Implement the required interface for Rails::Generators::Migration.
@@ -83,19 +82,6 @@ This generator makes the following changes to your application:
     copy_file 'config/resque_config.rb', 'config/initializers/resque_config.rb'
   end
 
-  # Add behaviors to the SolrDocument model
-  def inject_sufia_solr_document_behavior
-    file_path = "app/models/solr_document.rb"
-    if File.exists?(file_path)
-      inject_into_file file_path, after: /include Blacklight::Solr::Document.*$/ do
-        "\n  # Adds Sufia behaviors to the SolrDocument.\n" +
-          "  include Sufia::SolrDocumentBehavior\n"
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist."
-    end
-  end
-
   def install_mailboxer
     generate "mailboxer:install"
   end

data/lib/generators/sufia/models/templates/config/sufia.rb

@@ -48,6 +48,29 @@ Sufia.config do |config|
     "Other" => "Other",
   }
 
+  config.resource_types_to_schema = {
+    "Article" => "http://schema.org/Article",
+    "Audio" => "http://schema.org/AudioObject",
+    "Book" => "http://schema.org/Book",
+    "Capstone Project" => "http://schema.org/CreativeWork",
+    "Conference Proceeding" => "http://schema.org/ScholarlyArticle",
+    "Dataset" => "http://schema.org/Dataset",
+    "Dissertation" => "http://schema.org/ScholarlyArticle",
+    "Image" => "http://schema.org/ImageObject",
+    "Journal" => "http://schema.org/CreativeWork",
+    "Map or Cartographic Material" => "http://schema.org/Map",
+    "Masters Thesis" => "http://schema.org/ScholarlyArticle",
+    "Part of Book" => "http://schema.org/Book",
+    "Poster" => "http://schema.org/CreativeWork",
+    "Presentation" => "http://schema.org/CreativeWork",
+    "Project" => "http://schema.org/CreativeWork",
+    "Report" => "http://schema.org/CreativeWork",
+    "Research Paper" => "http://schema.org/ScholarlyArticle",
+    "Software or Program Code" => "http://schema.org/Code",
+    "Video" => "http://schema.org/VideoObject",
+    "Other" => "http://schema.org/CreativeWork",
+  }
+
   config.permission_levels = {
     "Choose Access"=>"none",
     "View/Download" => "read",

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0.beta3"
+    VERSION = "4.0.0.beta4"
   end
 end

data/sufia-models.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
-  spec.add_dependency 'mailboxer', '~> 0.12.0.rc1'
+  spec.add_dependency 'mailboxer', '~> 0.12.0.rc2'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9.0'
   spec.add_dependency 'hydra-derivatives', '~> 0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta3
+  version: 4.0.0.beta4
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc1
+        version: 0.12.0.rc2
 - !ruby/object:Gem::Dependency
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement