hydra-core 5.0.0.pre4 → 5.0.0.pre6

data/app/views/catalog/_home.html.erb

@@ -1,6 +1,4 @@
 <%= render :partial=>'search_form' %>
 <%= render :partial=>'home_text' %>
 
-<% sidebar_items << capture do %>
-  <%= render :partial=>'facets' %>
-<% end %>
+<%= sidebar_items.join('').html_safe %>

data/app/views/catalog/_index_partials/_default.html.erb

@@ -1,6 +1,6 @@
-<tr class="document <%= cycle("even","odd") %>">
+<tr class="document">
   <td>
-    <%= link_to_document(document, :label => blacklight_config.show.heading.to_sym, :counter => (counter + 1 + @response.params[:start].to_i)) %>
+    <%= link_to_document(document, :label => blacklight_config.show.heading.to_sym) %>
   </td>
   <td>
 
@@ -12,7 +12,7 @@
     <%= document.document_type(blacklight_config.show.display_type) %>
   </td>
   <td>
-    <%= get_file_asset_count(document)%>
+    <%= document.get_file_asset_count()%>
   </td>
   <td>
     Created

data/app/views/catalog/_show_partials/_default.html.erb

@@ -18,4 +18,3 @@
 <div class="<%= params[:action]%>_details">
   <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%>
 </div>
-<%= async_load_tag(hydra_asset_downloads_path(params[:id]), 'downloads') %>

data/hydra-core.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rails", '~>3.2.3' 
   gem.add_dependency "blacklight", '~>3.4'  
   gem.add_dependency "devise"
-  gem.add_dependency "active-fedora", '~>4.1'
+  gem.add_dependency "active-fedora", '~>4.6.0.rc1'
   gem.add_dependency 'RedCloth', '=4.2.9'
   gem.add_dependency 'block_helpers'
   gem.add_dependency 'sanitize'

data/lib/generators/hydra/head_generator.rb

@@ -30,7 +30,13 @@ class HeadGenerator < Rails::Generators::Base
     copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
 
     # Initializers
-    copy_file "config/initializers/hydra_config.rb", "config/initializers/hydra_config.rb"
+    file_path = "config/initializers/hydra_config.rb"
+    copy_file "config/initializers/hydra_config.rb", file_path
+    insert_into_file file_path, :after => '# specify the user model' do      
+        "\n    config[:user_model] = '#{model_name.classify}'" 
+    end
+    
+
     copy_file "config/initializers/action_dispatch_http_upload_monkey_patch.rb", "config/initializers/action_dispatch_http_upload_monkey_patch.rb"
 
     # Role Mappings

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

@@ -35,5 +35,7 @@ if Hydra.respond_to?(:configure)
       :owner => "depositor_t",
       :embargo_release_date => "embargo_release_date_dt"
     }
+
+    # specify the user model
   end
 end

data/lib/hydra-core.rb

@@ -16,3 +16,12 @@ module HydraHead
     HydraHead::Routes.new(router, options).draw
   end
 end
+
+ActiveSupport.on_load(:after_initialize) do
+  begin
+    puts "Requiring SolrDocumentExtension"
+    SolrDocument.use_extension Hydra::ModelMixins::SolrDocumentExtension
+  rescue NameError
+    puts "Couldn't find SolrDocument"
+  end
+end

data/lib/hydra-head/routes.rb

@@ -24,67 +24,23 @@ module HydraHead
     end
 
     def default_route_sets
-      [:catalog, :superuser, :permissions, :assets_with_all_nested_routes]
+      [:assets_with_all_nested_routes]
     end
 
     module RouteSets
-
-
       def assets_with_all_nested_routes
         add_routes do |options|
-          match "withdraw", :to => "hydra/assets#withdraw", :as => "withdraw"   
           namespace :hydra do
             resources :file_assets
             resources :assets do 
-              # this is to remove documents from SOLR but not from Fedora.
-              resources :contributors, :only=>[:new,:create]
-              match '/contributors', :to => 'contributors#update', :as => 'update_contributors'
-              # We would need to include the rails JS files (or implement our own) if we want this to work w/ DELETE because we delete from a link not a button.
-              #match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect',  :via => 'delete'
-              match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect'
-              # There is no ContributorsController#show
-              match 'contributors/:contributor_type/:index', :to => 'contributors#show', :as => 'contributor', :via => 'get'
               resources :file_assets
