ddr-models 2.0.0.pre.2 → 2.0.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daeaeb1ce7b02969ac1ba49962844211e7269aa5
-  data.tar.gz: 64a81704bbaf023d596eba10c943285fef47dff7
+  metadata.gz: 8f7801ca7ccbd206fbcbf14c003e94e96ec27bd8
+  data.tar.gz: aa257065eb2e5633013edde3fbf9dc129c15a797
 SHA512:
-  metadata.gz: 4bf9a10f346187f78ac98e17b6ec36fc739b7d67983fdc0c62b07edc0fb15d96aee79fb7b1f768daaed39e55fe1caad3615c13291927755e012510f995cd06b6
-  data.tar.gz: 9c3b5476c2fe4450edb2c5026af2ffc09703cbd19ba9ec487cf95d025e7e526c5b16911e80465ee2569e3ab29f4daa531a47e164ecf5e8564033e520976a83d7
+  metadata.gz: bf466708eec60b41361dee92ece57b90628f6942e6ac6719f4b804ad90e79fa99861de1d3554b217858bc7018f527ff5f0958acca26d4e371871d313913ca4f4
+  data.tar.gz: 7c411fd9230412b7d90498125fdadb2e0768192261628dc09e7400927776043af9943b2c4f267cdc9697f714e0d27ce63ab918b4ec62e3f4d0d61c9e077bbeae

data/db/migrate/20150710211530_change_events_exception_to_text.rb

@@ -0,0 +1,9 @@
+class ChangeEventsExceptionToText < ActiveRecord::Migration
+  def up
+    change_column :events, :exception, :text
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20150713171838_add_limit_to_events_exception.rb

@@ -0,0 +1,9 @@
+class AddLimitToEventsException < ActiveRecord::Migration
+  def up
+    change_column :events, :exception, :text, limit: 65535
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/ddr/auth/user.rb

@@ -1,62 +1,52 @@
-module Ddr
-  module Auth
-    module User
-      extend ActiveSupport::Concern
+module Ddr::Auth
+  module User
+    extend ActiveSupport::Concern
 
-      included do
-        include Blacklight::User
+    included do
+      delegate :can, :can?, :cannot, :cannot?, to: :ability
 
-        has_many :events, inverse_of: :user, class_name: "Ddr::Events::Event"
+      validates_uniqueness_of :username, case_sensitive: false
+      validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/
 
-        delegate :can, :can?, :cannot, :cannot?, to: :ability
+      devise :database_authenticatable, :omniauthable, omniauth_providers: [:shibboleth]
 
-        validates_uniqueness_of :username, :case_sensitive => false
-        validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/
-
-        devise :database_authenticatable, :omniauthable, omniauth_providers: [:shibboleth]
+      class_attribute :user_key_attribute
+      self.user_key_attribute = Devise.authentication_keys.first
+    end
 
-        class_attribute :user_key_attribute
-        self.user_key_attribute = Devise.authentication_keys.first
+    module ClassMethods
+      def find_by_user_key(key)
+        send("find_by_#{user_key_attribute}", key)
       end
 
-      module ClassMethods
-        def find_by_user_key(key)
-          send("find_by_#{user_key_attribute}", key)
-        end
-
-        def from_omniauth(auth)
-          user = find_by_user_key(auth.uid) ||
-            new(user_key_attribute => auth.uid, :password => Devise.friendly_token)
-          user.update!(email: auth.info.email,
-                       display_name: auth.info.name,
-                       first_name: auth.info.first_name,
-                       last_name: auth.info.last_name,
-                       nickname: auth.info.nickname)
-          user
-        end
+      def from_omniauth(auth)
+        user = find_by_user_key(auth.uid) ||
+               new(user_key_attribute => auth.uid, :password => Devise.friendly_token)
+        user.update!(email: auth.info.email,
+                     display_name: auth.info.name,
+                     first_name: auth.info.first_name,
+                     last_name: auth.info.last_name,
+                     nickname: auth.info.nickname)
+        user
       end
+    end
 
-      # Copied from Hydra::User
-      def user_key
-        send(user_key_attribute)
-      end
+    # Copied from Hydra::User
+    def user_key
+      send(user_key_attribute)
+    end
 
-      def to_s
-        user_key
-      end
+    def to_s
+      user_key
+    end
 
-      def agent
-        user_key
-      end
+    def agent
+      user_key
+    end
 
-      def ability
-        # warn "[DEPRECATION] `Ddr::Auth::User#ability` is deprecated." \
-        #      " In a web context, please use the `current_ability` helper." \
-        #      " Otherwise, please use `Ddr::Auth::AbilityFactory.call(user)`" \
-        #      " to create an ability instance for the user."
-        @ability ||= AbilityFactory.call(self)
-      end
-      
+    def ability
+      @ability ||= AbilityFactory.call(self)
     end
+
   end
 end

data/lib/ddr/events/event.rb

@@ -2,8 +2,6 @@ module Ddr
   module Events
     class Event < ActiveRecord::Base
 
-      belongs_to :user, inverse_of: :events
-
       # ActiveSupport::Notifications::Instrumenter sets payload[:exception]
       #   to an array of [<exception class name>, <exception message>]
       #   and we want to store this data in a string field.
@@ -95,17 +93,10 @@ module Ddr
       end
 
       # Object getter and setter
-
       def object
         @object ||= ActiveFedora::Base.find(pid) if pid
       end
 
-      # Sets user_key to user.user_key
-      # For compatibility with ddr-models <= 1.9.0
-      def user=(user)
-        self.user_key = user.user_key
-      end
-
       def object=(obj)
         raise ArgumentError, "Can't set to new object" if obj.new_record?
         self.pid = obj.pid
@@ -125,6 +116,10 @@ module Ddr
         event_date_time.utc.strftime DATE_TIME_FORMAT
       end
 
+      def user=(user)
+        self.user_key = user.user_key
+      end
+
       protected
 
       def set_defaults

data/lib/ddr/index_fields.rb

@@ -14,13 +14,14 @@ module Ddr
     CONTENT_CONTROL_GROUP       = solr_name :content_control_group, :searchable, type: :string
     CONTENT_SIZE                = solr_name :content_size, :stored_sortable, type: :integer
     CONTENT_SIZE_HUMAN          = solr_name :content_size_human, :symbol
+    CREATOR_FACET               = solr_name :creator_facet, :facetable
+    DATE_FACET                  = solr_name :date_facet, :facetable
+    DATE_SORT                   = solr_name :date_sort, :sortable
     DEFAULT_LICENSE_DESCRIPTION = solr_name :default_license_description, type: :string
     DEFAULT_LICENSE_TITLE       = solr_name :default_license_title, type: :string
     DEFAULT_LICENSE_URL         = solr_name :default_license_url, type: :string
     DISPLAY_FORMAT              = solr_name :display_format, :stored_sortable
     EXTRACTED_TEXT              = solr_name :extracted_text, :searchable, type: :text
-    FILE_GROUP                  = solr_name :struct_metadata__file_group, :stored_sortable
-    FILE_USE                    = solr_name :struct_metadata__file_use, :stored_sortable
     HAS_MODEL                   = solr_name :has_model, :symbol
     IDENTIFIER_ALL              = solr_name :identifier_all, :symbol
     INTERNAL_URI                = solr_name :internal_uri, :stored_sortable
@@ -46,11 +47,11 @@ module Ddr
     OBJECT_STATE                = solr_name :object_state, :stored_sortable
     OBJECT_CREATE_DATE          = solr_name :system_create, :stored_sortable, type: :date
     OBJECT_MODIFIED_DATE        = solr_name :system_modified, :stored_sortable, type: :date
-    ORDER                       = solr_name :struct_metadata__order, :stored_sortable, type: :integer
     PERMANENT_ID                = solr_name :permanent_id, :stored_sortable, type: :string
     PERMANENT_URL               = solr_name :permanent_url, :stored_sortable, type: :string
     POLICY_ROLE                 = solr_name :policy_role, :facetable, type: :string
     RESOURCE_ROLE               = solr_name :resource_role, :facetable, type: :string
+    STRUCT_MAPS                 = solr_name :struct_maps, :stored_sortable
     TITLE                       = solr_name :title, :stored_sortable
     WORKFLOW_STATE              = solr_name :workflow_state, :stored_sortable
 

data/lib/ddr/models/has_struct_metadata.rb

@@ -40,10 +40,10 @@ module Ddr
       end
 
       def create_div(stru)
-        div_count = stru.structMap('default').xpath('xmlns:div').size
+        div_count = stru.structMap_node('default').xpath('xmlns:div').size
         div = Nokogiri::XML::Node.new('div', stru.as_xml_document)
         div['ORDER'] = div_count + 1
-        stru.structMap('default').add_child(div)
+        stru.structMap_node('default').add_child(div)
         div
       end
 

data/lib/ddr/models/indexing.rb

@@ -17,14 +17,15 @@ module Ddr
           WORKFLOW_STATE    => workflow_state,
           LOCAL_ID          => local_id,
           ADMIN_SET         => admin_set,
-          ADMIN_SET_FACET   => admin_set_facet,
-          COLLECTION_FACET  => collection_facet,
           DISPLAY_FORMAT    => display_format,
-          PERMANENT_ID   => permanent_id,
-          PERMANENT_URL  => permanent_url,
-          ACCESS_ROLE    => roles.to_json,
-          RESOURCE_ROLE  => roles.in_resource_scope.agents,
-          POLICY_ROLE    => roles.in_policy_scope.agents,
+          PERMANENT_ID      => permanent_id,
+          PERMANENT_URL     => permanent_url,
+          ACCESS_ROLE       => roles.to_json,
+          RESOURCE_ROLE     => roles.in_resource_scope.agents,
+          POLICY_ROLE       => roles.in_policy_scope.agents,
+          CREATOR_FACET     => creator,
+          DATE_FACET        => date,
+          DATE_SORT         => date_sort
         }
         if respond_to? :fixity_checks
           last_fixity_check = fixity_checks.last
@@ -50,6 +51,9 @@ module Ddr
         if has_multires_image?
           fields[MULTIRES_IMAGE_FILE_PATH] = multires_image_file_path
         end
+        if has_struct_metadata?
+          fields[STRUCT_MAPS] = structure.struct_maps.to_json
+        end
         if has_extracted_text?
           fields[EXTRACTED_TEXT] = extractedText.content
         end
@@ -60,6 +64,12 @@ module Ddr
           fields[DEFAULT_LICENSE_DESCRIPTION] = default_license_description
           fields[DEFAULT_LICENSE_TITLE] = default_license_title
           fields[DEFAULT_LICENSE_URL] = default_license_url
+          fields[ADMIN_SET_FACET] = admin_set_facet
+          fields[COLLECTION_FACET] = collection_facet
+        end
+        if is_a? Item
+          fields[ADMIN_SET_FACET] = admin_set_facet
+          fields[COLLECTION_FACET] = collection_facet
         end
         fields
       end
@@ -91,6 +101,10 @@ module Ddr
         associated_collection.internal_uri if associated_collection.present?
       end
 
+      def date_sort
+        date.first
+      end
+
     end
   end
 end

data/lib/ddr/models/solr_document.rb

@@ -216,6 +216,16 @@ module Ddr
         get(Ddr::IndexFields::DISPLAY_FORMAT)
       end
 
+      def struct_maps
+        JSON.parse(fetch(Ddr::IndexFields::STRUCT_MAPS))
+      rescue
+        {}
+      end
+
+      def struct_map(type='default')
+        struct_maps.present? ? struct_maps.fetch(type) : nil
+      end
+
       private
 
       def targets_query

data/lib/ddr/models/struct_div.rb

@@ -2,7 +2,7 @@ module Ddr
   module Models
     class StructDiv
 
-      attr_accessor :id, :label, :order, :orderlabel, :type, :objs, :divs
+      attr_accessor :id, :label, :order, :orderlabel, :type, :fptrs, :divs
 
       def initialize(structmap_or_div_node)
         @id = structmap_or_div_node['ID']
@@ -10,7 +10,7 @@ module Ddr
         @order = structmap_or_div_node['ORDER']
         @orderlabel = structmap_or_div_node['ORDERLABEL']
         @type = structmap_or_div_node['TYPE']
-        @objs = obj_pids(structmap_or_div_node) if structmap_or_div_node.node_name == "div"
+        @fptrs = fptr_pids(structmap_or_div_node) if structmap_or_div_node.node_name == "div"
         @divs = subdivs(structmap_or_div_node).sort
       end
 
@@ -18,21 +18,31 @@ module Ddr
         self.order.to_i <=> other.order.to_i
       end
 
-      def objects?
-        objs.present?
+      def pids
+        collect_pids(self)
       end
 
-      def object_pids
-        objs
+      def docs
+        query = ActiveFedora::SolrService.construct_query_for_pids(pids)
+        results = ActiveFedora::SolrService.query(query, rows: 999999)
+        results.each_with_object({}) do |r, memo|
+          memo[r["id"]] = ::SolrDocument.new(r)
+        end
       end
 
       def objects
-        objs.map { |pid| ActiveFedora::Base.find(pid) }
+        pids.each_with_object({}) do |pid, memo|
+          memo[pid] = ActiveFedora::Base.find(pid)
+        end
+      end
+
+      def as_json(options={})
+        super.compact
       end
 
       private
 
-      def obj_pids(div_node)
+      def fptr_pids(div_node)
         div_node.xpath('xmlns:fptr').map { |fptr_node| fptr_node["CONTENTIDS"].gsub('info:fedora/', '') }
       end
 
@@ -40,6 +50,14 @@ module Ddr
         structmap_or_div_node.xpath('xmlns:div').map { |div_node| Ddr::Models::StructDiv.new(div_node) }
       end
 
+      def collect_pids(structdiv)
+        pids = structdiv.divs.each_with_object([]) do |div, memo|
+          memo << collect_pids(div)
+        end
+        pids << structdiv.fptrs if structdiv.fptrs
+        pids.flatten
+      end
+
     end
   end
 end

data/lib/ddr/models/structure.rb

@@ -9,11 +9,11 @@ module Ddr
         super
       end
 
-      def struct_divs
-        @struct_divs ||= build_struct_divs(structMaps)
+      def struct_maps
+        @struct_maps ||= build_struct_maps(structMap_nodes)
       end
 
-      def structMap(type='default')
+      def structMap_node(type='default')
         xpath("//xmlns:structMap[@TYPE='#{type}']").first
       end
 
@@ -23,18 +23,18 @@ module Ddr
 
       private
 
-      def structMaps
+      def structMap_nodes
         xpath("//xmlns:structMap")
       end
 
-      def build_struct_divs(structMaps)
-        sdivs = {}
-        structMaps.each do |structMap|
-          type = structMap['TYPE'] || 'default'
-          raise StandardError, "Multiple '#{type}' structMaps" if sdivs[type].present?
-          sdivs[type] = Ddr::Models::StructDiv.new(structMap)
+      def build_struct_maps(structMap_nodes)
+        smaps = {}
+        structMap_nodes.each do |structMap_node|
+          type = structMap_node['TYPE'] || 'default'
+          raise StandardError, "Multiple '#{type}' structMaps" if smaps[type].present?
+          smaps[type] = Ddr::Models::StructDiv.new(structMap_node)
         end
-        sdivs
+        smaps
       end
 
       def self.template

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.0.0.pre.2"
+    VERSION = "2.0.0.pre.3"
   end
 end

data/lib/ddr/vocab/asset.rb

@@ -2,21 +2,12 @@
   module Vocab
     class Asset < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/asset/")
 
-      property "order",
-        label: "Order"
-
       property "permanentId",
         label: "Permanent Identifier"
 
       property "permanentUrl",
         label: "Permanent URL"
 
-      property "fileGroup",
-        label: "File Group"
-
-      property "fileUse",
-        label: "File Use"
-
       property "workflowState",
         label: "Workflow State"
 

data/spec/dummy/app/models/user.rb

@@ -1,5 +1,4 @@
 class User < ActiveRecord::Base
-
   include Ddr::Auth::User
-
+  include Blacklight::User
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150130134416) do
+ActiveRecord::Schema.define(version: 20150713171838) do
 
   create_table "events", force: true do |t|
     t.datetime "event_date_time"
@@ -25,7 +25,7 @@ ActiveRecord::Schema.define(version: 20150130134416) do
     t.string   "summary"
     t.string   "outcome"
     t.text     "detail"
-    t.string   "exception"
+    t.text     "exception",       limit: 65535
     t.string   "user_key"
   end
 

data/spec/models/has_struct_metadata_spec.rb

@@ -4,8 +4,9 @@ module Ddr
   module Models
     RSpec.describe HasStructMetadata, type: :model, structural_metadata: true do
 
+      let(:item) { Item.new(pid: 'test:2') }
+
       describe "#structure" do
-        let(:item) { Item.new(pid: 'test:2') }
         context "no existing structural metadata" do
           it "should return nil" do
             expect(item.structure).to eq(nil)
@@ -20,7 +21,6 @@ module Ddr
       end
 
       describe "#build_default_structure" do
-        let(:item) { Item.new(pid: 'test:2') }
         let(:components) { [ Component.new(pid: 'test:5', identifier: [ 'abc002' ]),
                              Component.new(pid: 'test:6', identifier: [ 'abc001' ]),
                              Component.new(pid: 'test:7', identifier: [ 'abc003' ])
@@ -33,6 +33,16 @@ module Ddr
         end
       end
 
+      describe "indexing" do
+        let(:expected_json) { multiple_struct_maps_structure_to_json }
+        before { item.datastreams[Ddr::Datastreams::STRUCT_METADATA].content = multiple_struct_maps_structure }
+        it "should index the JSON representation of the structure" do
+          indexing = item.to_solr
+          expect(indexing.keys).to include(Ddr::IndexFields::STRUCT_MAPS)
+          expect(indexing[Ddr::IndexFields::STRUCT_MAPS]).to eq(expected_json)
+        end
+      end
+
     end
   end
 end

data/spec/models/solr_document_spec.rb

@@ -74,4 +74,39 @@ RSpec.describe SolrDocument, type: :model do
     its(:display_format) { should eq("Image") }
   end
 
+  describe "#struct_maps" do
+    context "no indexed struct maps" do
+      it "should return an empty hash" do
+        expect(subject.struct_maps).to be_empty
+      end
+    end
+    context "indexed struct maps" do
+      before { subject[Ddr::IndexFields::STRUCT_MAPS] = multiple_struct_maps_structure_to_json }
+      it "should return a hash of the struct maps" do
+        expect(subject.struct_maps).to eq(JSON.parse(multiple_struct_maps_structure_to_json))
+      end
+    end
+  end
+
+  describe "#struct_map" do
+    context "no indexed struct maps" do
+      it "should return nil" do
+        expect(subject.struct_map('default')).to be_nil
+      end
+    end
+    context "indexed struct maps" do
+      before { subject[Ddr::IndexFields::STRUCT_MAPS] = multiple_struct_maps_structure_to_json }
+      context "requested struct map is indexed" do
+        it "should return the struct map" do
+          expect(subject.struct_map('default')).to eq(JSON.parse(multiple_struct_maps_structure_to_json)["default"])
+        end
+      end
+      context "requested struct map is not indexed" do
+        it "should raise a KeyError" do
+          expect { subject.struct_map('foo') }.to raise_error(KeyError)
+        end
+      end
+    end
+  end
+
 end

data/spec/models/struct_div_spec.rb

@@ -5,8 +5,6 @@ module Ddr
   module Models
     RSpec.describe StructDiv, type: :model, structural_metadata: true do
 
-      # let(:structure) { FactoryGirl.build(:simple_structure) }
-      # let(:structDiv) { structure.struct_div_map['default'] }
       let(:structmap_node) { nested_structure_document.xpath('//xmlns:structMap').first }
       let(:struct_div) { described_class.new(structmap_node) }
 
@@ -15,48 +13,55 @@ module Ddr
           expect(struct_div.divs.size).to eq(2)
           expect(struct_div.divs.first.label).to eq("Front")
           expect(struct_div.divs.first.divs).to be_empty
-          expect(struct_div.divs.first.objs).to eq([ "test:5" ])
+          expect(struct_div.divs.first.fptrs).to eq([ "test:5" ])
           expect(struct_div.divs.last.label).to eq("Back")
           expect(struct_div.divs.last.divs.size).to eq(2)
-          expect(struct_div.divs.last.objs).to be_empty
+          expect(struct_div.divs.last.fptrs).to be_empty
           expect(struct_div.divs.last.divs.first.label).to eq("Top")
           expect(struct_div.divs.last.divs.first.divs).to be_empty
-          expect(struct_div.divs.last.divs.first.objs).to eq([ "test:7" ])
+          expect(struct_div.divs.last.divs.first.fptrs).to eq([ "test:7" ])
           expect(struct_div.divs.last.divs.last.label).to eq("Bottom")
           expect(struct_div.divs.last.divs.last.divs).to be_empty
-          expect(struct_div.divs.last.divs.last.objs).to eq([ "test:6" ])
+          expect(struct_div.divs.last.divs.last.fptrs).to eq([ "test:6" ])
         end
       end
 
-      describe "#objects?" do
-        context "objects" do
-          it "should be true" do
-            expect(struct_div.divs[0].objects?).to be_truthy
-          end
-        end
-        context "no objects" do
-          it "should be false" do
-            expect(struct_div.objects?).to_not be_truthy
+      describe "#pids" do
+        context "top level" do
+          it "should return all pids in the structMap" do
+            expect(struct_div.pids).to match_array([ 'test:5', 'test:6', 'test:7' ])
           end
         end
       end
-      
-      describe "#object_pids" do
-        it "should return the object pids in order" do
-          expect(struct_div.divs.last.divs.first.object_pids).to eq([ 'test:7' ])
-          expect(struct_div.divs.last.divs.last.object_pids).to eq([ 'test:6' ])
+
+      describe "#docs" do
+        let(:solr_response) { [ { 'id'=>'test:5' }, { 'id'=>'test:6' }, { 'id'=>'test:7'} ] }
+        before do
+          allow(ActiveFedora::SolrService).to receive(:query) { solr_response }
+        end
+        it "should return a hash of Solr documents" do
+          results = struct_div.docs
+          expect(results.keys).to match_array([ 'test:5', 'test:6', 'test:7' ])
+          results.keys.each do |key|
+            expect(results[key]).to be_a(SolrDocument)
+            expect(results[key].id).to eq(key)
+          end
         end
       end
 
       describe "#objects" do
-        let(:repo_objects) { [ Component.new(pid: 'test:6'), Component.new(pid: 'test:7') ] }
+        let(:repo_objects) { [ Component.new(pid: 'test:5'), Component.new(pid: 'test:6'), Component.new(pid: 'test:7') ] }
         before do
-          allow(ActiveFedora::Base).to receive(:find).with('test:6') { repo_objects.first }
-          allow(ActiveFedora::Base).to receive(:find).with('test:7') { repo_objects.last }
+          allow(ActiveFedora::Base).to receive(:find).with('test:5') { repo_objects[0] }
+          allow(ActiveFedora::Base).to receive(:find).with('test:6') { repo_objects[1] }
+          allow(ActiveFedora::Base).to receive(:find).with('test:7') { repo_objects[2] }
         end
-        it "should return the Active Fedora objects in order" do
-          expect(struct_div.divs.last.divs.first.objects).to eq([ repo_objects.last ])
-          expect(struct_div.divs.last.divs.last.objects).to eq([ repo_objects.first ])
+        it "should return a hash of Active Fedora objects" do
+          results = struct_div.objects
+          expect(results.keys).to match_array([ 'test:5', 'test:6', 'test:7' ])
+          expect(results['test:5']).to eq(repo_objects[0])
+          expect(results['test:6']).to eq(repo_objects[1])
+          expect(results['test:7']).to eq(repo_objects[2])
         end
       end
 

data/spec/models/structure_spec.rb

@@ -5,13 +5,14 @@ module Ddr
   module Models
     RSpec.describe Structure, type: :model, structural_metadata: true do
 
-      describe "#struct_divs" do
-        let(:structure) { FactoryGirl.build(:multiple_struct_maps_structure) }
-        let(:struct_divs) { structure.struct_divs }
+      let(:structure) { FactoryGirl.build(:multiple_struct_maps_structure) }
+
+      describe "#struct_maps" do
+        let(:struct_maps) { structure.struct_maps }
         it "should include struct divs for each struct map" do
-          expect(struct_divs.keys).to match_array([ 'default', 'reverse' ])
-          expect(struct_divs['default']).to be_a(Ddr::Models::StructDiv)
-          expect(struct_divs['reverse']).to be_a(Ddr::Models::StructDiv)
+          expect(struct_maps.keys).to match_array([ 'default', 'reverse' ])
+          expect(struct_maps['default']).to be_a(Ddr::Models::StructDiv)
+          expect(struct_maps['reverse']).to be_a(Ddr::Models::StructDiv)
         end
       end
 

data/spec/support/structural_metadata_helper.rb

@@ -87,9 +87,49 @@ def multiple_struct_maps_structure
       </structMap>
     </mets>
   eos
-
 end
 
 def simple_structure_query_response
   [{"system_create_dtsi"=>"2015-06-17T21:04:24Z", "system_modified_dtsi"=>"2015-06-17T21:04:56Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:6", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:56Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:6+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bf84faa89d6b25924bc06357f7c33347a602e2ec8df9c1020ec98015fe571760\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:56Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:6+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"4d227bc972634ba2126eefff207fb3b35f6ff802a210ad7945d2ec60360076dd\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:04:24Z\",\"objLastModDate\":\"2015-06-17T21:04:24Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A6/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A6/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc001"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc001", "internal_uri_ssi"=>"info:fedora/test:6", "identifier_ssi"=>"abc001", "access_role_ssi"=>"[]", "_version_"=>1504261016868880384, "timestamp"=>"2015-06-17T21:04:56.958Z"}, {"system_create_dtsi"=>"2015-06-17T21:03:58Z", "system_modified_dtsi"=>"2015-06-17T21:04:54Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:5", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:54Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:5+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7f1cbe6e435991ae3bba134e52e7a275af8a232b209ac725fa54fdd81bb973\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:54Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:5+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"8b106726ca2d39d9a2e187fc9da2e58b25bd3553031012515ae31cf4fbe520e9\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:03:58Z\",\"objLastModDate\":\"2015-06-17T21:03:58Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A5/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A5/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc002"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc002", "internal_uri_ssi"=>"info:fedora/test:5", "identifier_ssi"=>"abc002", "access_role_ssi"=>"[]", "_version_"=>1504261014501195776, "timestamp"=>"2015-06-17T21:04:54.701Z"}, {"system_create_dtsi"=>"2015-06-17T21:04:46Z", "system_modified_dtsi"=>"2015-06-17T21:04:59Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:7", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:59Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:7+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"cb385ff9a55b5fe24e8c2a8159fc928e3ee582ef312955132d34282676102a6a\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:59Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:7+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"523ee1e5d55d188bd17b2789e4c9109c8f9d0170b63af1219de8a74d4f32966a\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:04:46Z\",\"objLastModDate\":\"2015-06-17T21:04:46Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A7/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A7/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc003"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc003", "internal_uri_ssi"=>"info:fedora/test:7", "identifier_ssi"=>"abc003", "access_role_ssi"=>"[]", "_version_"=>1504261019487174656, "timestamp"=>"2015-06-17T21:04:59.455Z"}]
+end
+
+def simple_structure_to_json
+  j = <<-eos
+    {\"default\":
+      {\"type\":\"default\",
+        \"divs\":[{\"order\":\"1\",\"fptrs\":[\"test:6\"],\"divs\":[]},
+                  {\"order\":\"2\",\"fptrs\":[\"test:5\"],\"divs\":[]},
+                  {\"order\":\"3\",\"fptrs\":[\"test:7\"],\"divs\":[]}
+                 ]
+      }
+    }
+  eos
+  j.gsub(/\s+/, "")
+end
+
+def multiple_struct_maps_structure_to_json
+  j = <<-eos
+    {\"default\":
+      {\"type\":\"default\",
+        \"divs\":[{\"label\":\"Front\",\"order\":\"1\",\"fptrs\":[\"test:5\"],\"divs\":[]},
+                  {\"label\":\"Back\",\"order\":\"2\",\"fptrs\":[],
+                    \"divs\":[{\"label\":\"Top\",\"order\":\"1\",\"fptrs\":[\"test:7\"],\"divs\":[]},
+                              {\"label\":\"Bottom\",\"order\":\"2\",\"fptrs\":[\"test:6\"],\"divs\":[]}
+                             ]
+                  }
+                 ]
+      },
+     \"reverse\":
+      {\"type\":\"reverse\",
+        \"divs\":[{\"label\":\"Back\",\"order\":\"1\",\"fptrs\":[],
+                    \"divs\":[{\"label\":\"Bottom\",\"order\":\"1\",\"fptrs\":[\"test:6\"],\"divs\":[]},
+                              {\"label\":\"Top\",\"order\":\"2\",\"fptrs\":[\"test:7\"],\"divs\":[]}
+                             ]
+                  },
+                  {\"label\":\"Front\",\"order\":\"2\",\"fptrs\":[\"test:5\"],\"divs\":[]}
+                 ]
+      }
+    }    
+  eos
+  j.gsub(/\s+/, "")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.2
+  version: 2.0.0.pre.3
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -351,6 +351,8 @@ files:
 - db/migrate/20141218020612_add_exception_to_events.rb
 - db/migrate/20150110023410_drop_workflow_states.rb
 - db/migrate/20150130134416_add_user_key_to_events.rb
+- db/migrate/20150710211530_change_events_exception_to_text.rb
+- db/migrate/20150713171838_add_limit_to_events_exception.rb
 - ddr-models.gemspec
 - lib/ddr-models.rb
 - lib/ddr/actions.rb
@@ -622,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository