sufia-models 3.7.2 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46955d1e4d943f5aa48af13600bf6315f7de2246
-  data.tar.gz: c024b0bc111898801fe776e72df994964ca34b93
+  metadata.gz: 301cddec8289b8f56306d83bacadcf50b0941c72
+  data.tar.gz: 7e994e58c86d1b11f27c121ee7705875a4e136a7
 SHA512:
-  metadata.gz: 81d45bb938a76994c7f84fb30093d53421004930a809a3782932eb9bee52dd6a250f42de784ade74b3d70e806ce976df4a86af7d1f21a0876bd782d212346fcd
-  data.tar.gz: 0d69c56dc6ceab560b4d98642bfb7976c03cd4d06cd3455bb71a771cecf1d70d8a9b8b150963e3a55b5e0e9860bc51bb3ee66bcf9930206d6ed37090f232af93
+  metadata.gz: 9eb36508044dd1d918bebf9a96fd82c0db4b1d8a815a8c37c477a39e6c6db57c3bb8c346be9135e37b6abe87f7fdefb57fcdbd3589bd4a85f3f04ee9f5cd94ff
+  data.tar.gz: 336e723cfbe0fa1a1c447ef05175e9537427d272712e6fd208acd3cd0b12dd8f0f6a1927f88316123ee0fc2fc4d9aa94d0e962ffcc80587a8124bebfda846058

data/app/models/batch.rb

@@ -19,7 +19,7 @@ class Batch < ActiveFedora::Base
   end
 
   def to_solr(solr_doc={}, opts={})
-    super(solr_doc, opts)
+    solr_doc = super(solr_doc, opts)
     solr_doc[Solrizer.solr_name('noid', Sufia::GenericFile.noid_indexer)] = noid
     return solr_doc
   end

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

@@ -0,0 +1,30 @@
+module Sufia
+  module PropertiesDatastreamBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      set_terminology do |t|
+        t.root(:path=>"fields" )
+        # This is where we put the user id of the object depositor -- impacts permissions/access controls
+        t.depositor :index_as=>[:stored_searchable]
+        # This is where we put the relative path of the file if submitted as a folder
+        t.relative_path
+        t.import_url path: 'importUrl', :index_as=>:symbol
+      end
+    end
+
+    module ClassMethods
+      def xml_template
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.fields
+        end
+        builder.doc
+      end
+    end
+
+    def prefix
+      ""
+    end
+
+  end
+end

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

@@ -45,7 +45,7 @@ module Sufia::User
 
   def trophy_files
     trophies.map do |t|
-      GenericFile.load_instance_from_solr(Sufia::Noid.namespaceize(t.generic_file_id))
+      ::GenericFile.load_instance_from_solr(Sufia::Noid.namespaceize(t.generic_file_id))
     end
   end
 

data/app/models/datastreams/batch_rdf_datastream.rb

@@ -1,9 +1,6 @@
 class BatchRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-  map_predicates do |map|
-    map.part(:to => "hasPart", :in => RDF::DC)
-    map.creator(:to => "creator", :in => RDF::DC)
-    map.title(:to => "title", :in => RDF::DC)
-    map.status(:to => "type", :in => RDF::DC)
-  end
+  property :part, predicate: RDF::DC.hasPart
+  property :creator, predicate: RDF::DC.creator
+  property :title, predicate: RDF::DC.title
+  property :status, predicate: RDF::DC.type
 end
-

data/app/models/datastreams/fits_datastream.rb

@@ -1,5 +1,8 @@
 class FitsDatastream < ActiveFedora::OmDatastream
   include OM::XML::Document
