ddr-models 1.8.1 → 1.9.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,19 +96,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: devise-remote-user
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: omniauth-shibboleth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: grouper-rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -239,16 +253,16 @@ dependencies:
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +287,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/users/omniauth_callbacks_controller.rb
+- app/controllers/users/sessions_controller.rb
+- app/controllers/users/sessions_controller.rb~
 - app/models/attachment.rb
 - app/models/collection.rb
 - app/models/component.rb
@@ -290,9 +307,7 @@ files:
 - db/migrate/20141107124012_add_columns_to_user.rb
 - db/migrate/20141216040225_drop_minted_ids.rb
 - db/migrate/20141218020612_add_exception_to_events.rb
-- db/migrate/20150109192134_drop_workflow_state.rb~
 - db/migrate/20150110023410_drop_workflow_states.rb
-- db/migrate/20150110023410_drop_workflow_states.rb~
 - lib/ddr-models.rb
 - lib/ddr/actions.rb
 - lib/ddr/actions/fixity_check.rb
@@ -305,7 +320,6 @@ files:
 - lib/ddr/auth/user.rb
 - lib/ddr/datastreams.rb
 - lib/ddr/datastreams/admin_metadata_datastream.rb
-- lib/ddr/datastreams/admin_metadata_datastream.rb~
 - lib/ddr/datastreams/content_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
 - lib/ddr/datastreams/descriptive_metadata_datastream.rb
@@ -323,17 +337,13 @@ files:
 - lib/ddr/events/update_event.rb
 - lib/ddr/events/validation_event.rb
 - lib/ddr/events/virus_check_event.rb
-- lib/ddr/index.rb~
 - lib/ddr/index_fields.rb
 - lib/ddr/managers.rb
-- lib/ddr/managers/index_manager.rb~
+- lib/ddr/managers/#index_manager.rb#
 - lib/ddr/managers/manager.rb
-- lib/ddr/managers/manager.rb~
 - lib/ddr/managers/permanent_id_manager.rb
 - lib/ddr/managers/role_manager.rb
-- lib/ddr/managers/role_manager.rb~
 - lib/ddr/managers/workflow_manager.rb
-- lib/ddr/managers/workflow_manager.rb~
 - lib/ddr/metadata.rb
 - lib/ddr/metadata/#permanent_id_record.rb#
 - lib/ddr/metadata/duke_terms.rb
@@ -344,8 +354,7 @@ files:
 - lib/ddr/models.rb
 - lib/ddr/models/#has_ezid_identifier.rb#
 - lib/ddr/models/#has_permanent_identifier.rb#
-- lib/ddr/models/#index.rb#
-- lib/ddr/models/#indexing.rb#
+- lib/ddr/models/#index_fields.rb#
 - lib/ddr/models/access_controllable.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/describable.rb
@@ -356,7 +365,6 @@ files:
 - lib/ddr/models/fixity_checkable.rb
 - lib/ddr/models/governable.rb
 - lib/ddr/models/has_admin_metadata.rb
-- lib/ddr/models/has_admin_metadata.rb~
 - lib/ddr/models/has_attachments.rb
 - lib/ddr/models/has_children.rb
 - lib/ddr/models/has_content.rb
@@ -370,10 +378,8 @@ files:
 - lib/ddr/notifications.rb
 - lib/ddr/utils.rb
 - lib/ddr/vocab.rb
-- lib/ddr/vocab.rb~
 - lib/ddr/vocab/asset.rb
 - lib/ddr/vocab/roles.rb
-- lib/ddr/vocab/workflow.rb~
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -409,11 +415,18 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
+- spec/dummy/log/production.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
+- spec/dummy/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
+- spec/dummy/tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
+- spec/dummy/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
+- spec/dummy/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
+- spec/dummy/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - spec/factories/attachment_factories.rb
 - spec/factories/collection_factories.rb
 - spec/factories/component_factories.rb
@@ -440,7 +453,6 @@ files:
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
-- spec/models/has_admin_metadata_spec.rb~
 - spec/models/item_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb
@@ -517,6 +529,7 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
+- spec/dummy/log/production.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -524,6 +537,12 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/dummy/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
+- spec/dummy/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
+- spec/dummy/tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
+- spec/dummy/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
+- spec/dummy/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
+- spec/dummy/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - spec/factories/attachment_factories.rb
 - spec/factories/collection_factories.rb
 - spec/factories/component_factories.rb
@@ -550,7 +569,6 @@ test_files:
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
-- spec/models/has_admin_metadata_spec.rb~
 - spec/models/item_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb

data/db/migrate/20150109192134_drop_workflow_state.rb~

@@ -1,11 +0,0 @@
-class DropWorkflowState < ActiveRecord::Migration
-  def up
-    if table_exists?("workflow_states")
-      drop_table "workflow_states"
-    end
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

data/db/migrate/20150110023410_drop_workflow_states.rb~

@@ -1,4 +0,0 @@
-class DropWorkflowStates < ActiveRecord::Migration
-  def change
-  end
-end

data/lib/ddr/datastreams/admin_metadata_datastream.rb~

@@ -1,13 +0,0 @@
-module Ddr
-  module Datastreams
-    class AdminMetadataDatastream < ActiveFedora::NtriplesRDFDatastream
-
-      property :permanent_id, 
-      predicate: Ddr::Vocab::Preservation.permanentId
-
-      property :permanent_url, 
-      predicate: Ddr::Vocab::Preservation.permanentUrl
-
-    end
-  end
-end

data/lib/ddr/index.rb~

