hydra-access-controls 0.0.1 → 0.0.2

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hydra-access-controls.gemspec
 gemspec
+
+group :test do
+  gem 'cucumber-rails', '>=1.2.0', :require=>false
+  gem 'rcov', :platform => :mri_18
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/Rakefile

@@ -7,10 +7,10 @@ task :default => :spec
 
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
-  # if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
-  #   t.rcov = true
-  #   t.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
-  # end
+  if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
+    t.rcov = true
+    t.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
+  end
 end
 
 

data/hydra-access-controls.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'cancan'
   gem.add_dependency 'deprecation'
 
+  gem.add_development_dependency("rake")
   gem.add_development_dependency 'rspec'
+
   
 end

data/lib/hydra-access-controls.rb

@@ -2,7 +2,10 @@ require 'active_support'
 require 'active-fedora'
 require 'deprecation'
 require "hydra-access-controls/version"
-require 'hydra/model_mixins'
+begin
+  require 'hydra/model_mixins'
+rescue LoadError
+end
 require 'hydra/datastream'
 
 module Hydra
@@ -11,6 +14,11 @@ module Hydra
   autoload :AccessControlsEvaluation
   autoload :Ability
   autoload :RoleMapperBehavior
+
+  module ModelMixins
+    autoload :RightsMetadata, 'hydra/model_mixins/rights_metadata'
+  end
+
 end
 require 'ability'
 require 'role_mapper'

data/lib/hydra-access-controls/version.rb

@@ -1,7 +1,7 @@
 module Hydra
   module Access
     module Controls
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/lib/hydra/ability.rb

@@ -27,12 +27,17 @@ module Hydra::Ability
     if Deprecation.silence(Hydra::SuperuserAttributes) { user.is_being_superuser?(session) }
       can :manage, :all
     else
+      create_permissions(user, session)
       edit_permissions(user, session)
       read_permissions(user, session)
       custom_permissions(user, session)
     end
   end
 
+  def create_permissions(user, session)
+    can :create, :all if user_groups(user, session).include? 'registered'
+  end
+
   def edit_permissions(user, session)
     can :edit, String do |pid|
       test_edit(pid, user, session)
@@ -46,7 +51,6 @@ module Hydra::Ability
       @permissions_solr_document = obj
       test_edit(obj.id, user, session)
     end       
-
   end
 
   def read_permissions(user, session)

data/lib/hydra/access_controls_enforcement.rb

@@ -19,7 +19,6 @@ module Hydra::AccessControlsEnforcement
   #   end
   def enforce_access_controls(opts={})
     controller_action = params[:action].to_s
-    controller_action = "edit" if params[:action] == "destroy" 
     delegate_method = "enforce_#{controller_action}_permissions"
     if self.respond_to?(delegate_method.to_sym, true)
       self.send(delegate_method.to_sym)
@@ -126,6 +125,14 @@ module Hydra::AccessControlsEnforcement
     end
   end
 
+  ##  This method is here for you to override
+  def enforce_create_permissions(opts={})
+    logger.debug("Enforcing create permissions")
+    if !can? :create, ActiveFedora::Base.new
+      raise Hydra::AccessDenied.new "You do not have sufficient privileges to create a new document."
+    end
+  end
+
   ## proxies to enforce_edit_permssions.  This method is here for you to override
   def enforce_update_permissions(opts={})
     enforce_edit_permissions(opts)
@@ -136,6 +143,11 @@ module Hydra::AccessControlsEnforcement
     enforce_edit_permissions(opts)
   end
 
+  ## proxies to enforce_edit_permssions.  This method is here for you to override
+  def enforce_new_permissions(opts={})
+    enforce_create_permissions(opts)
+  end
+
   # Controller "before" filter for enforcing access controls on index actions
   # Currently does nothing, instead relies on 
   # @param [Hash] opts (optional, not currently used)

data/lib/hydra/datastream/rights_metadata.rb

@@ -7,14 +7,19 @@ module Hydra
       set_terminology do |t|
         t.root(:path=>"rightsMetadata", :xmlns=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1", :schema=>"http://github.com/projecthydra/schemas/tree/v1/rightsMetadata.xsd") 
         t.copyright {
+          ## BEGIN possible delete, justin 2012-06-22
           t.machine {
-            t.uvalicense
             t.cclicense   
             t.license     
           }
           t.human_readable(:path=>"human")
           t.license(:proxy=>[:machine, :license ])            
           t.cclicense(:proxy=>[:machine, :cclicense ])                  
+          ## END possible delete
+
+          t.title(:path=>'human', :attributes=>{:type=>'title'})
+          t.description(:path=>'human', :attributes=>{:type=>'description'})
+          t.url(:path=>'machine', :attributes=>{:type=>'uri'})
         }
         t.access {
           t.human_readable(:path=>"human")
@@ -40,6 +45,8 @@ module Hydra
           }
           t.embargo_release_date(:proxy => [:machine, :date])
         }    