+  def prefix
+    ""
+  end
 
   set_terminology do |t|
     t.root(:path => "fits", 

data/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -1,56 +1,58 @@
 class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-  map_predicates do |map|
-    map.part_of(:to => "isPartOf", :in => RDF::DC)
-    map.resource_type(:to => "type", :in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.title(:in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.creator(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.contributor(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.description(:in => RDF::DC) do |index|
-      index.type :text
-      index.as :stored_searchable
-    end
-    map.tag(:to => "relation", :in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.rights(:in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.publisher(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.date_created(:to => "created", :in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.date_uploaded(:to => "dateSubmitted", :in => RDF::DC) do |index|
-      index.type :date
-      index.as :stored_sortable
-    end
-    map.date_modified(:to => "modified", :in => RDF::DC) do |index|
-      index.type :date
-      index.as :stored_sortable
-    end
-    map.subject(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.language(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.identifier(:in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.based_near(:in => RDF::FOAF) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.related_url(:to => "seeAlso", :in => RDF::RDFS)
+  property :part_of, predicate: RDF::DC.isPartOf
+  property :resource_type, predicate: RDF::DC.type do |index|
+    index.as :stored_searchable, :facetable
   end
+  property :title, predicate: RDF::DC.title do |index|
+    index.as :stored_searchable
+  end
+  property :creator, predicate: RDF::DC.creator do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :contributor, predicate: RDF::DC.contributor do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :description, predicate: RDF::DC.description do |index|
+    index.type :text
+    index.as :stored_searchable
+  end
+  property :tag, predicate: RDF::DC.relation do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :rights, predicate: RDF::DC.rights do |index|
+    index.as :stored_searchable
+  end
+  property :publisher, predicate: RDF::DC.publisher do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :date_created, predicate: RDF::DC.created do |index|
+    index.as :stored_searchable
+  end
+  property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
+    index.type :date
+    index.as :stored_sortable
+  end
+  property :date_modified, predicate: RDF::DC.modified do |index|
+    index.type :date
+    index.as :stored_sortable
+  end
+  property :subject, predicate: RDF::DC.subject do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :language, predicate: RDF::DC.language do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :identifier, predicate: RDF::DC.identifier do |index|
+    index.as :stored_searchable
+  end
+  property :based_near, predicate: RDF::FOAF.based_near do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :related_url, predicate: RDF::RDFS.seeAlso do |index|
+    index.as :stored_searchable
+  end
+
+  # TODO: Move this somewhere more appropriate
   begin
     LocalAuthority.register_vocabulary(self, "subject", "lc_subjects")
     LocalAuthority.register_vocabulary(self, "language", "lexvo_languages")

data/app/models/datastreams/properties_datastream.rb

@@ -1,18 +1,4 @@
 # properties datastream: catch-all for info that didn't have another home.  Particularly depositor.
 class PropertiesDatastream < ActiveFedora::OmDatastream
-  set_terminology do |t|
-    t.root(:path=>"fields" ) 
-    # This is where we put the user id of the object depositor -- impacts permissions/access controls
-    t.depositor :index_as=>[:stored_searchable]
-    # This is where we put the relative path of the file if submitted as a folder
-    t.relative_path
-    t.import_url path: 'importUrl', :index_as=>:symbol
-  end
-
-  def self.xml_template
-    builder = Nokogiri::XML::Builder.new do |xml|
-      xml.fields
-    end
-    builder.doc
-  end
+  include Sufia::PropertiesDatastreamBehavior
 end

data/app/models/featured_work.rb

@@ -0,0 +1,22 @@
+class FeaturedWork < ActiveRecord::Base
+  FEATURE_LIMIT = 5
+  validate :count_within_limit, on: :create
+  validates :order, inclusion: { in: Proc.new{ 0..FEATURE_LIMIT } }
+
+  default_scope { order(:order) }
+
+  def count_within_limit
+    unless FeaturedWork.can_create_another?
+      errors.add(:base, "Limited to #{FEATURE_LIMIT} featured works.")
+    end
+  end
+
+  attr_accessor :generic_file_solr_document
+
+  class << self
+    def can_create_another?
+      FeaturedWork.count < FEATURE_LIMIT
+    end
+  end
+end
+

data/app/models/sufia/pageview.rb

@@ -0,0 +1,9 @@
+module Sufia
+  class Pageview
+    extend Legato::Model
+
+    metrics :pageviews
+    dimensions :date
+    filter :for_path, &lambda { |path| contains(:pagePath, path) }
+  end
+end

data/app/services/sufia/usage_statistics.rb

@@ -0,0 +1,73 @@
+require 'google/api_client'
+require 'oauth2'
+require 'legato'
+
+module Sufia
+  module UsageStatistics
+    # Loads configuration options from config/analytics.yml. Expected structure:
+    # `analytics:`
+    # `  app_name: GOOGLE_OAUTH_APP_NAME`
+    # `  app_version: GOOGLE_OAUTH_APP_VERSION`
+    # `  privkey_path: GOOGLE_OAUTH_PRIVATE_KEY_PATH`
+    # `  privkey_secret: GOOGLE_OAUTH_PRIVATE_KEY_SECRET`
+    # `  client_email: GOOGLE_OAUTH_CLIENT_EMAIL`
+    # @return [Hash] A hash containing five keys: 'app_name', 'app_version', 'client_email', 'privkey_path', 'privkey_secret'
+    def self.config
+      @config ||= YAML.load(File.read(File.join(Rails.root, 'config', 'analytics.yml')))['analytics']
+    end
+
+    # Convert query results into json for plotting in JQuery Flot
+    # @param [Legato::Query] A Legato query object containing the results
+    # @return [Array] An array of arrays represented in JSON: `[[1388563200000,4],[1388649600000,8],...]`
+    def self.as_flot_json(ga_results)
+      # Convert Legato query to hash
+      results_list = ga_results.map(&:marshal_dump)
+      # Results should look like: [[DATE_INT, NUM_HITS], ...]
+      values = results_list.map do |result_hash|
+        result_hash[:date] = Date.parse(result_hash[:date]).to_time.to_i * 1000
+        result_hash[:pageviews] = result_hash[:pageviews].to_i
+        result_hash.values
+      end
+
+      values.to_json
+    end
+
+    # Calculate total pageviews based on query results
+    # @param [Legato::Query] A Legato query object containing the results
+    # @return [Fixnum] An integer representing how many pageviews were recorded
+    def self.total_pageviews(ga_results)
+      ga_results.map(&:marshal_dump).reduce(0) { |total, result| total + result[:pageviews].to_i }
+    end
+
+    # Generate an OAuth2 token for Google Analytics
+    # @return [OAuth2::AccessToken] An OAuth2 access token for GA
+    def self.token
+      scope = 'https://www.googleapis.com/auth/analytics.readonly'
+      client = Google::APIClient.new(application_name: self.config['app_name'],
+        application_version: self.config['app_version'])
+      key = Google::APIClient::PKCS12.load_key(self.config['privkey_path'],
+        self.config['privkey_secret'])
+      service_account = Google::APIClient::JWTAsserter.new(self.config['client_email'], scope,
+        key)
+      client.authorization = service_account.authorize
+      oauth_client = OAuth2::Client.new('', '', {
+          authorize_url: 'https://accounts.google.com/o/oauth2/auth',
+          token_url: 'https://accounts.google.com/o/oauth2/token'})
+      OAuth2::AccessToken.new(oauth_client, client.authorization.access_token)
+    end
+
+    # Return a user object linked to a Google Analytics account
+    # @return [Legato::User] A user account wit GA access
+    def self.user
+      Legato::User.new(self.token)
+    end
+
+    # Return a Google Analytics profile matching specified ID
+    # @ return [Legato::Management::Profile] A user profile associated with GA
+    def self.profile
+      self.user.profiles.detect do |profile|
+        profile.web_property_id == Sufia.config.google_analytics_id
+      end
+    end
+  end
+end

data/config/locales/sufia.en.yml

@@ -1,6 +1,5 @@
 en:
   sufia:
-    product_name:       "ScholarSphere"
-    institution_name:   "Penn State"
-    institution_name_full: "The Pennsylvania State University"                                                
-
+    product_name:       "Sufia"
+    institution_name:   "Institution Name"
+    institution_name_full: "The Institution Name"

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

@@ -15,6 +15,7 @@ This generator makes the following changes to your application:
  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
        """
 
   # Implement the required interface for Rails::Generators::Migration.
@@ -32,6 +33,10 @@ This generator makes the following changes to your application:
     @prev_migration_nr.to_s
   end
 
+  def banner
+    say_status("warning", "GENERATING SUFIA MODELS", :yellow)
+  end
+
   # Setup the database migrations
   def copy_migrations
     # Can't get this any more DRY, because we need this order.
@@ -46,7 +51,10 @@ This generator makes the following changes to your application:
       "add_groups_to_users.rb",
       "create_local_authorities.rb",
       "create_trophies.rb",
-      'add_linkedin_to_users.rb'
+      'add_linkedin_to_users.rb',
+      'create_tinymce_assets.rb',
+      'create_content_blocks.rb',
+      'create_featured_works.rb'
     ].each do |file|
       better_migration_template file
     end
@@ -66,19 +74,22 @@ This generator makes the following changes to your application:
   end
 
   def create_configuration_files
-    copy_file "config/sufia.rb", "config/initializers/sufia.rb"
-    copy_file "config/redis.yml", "config/redis.yml"
-    copy_file "config/redis_config.rb", "config/initializers/redis_config.rb"
-    copy_file "config/resque_admin.rb", "config/initializers/resque_admin.rb"
-    copy_file "config/resque_config.rb", "config/initializers/resque_config.rb"
+    inject_into_file 'config/initializers/mime_types.rb',
+                     "\nMime::Type.register 'application/x-endnote-refer', :endnote",
+                     { :after => /# Mime::Type.register_alias "text\/html", :iphone/, :verbose => false }
+    copy_file 'config/sufia.rb', 'config/initializers/sufia.rb'
+    copy_file 'config/redis.yml', 'config/redis.yml'
+    copy_file 'config/redis_config.rb', 'config/initializers/redis_config.rb'
+    copy_file 'config/resque_admin.rb', 'config/initializers/resque_admin.rb'
+    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_class file_path, "SolrDocument" do
-        "  # Adds Sufia behaviors to the SolrDocument.\n" +
+      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
@@ -90,6 +101,10 @@ This generator makes the following changes to your application:
     generate "mailboxer:install"
   end
 
+  def configure_usage_stats
+    generate 'sufia:models:usagestats'
+  end
+
   private
 
   def better_migration_template(file)

data/lib/generators/sufia/models/templates/config/analytics.yml

@@ -0,0 +1,9 @@
+#
+# To integrate your app with Google Analytics, uncomment the lines below and add your API key information.
+#
+# analytics:
+#   :app_name: GOOGLE_OAUTH_APP_NAME
+#   :app_version: GOOGLE_OAUTH_APP_VERSION
+#   :privkey_path: GOOGLE_OAUTH_PRIVATE_KEY_PATH
+#   :privkey_secret: GOOGLE_OAUTH_PRIVATE_KEY_SECRET
+#   :client_email: GOOGLE_OAUTH_CLIENT_EMAIL

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

@@ -0,0 +1,6 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone
+Mime::Type.register 'application/x-endnote-refer', :endnote

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

@@ -60,9 +60,11 @@ Sufia.config do |config|
 
   config.queue = Sufia::Resque::Queue
 
-  # Map hostnames onto Google Analytics tracking IDs
-  # config.google_analytics_id = 'UA-99999999-1'
+  # Enable displaying usage statistics in the UI
+  config.usage_statistics = true
 
+  # Specify a Google Analytics tracking ID to gather usage statistics
+  # config.google_analytics_id = 'UA-99999999-1'
 
   # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
   # config.temp_file_base = '/home/developer1'
@@ -76,6 +78,13 @@ Sufia.config do |config|
   # Specify the path to the file characterization tool:
   # config.fits_path = "fits.sh"
 
+  # If browse-everything has been configured, load the configs.  Otherwise, set to nil.
+  begin
+    config.browse_everything = BrowseEverything.config
+  rescue Errno::ENOENT
+    config.browse_everything = nil
+  end
+
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/lib/generators/sufia/models/templates/migrations/create_content_blocks.rb

@@ -0,0 +1,10 @@
+class CreateContentBlocks < ActiveRecord::Migration
+  def change
+    create_table :content_blocks do |t|
+      t.string :name
+      t.text :value
+      t.timestamps
+    end
+    add_index :content_blocks, :name, unique: true
+  end
+end

data/lib/generators/sufia/models/templates/migrations/create_featured_works.rb

@@ -0,0 +1,12 @@
+class CreateFeaturedWorks < ActiveRecord::Migration
+  def change
+    create_table :featured_works do |t|
+      t.integer :order, default: 5
+      t.string :generic_file_id
+
+      t.timestamps
+    end
+    add_index :featured_works, :generic_file_id
+    add_index :featured_works, :order
+  end
+end

data/lib/generators/sufia/models/templates/migrations/create_tinymce_assets.rb

@@ -0,0 +1,8 @@
+class CreateTinymceAssets < ActiveRecord::Migration
+  def change
+    create_table :tinymce_assets do |t|
+      t.string :file
+      t.timestamps
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+
+class Sufia::Models::UsagestatsGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc """
+This generator makes the following changes to your application:
+ 1. Generates usage stats config
+       """
+
+  def banner
+    say_status("warning", "GENERATING SUFIA USAGE STATS", :yellow)
+  end
+
+  def create_configuration_file
+    copy_file 'config/analytics.yml', 'config/analytics.yml'
+  end
+end

data/lib/sufia/ability.rb

@@ -0,0 +1,34 @@
+module Sufia
+  module Ability
+    extend ActiveSupport::Concern
+    included do
+      self.ability_logic += [:sufia_abilities]
+    end
+
+    def sufia_abilities
+      generic_file_abilities
+      featured_work_abilities
+      editor_abilities
+      stats_abilities
+    end
+
+    def featured_work_abilities
+      can [:create, :destroy, :update], FeaturedWork if user_groups.include? 'admin'
+    end
+
+    def generic_file_abilities
+      can :create, GenericFile if user_groups.include? 'registered'
+    end
+
+    def editor_abilities
+      if user_groups.include? 'admin'
+        can :create, TinymceAsset
+        can :update, ContentBlock
+      end
+    end
+
+    def stats_abilities
+      alias_action :stats, to: :read
+    end
+  end
+end

data/lib/sufia/models/engine.rb

@@ -21,7 +21,7 @@ module Sufia
       config.id_namespace = "sufia"
       config.fits_path = "fits.sh"
       config.enable_contact_form_delivery = false
-      config.dropbox_api_key = nil
+      config.browse_everything = nil
       config.enable_local_ingest = nil
       config.queue = Sufia::Resque::Queue
 
@@ -44,7 +44,6 @@ module Sufia
         require 'activerecord-import'
         require 'hydra/derivatives'
         require 'sufia/models/model_methods'
-        require 'sufia/models/noid'
         require 'sufia/models/file_content'
         require 'sufia/models/file_content/versions'
         require 'sufia/models/generic_file/audit'
@@ -55,8 +54,11 @@ module Sufia
         require 'sufia/models/generic_file/thumbnail'
         require 'sufia/models/generic_file'
         require 'sufia/models/user_local_directory_behavior'
-        require 'sufia/models/id_service'
         require 'sufia/models/solr_document_behavior'
+        require 'sufia/noid'
+        require 'sufia/id_service'
+        require 'sufia/usage_statistics'
+        require 'sufia/pageview'
       end
 
       initializer 'configure' do

data/lib/sufia/models/generic_file.rb

@@ -8,6 +8,7 @@ module Sufia
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
     autoload :Trophies, 'sufia/models/generic_file/trophies'
+    autoload :Featured, 'sufia/models/generic_file/featured'
     autoload :Metadata, 'sufia/models/generic_file/metadata'
     autoload :Versions, 'sufia/models/generic_file/versions'
     autoload :VirusCheck, 'sufia/models/generic_file/virus_check'
@@ -23,6 +24,7 @@ module Sufia
     include Sufia::GenericFile::WebForm
     include Sufia::GenericFile::Derivatives
     include Sufia::GenericFile::Trophies
+    include Sufia::GenericFile::Featured
     include Sufia::GenericFile::Metadata
     include Sufia::GenericFile::Versions
     include Sufia::GenericFile::VirusCheck
@@ -76,7 +78,7 @@ module Sufia
     # to each file when it is done uploading.  The Batch object is not created
     # until all objects are done uploading and the user is redirected to
     # BatchController#edit.  Therefore, we must handle the case where
-    # self.batch_id is set but self.batch returns nil. 
+    # self.batch_id is set but self.batch returns nil.
     # This can get a major overhaul with ActiveFedora 7
     def related_files
       relateds = begin
@@ -96,7 +98,7 @@ module Sufia
     end
 
     def to_solr(solr_doc={}, opts={})
-      super(solr_doc, opts)
+      solr_doc = super(solr_doc, opts)
       solr_doc[Solrizer.solr_name('label')] = self.label
       solr_doc[Solrizer.solr_name('noid', Sufia::GenericFile.noid_indexer)] = noid
       solr_doc[Solrizer.solr_name('file_format')] = file_format

data/lib/sufia/models/generic_file/export.rb

@@ -22,7 +22,7 @@ module Sufia
           '%[' => [:date_modified],
           '%9' => [:resource_type],
           '%~' => Application.config.application_name,
-          '%W' => 'Penn State University'
+          '%W' => t('sufia.institution_name')
         }
         text = []
         text << "%0 GenericFile"
@@ -32,7 +32,7 @@ module Sufia
           else
             values = self.send(mapping[0]) if self.respond_to? mapping[0]
             values = mapping[1].call(values) if mapping.length == 2
-            values = [values] unless values.is_a? Array
+            values = Array(values)
           end
           next if values.empty? or values.first.nil?
           spaced_values = values.join("; ")
@@ -64,7 +64,7 @@ module Sufia
           values = self.send(element)
           next if values.empty? or values.first.nil?
           values.each do |value|
-            export_text << "rft.#{kev}=#{CGI::escape(value)}"
+            export_text << "rft.#{kev}=#{CGI::escape(value.to_s)}"
           end
         end
         export_text.join('&') unless export_text.blank?

data/lib/sufia/models/generic_file/featured.rb

@@ -0,0 +1,14 @@
+module Sufia
+  module GenericFile
+    module Featured
+      extend ActiveSupport::Concern
+
+
+      def featured?
+        FeaturedWork.where(generic_file_id: noid).exists?
+      end
+
+    end
+  end
+end
+

data/lib/sufia/models/solr_document_behavior.rb

@@ -11,6 +11,10 @@ module Sufia
       get(Solrizer.solr_name('has_model', :symbol)).split(':').last.downcase
     end
 
+    def to_param
+      noid
+    end
+
     ##
     # Offer the source (ActiveFedora-based) model to Rails for some of the
     # Rails methods (e.g. link_to).
@@ -65,20 +69,24 @@ module Sufia
       Array(self[Solrizer.solr_name("desc_metadata__tag")])
     end
 
+    def resource_type
+      Array(self[Solrizer.solr_name("desc_metadata__resource_type")])
+    end
+
     def mime_type
       Array(self[Solrizer.solr_name("mime_type")]).first
     end
 
     def read_groups
-      Array(self[Ability.read_group_field])
+      Array(self[::Ability.read_group_field])
     end
 
     def edit_groups
-      Array(self[Ability.edit_group_field])
+      Array(self[::Ability.edit_group_field])
     end
 
     def edit_people
-      Array(self[Ability.edit_person_field])
+      Array(self[::Ability.edit_user_field])
     end
 
     def public?
@@ -89,7 +97,6 @@ module Sufia
       read_groups.include?('registered')
     end
 
-
     def pdf?
       ['application/pdf'].include? self.mime_type
     end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.7.2"
+    VERSION = "4.0.0.beta1"
   end
 end

data/sufia-models.gemspec

@@ -26,19 +26,20 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency 'rails', '> 4.0.0', '< 5.0'
+  spec.add_dependency 'rails', '~> 4.0.0'
   spec.add_dependency 'activeresource', "~>4.0.0" # No longer a dependency of rails 4.0
 
-  spec.add_dependency "blacklight", "~> 4.7.0"
-  spec.add_dependency "hydra-head", "~> 6.5.0"
-  spec.add_dependency "rubydora", "~> 1.7.0"
+  spec.add_dependency "hydra-head", "~> 7.0.1"
   spec.add_dependency 'nest', '~> 1.1.1'
   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.11.0'
+  spec.add_dependency 'mailboxer', '~> 0.12.0.rc1'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9.0'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
+  spec.add_dependency 'oauth2', '~> 0.9.3'
+  spec.add_dependency 'google-api-client', '~> 0.7.1'
+  spec.add_dependency 'legato', '~> 0.3.0'
   spec.add_dependency 'activerecord-import'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,22 +42,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -72,48 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: blacklight
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.5.0
-- !ruby/object:Gem::Dependency
-  name: rubydora
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +198,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: legato
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +268,7 @@ files:
 - Rakefile
 - app/models/batch.rb
 - app/models/checksum_audit_log.rb
+- app/models/concerns/sufia/properties_datastream_behavior.rb
 - app/models/concerns/sufia/user.rb
 - app/models/datastreams/batch_rdf_datastream.rb
 - app/models/datastreams/file_content_datastream.rb
@@ -268,6 +277,7 @@ files:
 - app/models/datastreams/paranoid_rights_datastream.rb
 - app/models/datastreams/properties_datastream.rb
 - app/models/domain_term.rb
+- app/models/featured_work.rb
 - app/models/follow.rb
 - app/models/generic_file.rb
 - app/models/geo_names_resource.rb
@@ -278,12 +288,18 @@ files:
 - app/models/subject_local_authority_entry.rb
 - app/models/sufia/avatar_uploader.rb
 - app/models/sufia/avatar_validator.rb
+- app/models/sufia/pageview.rb
 - app/models/trophy.rb
 - app/models/version_committer.rb
+- app/services/sufia/id_service.rb
+- app/services/sufia/noid.rb
+- app/services/sufia/usage_statistics.rb
 - config/locales/sufia.en.yml
 - lib/generators/sufia/models/install_generator.rb
+- lib/generators/sufia/models/templates/config/analytics.yml
 - lib/generators/sufia/models/templates/config/clamav.rb
 - lib/generators/sufia/models/templates/config/mailboxer.rb
+- lib/generators/sufia/models/templates/config/mime_types.rb
 - lib/generators/sufia/models/templates/config/redis.yml
 - lib/generators/sufia/models/templates/config/redis_config.rb
 - lib/generators/sufia/models/templates/config/resque_admin.rb
@@ -297,10 +313,15 @@ files:
 - lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_social_to_users.rb
 - lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb
+- lib/generators/sufia/models/templates/migrations/create_content_blocks.rb
+- lib/generators/sufia/models/templates/migrations/create_featured_works.rb
 - lib/generators/sufia/models/templates/migrations/create_local_authorities.rb
 - lib/generators/sufia/models/templates/migrations/create_single_use_links.rb
+- lib/generators/sufia/models/templates/migrations/create_tinymce_assets.rb
 - lib/generators/sufia/models/templates/migrations/create_trophies.rb
 - lib/generators/sufia/models/templates/migrations/create_version_committers.rb
+- lib/generators/sufia/models/usagestats_generator.rb
+- lib/sufia/ability.rb
 - lib/sufia/models.rb
 - lib/sufia/models/active_fedora/redis.rb
 - lib/sufia/models/active_record/redis.rb
@@ -314,6 +335,7 @@ files:
 - lib/sufia/models/generic_file/characterization.rb
 - lib/sufia/models/generic_file/derivatives.rb
 - lib/sufia/models/generic_file/export.rb
+- lib/sufia/models/generic_file/featured.rb
 - lib/sufia/models/generic_file/metadata.rb
 - lib/sufia/models/generic_file/mime_types.rb
 - lib/sufia/models/generic_file/permissions.rb
@@ -323,7 +345,6 @@ files:
 - lib/sufia/models/generic_file/versions.rb
 - lib/sufia/models/generic_file/virus_check.rb
 - lib/sufia/models/generic_file/web_form.rb
-- lib/sufia/models/id_service.rb
 - lib/sufia/models/jobs/active_fedora_pid_based_job.rb
 - lib/sufia/models/jobs/audit_job.rb
 - lib/sufia/models/jobs/batch_update_job.rb
@@ -333,7 +354,6 @@ files:
 - lib/sufia/models/jobs/transcode_audio_job.rb
 - lib/sufia/models/jobs/transcode_video_job.rb
 - lib/sufia/models/model_methods.rb
-- lib/sufia/models/noid.rb
 - lib/sufia/models/resque.rb
 - lib/sufia/models/solr_document_behavior.rb
 - lib/sufia/models/user_local_directory_behavior.rb
@@ -357,9 +377,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1