@@ -1,8 +0,0 @@
-module Ddr
-  module Index
-    extend ActiveSupport::Autoload
-
-    autoload :Fields
-
-  end
-end

data/lib/ddr/managers/index_manager.rb~

@@ -1,7 +0,0 @@
-module Ddr
-  module Managers
-    class IndexManager < Manager
-
-    end
-  end
-end

data/lib/ddr/managers/manager.rb~

@@ -1,14 +0,0 @@
-module Ddr
-  module Managers
-    # @abstract
-    class Manager
-
-      attr_reader :object
-
-      def initialize
-        @object = object
-      end
-
-    end
-  end
-end

data/lib/ddr/managers/role_manager.rb~

@@ -1,21 +0,0 @@
-module Ddr
-  module Managers
-    class RoleManager
-
-      attr_reader :object
-
-      def initialize(object)
-        @object = object
-      end
-
-      def principal_has_role?(principal, role)
-        ( principals(role) & Array(principal) ).any?
-      end
-
-      def principals(role)
-        object.adminMetadata.send(role)
-      end
-
-    end
-  end
-end

data/lib/ddr/managers/workflow_manager.rb~

@@ -1,33 +0,0 @@
-module Ddr
-  module Managers
-    class WorkflowManager < Manager
-
-      PUBLISHED = "published"
-      UNPUBLISHED = nil
-
-      def published?
-        object.workflow_state == PUBLISHED
-      end
-      
-      def publish
-        object.workflow_state = PUBLISHED
-      end
-
-      def publish!
-        publish
-        object.save
-      end
-      
-      def unpublish
-        object.workflow_state = UNPUBLISHED
-      end
-
-      def unpublish!
-        unpublish
-        object.save
-      end
-
-    end
-  end
-end
-      

data/lib/ddr/models/#index.rb#

@@ -1,25 +0,0 @@
-module Ddr
-  module Models
-    class Index
-
-      Field = Struct.new(:name, :index_as, :method)
-
-      def fields
-        @fields ||= {}
-      end
-
-      def field(key, *index_as)
-        raise "Field :#{key} already indexed." if fields.include?(key)
-        fields[key] = Field.new.tap do |f|
-          f.name = ActiveFedora::SolrService.solr_name(key, *index_as)
-          f.index_as = index_as
-          yield f if block_given?
-        end
-      end
-
-      def [](key)
-        fields[key]
-      end
-    end
-  end
-end

data/lib/ddr/models/#indexing.rb#

@@ -1,108 +0,0 @@
-module Ddr
-  module Models
-    module Indexing
-      extend ActiveSupport::Autoloading
-
-      included do
-        def self.index(&block)
-          if block_given?
-            index.instance_eval(&block)
-          else
-            @@index ||= Index.new
-          end
-        end
-      end
-
-        class Index
-          Field = Struct.new(:name, :index_as, :method)
-
-          class << self
-            def fields
-              @fields ||= {}
-            end
-
-            def field(key, *index_as)
-              raise "Field :#{key} already indexed." if fields.include?(key)
-              fields[key] = Field.new.tap do |f|
-                f.name = ActiveFedora::SolrService.solr_name(key, *index_as)
-                f.index_as = index_as
-                yield f if block_given?
-              end
-            end
-
-            def [](key)
-              fields[key]
-            end
-          end
-        end
-
-        def self.index(&block)
-          Index.instance_eval(&block)
-        end
-
-
-      def to_solr(solr_doc=Hash.new, opts={})
-        solr_doc = super(solr_doc, opts)
-        index.fields.values.each_with_object(solr_doc) do |field, doc|
-          if method = field.method
-            doc[field.name] = method.is_a?(Symbol) ? send(method) : instance_eval(method)
-          end
-        end
-      end
-
-      def index
-        Index
-      end
-
-      # def index_fields
-      #   fields = {
-      #     TITLE => title_display,
-      #     INTERNAL_URI => internal_uri,
-      #     IDENTIFIER => identifier_sort,
-      #     WORKFLOW_STATE => workflow_state
-      #   }
-      #   if permanent_id.present?
-      #     fields[PERMANENT_ID] = permanent_id
-      #   end
-      #   if permanent_url.present?
-      #     fields[PERMANENT_URL] = permanent_url
-      #   end
-      #   if respond_to? :fixity_checks
-      #     last_fixity_check = fixity_checks.last
-      #     fields.merge!(last_fixity_check.to_solr) if last_fixity_check
-      #   end
-      #   if respond_to? :virus_checks
-      #     last_virus_check = virus_checks.last
-      #     fields.merge!(last_virus_check.to_solr) if last_virus_check
-      #   end
-      #   if respond_to?(:original_filename) && original_filename.present?
-      #     fields[ORIGINAL_FILENAME] = original_filename
-      #   end
-      #   if has_content?
-      #     fields[CONTENT_CONTROL_GROUP] = content.controlGroup
-      #     fields[CONTENT_SIZE] = content_size
-      #     fields[CONTENT_SIZE_HUMAN] = content_human_size
-      #     fields[MEDIA_TYPE] = content_type
-      #     fields[MEDIA_MAJOR_TYPE] = content_major_type
-      #     fields[MEDIA_SUB_TYPE] = content_sub_type
-      #   end
-      #   if is_a? Component
-      #     fields[COLLECTION_URI] = collection_uri
-      #   end
-      #   fields
-      # end
-
-      def title_display
-        return title.first if title.present?
-        return identifier.first if identifier.present?
-        return original_filename if respond_to?(:original_filename) && original_filename.present?
-        "[#{pid}]"
-      end
-
-      def identifier_sort
-        identifier.first
-      end
-
-    end
-  end
-end