sufia 0.0.1.pre1 → 0.0.1.pre2

data/spec/models/local_authority_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 
 describe LocalAuthority do
   before(:all) do
-    @tsv = [Rails.root + 'spec/fixtures/cities15000.tsv']
-    @nt = [Rails.root + 'spec/fixtures/genreForms.nt']
-    @rdfxml = [Rails.root + 'spec/fixtures/lexvo.rdf']
+    @tsv = [fixture_path + '/cities15000.tsv']
+    @nt = [fixture_path + '/genreForms.nt']
+    @rdfxml = [fixture_path + '/lexvo.rdf']
     LocalAuthority.count.should == 0
     LocalAuthorityEntry.count.should == 0
   end

data/spec/models/single_use_link_spec.rb

@@ -4,7 +4,7 @@ describe SingleUseLink do
   before (:all) do
     GenericFile.any_instance.stubs(:terms_of_service).returns('1')
     @file = GenericFile.new
-    @file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+    @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @file.apply_depositor_metadata('mjg36')
     @file.save
   end
@@ -25,21 +25,21 @@ describe SingleUseLink do
         su = SingleUseLink.create_show( @file.pid)
         su.downloadKey.should == @hash
         su.itemId.should == @file.pid
-        su.path.should == Rails.application.routes.url_helpers.generic_file_path(@file.pid)
+        su.path.should == Sufia::Engine.routes.url_helpers.generic_file_path(@file.pid)
         su.delete
      end 
      it "should create show download link" do
         su = SingleUseLink.create_download( @file.pid)
         su.downloadKey.should == @hash
         su.itemId.should == @file.pid
-        su.path.should == Rails.application.routes.url_helpers.download_path(@file.pid)        
+        su.path.should == Sufia::Engine.routes.url_helpers.download_path(@file.pid)        
         su.delete
      end 
   end
   describe "find" do
      describe "not expired" do
        before do
-          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:@file.pid, path:Rails.application.routes.url_helpers.download_path(@file.noid), expires:DateTime.now.advance(:hours => 1))
+          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:@file.pid, path:Sufia::Engine.routes.url_helpers.download_path(@file.noid), expires:DateTime.now.advance(:hours => 1))
        end
        after do
           @su.delete
@@ -59,7 +59,7 @@ describe SingleUseLink do
      end
      describe "expired" do
        before do
-          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:@file.pid, path:Rails.application.routes.url_helpers.download_path(@file.noid), expires:DateTime.now.advance(:hours => -1))
+          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:@file.pid, path:Sufia::Engine.routes.url_helpers.download_path(@file.noid), expires:DateTime.now.advance(:hours => -1))
        end
        after do
           @su.delete

data/spec/models/unzip_job_spec.rb

@@ -20,7 +20,7 @@ describe UnzipJob do
     GenericFile.any_instance.expects(:characterize_if_changed).at_least_once.yields
     GenericFile.any_instance.stubs(:terms_of_service).returns('1')
     @generic_file = GenericFile.new(:batch=>@batch)
-    @generic_file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/icons.zip'), :dsid=>'content')
+    @generic_file.add_file_datastream(File.new(fixture_path + '/icons.zip'), :dsid=>'content')
     @generic_file.apply_depositor_metadata('mjg36')
     @generic_file.save
   end

data/spec/models/user_spec.rb

@@ -24,8 +24,12 @@ describe User do
     @another_user.delete
   end
   it "should have a login" do
+    pending "Move to scholarsphere"
     @user.login.should == "jilluser"
   end
+  it "should have an email" do
+    @user.user_key.should == "jilluser@example.com"
+  end
   it "should have activity stream-related methods defined" do
     @user.should respond_to(:stream)
     @user.should respond_to(:events)
@@ -40,7 +44,7 @@ describe User do
     @user.should respond_to(:googleplus_handle)
   end
   it "should redefine to_param to make redis keys more recognizable" do
-    @user.to_param.should == @user.login
+    @user.to_param.should == @user.user_key
   end
   it "should have a cancan ability defined" do
     @user.should respond_to(:can?)
@@ -71,29 +75,4 @@ describe User do
       @another_user.followed_by?(@user).should be_false
     end
   end
