blacklight 4.5.0.rc1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8939b4f8da0fd45881552613dba681ddcec93083
-  data.tar.gz: 6207de54f96ee4794e2c051f0086691575d4fea4
+  metadata.gz: 0d0587369df20fe60865e7e145ee2331b24bb10e
+  data.tar.gz: 45af7e3cca647a11de41d7d87c5b9d29bfe84585
 SHA512:
-  metadata.gz: 146016cf9d6b18fd08741e700a1be242d25adc78d83a8a299dbad03443a7b0f8c83d852e1f88b447442e24bd2dfd8cf92abdf47e323c7d26dfbae7d6950c70b4
-  data.tar.gz: 10b7fe255b81f6e4effdb5d2199478c4c8c2b8f702f0e21661ea2130fb3eea7714cacee66dc9ab4a58c808d934dadd307c2fcc521b1f038087372e0bcdbd1681
+  metadata.gz: 6e3916a1be5e25e6d1455de5a76bdea0102fada96d69e1ccb182b8e674d45968f36509f25e2a163e6533d3ef3caa65474867aa91ece5de100eb54674b156ec4e
+  data.tar.gz: db866f3d02c5a0e8b2a9a5c773c999308cb8f68fdd3cf79d366efecaefd2e41b279df6774ee5f5237a6097bf7ee122be82d5ab8b63f353012cd52e2bf4293b5b

data/Rakefile

@@ -7,11 +7,12 @@ rescue LoadError
 end
 
 Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 # load rake tasks defined in lib/tasks that are not loaded in lib/active_fedora.rb
 load "tasks/blacklight.rake"
 
 task :default => [:ci]
-task :spec => ['blacklight:spec']
 task :clean => ['blacklight:clean']
 

data/VERSION

@@ -1 +1 @@
-4.5.0.rc1
+4.5.0

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -189,7 +189,7 @@ module Blacklight::BlacklightHelperBehavior
     value = options[:value] || get_field_values(document, field, field_config, options)
 
 
-    render_field_value value
+    render_field_value value, field_config
   end
 
   # Used in the show view for displaying the main solr document heading
@@ -312,7 +312,7 @@ module Blacklight::BlacklightHelperBehavior
     field_config = document_show_fields(document)[field]
     value = options[:value] || get_field_values(document, field, field_config, options)
 
-    render_field_value value
+    render_field_value value, field_config
   end
 
   ##
@@ -335,7 +335,7 @@ module Blacklight::BlacklightHelperBehavior
         end
 
         Array(document.get(field, :sep => nil)).map do |v|
-          link_to render_field_value(v), search_action_url(add_facet_params(link_field, v, {}))
+          link_to render_field_value(v, field_config), search_action_url(add_facet_params(link_field, v, {}))
         end if field
       when (field_config and field_config.highlight)
         document.highlight_field(field_config.field).map { |x| x.html_safe } if document.has_highlight_field? field_config.field
@@ -349,10 +349,9 @@ module Blacklight::BlacklightHelperBehavior
       (document.has_highlight_field? solr_field.field if solr_field.highlight)
   end
 
-  def render_field_value value=nil
-    value = [value] unless value.is_a? Array
-    value = value.collect { |x| x.respond_to?(:force_encoding) ? x.force_encoding("UTF-8") : x}
-    return value.map { |v| html_escape v }.join(field_value_separator).html_safe
+  def render_field_value value=nil, field_config=nil
+    safe_values = Array(value).collect { |x| x.respond_to?(:force_encoding) ? x.force_encoding("UTF-8") : x }
+    safe_join(safe_values, (field_config.separator if field_config) || field_value_separator)
   end
 
   def field_value_separator

data/blacklight.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://projectblacklight.org/"
   s.summary     = "Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr) index."
   s.description = %q{Blacklight is an open source Solr user interface discovery platform. You can use Blacklight to enable searching and browsing of your collections. Blacklight uses the Apache Solr search engine to search full text and/or metadata.}
-  
+  s.license     = "Apache 2.0"
   s.rubyforge_project = "blacklight"
   
   s.files         = `git ls-files`.split("\n")
@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_dependency "bootstrap-sass", ">= 2.2.0", "< 2.4"
   s.add_development_dependency "jettywrapper", ">= 1.4.1"
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency 'engine_cart', ">= 0.1.0"
 end

data/gemfiles/rails3.gemfile

@@ -8,10 +8,15 @@ gem 'simplecov-rcov', :platform => :mri
 
 gem 'rails', "~> 3.2"
 
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
 group :test do
   gem 'devise'
