hydra-head 4.1.0 → 4.1.1

data/hydra-head.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'hydra-mods', ">= 0.0.5"
   s.add_dependency 'deprecation', ">= 0.0.5"
   s.add_dependency 'jquery-rails'
-  s.add_dependency 'hydra-access-controls', ">= 0.0.2"
+  s.add_dependency 'hydra-access-controls', ">= 0.0.5"
   
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'yard'

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end
 

data/lib/hydra.rb

@@ -21,6 +21,7 @@ module Hydra
   autoload :SuperuserAttributes
   autoload :User
   autoload :UI
+  autoload :Solr
   autoload :Workflow
 
   autoload :FileAssetsHelper
@@ -29,6 +30,9 @@ module Hydra
   # This usually happens within a call to AccessControlsEnforcement#enforce_access_controls but can be
   # raised manually.
   class Hydra::AccessDenied < CanCan::AccessDenied; end
+
+  User.send(:include, Hydra::SuperuserAttributes)  #Deprecated
+
 end
 
 
@@ -39,5 +43,6 @@ require 'hydra/model_methods'
 require 'hydra/models/file_asset'
 require 'mediashelf/active_fedora_helper' #deprecated
 
+
 SolrDocument.use_extension Hydra::ModelMixins::SolrDocumentExtension
 

data/lib/hydra/solr.rb

@@ -0,0 +1,9 @@
+module Hydra
+  module Solr
+    module Document
+      def to_model
+        ActiveFedora::Base.load_instance_from_solr(id, self)
+      end
+    end
+  end
+end

data/tasks/hydra_jetty.rake

@@ -47,8 +47,7 @@ namespace :hydra do
 
     desc "return development jetty to its pristine state, as pulled from git"
     task :reset => ['jetty:stop'] do
-      system("cd jetty && git reset --hard HEAD && git clean -dfx & cd ..")
-      sleep 2
+      system("cd jetty && git reset --hard HEAD && git clean -dfx && cd ..")
     end
   end
 end

data/test_support/etc/Gemfile

@@ -27,7 +27,7 @@ gem 'jettywrapper'
 # For testing
 group :development, :test do 
        gem 'rspec-rails'
-       gem 'mocha'
+       gem 'mocha', "~> 0.11.4"
        gem 'cucumber-rails', :require => false
        gem 'capybara'
        gem 'factory_girl', '~> 2.6.0'

data/test_support/spec/models/solr_document_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe SolrDocument do
+  describe "#to_model" do
+
+    before do
+      class SolrDocumentWithHydraOverride < SolrDocument
+         include Hydra::Solr::Document
+      end
+    end
+    # this isn't a great test, but...
+    it "should try to cast the SolrDocument to the Fedora object" do
+      ActiveFedora::Base.expects(:load_instance_from_solr).with('asdfg', kind_of(SolrDocument))
+      SolrDocumentWithHydraOverride.new(:id => 'asdfg').to_model
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-head
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -599,11 +599,11 @@ files:
 - lib/hydra/models/file_asset.rb
 - lib/hydra/repository_controller.rb
 - lib/hydra/rights_metadata.rb
+- lib/hydra/solr.rb
 - lib/hydra/submission_workflow.rb
 - lib/hydra/superuser_attributes.rb
 - lib/hydra/ui.rb
 - lib/hydra/ui/controller.rb
-- lib/hydra/user.rb
 - lib/hydra/workflow.rb
 - lib/hydra/workflow/controller.rb
 - lib/mediashelf/active_fedora_helper.rb
@@ -728,6 +728,7 @@ files:
 - test_support/spec/models/generic_content_spec.rb
 - test_support/spec/models/generic_image_spec.rb
 - test_support/spec/models/mods_asset_spec.rb
+- test_support/spec/models/solr_document_spec.rb
 - test_support/spec/models/user_spec.rb
 - test_support/spec/rcov.opts
 - test_support/spec/spec.opts

data/lib/hydra/user.rb

@@ -1,35 +0,0 @@
-# Injects behaviors into User model so that it will work with Hydra Access Controls
-# By default, this module assumes you are using the User model created by Blacklight, which uses Devise.
-# To integrate your own User implementation into Hydra, override this Module or define your own User model in app/models/user.rb within your Hydra head.
-require 'deprecation'
-module Hydra::User
-  extend Deprecation
-  
-  def self.included(klass)
-    # Other modules to auto-include
-    klass.send(:include, Hydra::SuperuserAttributes)
-  end
-
-  # This method should display the unique identifier for this user as defined by devise.
-  # The unique identifier is what access controls will be enforced against. 
-  def user_key
-    send(Devise.authentication_keys.first)
-  end
-
-
-  # This method should display the unique identifier for this user
-  # the unique identifier is what access controls will be enforced against. 
-  def unique_id
-    return to_s
-  end
-  deprecation_deprecate :unique_id
-
-  
-
-  # For backwards compatibility with the Rails2 User models in Hydra/Blacklight
-  def login
-    return unique_id
-  end
-  deprecation_deprecate :login
-  
-end