+
+        t.license(:ref=>[:copyright])
       end
 
       # Generates an empty Mods Article (used when you call ModsArticle.new without passing in existing xml)
@@ -47,10 +54,10 @@ module Hydra
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.rightsMetadata(:version=>"0.1", "xmlns"=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1") {
             xml.copyright {
-              xml.human
-              xml.machine {
-                xml.uvalicense "no"
-              }
+              xml.human(:type=>'title')
+              xml.human(:type=>'description')
+              xml.machine(:type=>'uri')
+              
             }
             xml.access(:type=>"discover") {
               xml.human

data/spec/spec_helper.rb

@@ -3,14 +3,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 
 
-# if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
-#   require 'simplecov'
-#   require 'simplecov-rcov'
-# 
-#   SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-#   SimpleCov.start
-# end
-# 
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
+end
+
 require 'rspec/autorun'
 require 'hydra-access-controls'
 require 'support/mods_asset'

data/spec/unit/ability_spec.rb

@@ -65,6 +65,9 @@ describe Ability do
       @solr_resp.stub(:docs).and_return([{'read_access_group_t' =>['registered']}])
       subject.can?(:read, registered_object).should_not be_true
     end
+    it "should not be able to create objects" do
+      subject.can?(:create, :any).should be_false
+    end
   end
   context "for a signed in user" do
     subject { Ability.new(stub("user", :email=>'archivist1@example.com', :new_record? => false, :is_being_superuser? =>false)) }
@@ -78,5 +81,8 @@ describe Ability do
       @solr_resp.stub(:docs).and_return([{'read_access_group_t' =>['registered']}])
       subject.can?(:read, registered_object).should be_true
     end
+    it "should be able to create objects" do
+      subject.can?(:create, :any).should be_true
+    end
   end
 end

data/spec/unit/hydra_rights_metadata_spec.rb

@@ -10,6 +10,24 @@ describe Hydra::Datastream::RightsMetadata do
     @sample = Hydra::Datastream::RightsMetadata.new(obj.inner_object, nil)
     @sample.stub(:content).and_return('')
   end
+
+  describe "license" do
+    before do
+      @sample.license.title = "Creative Commons Attribution 3.0 Unported License." 
+      @sample.license.description = "This Creative Commons license lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials." 
+      @sample.license.url = "http://creativecommons.org/licenses/by/3.0/" 
+    end
+    subject { @sample.license}
+    its(:title) {should == ["Creative Commons Attribution 3.0 Unported License."] }
+    its(:description) { should == ["This Creative Commons license lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials."] }
+    its(:url) {should == ["http://creativecommons.org/licenses/by/3.0/"] }
+
+    it "should be accessable as a term path" do
+      # This enables us to use:
+      #  delegate :license_title, :to=>'rightsMetadata', :at=>[:license, :title]
+      @sample.term_values(:license, :title).should == ["Creative Commons Attribution 3.0 Unported License."]
+    end
+  end
   
   describe "permissions" do
     describe "setter" do

data/spec/unit/rights_metadata_spec.rb

@@ -50,7 +50,6 @@ describe Hydra::ModelMixins::RightsMetadata do
   context "with rightsMetadata" do
     before do
       subject.rightsMetadata.update_permissions("person"=>{"person1"=>"read","person2"=>"discover"}, "group"=>{'group-6' => 'read', "group-7"=>'read', 'group-8'=>'edit'})
-      subject.save
     end
     it "should have read groups accessor" do
       subject.read_groups.should == ['group-6', 'group-7']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +128,6 @@ files:
 - lib/hydra/access_controls_evaluation.rb
 - lib/hydra/datastream.rb
 - lib/hydra/datastream/rights_metadata.rb
-- lib/hydra/model_mixins.rb
 - lib/hydra/model_mixins/rights_metadata.rb
 - lib/hydra/role_mapper_behavior.rb
 - lib/role_mapper.rb
@@ -143,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Access controls for project hydra

data/lib/hydra/model_mixins.rb

@@ -1,7 +0,0 @@
-module Hydra
-  module ModelMixins
-    extend ActiveSupport::Autoload
-    autoload :RightsMetadata
-  end
-end
-