hydra-head 4.0.0.rc4 → 4.0.0.rc5

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    hydra-head (4.0.0.rc4)
+    hydra-head (4.0.0.rc5)
       RedCloth (= 4.2.9)
-      active-fedora (~> 4.0.0.rc19)
+      active-fedora (~> 4.0.0.rc20)
       blacklight (~> 3.3.1)
       block_helpers
       cancan
       devise
-      rails (~> 3.2.1)
+      rails (= 3.2.2)
       sanitize
 
 GEM
@@ -28,7 +28,7 @@ GEM
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    active-fedora (4.0.0.rc19)
+    active-fedora (4.0.0.rc20)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -115,12 +115,12 @@ GEM
     equivalent-xml (0.2.9)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
+    factory_girl (3.0.0)
+      activesupport (>= 3.0.0)
     fastercsv (1.5.4)
     ffi (1.0.11)
     fssm (0.2.8.1)
-    gherkin (2.9.1)
+    gherkin (2.9.3)
       json (>= 1.4.6)
     gyoku (0.4.4)
       builder (>= 2.1.2)
@@ -135,7 +135,7 @@ GEM
       logger
       mediashelf-loggable
     journey (1.0.3)
-    json (1.6.5)
+    json (1.6.6)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -148,14 +148,14 @@ GEM
     marc (0.4.4)
     mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
-    mime-types (1.17.2)
+    mime-types (1.18)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.1.0)
+    multi_json (1.2.0)
     multipart-post (1.1.2)
     nokogiri (1.5.2)
     nori (1.1.0)
-    om (1.6.0.rc3)
+    om (1.6.0)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     orm_adapter (0.0.7)

data/HISTORY.textile

@@ -4,6 +4,8 @@ h3. 4.0.0
 * Removed railtie to configure active-fedora
 * Register solr happens automatically
 * Using CanCan gem for authorization
+* Compatibility with Rails 3.2
+* Compatibility with Ruby 1.9.3
 
 h3. 3.3.0
 * HYDRA-737: fixes to work with Ruby Enterprise Edition 2011.12 and ruby-1.8.7-p357.

data/hydra-head.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.summary     = %q{Hydra-Head Rails Engine (requires Rails3) }
   s.description = %q{Hydra-Head is a Rails Engine containing the core code for a Hydra application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om}
 
-  s.add_dependency "rails", '~> 3.2.1'
+  s.add_dependency "rails", '3.2.2' # 3.2.3 needs an updated version of BL(>3.3.1)
   s.add_dependency "blacklight", '~>3.3.1'  
   s.add_dependency "devise"
-  s.add_dependency "active-fedora", '~>4.0.0.rc19'
+  s.add_dependency "active-fedora", '~>4.0.0.rc20'
   s.add_dependency 'RedCloth', '=4.2.9'
   s.add_development_dependency 'solrizer-fedora', '>=1.2.5'
   s.add_dependency 'block_helpers'

data/lib/hydra/catalog.rb

@@ -21,6 +21,7 @@ module Hydra::Catalog
     # View Helpers
     helper :hydra_uploader
     helper :article_metadata
+    rescue_from ActiveFedora::ObjectNotFoundError, :with => :nonexistent_document
   end
   
   def edit
@@ -33,5 +34,15 @@ module Hydra::Catalog
     show
     render "show"
   end
-
+  
+  def nonexistent_document
+    if Rails.env == "development"
+      render
+    else
+      flash[:notice] = "Sorry, you have requested a record that doesn't exist."
+      params.delete(:id)
+      index
+      render "index", :status => 404
+    end
+  end
 end

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "4.0.0.rc4"
+  VERSION = "4.0.0.rc5"
 end
 

data/lib/hydra.rb

@@ -1,5 +1,7 @@
 require "blacklight"
 require 'active-fedora'
+require 'cancan'
+
 # Hydra libraries
 module Hydra
   extend Blacklight::GlobalConfigurable
@@ -34,5 +36,6 @@ require 'hydra/common_mods_index_methods'
 require 'hydra/mods_article'
 require 'hydra/model_methods'
 require 'hydra/models/file_asset'
+require 'mediashelf/active_fedora_helper' #deprecated
 
 

data/lib/railties/hydra-fixtures.rake

@@ -1,6 +1,3 @@
-require "active-fedora"
-require "solrizer-fedora"
-require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
 namespace :hydra do
   
   desc "Init Hydra configuration" 

data/test_support/etc/Gemfile

@@ -13,7 +13,6 @@ gem 'blacklight', '~>3.3.0'
 gem 'hydra-head', :path => '../../'
 gem 'devise'
 gem 'jettywrapper'
-gem 'cancan'
 
 # For testing
 group :development, :test do 

data/test_support/features/html_validity.feature

@@ -21,8 +21,7 @@ Feature: HTML validity
   Scenario: Search Results (authenticated)
     Given I am logged in as "archivist1@example.com" 
     When I am on the home page