-  describe "#groups" do
-    before do
-      filter = Net::LDAP::Filter.eq('uid', @user.login)
-      Hydra::LDAP.expects(:groups_for_user).with(filter).returns(["umg/up.dlt.gamma-ci", "umg/up.dlt.redmine"])
-      stub_connection = stub(:get_operation_result => OpenStruct.new({code:0, message:"Success"}))
-      Hydra::LDAP.stubs(:connection).returns(stub_connection)
-    end
-    it "should return a list" do
-      @user.groups.should == ["umg/up.dlt.gamma-ci", "umg/up.dlt.redmine"]
-    end
-  end
-
-  describe "#attributes" do
-    before do
-      entry = Net::LDAP::Entry.new()
-      entry['dn'] = ["uid=mjg36,dc=psu,edu"]
-      entry['cn'] = ["MICHAEL JOSEPH GIARLO"]
-      Hydra::LDAP.expects(:get_user).returns([entry])
-      stub_connection = stub(:get_operation_result => OpenStruct.new({code:0, message:"Success"}))
-      Hydra::LDAP.stubs(:connection).returns(stub_connection)
-    end
-    it "should return user attributes from LDAP" do
-      User.directory_attributes('mjg36', ['cn']).first['cn'].should == ['MICHAEL JOSEPH GIARLO']
-    end
-  end
 end

data/spec/rake/scholarsphere_fixtures_spec.rb

@@ -20,7 +20,7 @@ require "rake"
 describe "scholarsphere:fixtures" do
 
   def loaded_files_excluding_current_rake_file
-    $".reject { |file| file.include? "lib/tasks/scholarsphere-fixtures" }
+    $".reject { |file| file.include? "tasks/scholarsphere-fixtures" }
   end
 
   # saves original $stdout in variable
@@ -42,11 +42,11 @@ describe "scholarsphere:fixtures" do
   end
   
   def delete_fixture_files