-              resources :downloads, :only=>[:index]
-              resources :grants, :only=>[:new,:create]
-              resources :permissions
-              # Allow updates to assets/:asset_id/permissions (no :id necessary)
-              match '/permissions', :to => 'permissions#update', :as => 'update_group_permissions'            
             end
           end
-          match "generic_contents_object/content/:container_id", :to=>"generic_content_objects#create", :as=>'generic_content_object',  :via => 'post'            
         end
       end
-      
-      def permissions
-        add_routes do |options|
-          namespace :hydra do
-            resources :permissions
-          end
-        end
-      end
-
-
-      def superuser
-        add_routes do |options|
-          match 'superuser', :to => 'user_sessions#superuser', :as => 'superuser'
-        end
-      end
-
-      def catalog
-        add_routes do |options|
-          match 'catalog/:id/edit', :to => 'catalog#edit', :as => 'edit_catalog'
-          # The delete method renders a confirmation page with a button to submit actual destroy request
-          match 'catalog/:id/delete', :to => 'catalog#delete', :as => 'delete_catalog'
-        end
-      end
-
-
-
-
     end
+
     include RouteSets
 
-#match 'generic_contents_object/content/:container_id', :to => 'generic_content_objects#create', :as => 'generic_content_object', :via => :post
   end
 end

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.0.0.pre4"
+  VERSION = "5.0.0.pre6"
 end
 

data/lib/hydra.rb

@@ -1,5 +1,5 @@
 require 'hydra-access-controls'
-# Hydra libraries
+
 module Hydra
   extend ActiveSupport::Autoload
   autoload :GlobalConfigurable
@@ -15,12 +15,3 @@ module Hydra
   end
   autoload :Models
 end
-
-# require these models once the hydra module has been set up, so that all autoloads take place
-#require 'hydra-file-access'
-
-begin
-  SolrDocument.use_extension Hydra::ModelMixins::SolrDocumentExtension
-rescue NameError
-end
-

data/lib/hydra/controller/upload_behavior.rb

@@ -1,4 +1,3 @@
-# will move to lib/hydra/controller / upload_behavior.rb in release 5.x
 module Hydra::Controller::UploadBehavior
   
   # Creates a File Asset, adding the posted blob to the File Asset's datastreams and saves the File Asset

data/lib/hydra/model_mixins/solr_document_extension.rb

@@ -18,7 +18,9 @@ module Hydra::ModelMixins
         i += 1
       end
     end
+    def get_file_asset_count()
+      ActiveFedora::Base.count(:conditions=>"is_part_of_t:#{ActiveFedora::Base.quote_for_solr(id)}")
+    end
   end
 end
 
-SolrDocument.use_extension Hydra::ModelMixins::SolrDocumentExtension

data/spec/controllers/catalog_controller_spec.rb

@@ -26,9 +26,6 @@ describe CatalogController do
     it "should map {:controller=>'catalog', :action=>'show', :id=>'test:3'} to GET /catalog/test:3" do
       { :get => "/catalog/test:3" }.should route_to(:controller => 'catalog', :action => 'show', :id=>'test:3')
     end
-    it "should map {:controller=>'catalog', :action=>'edit', :id=>'test:3'} to GET /catalog/test:3" do
-      { :get => "/catalog/test:3/edit" }.should route_to(:controller => 'catalog', :action => 'edit', :id=>'test:3')
-    end
 
     it "should map catalog_path" do
       # catalog_path.should == '/catalog'
@@ -68,16 +65,6 @@ describe CatalogController do
         get :index
         assigns(:document_list).count.should == @public_only_results.docs.count
       end
-      it "should return all documents if role does have permissions" do
-        pending "Need to put documents into solr"
-        mock_user =  FactoryGirl.build(:user, :email=>"BigWig@example.com")
-        mock_user.stub(:is_being_superuser?).and_return(true)
-        controller.stub(:current_user).and_return(mock_user)
-        get :index
-        ### This fails when there are more than 10 public documents in the solr index
-        ### TODO: instead, expect a certain query(especially the :fq component) to solr
-        assigns(:document_list).count.should > @public_only_results.docs.count
-      end
     end
   end
   

data/spec/controllers/catalog_valid_html_spec.rb

@@ -35,17 +35,12 @@ describe CatalogController do
   describe "Home Page" do
     
     it "Should have Valid HTML when not logged in" do
-      controller.stub(:current_user).and_return(nil)
       get("index", "controller"=>"catalog")
       document_check(response.body)
     end
     
     it "Should have Valid HTML when I'm logged in" do
-        mock_user = FactoryGirl.build(:user, :email=>"archivist1@example.com")
-        mock_user.stub(:can_be_superuser?).and_return(true)
-        mock_user.stub(:is_being_superuser?).and_return(true)
-
-        sign_in mock_user
+        sign_in FactoryGirl.build(:user, :email=>"archivist1@example.com")
         get("index", "controller"=>"catalog")
         document_check(response.body)
     end
@@ -55,8 +50,6 @@ describe CatalogController do
     
     before(:each)  do
         mock_user = FactoryGirl.build(:user, :email=>"archivist1@example.com")
-        mock_user.stub(:can_be_superuser?).and_return(true)
-        mock_user.stub(:is_being_superuser?).and_return(true)
         sign_in mock_user
     end
     

data/spec/helpers/facets_helper_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe FacetsHelper do
+  let(:blacklight_config) { Blacklight::Configuration.new }
+
+  before(:each) do
+    helper.stub(:blacklight_config).and_return blacklight_config
+  end
+  
   
   describe "render_selected_facet_value" do
     it "should be html_safe and not have the remove link" do

data/spec/lib/solr_document_extension_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Hydra::ModelMixins::SolrDocumentExtension do
+  before do
+    @doc = SolrDocument.new(:id=>'changeme:99')
+  end
+
+  it "should get_file_asset_count" do
+
+    mock_result = {'response'=>{'numFound'=>0}}
+    ActiveFedora::SolrService.should_receive(:query).with("is_part_of_t:\"changeme\\:99\"", :rows=>0, :raw=>true).and_return(mock_result)
+    @doc.get_file_asset_count.should == 0
+  end
+end

data/spec/support/app/models/generic_content.rb

@@ -7,8 +7,6 @@ class GenericContent < ActiveFedora::Base
   #  FIXME:  should this have   "include Hydra::ModelMixins::CommonMetadata" instead?
   has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata 
 
-  #has_metadata :name => "descMetadata", :type => Hydra::Datastream::ModsGenericContent
-
   # A place to put extra metadata values, e.g. the user id of the object depositor (for permissions)
   has_metadata :name => "properties", :type => Hydra::Datastream::Properties
   

data/tasks/rspec.rake

@@ -18,7 +18,7 @@ task :fixtures do
 end
 
 
-describe "Create the test rails app"
+desc "Create the test rails app"
 task :generate do
   unless File.exists?('spec/internal/Rakefile')
     puts "Generating rails app"
@@ -40,7 +40,7 @@ task :generate do
   puts "Running specs"
 end
 
-describe "Clean out the test rails app"
+desc "Clean out the test rails app"
 task :clean do
   puts "Removing sample rails app"
   `rm -rf spec/internal`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre4
+  version: 5.0.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre4
+        version: 5.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre4
+        version: 5.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -319,21 +319,17 @@ files:
 - app/models/mods_asset.rb
 - app/views/_flash_msg.html.erb
 - app/views/catalog/_citation.html.erb
-- app/views/catalog/_constraints_element.html.erb
 - app/views/catalog/_delete_partials/_default.html.erb
 - app/views/catalog/_edit_partials/_default.html.erb
 - app/views/catalog/_edit_partials/_default_details.html.erb
-- app/views/catalog/_facets.html.erb
 - app/views/catalog/_home.html.erb
 - app/views/catalog/_home_text.html.erb
 - app/views/catalog/_index_partials/_default.html.erb
 - app/views/catalog/_index_partials/_default_details.html.erb
-- app/views/catalog/_opensearch_response_metadata.html.erb
 - app/views/catalog/_show_partials/_default.html.erb
 - app/views/catalog/_show_partials/_default_details.html.erb
 - app/views/catalog/_show_partials/_facets.html.erb
 - app/views/catalog/_sms_form.html.erb
-- app/views/catalog/_sort_and_per_page.html.erb
 - app/views/catalog/_uva_tabs.html.erb
 - app/views/catalog/about.html.erb
 - app/views/catalog/show.html.erb
@@ -391,6 +387,7 @@ files:
 - spec/lib/global_configurable_spec.rb
 - spec/lib/model_methods_spec.rb
 - spec/lib/repository_controller_behavior_spec.rb
+- spec/lib/solr_document_extension_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
@@ -447,6 +444,7 @@ test_files:
 - spec/lib/global_configurable_spec.rb
 - spec/lib/model_methods_spec.rb
 - spec/lib/repository_controller_behavior_spec.rb
+- spec/lib/solr_document_extension_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb

data/app/views/catalog/_constraints_element.html.erb

