cul_scv_hydra 0.10.0 → 0.11.0

data/{lib/cul_scv_hydra/active_fedora/model → app/models/cul/scv/hydra/datastreams}/struct_metadata.rb

@@ -1,9 +1,12 @@
-module Cul::Scv::Hydra::ActiveFedora::Model
+module Cul
+module Scv
+module Hydra
+module Datastreams
 class StructMetadata < ::ActiveFedora::Datastream
-  include NokogiriDatastreams
+  include ::ActiveFedora::Datastreams::NokogiriDatastreams
 
-	def self.default_attributes
-		super.merge(:controlGroup => 'M', :mimeType => 'text/xml')
+  def self.default_attributes
+    super.merge(:controlGroup => 'M', :mimeType => 'text/xml')
   end
 
   def self.xml_template
@@ -116,3 +119,6 @@ class StructMetadata < ::ActiveFedora::Datastream
 
 end
 end
+end
+end
+end

data/app/models/dcdocument.rb

@@ -1,10 +1,11 @@
 require "active-fedora"
+require "active_fedora_finders"
 class DcDocument < ActiveFedora::Base
   include ::ActiveFedora::Associations
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
+  include Cul::Scv::Hydra::Models::Common
   alias :file_objects :resources
   
   has_many :parts, :property=>:cul_member_of, :class_name=>'ActiveFedora::Base'

data/app/models/generic_aggregator.rb

@@ -1,15 +1,16 @@
 require "active-fedora"
+require "active_fedora_finders"
 class GenericAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   alias :file_objects :resources
 
   def route_as
     "multipartitem"
   end
-end
+end

data/app/models/generic_object.rb

@@ -1,11 +1,12 @@
 require "active-fedora"
+require "active_fedora_finders"
 class GenericObject < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   alias :file_objects :resources
 

data/app/models/generic_resource.rb

@@ -3,12 +3,13 @@ require "mime/types"
 require "uri"
 require "open-uri"
 require "tempfile"
+require "active_fedora_finders"
 class GenericResource < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
+  include Cul::Scv::Hydra::Models::Common
   include ::ActiveFedora::RelsInt
   alias :file_objects :resources
   

data/app/models/jp2_image_aggregator.rb

@@ -1,11 +1,12 @@
 require "active-fedora"
+require "active_fedora_finders"
 class JP2ImageAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   has_datastream :name => "SOURCE", :type=>::ActiveFedora::Datastream, :mimeType=>"image/jp2", :controlGroup=>'E'
 

data/app/models/mets_structured_aggregator.rb

@@ -1,11 +1,12 @@
 require "active-fedora"
+require "active_fedora_finders"
 class METSStructuredAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   alias :file_objects :resources
 

data/app/models/resource.rb

@@ -1,4 +1,5 @@
 require "active-fedora"
+require "active_fedora_finders"
 require "cul_image_props"
 require "mime/types"
 require "uri"
@@ -7,8 +8,8 @@ class Resource < ::ActiveFedora::Base
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Resource
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Resource
 
   alias :file_objects :resources
 

data/app/models/static_audio_aggregator.rb

@@ -1,11 +1,12 @@
 require "active-fedora"
+require "active_fedora_finders"
 class StaticAudioAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   alias :file_objects :resources
 

data/app/models/static_image_aggregator.rb

@@ -1,11 +1,12 @@
 require "active-fedora"
+require "active_fedora_finders"
 class StaticImageAggregator < ::ActiveFedora::Base
   extend ActiveModel::Callbacks
   include ::ActiveFedora::Finders
   include ::ActiveFedora::DatastreamCollections
   include ::Hydra::ModelMethods
-  include Cul::Scv::Hydra::ActiveFedora::Model::Common
-  include Cul::Scv::Hydra::ActiveFedora::Model::Aggregator
+  include Cul::Scv::Hydra::Models::Common
+  include Cul::Scv::Hydra::Models::Aggregator
 
   alias :file_objects :resources
   

data/bin/rails

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/cul_scv_hydra/engine', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/lib/cul_scv_hydra.rb

@@ -15,7 +15,6 @@ end
 require 'hydra/head'
 require 'active_fedora_relsint'
 require "cul_scv_hydra/access_controls_enforcement"
-require "cul_scv_hydra/active_fedora"
 require "cul_scv_hydra/controllers"
 require "cul_scv_hydra/om"
 require "cul_scv_hydra/solrizer"

data/lib/cul_scv_hydra/engine.rb

@@ -5,5 +5,20 @@ require "rails"
 
 module Cul::Scv::Hydra
   class Engine < ::Rails::Engine