-    And I follow "Article"
-#This may fail if there are a lot of articles in fedora and the expected article is not on the first page
+    And I follow "TOPIC 1"
     Then I should see "TITLE OF HOST JOURNAL"
     And the page should be HTML5 valid
     

data/test_support/features/nonexistent_object_show.feature

@@ -0,0 +1,9 @@
+Feature: Non-existent Objects - Show View
+  I want to see a 404 for the show view for objects not in fedora or solr
+  Scenario: an object exists for an id
+    Given I am on the show document page for hydra:test_no_model
+    Then I should get a status code 200
+  Scenario: no object exists for an id 
+    Given I am on the show document page for hydra:test_no_exist
+    Then I should get a status code 404
+    And I should see "Sorry, you have requested a record that doesn't exist."

data/test_support/features/step_definitions/user_steps.rb

@@ -23,7 +23,10 @@ end
 Given /^I am a superuser$/ do
   step %{I am logged in as "bigwig@example.com"}
   bigwig_id = User.find_by_email("bigwig@example.com").id
-  superuser = Superuser.create(:id => 20, :user_id => bigwig_id)
+  superuser = Superuser.new()
+  superuser.id = 20
+  superuser.user_id = bigwig_id
+  superuser.save!
   visit superuser_path
 end
 

data/test_support/features/step_definitions/web_steps.rb

@@ -217,3 +217,7 @@ end
 Then /^show me the page$/ do
   save_and_open_page
 end
+
+Then  /^I should get a status code (\d+)/ do |http_status|
+  page.driver.status_code.should == http_status.to_i
+end

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -109,6 +109,7 @@ describe CatalogController do
     end
     describe "show" do
       it "should trigger enforce_show_permissions and load_fedora_document" do
+        controller.stubs(:current_user).returns(nil)
         controller.expects(:load_fedora_document)
         controller.expects(:enforce_show_permissions)
         get :show, :id=>'test:3'
@@ -116,6 +117,7 @@ describe CatalogController do
     end
     describe "edit" do
       it "should trigger enforce_edit_permissions and load_fedora_document" do
+        controller.stubs(:current_user).returns(nil)
         controller.expects(:load_fedora_document)
         controller.expects(:enforce_edit_permissions)
         get :edit, :id=>'test:3'

data/test_support/spec/models/user_spec.rb

@@ -8,7 +8,10 @@ describe User do
       @user = User.create(:email=> "testuser@example.com", :password=> "password", :password_confirmation => "password")
     end
     it "should know if a user can be a superuser" do
-      superuser = Superuser.create(:id => 20, :user_id => @user.id)
+      superuser = Superuser.new()
+      superuser.id = 20
+      superuser.user_id = @user.id
+      superuser.save!
       @user.extend(Hydra::SuperuserAttributes)
       @user.can_be_superuser?.should be_true
     end
@@ -19,7 +22,10 @@ describe User do
     end
 
     it "should know if the user is being a superuser" do
-      superuser = Superuser.create(:id => 50, :user_id => @user.id)
+      superuser = Superuser.new()
+      superuser.id = 50
+      superuser.user_id = @user.id
+      superuser.save!
       @user.extend(Hydra::SuperuserAttributes)
       session = { :superuser_mode => true }
       @user.is_being_superuser?(session).should be_true
@@ -32,7 +38,10 @@ describe User do
     end
 
     it "should know if the user is not being a superuser even if the user can be a superuser" do
-      superuser = Superuser.create(:id => 60, :user_id => @user.id)
+      superuser = Superuser.new()
+      superuser.id = 60
+      superuser.user_id = @user.id
+      superuser.save!
       @user.extend(Hydra::SuperuserAttributes)
       @user.can_be_superuser?.should be_true
       session = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-head
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc4
+  version: 4.0.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70283600038780 !ruby/object:Gem::Requirement
+  requirement: &70107854576240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70283600038780
+  version_requirements: *70107854576240
 - !ruby/object:Gem::Dependency
   name: blacklight
-  requirement: &70283600038160 !ruby/object:Gem::Requirement
+  requirement: &70107854603200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70283600038160
+  version_requirements: *70107854603200
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70283600037660 !ruby/object:Gem::Requirement
+  requirement: &70107854601100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +44,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283600037660
+  version_requirements: *70107854601100
 - !ruby/object:Gem::Dependency
   name: active-fedora
-  requirement: &70283600037020 !ruby/object:Gem::Requirement
+  requirement: &70107854613840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc19
+        version: 4.0.0.rc20
   type: :runtime
   prerelease: false
-  version_requirements: *70283600037020
+  version_requirements: *70107854613840
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70283600036420 !ruby/object:Gem::Requirement
+  requirement: &70107854613340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70283600036420
+  version_requirements: *70107854613340
 - !ruby/object:Gem::Dependency
   name: solrizer-fedora
-  requirement: &70283600035840 !ruby/object:Gem::Requirement
+  requirement: &70107854612860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70283600035840
+  version_requirements: *70107854612860
 - !ruby/object:Gem::Dependency
   name: block_helpers
-  requirement: &70283600035380 !ruby/object:Gem::Requirement
+  requirement: &70107854612180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283600035380
+  version_requirements: *70107854612180
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &70283600034820 !ruby/object:Gem::Requirement
+  requirement: &70107854611440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283600034820
+  version_requirements: *70107854611440
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70283600034300 !ruby/object:Gem::Requirement
+  requirement: &70107854610740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283600034300
+  version_requirements: *70107854610740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70283600062900 !ruby/object:Gem::Requirement
+  requirement: &70107854608140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283600062900
+  version_requirements: *70107854608140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70283600062380 !ruby/object:Gem::Requirement
+  requirement: &70107854637400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283600062380
+  version_requirements: *70107854637400
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &70283600061760 !ruby/object:Gem::Requirement
+  requirement: &70107854636480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70283600061760
+  version_requirements: *70107854636480
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70283600061260 !ruby/object:Gem::Requirement
+  requirement: &70107854635520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283600061260
+  version_requirements: *70107854635520
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70283600060660 !ruby/object:Gem::Requirement
+  requirement: &70107854634600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283600060660
+  version_requirements: *70107854634600
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70283600059920 !ruby/object:Gem::Requirement
+  requirement: &70107854633860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70283600059920
+  version_requirements: *70107854633860
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70283600059280 !ruby/object:Gem::Requirement
+  requirement: &70107854633040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,7 +187,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283600059280
+  version_requirements: *70107854633040
 description: ! 'Hydra-Head is a Rails Engine containing the core code for a Hydra
   application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora,
   solrizer, and om'
@@ -566,6 +566,7 @@ files:
 - test_support/features/mods_asset_edit_without_permission.feature
 - test_support/features/mods_asset_search_result.feature
 - test_support/features/mods_asset_show.feature
+- test_support/features/nonexistent_object_show.feature
 - test_support/features/permissions_add.feature
 - test_support/features/permissions_edit.feature
 - test_support/features/step_definitions/catalog_index_steps.rb
@@ -652,7 +653,7 @@ files:
 - vendor/cache/RedCloth-4.2.9.gem
 - vendor/cache/actionmailer-3.2.2.gem
 - vendor/cache/actionpack-3.2.2.gem
-- vendor/cache/active-fedora-4.0.0.rc19.gem
+- vendor/cache/active-fedora-4.0.0.rc20.gem
 - vendor/cache/activemodel-3.2.2.gem
 - vendor/cache/activerecord-3.2.2.gem
 - vendor/cache/activeresource-3.2.2.gem
@@ -678,31 +679,31 @@ files:
 - vendor/cache/diff-lcs-1.1.3.gem
 - vendor/cache/equivalent-xml-0.2.9.gem
 - vendor/cache/erubis-2.7.0.gem
-- vendor/cache/factory_girl-2.6.4.gem
+- vendor/cache/factory_girl-3.0.0.gem
 - vendor/cache/fastercsv-1.5.4.gem
 - vendor/cache/ffi-1.0.11.gem
 - vendor/cache/fssm-0.2.8.1.gem
-- vendor/cache/gherkin-2.9.1.gem
+- vendor/cache/gherkin-2.9.3.gem
 - vendor/cache/gyoku-0.4.4.gem
 - vendor/cache/hike-1.2.1.gem
 - vendor/cache/httpi-0.9.6.gem
 - vendor/cache/i18n-0.6.0.gem
 - vendor/cache/jettywrapper-1.2.1.gem
 - vendor/cache/journey-1.0.3.gem
-- vendor/cache/json-1.6.5.gem
+- vendor/cache/json-1.6.6.gem
 - vendor/cache/kaminari-0.13.0.gem
 - vendor/cache/logger-1.2.8.gem
 - vendor/cache/mail-2.4.4.gem
 - vendor/cache/marc-0.4.4.gem
 - vendor/cache/mediashelf-loggable-0.4.9.gem
 - vendor/cache/metaclass-0.0.1.gem
-- vendor/cache/mime-types-1.17.2.gem
+- vendor/cache/mime-types-1.18.gem
 - vendor/cache/mocha-0.10.5.gem
-- vendor/cache/multi_json-1.1.0.gem
+- vendor/cache/multi_json-1.2.0.gem
 - vendor/cache/multipart-post-1.1.2.gem
 - vendor/cache/nokogiri-1.5.2.gem
 - vendor/cache/nori-1.1.0.gem
-- vendor/cache/om-1.6.0.rc3.gem
+- vendor/cache/om-1.6.0.gem
 - vendor/cache/orm_adapter-0.0.7.gem
 - vendor/cache/polyglot-0.3.3.gem
 - vendor/cache/rack-1.4.1.gem