-    File.delete(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.txt"))
-    File.delete(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.descMeta.txt"))
-    File.delete(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.foxml.erb"))
+    File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.txt"))
+    File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.descMeta.txt"))
+    File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.foxml.erb"))
     begin
-      File.delete(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.foxml.xml"))
+      File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.foxml.xml"))
     rescue
       # do nothing; this just means the generate task was not called
     end
@@ -56,7 +56,8 @@ describe "scholarsphere:fixtures" do
   before(:each) do
     @rake = Rake::Application.new 
     Rake.application = @rake
-    Rake.application.rake_require("lib/tasks/scholarsphere-fixtures", ["."], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("tasks/scholarsphere-fixtures", ["."], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("lib/tasks/fixtures", ["."], loaded_files_excluding_current_rake_file)
     Rake.application.rake_require("lib/tasks/active_fedora", [activefedora_path], loaded_files_excluding_current_rake_file)      
     Rake::Task.define_task(:environment)
   end
@@ -76,12 +77,12 @@ describe "scholarsphere:fixtures" do
         @rake['scholarsphere:fixtures:load'].invoke       
         @rake['scholarsphere:fixtures:delete'].invoke
       end
-      Dir.glob(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.txt")).length.should == 1
-      Dir.glob(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.foxml.erb")).length.should == 1
-      Dir.glob(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.descMeta.txt")).length.should == 1
-      Dir.glob(Rails.root.join(File.expand_path("spec/fixtures/scholarsphere"), "scholarsphere_rspecTestFixture.foxml.xml")).length.should == 1
-      o.should include "Loaded 'scholarsphere:rspecTestFixture'"
-      o.should include "Deleted 'scholarsphere:rspecTestFixture'"
+      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.txt")).length.should == 1
+      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.foxml.erb")).length.should == 1
+      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.descMeta.txt")).length.should == 1
+      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.foxml.xml")).length.should == 1
+      o.should include "Loaded 'sufia:rspecTestFixture'"
+      o.should include "Deleted 'sufia:rspecTestFixture'"
     end    
   end
 end

data/spec/routing/route_spec.rb

@@ -15,52 +15,15 @@
 require 'spec_helper'
 
 describe 'Routes' do
-  describe 'Blacklight' do
-    it "should route Blacklight routes"
-    # TODO: finish adding route specs for BL
-    #           clear_bookmarks        /bookmarks/clear(.:format)                bookmarks#clear
-    #                 bookmarks GET    /bookmarks(.:format)                      bookmarks#index
-    #                           POST   /bookmarks(.:format)                      bookmarks#create
-    #              new_bookmark GET    /bookmarks/new(.:format)                  bookmarks#new
-    #             edit_bookmark GET    /bookmarks/:id/edit(.:format)             bookmarks#edit
-    #                  bookmark GET    /bookmarks/:id(.:format)                  bookmarks#show
-    #                           PUT    /bookmarks/:id(.:format)                  bookmarks#update
-    #                           DELETE /bookmarks/:id(.:format)                  bookmarks#destroy
-    #              clear_folder        /folder/clear(.:format)                   folder#clear
-    #            folder_destroy        /folder/destroy(.:format)                 folder#destroy
-    #              folder_index GET    /folder(.:format)                         folder#index
-    #                    folder PUT    /folder/:id(.:format)                     folder#update
-    #                           DELETE /folder/:id(.:format)                     folder#destroy
-    #            search_history        /search_history(.:format)                 search_history#index
-    #      clear_search_history        /search_history/clear(.:format)           search_history#clear
-    #      clear_saved_searches        /saved_searches/clear(.:format)           saved_searches#clear
-    #            saved_searches        /saved_searches(.:format)                 saved_searches#index
-    #               save_search        /saved_searches/save/:id(.:format)        saved_searches#save
-    #             forget_search        /saved_searches/forget/:id(.:format)      saved_searches#forget
-    #        opensearch_catalog        /catalog/opensearch(.:format)             catalog#opensearch
-    #          citation_catalog        /catalog/citation(.:format)               catalog#citation
-    #             email_catalog        /catalog/email(.:format)                  catalog#email
-    #               sms_catalog        /catalog/sms(.:format)                    catalog#sms
-    #           endnote_catalog        /catalog/endnote(.:format)                catalog#endnote
-    # send_email_record_catalog        /catalog/send_email_record(.:format)      catalog#send_email_record
-    #             catalog_facet        /catalog/facet/:id(.:format)              catalog#facet
-    #             catalog_index        /catalog(.:format)                        catalog#index
-    #    librarian_view_catalog        /catalog/:id/librarian_view(.:format)     catalog#librarian_view
-    #             solr_document GET    /catalog/:id(.:format)                    catalog#show
-    #                           PUT    /catalog/:id(.:format)                    catalog#update
-    #                   catalog GET    /catalog/:id(.:format)                    catalog#show
-    #                           PUT    /catalog/:id(.:format)                    catalog#update
-    #                  feedback        /feedback(.:format)                       feedback#show
-    #         feedback_complete        /feedback/complete(.:format)              feedback#complete
-  end
-
+  before(:each) { @routes = Sufia::Engine.routes }
   describe 'Catalog' do
+  
     it 'should route the root url to the catalog controller' do
       { get: '/' }.should route_to(controller: 'catalog', action: 'index')
     end
 
     it 'should route to recently added files' do
-      { get: '/catalog/recent' }.should route_to(controller: 'catalog', action: 'show', id: 'recent')
+      { get: '/catalog/recent' }.should route_to(controller: 'catalog', action: 'recent')
     end
   end
 
@@ -256,7 +219,7 @@ describe 'Routes' do
 
   describe "Catch-all" do
     it "should route non-existent routes to errors" do
-      { get: '/awesome' }.should route_to(controller: 'errors', action: 'routing', error: 'awesome')
+       get('/awesome').should_not be_routable
     end
   end
 end

data/spec/spec_helper.rb

@@ -14,16 +14,22 @@
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
+
+require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'mocha'
 
+Resque.inline = Rails.env.test?
+
+FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
+FactoryGirl.find_definitions
+
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+#Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
   # == Mock Framework
@@ -33,7 +39,7 @@ RSpec.configure do |config|
   config.mock_with :mocha
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = File.expand_path("../fixtures", __FILE__)
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -46,10 +52,14 @@ RSpec.configure do |config|
   config.infer_base_class_for_anonymous_controllers = false
 
   config.include Devise::TestHelpers, :type => :controller
+
+  # see https://github.com/rails/journey/issues/39
+  config.before(:each, :type=>"controller") { @routes = Sufia::Engine.routes }
 end
 
+
 module FactoryGirl
-  def self.find_or_create(handle, by=:login)
+  def self.find_or_create(handle, by=:email)
     tmpl = FactoryGirl.build(handle)
     tmpl.class.send("find_by_#{by}".to_sym, tmpl.send(by)) || FactoryGirl.create(handle)
   end

data/spec/support/Gemfile

@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.9'
+
+gem 'sqlite3'
+
+gem 'devise'
+gem 'blacklight'
+gem 'hydra-head'
+gem 'sufia', :path=>'../../'
+gem 'rspec-rails', :group=>:test
+gem 'capybara', :group=>:test
+gem 'mocha', :group=>:test
+
+gem 'factory_girl'
+
+group :assets do
+gem 'sass-rails', '~> 3.2.0'
+gem 'compass-rails', '~> 1.0.0'
+gem 'compass-susy-plugin', '~> 0.9.0'
+end

data/spec/support/config/redis.yml

@@ -0,0 +1,6 @@
+development:
+  host: localhost
+  port: 6379
+test:
+  host: localhost
+  port: 6379

data/spec/support/lib/generators/test_app_generator.rb

@@ -0,0 +1,40 @@
+require 'rails/generators'
+
+class TestAppGenerator < Rails::Generators::Base
+  source_root File.expand_path("../../../../support", __FILE__)
+
+  def run_blacklight_generator
+    say_status("warning", "GENERATING BL", :yellow)       
+
+    generate 'blacklight', '--devise'
+  end
+
+  def run_hydra_head_generator
+    say_status("warning", "GENERATING HH", :yellow)       
+
+    generate 'hydra:head', '-f'
+  end
+
+  def run_hydra_head_generator
+    say_status("warning", "GENERATING HH", :yellow)       
+
+    generate 'hydra:head', '-f'
+  end
+
+  def install_redis_config
+    copy_file "config/redis.yml"
+  end
+
+  def run_sufia_generator
+    say_status("warning", "GENERATING SUFIA", :yellow)       
+
+    generate 'sufia', '-f'
+
+    remove_file 'spec/factories/users.rb'
+  end
+
+  def remove_index_page
+    remove_file 'public/index.html'
+  end
+
+end

data/sufia.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'blacklight'#, '~> 4.0.0.pre4'
   gem.add_dependency 'blacklight_advanced_search'
   gem.add_dependency 'hydra-head', '5.0.0.pre11'
-  #gem 'hydra-ldap', '0.1.0'
+  #TODO remove
   gem.add_dependency 'noid', '0.5.5'
-  gem.add_dependency 'hydra-batch-edit'#, :git=>'git://github.com/psu-stewardship/hydra-batch-edit.git', :ref => 'b753c7aeac'
+  gem.add_dependency 'hydra-batch-edit', '~> 0.0.7'
 
 # Other components
   gem.add_dependency 'resque', '1.22.0'#, :require => 'resque/server'
@@ -34,6 +34,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'execjs', '1.4.0'
   gem.add_dependency 'therubyracer', '0.10.2'
   gem.add_dependency 'zipruby', '0.3.6'
+  gem.add_dependency 'mail_form'
   gem.add_dependency 'rails_autolink', '1.0.9'
   gem.add_dependency 'acts_as_follower', '0.1.1'
   gem.add_dependency 'nest', '1.1.1'
@@ -42,4 +43,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'mailboxer', '0.8.0'
   gem.add_dependency 'rainbow', '1.1.4'
   gem.add_dependency 'will_paginate', '3.0.3'
+  gem.add_dependency 'activerecord-import'
 end

data/tasks/cucumber.rake

@@ -21,27 +21,21 @@
 
 unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
 
-vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
-
 begin
   require 'cucumber/rake/task'
 
   namespace :cucumber do
     Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
-      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
     end
 
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
-      t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'wip'
     end
 
     Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
-      t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'rerun'
     end

data/tasks/jetty.rake

@@ -0,0 +1,40 @@
+namespace :jetty do
+  desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
+  task :config do
+    Rake::Task["jetty:config_fedora"].invoke
+    Rake::Task["jetty:config_solr"].invoke
+  end
+  
+  desc "Copies the contents of solr_conf into the Solr development-core and test-core of Testing Server"
+  task :config_solr do
+    FileList['solr_conf/conf/*'].each do |f|  
+      cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
+      cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
+    end
+  end
+
+  desc "Copies a custom fedora config for the bundled Hydra Testing Server"
+  task :config_fedora do
+    # load a custom fedora.fcfg - 
+    if defined?(Rails.root)
+      app_root = Rails.root
+    else
+      app_root = File.join(File.dirname(__FILE__),"..")
+    end
+     
+    fcfg = File.join(app_root,"fedora_conf","conf","development","fedora.fcfg")
+    if File.exists?(fcfg)
+      puts "copying over development/fedora.fcfg"
+      cp("#{fcfg}", 'jetty/fedora/default/server/config/', :verbose => true)
+    else
+      puts "#{fcfg} file not found -- skipping fedora config"
+    end
+    fcfg = File.join(app_root,"fedora_conf","conf","test","fedora.fcfg")
+    if File.exists?(fcfg)
+      puts "copying over test/fedora.fcfg"
+      cp("#{fcfg}", 'jetty/fedora/test/server/config/', :verbose => true)
+    else
+      puts "#{fcfg} file not found -- skipping fedora config"
+    end
+  end
+end