+  gem 'devise-guests'
   gem "bootstrap-sass"
   gem 'turbolinks'
+  gem 'uglifier'
+  gem 'poltergeist'
   gem "unicode", :platforms => [:mri_18, :mri_19]
 end
 

data/gemfiles/rails4.gemfile

@@ -8,10 +8,14 @@ gem 'simplecov-rcov', :platform => :mri
 
 gem 'rails', '~> 4.0.0'
 
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
 group :test do
   gem 'devise'
+  gem 'devise-guests'
   gem "bootstrap-sass"
   gem 'turbolinks'
+  gem 'poltergeist'
   gem "unicode", :platforms => [:mri_18, :mri_19]
 end
 

data/spec/helpers/blacklight_helper_spec.rb

@@ -679,4 +679,19 @@ describe BlacklightHelper do
   describe "render_grouped_document_index" do
 
   end
+
+  describe "render_field_value" do
+    it "should join and html-safe values" do
+      expect(helper.render_field_value(['a', 'b'])).to eq "a, b"
+    end
+
+    it "should join values using the field_value_separator" do
+      helper.stub(:field_value_separator).and_return(" -- ")
+      expect(helper.render_field_value(['a', 'b'])).to eq "a -- b"
+    end
+
+    it "should use the separator from the Blacklight field configuration by default" do
+      expect(helper.render_field_value(['c', 'd'], double(:separator => '; '))).to eq "c; d"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -16,9 +16,8 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/ and ruby_engine != "jruby"
   end
 end
 
-# version that works with our blacklight:spec stuff that calls specs
-# in a remote directory. 
-require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
+require 'engine_cart'
+EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara/rspec'

data/tasks/blacklight.rake

@@ -1,12 +1,7 @@
 ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
-APP_ROOT = File.expand_path("../..", __FILE__)
-
-TEST_APP_TEMPLATES = 'spec/test_app_templates'
-TEST_APP = 'spec/internal'
 
 require 'jettywrapper'
-require 'rspec/core/rake_task'
-
+require 'engine_cart/rake_task'
 
 task :ci => 'jetty:clean' do
   ENV['environment'] = "test"
@@ -30,61 +25,18 @@ namespace :blacklight do
     end
   end
 
-
   desc "Run tests with coverage"
   task :coverage do
     ENV['COVERAGE'] = 'true'
-    Rake::Task["blacklight:spec"].invoke
-  end
-
-  desc "Run specs"
-  task :spec => [:generate] do |t|
-    spec_options = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
-    within_test_app do
-      system "rake blacklight_test_app:spec#{spec_options}"
-      abort "Error running spec" unless $?.success?
-    end
+    Rake::Task["spec"].invoke
   end
 
   desc "Clean out the test rails app"
-  task :clean do
-    puts "Removing sample rails app"
-    `rm -rf #{TEST_APP}`
+  task :clean => ['engine_cart:clean'] do
   end
 
   desc "Create the test rails app"
-  task :generate do
-    unless File.exists?('spec/internal/Rakefile')
-      puts "Generating rails app"
-      `rails new #{TEST_APP}`
-      puts "Copying gemfile"
-      open("#{TEST_APP}/Gemfile", 'a') do |f|
-        f.write File.read(TEST_APP_TEMPLATES + "/Gemfile.extra")
-        f.write "gem 'blacklight', :path => '../../'" 
-      end
-      puts "Copying generator"
-      `cp -r #{TEST_APP_TEMPLATES}/lib/generators #{TEST_APP}/lib`
-      within_test_app do
-        puts "Bundle install"
-        `bundle install`
-        puts "running test_app_generator"
-        system "rails generate test_app"
-
-        puts "running migrations"
-        puts `rake db:migrate db:test:prepare`
-      end
-    end
-    puts "Done generating test app"
+  task :generate => ['engine_cart:generate'] do
   end
-
-
-
 end
 
-def within_test_app
-  FileUtils.cd(TEST_APP)
-  Bundler.with_clean_env do
-    yield
-  end
-  FileUtils.cd(APP_ROOT)
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.5.0.rc1
+  version: 4.5.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -163,6 +163,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: engine_cart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Blacklight is an open source Solr user interface discovery platform.
   You can use Blacklight to enable searching and browsing of your collections. Blacklight
   uses the Apache Solr search engine to search full text and/or metadata.
@@ -481,7 +495,8 @@ files:
 - tasks/blacklight.rake
 - test_support/data/test_data.utf8.mrc
 homepage: http://projectblacklight.org/
-licenses: []
+licenses:
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -494,12 +509,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.1.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)