@@ -1,34 +0,0 @@
-<%# This view is overridden to change the alt attribute to be a title in the link_to below in order to conform to the HTML5 validity standard.  This should ultimately be fixed in Blacklight.  -%>
-<%- # local params:
-    # label 
-    # value
-    # options =>
-    #   :remove => url for a remove constraint link
-    #   :classes => array of classes to add to container span
-    options ||= {}
-    options[:escape_label] = true unless options.has_key?(:escape_label)
-    options[:escape_value] = true unless options.has_key?(:escape_value)
--%>
-
-<span class="appliedFilter constraint <%= options[:classes].join(" ") if options[:classes] %>">
-      <%- unless label.blank? -%>
-        <span class="filterName"><%= options[:escape_label] ? h(label) : label %></span> 
-      <%- end -%>
-      <%- unless value.blank? -%>
-        <span class="filterValue"><%= options[:escape_value] ? h(value) : value %></span>
-      <%- end -%>
-      <%- unless options[:remove].blank? -%>
-        <% accessible_remove_label =               
-                if label.blank?
-                  "Remove constraint #{options[:escape_value] ? h(value) : value}"
-                else
-                  "Remove constraint #{options[:escape_value] ? h(value) : value}: #{options[:escape_value] ? h(value) : value}"
-                end              
-        %>                
-        <%= link_to(accessible_remove_label,
-					options[:remove],
-					:class=>'btnRemove imgReplace',
-          :title=>'remove'
-				) %>
-      <%- end -%>
-</span>

data/app/views/catalog/_facets.html.erb

@@ -1,37 +0,0 @@
-<% # main container for facets/limits menu -%>
-<div id="facets" class="facets">
-  <% facet_field_names.each do |solr_fname| %>
-    
-    <% next if solr_fname == 'person_full_name_cid_facet' %>
-    <div>
-      <% display_facet = @response.facets.detect {|f| f.name == solr_fname} -%>
-      <% if display_facet && display_facet.items.length > 0 %>
-        <h3 id="facet_<%= facet_field_labels[solr_fname].downcase.gsub(/ /, '_') -%>"><%= facet_field_labels[solr_fname] -%></h3>
-        <ul>
-          <% paginator =    
-              Blacklight::Solr::FacetPaginator.new(display_facet.items,        
-                :limit => facet_limit_for(solr_fname))
-          %>
-          <% paginator.items.each do |item| -%>
-            <li>
-            <% if facet_in_params?( solr_fname, item.value ) %>              
-                <%= render_selected_facet_value(solr_fname, item) %>              
-              <% else %>              
-                <% if item.value.blank? %>
-                  <%#= render_facet_value(solr_fname, ["Unknown",item.hits]) %>
-                <% else %>
-                  <%= render_facet_value(solr_fname, item) %>
-                <% end %>
-            <% end -%>
-            </li>
-          <% end %>
-          
-          <% if(paginator.has_next?)  %>
-            <li class="more_facets_link"><%= link_to('more »', params.merge(:id => solr_fname, :action=>"facet"), :class => "more_facets_link") %></li>
-          <% end %>
-          
-        </ul>
-      <% end %>
-    </div>
-  <% end %>
-</div>

data/app/views/catalog/_opensearch_response_metadata.html.erb

@@ -1,2 +0,0 @@
-<!-- Suppressing opensearch tags (to maintain html5 validity) by overriding views/catalog/_opensearch_response_metadata.html.erb with an empty file.  To undo this, just delete the file.  -->
-

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,23 +0,0 @@
-<div id="sortAndPerPage">
-	<% unless @response.response['numFound'] < 2 %>
-  	<%= form_tag catalog_index_path, :method=>:get, :class=>'per_page' do %>
-  		<%= label_tag(:per_page, "Show") %>
-  		<%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page", :onchange => 'this.form.submit()') %>
-      per page
-      <%= search_as_hidden_fields(:omit_keys => [:page, :per_page]) %>
-		
-      <noscript><%= submit_tag 'update' %></noscript>
-  	<% end %>
-
-		<%= form_tag catalog_index_path, :method=>:get, :class=>'sort', :id => "sort_form" do %>
-			<%= label_tag 'sort', 'Sort by' %>
-			<%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort])), :onchange => 'this.form.submit()') %>
-			      
-      <%= search_as_hidden_fields(:omit_keys => [:page, :sort]) %>
-      
-			<noscript><%= submit_tag 'sort results' %></noscript>
-		<% end %>
-	<% end %>
-	
-
-</div>