hydra-collections 1.0.0 → 1.1.0

data/spec/models/collection_spec.rb

@@ -94,7 +94,35 @@ describe Collection do
     @collection.members = [@gf1, @gf2]
     @collection.save
     @collection.destroy
-    lambda {GenericFile.find(@gf1.pid)}.should_not raise_error ActiveFedora::ObjectNotFoundError
-    lambda {GenericFile.find(@gf2.pid)}.should_not raise_error ActiveFedora::ObjectNotFoundError
+    GenericFile.exists?(@gf1.pid).should be_true
+    GenericFile.exists?(@gf2.pid).should be_true
   end
+
+  describe "Collection by another name" do
+    before (:all) do
+      class OtherCollection < ActiveFedora::Base
+        include Hydra::Collection
+        include Hydra::Collections::Collectible
+      end
+      class Member < ActiveFedora::Base
+        include Hydra::Collections::Collectible
+      end
+    end
+    after(:all) do
+      Object.send(:remove_const, :OtherCollection)
+      Object.send(:remove_const, :Member)
+    end
+
+    it "have members that know about the collection" do
+      collection = OtherCollection.new
+      member = Member.create
+      collection.members << member
+      collection.save
+      member.reload
+      member.collections.should == [collection]
+      collection.destroy
+      member.destroy
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -9,10 +9,17 @@ require 'hydra-collections'
 FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
 FactoryGirl.find_definitions
 
+module EngineRoutes
+  def self.included(base)
+    base.routes { Hydra::Collections::Engine.routes }
+  end
+end
+
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.include Devise::TestHelpers, :type => :controller
   config.before(:each, :type=>"controller") { @routes = Hydra::Collections::Engine.routes }
+  config.include EngineRoutes, :type => :controller
 end
 
 module FactoryGirl

data/tasks/hydra-collections-dev.rake

@@ -19,9 +19,11 @@ desc "Run specs"
 # It's a regular rake task that calls the RSpec RakeTask that's defined in spec/support/lib/tasks/rspec.rake
 task :spec => [:generate] do |t|
   focused_spec = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
-  within_test_app do
-    system "rake myspec#{focused_spec}"
-    abort "Error running hydra-collections" unless $?.success?
+  Bundler.with_clean_env do
+    within_test_app do
+      system "rake myspec#{focused_spec}"
+      abort "Error running hydra-collections" unless $?.success?
+    end
   end
 end
 
@@ -30,8 +32,11 @@ task :generate do
   unless File.exists?('spec/internal/Rakefile')
     puts "Generating rails app"
     `rails new spec/internal`
-    puts "Copying gemfile"
-    `cp spec/support/Gemfile spec/internal`
+    puts "Updating gemfile"
+
+    `echo "gem 'hydra-collections', :path=>'../../../hydra-collections'
+gem 'factory_girl_rails'
+    " >> spec/internal/Gemfile`
     puts "Copying generator"
     `cp -r spec/support/lib/generators spec/internal/lib`
     Bundler.with_clean_env do
@@ -40,7 +45,8 @@ task :generate do
         `bundle install`
         puts "running test_app_generator"
         system "rails generate test_app"
-
+        # These factories are autogenerated and conflict with our factories
+        system 'rm test/factories/users.rb'
         puts "running migrations"
         puts `rake db:migrate db:test:prepare`
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -80,6 +80,26 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: A rails engine for managing Hydra Collections
 email:
 - cam156@psu.edu
@@ -92,6 +112,8 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
+- CONTRIBUTING.md
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,10 +122,12 @@ files:
 - app/assets/javascripts/hydra_collections.js
 - app/assets/stylesheets/hydra_collections.css.scss
 - app/controllers/collections_controller.rb
+- app/controllers/concerns/hydra/collections_controller_behavior.rb
 - app/helpers/batch_select_helper.rb
 - app/helpers/collections_helper.rb
 - app/helpers/collections_search_helper.rb
 - app/models/collection.rb
+- app/models/concerns/hydra/collection.rb
 - app/models/solr_document.rb
 - app/views/batch_select/_add_button.html.erb
 - app/views/batch_select/_check_all.html.erb
@@ -117,6 +141,7 @@ files:
 - app/views/collections/_document_list.html.erb
 - app/views/collections/_form.html.erb
 - app/views/collections/_form_for_select_collection.html.erb
+- app/views/collections/_form_for_select_destination_collection.html.erb
 - app/views/collections/_search_form.html.erb
 - app/views/collections/_single_item_action_fields.html.erb
 - app/views/collections/edit.html.erb
@@ -126,17 +151,16 @@ files:
 - config/routes.rb
 - fedora_conf/conf/development/fedora.fcfg
 - fedora_conf/conf/test/fedora.fcfg
+- gemfiles/rails3.gemfile
+- gemfiles/rails4.gemfile
 - hydra-collections.gemspec
 - lib/hydra-collections.rb
-- lib/hydra/collection.rb
-- lib/hydra/collections.rb
 - lib/hydra/collections/accepts_batches.rb
 - lib/hydra/collections/collectible.rb
 - lib/hydra/collections/search_service.rb
 - lib/hydra/collections/selects_collections.rb
 - lib/hydra/collections/solr_document_behavior.rb
 - lib/hydra/collections/version.rb
-- lib/hydra/collections_controller_behavior.rb
 - lib/hydra/datastreams/collection_rdf_datastream.rb
 - solr_conf/conf/schema.xml
 - solr_conf/conf/solrconfig.xml
@@ -144,6 +168,7 @@ files:
 - spec/controllers/accepts_batches_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/collections_controller_spec.rb
+- spec/controllers/other_collections_controller_spec.rb
 - spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
 - spec/factories/.gitkeep
@@ -154,7 +179,6 @@ files:
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
-- spec/support/Gemfile
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/app/views/catalog/_document_header.html.erb
@@ -193,6 +217,7 @@ test_files:
 - spec/controllers/accepts_batches_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/collections_controller_spec.rb
+- spec/controllers/other_collections_controller_spec.rb
 - spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
 - spec/factories/.gitkeep
@@ -203,7 +228,6 @@ test_files:
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
-- spec/support/Gemfile
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/app/views/catalog/_document_header.html.erb

data/lib/hydra/collections.rb

@@ -1,14 +0,0 @@
-module Hydra
-  module Collections
-    extend ActiveSupport::Autoload
-    autoload :Version
-    autoload :Collectible
-    autoload :SearchService
-    autoload :AcceptsBatches
-    autoload :SelectsCollections
-    autoload :SolrDocumentBehavior
-    class Engine < ::Rails::Engine
-      engine_name "collections"
-    end
-  end
-end

data/spec/support/Gemfile

@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails'
-gem 'sqlite3'
-gem 'devise'
-gem 'hydra-head'
-gem 'hydra-collections', :path=>'../../'
-
-gem 'rspec-rails'
-gem 'factory_girl'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'jquery-rails'
-  gem 'uglifier', '>= 1.0.3'
-end