hydra-core 7.0.2 → 7.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d577174ff0ef92967ca14739944d84afb20a9423
-  data.tar.gz: 9a543361435ece3e0d8dd79c7e3f14e7ef132cbf
+  metadata.gz: 49c1ef1f64800f182b669ba5b25067a0a7d415d4
+  data.tar.gz: 1fd527af20a13a8b4dc3db83892f241c633000c3
 SHA512:
-  metadata.gz: d63eebac5910e2c2e605a14f0410ce08ddbd6e36bf322070475d96ddf39189c9ccf0c3f85a9d431ca5dc091bb2bcdea9dd1a93984cdb50c89314805f3aec7e9c
-  data.tar.gz: 4159b69fa1ff989ef98e07e15e8d8322f168df8dd7670ce23e62deba5276e531245eddc24ed78e937df12558d4bd28962772b28c0986fe3ac53e83e45d857e25
+  metadata.gz: 3740cfd837867de113e17925b004e65d71d363be1c651fad8f11a6d2abf048e78cc970f942e14507422737082377523c77aa4fe2dd348365eca7697321869bb0
+  data.tar.gz: 7d9cf5f855fb92a68cc2b91d5281226a6db7e52252be6bde9826e54d14e71dd95c2e49bf0eb4b780459d43efbfc702a8fd7fc0ff330e7205f74bf1b75285b204

data/lib/generators/hydra/head_generator.rb

@@ -7,6 +7,8 @@ module Hydra
     source_root File.expand_path('../templates', __FILE__)
 
     argument :model_name, :type => :string , :default => "user"
+    class_option :'skip-rspec', type: :boolean, default: false, desc: "Skip the rspec generator"
+
 
       desc """
     This generator makes the following changes to your application:
@@ -21,6 +23,8 @@ module Hydra
     #
 
     def inject_test_framework
+      return if options[:'skip-rspec']
+
       application("\n" <<
         "    config.generators do |g|\n" <<
         "      g.test_framework :rspec, :spec => true\n" <<

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "7.0.2"
+  VERSION = "7.1.0.rc1"
 end
 

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

@@ -28,6 +28,6 @@ class TestAppGenerator < Rails::Generators::Base
   def run_hydra_head_generator
     say_status("warning", "GENERATING HH", :yellow)       
 
-    generate 'hydra:head', '-f'
+    generate 'hydra:head', '-f --skip-rspec'
   end
 end

data/spec/test_app_templates/Gemfile.extra

@@ -1,4 +1,6 @@
 group :develop do
   gem 'active-fedora', github: "projecthydra/active_fedora"
 end
+gem 'rspec-rails', '~> 2.99', group: :test
+gem 'rspec-its'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,6 @@ files:
 - lib/railties/hydra_jetty.rake
 - spec/.gitignore
 - spec/controllers/catalog_controller_spec.rb
-- spec/controllers/catalog_valid_html_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
@@ -213,9 +212,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -225,7 +224,6 @@ summary: Hydra-Head Rails Engine (requires Rails3)
 test_files:
 - spec/.gitignore
 - spec/controllers/catalog_controller_spec.rb
-- spec/controllers/catalog_valid_html_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb

data/spec/controllers/catalog_valid_html_spec.rb

@@ -1,81 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-# This uses nokogiri to check formedness. It's slightly less strict than the markup_validit
-# currently not being used. 
-def well_formed(html)
-  begin
-    Nokogiri::XML(html.gsub("&", "&" )) { |config| config.strict } #Literal & in text are not allowed, but we don't care. 
-    return "ok"
-  rescue Nokogiri::XML::SyntaxError => e
-    # Write the offensive HTML to a file in tmp/html_validity_failures with a filename based on Time.now.iso8601
-    html_failures_dir = File.expand_path(File.dirname(__FILE__) + '/../../tmp/html_validity_failures')
-    FileUtils.mkdir_p(html_failures_dir)
-    filename = Time.now.iso8601(3).gsub(":","")+".html"
-    file_path = File.join(html_failures_dir, filename)
-    file = File.open(file_path, "w")
-    file.write(html)
-    return "#{e.inspect} -- Line: #{e.line} -- Level: #{e.level} -- Code: #{e.code}.  HTML Saved to RAILS_ROOT/tmp/html_validity_failures/#{filename}"
-  end
-end
-
-
-
-# This checks document for validity (if required) and well formedness  
-# Pass in a html string. IF you want to check for XHTML validity, do rake spec HTML_VALIDITY=true. Otherwise only document form is checked
-# by nokogiri.  
-def document_check(html, html_validity=ENV["HTML_VALIDITY"])
-  if html_validity == "true" || html_validity == true
-    html.should be_xhtml_transitional
-  end
-  well_formed(html).should == "ok"
-end
-
-
-describe CatalogController do
-  describe "Home Page" do
-    
-    it "Should have Valid HTML when not logged in" do
-      get("index", "controller"=>"catalog")
-      document_check(response.body)
-    end
-    
-    it "Should have Valid HTML when I'm logged in" do
-        sign_in FactoryGirl.build(:user, :email=>"archivist1@example.com")
-        get("index", "controller"=>"catalog")
-        document_check(response.body)
-    end
-  end
-
-  describe "Document Pages" do 
-    
-    before(:each)  do
-        mock_user = FactoryGirl.build(:user, :email=>"archivist1@example.com")
-        sign_in mock_user
-    end
-    
-    it "Should have valid html when in Article Browse Show" do 
-       get(:show, {:id=>"hydrangea:fixture_mods_article1"})
-       document_check(response.body)
-    end
-    
-    it "Should have valid html when in Dataset Browse Show" do 
-      get(:show, {:id=>"hydrangea:fixture_mods_dataset1"})
-      document_check(response.body)
-    end
-    
-    it "Should have valid html when in Dataset Browse Show" do 
-      get(:show, {:id=>"hydrus:admin_class1"})
-      File.open('/tmp/out.xml', 'w') { |f| f << response.body }
-      document_check(response.body)
-    end
-    
-    # The delete view should be the same for all data types
-    it "Should have valid html when in Dataset Delete" do 
-       get(:show, {:id=>"hydrangea:fixture_mods_dataset1"}, :action=>"delete")
-       document_check(response.body)
-    end
-    
-    
-  end #Document pages
-  
-end