+  	isolate_namespace Cul::Scv::Hydra
+
+    config.generators do |g|                                                               
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
+
+    # Make the rake tasks visible.
+    rake_tasks do
+      Dir.chdir(File.expand_path(File.join(File.dirname(__FILE__), '..'))) do
+        Dir.glob(File.join('tasks', '*.rake')).each do |railtie|
+          load railtie
+        end
+      end
+    end
   end
 end

data/lib/cul_scv_hydra/om.rb

@@ -6,6 +6,4 @@ module Cul
     end
   end
 end
-require "cul_scv_hydra/om/dc_metadata"
-require "cul_scv_hydra/om/scv_mods_document"
 require "cul_scv_hydra/om/standard_mods"

data/lib/cul_scv_hydra/om/standard_mods.rb

@@ -77,6 +77,14 @@ module Om
       builder.doc.root["xsi:schemaLocation"] = 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd'
       return builder.doc
     end
+
+    def prefix
+      if ::ActiveFedora::VERSION >= '8'
+        Rails.logger.warn("the prefix method of #{self.class.name} was overriden to maintain backwards compatibility")
+      end
+      ''
+    end
+
     def method_missing method, *args
       query = false
       _mname = method.id2name

data/lib/cul_scv_hydra/version.rb

@@ -1,7 +1,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.10.0'
+        VERSION = '0.11.0'
         def self.version
           VERSION
         end

data/lib/tasks/cmodel.rake

@@ -23,8 +23,17 @@ def each_cmodel
 end
 
 def config_subs
-  cfile = File.open(File.join(APP_ROOT,'config','subs.yml'))
-  YAML::load(cfile)[Rails.env]
+  @subs ||= begin
+    cfile = File.join(APP_ROOT,'config','subs.yml')
+    subs = {}
+    if File.exists? cfile
+      open(cfile) {|blob| subs = YAML::load(blob)[Rails.env] }
+    else
+      Rails.logger.warn("No subs.yml found; CModels will be loaded without inline substitutions")
+    end
+    subs
+  end
+  @subs
 end
 
 def do_subs(orig)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,39 +26,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: active-fedora
+  name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 6.7.0
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: hydra-head
+  name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 6.4.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 6.4.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: active_fedora_finders
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: active_fedora_relsint
   requirement: !ruby/object:Gem::Requirement
@@ -124,14 +124,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: om
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -139,22 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solrizer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,22 +171,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.7
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -235,21 +203,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection
-  Viewer
+description: Hydra implementations for CUL Staff Collection Viewer
 email: armintor@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/rails
 - lib/cul_scv_hydra/access_controls_enforcement.rb
-- lib/cul_scv_hydra/active_fedora/model/aggregator.rb
-- lib/cul_scv_hydra/active_fedora/model/common.rb
-- lib/cul_scv_hydra/active_fedora/model/nokogiri_datastreams.rb
-- lib/cul_scv_hydra/active_fedora/model/resource.rb
-- lib/cul_scv_hydra/active_fedora/model/struct_metadata.rb
-- lib/cul_scv_hydra/active_fedora/model.rb
-- lib/cul_scv_hydra/active_fedora.rb
 - lib/cul_scv_hydra/controllers/aggregates.rb
 - lib/cul_scv_hydra/controllers/aggregator_controller_helper.rb
 - lib/cul_scv_hydra/controllers/catalog.rb
@@ -269,8 +230,6 @@ files:
 - lib/cul_scv_hydra/controllers/terms.rb
 - lib/cul_scv_hydra/controllers.rb
 - lib/cul_scv_hydra/engine.rb
-- lib/cul_scv_hydra/om/dc_metadata.rb
-- lib/cul_scv_hydra/om/scv_mods_document.rb
 - lib/cul_scv_hydra/om/standard_mods.rb
 - lib/cul_scv_hydra/om.rb
 - lib/cul_scv_hydra/solrizer/extractor.rb
@@ -297,7 +256,15 @@ files:
 - app/assets/images/cul_scv_hydra/crystal/multimedia2.png
 - app/assets/images/cul_scv_hydra/crystal/video.png
 - app/models/bag_aggregator.rb
+- app/models/concerns/cul/scv/hydra/models/aggregator.rb
+- app/models/concerns/cul/scv/hydra/models/common.rb
+- app/models/concerns/cul/scv/hydra/models/resource.rb
+- app/models/concerns/cul/scv/hydra/models.rb
+- app/models/concerns/cul.rb
 - app/models/content_aggregator.rb
+- app/models/cul/scv/hydra/datastreams/dc_metadata.rb
+- app/models/cul/scv/hydra/datastreams/mods_document.rb
+- app/models/cul/scv/hydra/datastreams/struct_metadata.rb
 - app/models/dcdocument.rb
 - app/models/generic_aggregator.rb
 - app/models/generic_object.rb
@@ -318,6 +285,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- fixtures
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements: