curate 0.6.3 → 0.6.4

data/lib/generators/curate/soft_delete/active_fedora_soft_delete_monkey_patch.rb

@@ -0,0 +1,92 @@
+
+require 'rubydora/repository'
+require 'active_fedora/digital_object'
+require 'active_fedora/base'
+
+module Rubydora
+  class PerformedSoftDelete < RuntimeError
+    attr_reader :options
+    def initialize(method_name, pid, options)
+      @options = options
+      super("Performed soft delete on '#{pid}' via '#{method_name}'")
+    end
+  end
+
+  class Repository
+
+    # There is likely a better way of doing this, but the ActiveFedora API doesn't
+    # appear to support soft-deletes (i.e. changing the state to 'D')
+    #
+    # So I am intercepting the :purge_object, :purge_datastream, and
+    # :purge_relationship methods and instead of purging, I'm modifying.
+    # the state.
+    module SoftDeleteBehavior
+      extend ActiveSupport::Concern
+      included do
+        before_purge_object do |options|
+          client[object_url(options[:pid],state: ActiveFedora::DELETED_STATE)].put(nil)
+          raise PerformedSoftDelete.new('purge_object', options[:pid], options)
+        end
+        before_purge_datastream do |options|
+          client[datastream_url(options[:pid], options[:dsid], dsState: ActiveFedora::DELETED_STATE )].put(nil)
+          raise PerformedSoftDelete.new('purge_datastream', options[:pid], options)
+        end
+
+        before_purge_relationship do |options|
+          client[object_relationship_url(options[:pid], state: ActiveFedora::DELETED_STATE)].put(nil)
+          raise PerformedSoftDelete.new('purge_relationship', options[:pid], options)
+        end
+      end
+
+      def purge_object(*args)
+        super(*args) rescue PerformedSoftDelete; true
+      end
+      def purge_datastream(*args)
+        super(*args) rescue PerformedSoftDelete; true
+      end
+      def purge_relationship(*args)
+        super(*args) rescue PerformedSoftDelete; true
+      end
+    end
+
+    include SoftDeleteBehavior
+  end
+end
+
+module ActiveFedora
+  DELETED_STATE = 'D'
+  class ActiveObjectNotFoundError < RuntimeError
+    attr_reader :base_exception
+    def initialize(exception, *args)
+      @base_exception = exception
+      super("Unable to find via #{args.inspect} in fedora.")
+    end
+  end
+
+  class Base
+    module SoftDeleteBehavior
+      def exists?(*args)
+        super
+      rescue ActiveObjectNotFoundError, RestClient::Unauthorized
+        true
+      end
+    end
+
+    extend SoftDeleteBehavior
+  end
+
+  class DigitalObject
+    # Application level enforcement of finding a DELETE_STATE object
+    module SoftDeleteBehavior
+      # Because I don't want to be handling RestClient::Unauthorized in a
+      # controller, I want to change the exception to a more meaningful
+      # exception
+      def find(*args)
+        super
+      rescue RestClient::Unauthorized => e
+        raise ActiveObjectNotFoundError.new(e, *args)
+      end
+    end
+    extend SoftDeleteBehavior
+  end
+end

data/lib/generators/curate/soft_delete/deny-d-objects-and-datastreams.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Policy xmlns="urn:oasis:names:tc:xacml:1.0:policy"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  PolicyId="deny-d-objects-and-datastreams"
+  RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:first-applicable">
+  <Description>Deny access to any objects or datastreams in the "D" deleted state</Description>
+  <Target>
+    <Subjects>
+        <AnySubject/>
+    </Subjects>
+    <Resources>
+      <Resource>
+        <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">D</AttributeValue>
+          <ResourceAttributeDesignator DataType="http://www.w3.org/2001/XMLSchema#string"
+            AttributeId="urn:fedora:names:fedora:2.1:resource:object:state" MustBePresent="false"/>
+        </ResourceMatch>
+      </Resource>
+      <Resource>
+        <ResourceMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">D</AttributeValue>
+          <ResourceAttributeDesignator DataType="http://www.w3.org/2001/XMLSchema#string"
+            AttributeId="urn:fedora:names:fedora:2.1:resource:datastream:state" MustBePresent="false"/>
+        </ResourceMatch>
+      </Resource>
+    </Resources>
+    <Actions>
+      <AnyAction/>
+    </Actions>
+  </Target>
+  <Rule RuleId="1" Effect="Deny"/>
+</Policy>

data/lib/generators/curate/soft_delete/deny-purge.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Policy xmlns="urn:oasis:names:tc:xacml:1.0:policy"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        PolicyId="deny-purge"
+        RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:first-applicable">
+  <Description>deny any object or datastream purging except for those in the legacy namespaces</Description>
+  <Target>
+    <Subjects>
+      <AnySubject/>
+    </Subjects>
+    <Resources>
+      <AnyResource/>
+    </Resources>
+    <Actions>
+      <Action>
+        <ActionMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:fedora:names:fedora:2.1:action:id-purgeObject</AttributeValue>
+          <ActionAttributeDesignator DataType="http://www.w3.org/2001/XMLSchema#string"
+            AttributeId="urn:fedora:names:fedora:2.1:action:id"/>
+        </ActionMatch>
+      </Action>
+      <Action>
+        <ActionMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:fedora:names:fedora:2.1:action:id-purgeDatastream</AttributeValue>
+          <ActionAttributeDesignator DataType="http://www.w3.org/2001/XMLSchema#string"
+            AttributeId="urn:fedora:names:fedora:2.1:action:id"/>
+        </ActionMatch>
+      </Action>
+    </Actions>
+  </Target>
+  <Rule RuleId="1" Effect="Deny" />
+</Policy>

data/lib/generators/curate/soft_delete/permit-describerepository.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Policy xmlns="urn:oasis:names:tc:xacml:1.0:policy"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        PolicyId="permit-describerepository"
+        RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:first-applicable">
+  <Description>Permit anyone to access describeRepository</Description>
+  <Target>
+    <Subjects>
+      <AnySubject/>
+    </Subjects>
+    <Resources>
+      <AnyResource/>
+    </Resources>
+    <Actions>
+      <Action>
+        <ActionMatch MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">urn:fedora:names:fedora:2.1:action:id-describeRepository</AttributeValue>
+          <ActionAttributeDesignator DataType="http://www.w3.org/2001/XMLSchema#string"
+            AttributeId="urn:fedora:names:fedora:2.1:action:id"/>
+        </ActionMatch>
+      </Action>
+    </Actions>
+  </Target>
+  <Rule RuleId="1" Effect="Permit"/>
+</Policy>

data/spec/features/collections_show_spec.rb

@@ -17,6 +17,13 @@ describe "Collections show view: " do
       visit collection_path(collection.pid)
       page.should_not have_css(".collection-member[data-noid='#{article.noid}']")
     end
+
+    it "should display the delete button" do
+      collection.save!
+      login_as(user)
+      visit collection_path(collection.pid)
+      expect(page).to have_button('Delete')
+    end
   end
 
   context "In public view: " do
@@ -36,3 +43,4 @@ describe "Collections show view: " do
     end
   end
 end
+

data/spec/helpers/curate_helper_spec.rb

@@ -208,4 +208,8 @@ describe ApplicationHelper do
       end
     end
   end
+
+  it "should have link for google.com" do
+    helper.auto_link_without_protocols("google.com").should have_link("http://google.com")
+  end
 end

data/spec/internal/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: ../../../curate
   specs:
-    curate (0.6.1)
+    curate (0.6.3)
       active_attr
       active_fedora-registered_attributes (~> 0.2.0)
       bootstrap-datepicker-rails
@@ -28,6 +28,7 @@ PATH
       mini_magick
       morphine
       rails (~> 4.0.2)
+      rails_autolink
       simple_form (~> 3.0.1)
       sufia-models (~> 3.4.0)
       virtus
@@ -44,13 +45,13 @@ GEM
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    active-fedora (6.7.0)
+    active-fedora (6.7.6)
       activesupport (>= 3.0.0)
       deprecation
       mediashelf-loggable
       nom-xml (>= 0.5.1)
       om (~> 3.0.0)
-      rdf
+      rdf (~> 1.1.1.1)
       rdf-rdfxml (= 1.0.1)
       rsolr
       rubydora (~> 1.6, >= 1.6.5)
@@ -88,7 +89,7 @@ GEM
     axiom-types (0.0.5)
       descendants_tracker (~> 0.0.1)
       ice_nine (~> 0.9)
-    backports (3.3.5)
+    backports (3.4.1)
     bcrypt-ruby (3.1.2)
     blacklight (4.5.0)
       bootstrap-sass (>= 2.2.0, < 2.4)
@@ -100,16 +101,16 @@ GEM
       sass-rails
     block_helpers (0.3.3)
       activesupport (>= 2.0)
-    bootstrap-datepicker-rails (1.1.1.10)
+    bootstrap-datepicker-rails (1.3.0.1)
       railties (>= 3.0)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     breach-mitigation-rails (0.0.4)
     breadcrumbs_on_rails (2.3.0)
-    browser (0.2.1)
+    browser (0.3.2)
     builder (3.1.4)
     cancan (1.6.10)
-    capybara (2.1.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -119,16 +120,15 @@ GEM
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
-    childprocess (0.3.9)
+    childprocess (0.4.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cliver (0.2.2)
+    cliver (0.3.2)
     cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
-    coercible (0.2.0)
-      backports (~> 3.0, >= 3.1.0)
+    coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -136,7 +136,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     columnize (0.3.6)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -148,12 +148,12 @@ GEM
       safe_yaml (~> 0.9.0)
     daemons (1.1.9)
     database_cleaner (1.0.1)
-    debugger (1.6.3)
+    debugger (1.6.5)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.4)
+      debugger-ruby_core_source (~> 1.3.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.4)
+    debugger-ruby_core_source (1.3.1)
     deprecation (0.0.5)
       activesupport
     descendants_tracker (0.0.3)
@@ -166,10 +166,10 @@ GEM
     devise-guests (0.3.2)
       devise
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.2)
     ensure_valid_encoding (0.5.3)
-    equalizer (0.0.8)
-    equivalent-xml (0.3.0)
+    equalizer (0.0.9)
+    equivalent-xml (0.4.0)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
     execjs (2.0.2)
@@ -180,7 +180,7 @@ GEM
       railties (>= 3.0.0)
     fastercsv (1.5.5)
     ffi (1.9.3)
-    foreigner (1.6.0)
+    foreigner (1.6.1)
       activerecord (>= 3.0.0)
     hike (1.2.3)
     hooks (0.3.3)
@@ -193,7 +193,7 @@ GEM
     hydra-batch-edit (1.1.1)
       blacklight
       hydra-collections
-    hydra-collections (1.3.1)
+    hydra-collections (1.3.2)
       active-fedora (>= 6.7.0)
       blacklight
       hydra-head (~> 6.4.0)
@@ -220,17 +220,17 @@ GEM
       activesupport (>= 3.2.13, < 5.0)
       rest-client (~> 1.6.7)
     i18n (0.6.9)
-    ice_nine (0.10.0)
+    ice_nine (0.11.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jettywrapper (1.5.0)
+    jettywrapper (1.5.2)
       activesupport (>= 3.0.0)
       childprocess
       i18n
       logger
       mediashelf-loggable
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -255,12 +255,12 @@ GEM
     minitest (4.7.5)
     mono_logger (1.1.0)
     morphine (0.1.1)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     nest (1.1.2)
       redis
     noid (0.6.6)
       backports
-    nokogiri (1.6.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     nom-xml (0.5.1)
       activesupport
@@ -280,14 +280,14 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.0)
       mime-types
-    poltergeist (1.4.1)
-      capybara (~> 2.1.0)
-      cliver (~> 0.2.1)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
     rack (1.5.2)
-    rack-protection (1.5.1)
+    rack-protection (1.5.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -301,23 +301,23 @@ GEM
       sprockets-rails (~> 2.0.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
+    rails_autolink (1.1.5)
+      rails (> 3.1)
     railties (4.0.2)
       actionpack (= 4.0.2)
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rdf (1.0.10.2)
-      addressable (>= 2.3)
+    rake (10.1.1)
+    rdf (1.1.1.1)
     rdf-rdfxml (1.0.1)
       rdf (>= 1.0)
       rdf-xsd (>= 1.0)
-    rdf-xsd (1.0.2.1)
-      nokogiri (>= 1.5.0)
-      rdf (>= 0.3.4)
-    rdoc (3.12.2)
+    rdf-xsd (1.1.0)
+      rdf (>= 1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
-    redis (3.0.6)
+    redis (3.0.7)
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
     resque (1.25.1)
@@ -341,9 +341,9 @@ GEM
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-html-matchers (0.4.3)
-      nokogiri (>= 1.4.4)
-      rspec (>= 2.0.0)
+    rspec-html-matchers (0.4.4)
+      nokogiri (~> 1)
+      rspec (~> 2, >= 2.11.0)
     rspec-mocks (2.14.4)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
@@ -352,7 +352,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rubydora (1.6.5)
+    rubydora (1.7.0)
       activemodel
       activesupport
       deprecation
@@ -363,14 +363,14 @@ GEM
       nokogiri
       rest-client
     safe_yaml (0.9.7)
-    sass (3.2.12)
+    sass (3.2.14)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
+    sdoc (0.4.0)
+      json (~> 1.8)
+      rdoc (~> 4.0, < 5.0)
     simple_form (3.0.1)
       actionpack (>= 4.0.0, < 4.1)
       activemodel (>= 4.0.0, < 4.1)
@@ -400,7 +400,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.8)
-    stomp (1.3.1)
+    stomp (1.3.2)
     subexec (0.2.3)
     sufia-models (3.4.0)
       active-fedora (~> 6.7.0)
@@ -425,16 +425,16 @@ GEM
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    timecop (0.7.0)
+    timecop (0.7.1)
     tins (0.13.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     trollop (1.16.2)
-    turbolinks (2.0.0)
+    turbolinks (2.2.1)
       coffee-rails
     tzinfo (0.3.38)
-    uglifier (2.3.2)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.3)
@@ -443,18 +443,18 @@ GEM
     vcr (2.8.0)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    virtus (1.0.0)
+    virtus (1.0.1)
       axiom-types (~> 0.0.5)
-      coercible (~> 0.2)
+      coercible (~> 1.0)
       descendants_tracker (~> 0.0.1)
       equalizer (~> 0.0.7)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.16.0)
+    webmock (1.17.1)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.3.1)
-    xml-simple (1.1.2)
+    websocket-driver (0.3.2)
+    xml-simple (1.1.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     zipruby (0.3.6)