blacklight-marc 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a674be3c4819a0ea53a8c949f68dc305adc2715
-  data.tar.gz: b2b7608c6e893f43fce519908d35f257a759a14f
+  metadata.gz: 6afab16e002745041c1c9e04d24d6285b666c349
+  data.tar.gz: bb0dc662ae4197a5072a045cb44216b2e15cf043
 SHA512:
-  metadata.gz: 506c0334c905f179256b15044a46c0bf6a8cc0b71d49af5fc482a8e24b0cf9fbc402612486b3a3a01fc926ee6a20ad4acd1e32b79c06d69e0fe4e0333bd6cb90
-  data.tar.gz: 00399aeb90e6f0098849378eb99155f1b9f07d476e0970af1b39f9ca654c5e636d080033347f82f9509bf4d2d360738d002fab3e40b36d126cee5b06bd7774bf
+  metadata.gz: 6a41fc49bc09c38a42cb319db12a7c31817e3e7b1d1ec2c19816a1436dd5271e6f732e65c9bdab1e5c9f9112356971f9bdf9efb919e8f0d068ba73e599f19e1e
+  data.tar.gz: 7d2fd4fe4c039c7177d173a006732f557c7f08a688d17fa324c84e3b5d7654431d3400735c4a879f44d193ccde206a67d9dd1dff5341e4f28653078cbca5af88

data/.gitignore

@@ -17,6 +17,5 @@ test/version_tmp
 tmp
 lib/solrmarc.log
 lib/solrmarc.log.*
-spec/internal
+.internal_test_app
 jetty
-.internal_test_app

data/.travis.yml

@@ -5,20 +5,18 @@ notifications:
   email: false
 
 rvm:
-  - 2.2.3
+  - 2.2.4
 
 matrix:
   include:
-    - rvm: 2.2.2
-      env: "RAILS_VERSION=4.1.13"
-    - rvm: 2.1.6
-      env: "RAILS_VERSION=4.2.4"
+    - rvm: 2.1.8
+      env: "RAILS_VERSION=4.2.5.1"
 
 before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=4.2.4"
+ - "RAILS_VERSION=4.2.5.1"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/Gemfile

@@ -7,7 +7,7 @@ gem 'simplecov', '~> 0.10', require: false
 gem 'coveralls', require: false
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
+# engine_cart: 0.8.2
 # engine_cart stanza: 0.8.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
@@ -21,12 +21,21 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
 
   if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'bootstrap-sass', '>= 3.3.5.1'
+    #gem 'bootstrap-sass', '>= 3.3.5.1'
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
+  elsif ENV['RAILS_VERSION'] =~ /^5.0/ || ENV['RAILS_VERSION'] == 'edge'
+    # nop
   else
     gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
     gem 'sass-rails', "< 5.0"

data/blacklight-marc.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'blacklight', '>= 6.0.0.pre3', '< 7'
+  spec.add_dependency 'blacklight', '~> 6.1'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = '6.0.0'
+    VERSION = '6.1.0'
   end
 end

data/lib/generators/blacklight/marc/install_generator.rb

@@ -16,7 +16,7 @@ module Blacklight::Marc
     source_root File.expand_path('../templates', __FILE__)
 
     def assets
-      insert_into_file "app/assets/stylesheets/blacklight.css.scss", after: "@import 'blacklight/blacklight';" do
+      insert_into_file "app/assets/stylesheets/blacklight.scss", after: "@import 'blacklight/blacklight';" do
 <<-EOF
 
 @import 'blacklight_marc';

data/spec/spec_helper.rb

@@ -20,8 +20,8 @@ require 'rspec/active_model/mocks'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-# Blacklight, again, make sure we're looking in the right place for em. 
-# Relative to HERE, NOT to Rails.root, which is off somewhere else. 
+# Blacklight, again, make sure we're looking in the right place for em.
+# Relative to HERE, NOT to Rails.root, which is off somewhere else.
 Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
 
 RSpec.configure do |config|

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement