hydra-head 3.0.0pre1 → 3.0.0pre2

data/lib/generators/hydra/hyhead_fixtures_generator.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+require 'rails/generators/migration'     
+
+module Hydra
+class HyheadFixturesGenerator < Rails::Generators::Base
+  
+  source_root File.expand_path('../../../../', __FILE__)
+        
+  desc """
+  This Generator copies the hydra-head sample/test objects into your application's test_support/fixtures directory
+  These objects are useful for getting a sense of how hydra works, but you will want to delete them and create your own 
+  fixtures to run your application's tests against.
+  
+  After running this generator, you can import your fixtures into fedora & solr by running
+  
+  rake hydra:fixtures:refresh
+  rake hydra:fixtures:refresh RAILS_ENV=test
+  
+  """
+  
+  def copy_hyhead_fixtures
+    directory("test_support/fixtures", "test_support/fixtures")
+  end
+  
+end
+end

data/lib/generators/hydra/templates/config/initializers/fedora_config.rb

@@ -7,7 +7,9 @@ require 'active-fedora'
 # This initializes ActiveFedora with config info from RAILS_ROOT/lib/fedora.yml
 # Among other things, it allows you to access Fedora and Solr (ActiveFedora's copy) as ActiveFedora.fedora and ActiveFedora.solr
 silence_warnings { ENABLE_SOLR_UPDATES=true }
-ActiveFedora.init
+
+# Don't need to call ActiveFedora.init any more.  It's handled by {ActiveFedora::Railtie}
+# ActiveFedora.init
 
 #
 # Loads EAD descriptors 

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.0.0pre1"
+  VERSION = "3.0.0pre2"
 end
 

data/lib/hydra/access_controls_evaluation.rb

@@ -69,27 +69,31 @@ module Hydra::AccessControlsEvaluation
 
   private
   def edit_groups
-    eg = (@permissions_solr_document == nil || @permissions_solr_document['edit_access_group_t'] == nil) ? [] : @permissions_solr_document['edit_access_group_t']
+    edit_group_field = Hydra.config[:permissions][:edit][:group]
+    eg = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_group_field,nil))
     logger.debug("edit_groups: #{eg.inspect}")
     return eg
   end
 
   # edit implies read, so read_groups is the union of edit and read groups
   def read_groups
-    rg = edit_groups | ((@permissions_solr_document == nil || @permissions_solr_document['read_access_group_t'] == nil) ? [] : @permissions_solr_document['read_access_group_t'])
+    read_group_field = Hydra.config[:permissions][:read][:group]
+    rg = edit_groups | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_group_field,nil))
     logger.debug("read_groups: #{rg.inspect}")
     return rg
   end
 
   def edit_persons
-    ep = (@permissions_solr_document == nil || @permissions_solr_document['edit_access_person_t'] == nil) ? [] : @permissions_solr_document['edit_access_person_t']
+    edit_person_field = Hydra.config[:permissions][:edit][:individual]
+    ep = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_person_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_person_field,nil))
     logger.debug("edit_persons: #{ep.inspect}")
     return ep
   end
 
   # edit implies read, so read_persons is the union of edit and read persons
   def read_persons
-    rp = edit_persons | ((@permissions_solr_document == nil || @permissions_solr_document['read_access_person_t'] == nil) ? [] : @permissions_solr_document['read_access_person_t'])
+    read_individual_field = Hydra.config[:permissions][:read][:individual]
+    rp = edit_persons | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_individual_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_individual_field,nil))
     logger.debug("read_persons: #{rp.inspect}")
     return rp
   end

data/lib/hydra/{fixtures.rb → fixture_loader.rb}

@@ -1,8 +1,14 @@
 module Hydra
 
-  class Fixtures
-    def self.filename_for_pid(pid)
-      File.join("test_support","fixtures","#{pid.gsub(":","_")}.foxml.xml")
+  class FixtureLoader
+    attr_accessor :path
+
+    def initialize(path)
+      self.path = path
+    end 
+
+    def filename_for_pid(pid)
+      File.join(path, "#{pid.gsub(":","_")}.foxml.xml")
     end
 
     def self.delete(pid)
@@ -15,14 +21,14 @@ module Hydra
       end
     end
 
-    def self.reload(pid)
-      delete(pid)
+    def reload(pid)
+      self.class.delete(pid)
       import_and_index(pid)
     end
 
-    def self.import_and_index(pid)
-      body = import_to_fedora(filename_for_pid(pid))
-      index(pid)
+    def import_and_index(pid)
+      body = self.class.import_to_fedora(filename_for_pid(pid))
+      self.class.index(pid)
       body
     end
 
@@ -33,7 +39,6 @@ module Hydra
 
     def self.import_to_fedora(filename)
       file = File.new(filename, "r")
-puts "Loading #{filename}"
       result = foxml = Fedora::Repository.instance.ingest(file.read)
       raise "Failed to ingest the fixture." unless result
       result.body

data/lib/railties/hydra-fixtures.rake

@@ -2,7 +2,7 @@
 require "active-fedora"
 require "solrizer-fedora"
 require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
-require "hydra/fixtures"
+require "hydra/fixture_loader"
 namespace :hydra do
   
   
@@ -16,7 +16,7 @@ namespace :hydra do
       raise "You must specify a valid pid.  Example: rake hydra:refresh_fixture pid=demo:12"
     end
     begin
-      Hydra::Fixtures.reload(ENV["pid"])
+      Hydra::FixtureLoader.new('test_support/fixtures').reload(ENV["pid"])
     rescue Errno::ECONNREFUSED => e
       puts "Can't connect to Fedora! Are you sure jetty is running?"
     rescue Fedora::ServerError => e
@@ -37,7 +37,7 @@ namespace :hydra do
       pid = ENV["pid"]
       puts "Deleting '#{pid}' from #{Fedora::Repository.instance.fedora_url}"
       begin
-        Hydra::Fixtures.delete(pid)
+        Hydra::FixtureLoader.delete(pid)
       rescue Errno::ECONNREFUSED => e
         puts "Can't connect to Fedora! Are you sure jetty is running?"
       rescue Fedora::ServerError => e
@@ -107,9 +107,9 @@ namespace :hydra do
       Fedora::Repository.register(ENV["destination"])
     end
     if !ENV["fixture"].nil? 
-      body = Hydra::Fixtures.import_to_fedora(ENV["fixture"])
+      body = Hydra::FixtureLoader.import_to_fedora(ENV["fixture"])
     elsif !ENV["pid"].nil?
-      body = Hydra::Fixtures.import_and_index(ENV["pid"])
+      body = Hydra::FixtureLoader.new('test_support/fixtures').import_and_index(ENV["pid"])
     else
       raise "You must specify a path to the fixture or provide its pid.  Example: rake hydra:import_fixture fixture=test_support/fixtures/demo_12.foxml.xml"
     end

data/tasks/hydra-head.rake

@@ -7,26 +7,31 @@ namespace :hyhead do
 
   desc "Execute Continuous Integration build (docs, tests with coverage)"
   task :ci do
-    Rake::Task["hyhead:doc"].invoke
-    Rake::Task["hydra:jetty:config"].invoke
-    
-    require 'jettywrapper'
-    jetty_params = {
-      :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../jetty'),
-      :quiet => false,
-      :jetty_port => 8983,
-      :solr_home => File.expand_path(File.dirname(__FILE__) + '/../jetty/solr'),
-      :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../jetty/fedora/default'),
-      :startup_wait => 30
-      }
-
-    # does this make jetty run in TEST environment???
-    error = Jettywrapper.wrap(jetty_params) do
-      Rake::Task['hyhead:setup_test_app'].invoke
-      puts %x[rake hyhead:fixtures:refresh RAILS_ENV=test] # calling hydra:fixtures:refresh from the root of the test app
-      Rake::Task['hyhead:test'].invoke
+    if ( ENV['environment'] == 'test' )
+      Rake::Task["hyhead:doc"].invoke
+      Rake::Task["hydra:jetty:config"].invoke
+      
+      require 'jettywrapper'
+      jetty_params = {
+        :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../jetty'),
+        :quiet => false,
+        :jetty_port => 8983,
+        :solr_home => File.expand_path(File.dirname(__FILE__) + '/../jetty/solr'),
+        :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../jetty/fedora/default'),
+        :startup_wait => 30
+        }
+
+      # does this make jetty run in TEST environment???
+      error = Jettywrapper.wrap(jetty_params) do
+        Rake::Task['hyhead:setup_test_app'].invoke
+        puts %x[rake hyhead:fixtures:refresh RAILS_ENV=test] # calling hydra:fixtures:refresh from the root of the test app
+        Rake::Task['hyhead:test'].invoke
+      end
+      raise "test failures: #{error}" if error
+    else
+      system("rake hyhead:ci environment=test")
+      fail unless $?.success?
     end
-    raise "test failures: #{error}" if error
   end
 
   
@@ -166,11 +171,6 @@ namespace :hyhead do
       
       FileUtils.rm('public/index.html')
 
-
-      after = 'TestApp::Application.configure do'
-      replace!( "#{path}/config/environments/test.rb",  /#{after}/, "#{after}\n    config.log_level = :warn\n")
-      
-
       puts "Copying Gemfile from test_support/etc"
       FileUtils.cp('../../test_support/etc/Gemfile','./Gemfile')
 
@@ -197,6 +197,10 @@ namespace :hyhead do
       %x[rails generate hydra:head -df]  # using -f to force overwriting of solr.yml
       errors << 'Error generating default hydra-head install' unless $?.success?
 
+      # set log_level to :warn in the test app's test environment. (:debug is too verbose)
+      after = 'TestApp::Application.configure do'
+      replace!( "#{path}/config/environments/test.rb",  /#{after}/, "#{after}\n    config.log_level = :warn\n")
+
       puts "Running rake db:migrate"
       %x[rake db:migrate]
       %x[rake db:migrate RAILS_ENV=test]
@@ -222,12 +226,19 @@ namespace :hyhead do
     
     puts "Running rspec tests"
     puts  %x[rake hyhead:spec:rcov]
+    rspec_success = $?.success?
 
     puts "Running cucumber tests"
     puts %x[rake hyhead:cucumber]
+    cucumber_success = $?.success?
 
     FileUtils.cd('../../')
-    puts "Completed test suite"
+    if rspec_success && cucumber_success
+      puts "Completed test suite with no errors"
+    else
+      puts "Test suite encountered failures... check console output for details."
+      fail
+    end
   end
   
   desc "Make sure the test app is installed, then run the tasks from its root directory"

data/test_support/features/file_upload.feature

@@ -25,7 +25,7 @@ Feature: Upload file into a document
   Scenario: Upload files on file assets list page
     Given I am logged in as "archivist1@example.com"
     And I am on the file asset list page for hydrangea:fixture_mods_dataset1
-    Then show me the page
+#Then show me the page
     And I attach the file "test_support/fixtures/image.jp2" to "Filedata"
     When I press "Upload File"
     Then I should see "The file image.jp2 has been saved"

data/test_support/features/mods_asset_search_result.feature

@@ -4,10 +4,21 @@ Feature: Article Search Result
   In order to find articles
   I want to see appropriate information about articles in a search result
 
-  Scenario: Viewing search results
+  Scenario: Viewing a single search result
     Given I am on the search page
     And I fill in "q" with "1234-5678"
     When I press "submit"
     Then I should see a link to "the show document page for hydrangea:fixture_mods_article3"
     And I should see "Test Article"
     And I should see "Aug. 1, 1998"
+  Scenario: Viewing multiple search results
+    Given I am on the search page
+    And I fill in "q" with "fixture"
+    When I press "submit"
+    Then I should see a link to "the show document page for hydrangea:fixture_mods_article1"
+    Then I should see a link to "the show document page for hydrangea:fixture_mods_article2"
+    Then I should see a link to "the show document page for hydrangea:fixture_mods_dataset1"
+    Then I should see a link to "the show document page for hydrangea:fixture_mods_article3"
+    And I should see "Displaying all 4 items"
+    And I should see a dropdown for "per_page"
+

data/test_support/features/step_definitions/edit_metadata_steps.rb

@@ -1,4 +1,4 @@
-require "hydra/fixtures"
+require "hydra/fixture_loader"
 # This is the post-submission complement to "I fill in the following" from web_steps.rb
 Then /^the following (should contain|contain|should not contain|do not contain):$/ do |bool,table|
   # table is a Cucumber::Ast::Table
@@ -48,7 +48,7 @@ Then /^I should see a "([^"]*)" button(?: within "([^"]*)")?$/ do |button_locato
 end
 
 Given /^that "([^"]*)" has been loaded into fedora$/ do |pid|
-  Hydra::Fixtures.reload(pid)
+  Hydra::FixtureLoader.new('test_support/fixtures').reload(pid)
   
 end
 

data/test_support/features/step_definitions/show_document_steps.rb

@@ -46,6 +46,10 @@ Then /^I should not see a link to the "([^\"]*)" page$/ do |link_name|
   page.should_not have_xpath(".//a[@href=\"#{path_to(link_name)}\"]")
 end
 
+Then /^I should see a dropdown for "([^\"]*)"/ do |id|
+  page.should have_selector("select##{id}")
+end
+
 Then /^related links are displayed as urls$/ do
   pending
 end

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -169,7 +169,7 @@ describe Hydra::AccessControlsEnforcement do
    before(:each) do
      @doc_id = 'hydrangea:fixture_mods_article1'
      @bad_id = "redrum"
-     @response2, @document = helper.get_permissions_solr_response_for_doc_id(@doc_id)
+     @permissions_solr_response2, @permissions_solr_document = helper.get_permissions_solr_response_for_doc_id(@doc_id)
    end
 
    it "should raise Blacklight::InvalidSolrID for an unknown id" do
@@ -185,28 +185,80 @@ describe Hydra::AccessControlsEnforcement do
    end
 
    it "should have a non-nil result for a known id" do
-     @document.should_not == nil
+     @permissions_solr_document.should_not == nil
    end
    it "should have a single document in the response for a known id" do
-     @response2.docs.size.should == 1
+     @permissions_solr_response2.docs.size.should == 1
    end
    it 'should have the expected value in the id field' do
-     @document.id.should == @doc_id
+     @permissions_solr_document.id.should == @doc_id
    end
    it 'should have non-nil values for permissions fields that are set on the object' do
-     @document.get(Hydra.config[:permissions][:catchall]).should_not be_nil
-     @document.get(Hydra.config[:permissions][:discover][:group]).should_not be_nil
-     @document.get(Hydra.config[:permissions][:edit][:group]).should_not be_nil
-     @document.get(Hydra.config[:permissions][:edit][:individual]).should_not be_nil
-     @document.get(Hydra.config[:permissions][:read][:group]).should_not be_nil
+     @permissions_solr_document.get(Hydra.config[:permissions][:catchall]).should_not be_nil
+     @permissions_solr_document.get(Hydra.config[:permissions][:discover][:group]).should_not be_nil
+     @permissions_solr_document.get(Hydra.config[:permissions][:edit][:group]).should_not be_nil
+     @permissions_solr_document.get(Hydra.config[:permissions][:edit][:individual]).should_not be_nil
+     @permissions_solr_document.get(Hydra.config[:permissions][:read][:group]).should_not be_nil
  
      # @document.get(Hydra.config[:permissions][:discover][:individual]).should_not be_nil
      # @document.get(Hydra.config[:permissions][:read][:individual]).should_not be_nil
      # @document.get(Hydra.config[:permissions][:owner]).should_not be_nil
      # @document.get(Hydra.config[:permissions][:embargo_release_date]).should_not be_nil
    end
+ 
+   describe "permissions helpers" do 
+     before :each do
+       @hydra_config_hash = { :permissions => {
+              :catchall => "access_t",
+              :discover => {:group =>"discover_access_group_t", :individual=>"discover_access_person_t"},
+              :read => {:group =>"read_foobar_group_t", :individual=>"read_foobar_person_t"},
+              :edit => {:group =>"edit_foobar_group_t", :individual=>"edit_foobar_person_t"},
+              :owner => "depositor_t",
+              :embargo_release_date => "embargo_release_date_dt"
+            }}
+        @stub_user = User.new
+        @stub_user.stubs(:is_being_superuser?).returns false
+      end
+      it "should check fields from Hydra.config when checking read permissions" do
+        Hydra.expects(:config).at_least(2).returns(@hydra_config_hash)
+        @permissions_solr_document.expects(:fetch).with("read_foobar_group_t",nil)
+        @permissions_solr_document.expects(:fetch).with("read_foobar_person_t",nil)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_group_t",nil)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_person_t",nil)
+        helper.stubs(:current_user).returns(@stub_user)
+        helper.reader?
+      end
+      it "should check fields from Hydra.config when checking edit permissions" do
+        Hydra.expects(:config).at_least(2).returns(@hydra_config_hash)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_group_t",nil)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_person_t",nil)
+        helper.stubs(:current_user).returns(@stub_user)
+        helper.editor?
+      end
+      it "should check fields from Hydra.config when executing test_permissions for editor" do
+        Hydra.expects(:config).at_least(2).returns(@hydra_config_hash)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_group_t",nil)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_person_t",nil)
+        helper.stubs(:current_user).returns(@stub_user)
+        helper.test_permission(:edit)
+      end
+      it "should check fields from Hydra.config when executing test_permissions for reader" do
+        Hydra.expects(:config).at_least(2).returns(@hydra_config_hash)
+        @permissions_solr_document.expects(:fetch).with("read_foobar_group_t",nil)
+        @permissions_solr_document.expects(:fetch).with("read_foobar_person_t",nil)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_group_t",nil)
+        @permissions_solr_document.expects(:fetch).with("edit_foobar_person_t",nil)
+        helper.stubs(:current_user).returns(@stub_user)
+        helper.test_permission(:read)
+      end
+    end
+  end
+
+  it "should include the methods from Hydra::AccessControlsEvaluation" do
+    helper.should respond_to(:reader?)
+    helper.should respond_to(:editor?)
+    helper.should respond_to(:test_permission)
   end
-   
 end
 
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 1923832011
+  hash: 1923832013
   prerelease: 5
   segments: 
   - 3
   - 0
   - 0
   - pre
-  - 1
-  version: 3.0.0pre1
+  - 2
+  version: 3.0.0pre2
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 -05:00
-default_executable: 
+date: 2011-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -708,6 +707,9 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- HOW_TO_GET_STARTED.textile
+- HYDRA_ACCESS_CONTROLS.textile
+- INITIAL_APP_MODS.textile
 - README.textile
 - README_RAILS3_CHANGES.textile
 - Rakefile
@@ -829,7 +831,9 @@ files:
 - lib/application_controller.rb
 - lib/application_helper.rb
 - lib/engine.rb
+- lib/generators/hydra/cucumber_support_generator.rb
 - lib/generators/hydra/head_generator.rb
+- lib/generators/hydra/hyhead_fixtures_generator.rb
 - lib/generators/hydra/templates/config/fedora.yml
 - lib/generators/hydra/templates/config/initializers/blacklight_config.rb
 - lib/generators/hydra/templates/config/initializers/fedora_config.rb
@@ -841,7 +845,6 @@ files:
 - lib/generators/hydra/templates/config/solr.yml
 - lib/generators/hydra/templates/config/solr_mappings.yml
 - lib/generators/hydra/templates/fedora_conf/conf/fedora.fcfg
-- lib/generators/hydra/templates/migrations/add_user_attributes_table.rb
 - lib/generators/hydra/templates/migrations/create_superusers.rb
 - lib/generators/hydra/templates/solr_conf/conf/schema.xml
 - lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml
@@ -858,7 +861,7 @@ files:
 - lib/hydra/common_mods_index_methods.rb
 - lib/hydra/controller.rb
 - lib/hydra/file_assets_helper.rb
-- lib/hydra/fixtures.rb
+- lib/hydra/fixture_loader.rb
 - lib/hydra/generic_content.rb
 - lib/hydra/generic_image.rb
 - lib/hydra/image.rb
@@ -903,7 +906,6 @@ files:
 - test_support/features/file_assets_list.feature
 - test_support/features/file_upload.feature
 - test_support/features/home_page.feature
-- test_support/features/html_validity.feature
 - test_support/features/mods_asset_contributors_edit.feature
 - test_support/features/mods_asset_create.feature
 - test_support/features/mods_asset_edit.feature
@@ -994,6 +996,7 @@ files:
 - vendor/cache/activerecord-3.0.9.gem
 - vendor/cache/activeresource-3.0.9.gem
 - vendor/cache/activesupport-3.0.9.gem
+- vendor/cache/addressable-2.2.6.gem
 - vendor/cache/arel-2.0.10.gem
 - vendor/cache/blacklight-3.0.0.gem
 - vendor/cache/block_helpers-0.3.3.gem
@@ -1022,15 +1025,15 @@ files:
 - vendor/cache/json-1.5.3.gem
 - vendor/cache/json_pure-1.5.3.gem
 - vendor/cache/kaminari-0.12.4.gem
-- vendor/cache/launchy-2.0.3.gem
+- vendor/cache/launchy-2.0.4.gem
 - vendor/cache/linecache-0.46.gem
 - vendor/cache/logger-1.2.8.gem
 - vendor/cache/mail-2.2.19.gem
 - vendor/cache/marc-0.4.3.gem
-- vendor/cache/mediashelf-loggable-0.4.2.gem
+- vendor/cache/mediashelf-loggable-0.4.3.gem
 - vendor/cache/mime-types-1.16.gem
 - vendor/cache/mocha-0.9.12.gem
-- vendor/cache/multipart-post-1.1.2.gem
+- vendor/cache/multipart-post-1.1.3.gem
 - vendor/cache/nokogiri-1.5.0.gem
 - vendor/cache/om-1.2.5.gem
 - vendor/cache/polyglot-0.3.1.gem
@@ -1070,7 +1073,6 @@ files:
 - vendor/cache/xml-simple-1.1.0.gem
 - vendor/cache/xpath-0.1.4.gem
 - vendor/cache/yard-0.7.2.gem
-has_rdoc: true
 homepage: http://projecthydra.org
 licenses: []
 
@@ -1102,7 +1104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Hydra-Head Rails Engine (requires Rails3)