blacklight 3.4.2 → 3.5.0

data/test_support/spec/requests/alternate_controller_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "controllers that are not catalog controller" do
+
+  it "should have the correct search form" do
+    visit alternate_index_path
+    page.should have_selector("form[action='#{alternate_index_path}']")
+    fill_in "q", :with=>"history"
+    click_button 'search'
+    page.should have_link("startOverLink", :href=>alternate_index_path)
+    page.should have_selector("form.per_page[action='#{alternate_index_path}']")
+    page.should have_selector("form#sort_form[action='#{alternate_index_path}']")
+  end
+end

data/test_support/spec/spec_helper.rb

@@ -5,11 +5,23 @@
 
 ENV["RAILS_ENV"] ||= 'test'
 
+ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/ and ruby_engine != "jruby"
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start do
+    root File.expand_path(File.dirname(__FILE__) + "../../..")
+  end
+end
+
 #require File.expand_path("../../config/environment", __FILE__)
 # 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("../..", __FILE__))
 require 'rspec/rails'
+require 'capybara/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/test_support/spec/views/catalog/_index_default.erb_spec.rb

@@ -9,23 +9,12 @@ describe "/catalog/_index_default.erb" do
   include CatalogHelper
 
   before(:each) do
-    @config = Blacklight::Configuration.from_legacy_configuration({
-      :show => {
-        :display_type => 'asdf'
-      },
-      :index_fields => {
-        :field_names => [
-          'one_field',
-          'empty_field',
-          'four_field'
-        ],
-        :labels => {
-          'one_field' => 'One:',
-          'empty_field' => 'Three:',
-          'four_field' => 'Four:'
-        }
-      }
-    })
+    @config = Blacklight::Configuration.new do |config|
+      config.show.display_type = 'asdf'
+      config.add_index_field 'one_field', :label => 'One:'
+      config.add_index_field 'empty_field', :label => 'Three:'
+      config.add_index_field 'four_field', :label => 'Four:'
+    end
 
     @fname_1 = "one_field"
     @fname_2 = "solr_field_not_in_config"

data/test_support/spec/views/catalog/_show_default.erb_spec.rb

@@ -11,23 +11,13 @@ describe "/catalog/_show_default.html.erb" do
 
 
   before(:each) do
-    @config = Blacklight::Configuration.from_legacy_configuration({
-      :show => {
-        :display_type => 'asdf'
-      },
-      :show_fields => {
-        :field_names => [
-          'one_field',
-          'empty_field',
-          'four_field'
-        ],
-        :labels => {
-          'one_field' => 'One:',
-          'empty_field' => 'Three:',
-          'four_field' => 'Four:'
-        }
-      }
-    })
+     @config = Blacklight::Configuration.new do |config|
+      config.show.display_type = 'asdf'
+      config.add_show_field 'one_field', :label => 'One:'
+      config.add_show_field 'empty_field', :label => 'Three:'
+      config.add_show_field 'four_field', :label => 'Four:'
+    end
+
     @fname_1 = "one_field"
     @fname_2 = "solr_field_not_in_config"
     @fname_3 = "empty_field"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,8 +229,19 @@ files:
 - app/assets/images/blacklight/start_over.gif
 - app/assets/images/favicon.ico
 - app/assets/javascripts/blacklight/blacklight.js
+- app/assets/javascripts/blacklight/bookmark_toggle.js
+- app/assets/javascripts/blacklight/checkbox_submit.js
+- app/assets/javascripts/blacklight/core.js
+- app/assets/javascripts/blacklight/facet_expand_contract.js
+- app/assets/javascripts/blacklight/folder_toggle.js
+- app/assets/javascripts/blacklight/lightbox_dialog.js
+- app/assets/javascripts/blacklight/more_facets.js
+- app/assets/javascripts/blacklight/search_context.js
+- app/assets/javascripts/blacklight/select_submit.js
+- app/assets/javascripts/blacklight/zebra_stripe.js
 - app/assets/javascripts/jquery-1.4.2.min.js
 - app/assets/javascripts/jquery-ui-1.8.1.custom.min.js
+- app/assets/javascripts/jquery.uiExt.ajaxyDialog.js
 - app/assets/stylesheets/blacklight/_blacklight_base.css.scss
 - app/assets/stylesheets/blacklight/_catalog.css.scss
 - app/assets/stylesheets/blacklight/_facets.css.scss
@@ -347,7 +358,7 @@ files:
 - app/views/search_history/index.html.erb
 - blacklight.gemspec
 - config.ru
-- config/locales/kaminari.yml
+- config/locales/blacklight.en.yml
 - config/routes.rb
 - db/seeds.rb
 - install.rb
@@ -364,7 +375,6 @@ files:
 - lib/blacklight/controller.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
-- lib/blacklight/global_configurable.rb
 - lib/blacklight/kaminari_relevant_pages_patch.rb
 - lib/blacklight/routes.rb
 - lib/blacklight/search_fields.rb
@@ -416,6 +426,7 @@ files:
 - lib/railties/solr_marc.rake
 - tasks/blacklight_tasks.rake
 - test_support/.rspec
+- test_support/alternate_controller.rb
 - test_support/bin/run-tests.sh
 - test_support/bin/test.sh
 - test_support/data/test_data.utf8.mrc
@@ -468,7 +479,6 @@ files:
 - test_support/spec/lib/blacklight_spec.rb
 - test_support/spec/lib/blacklight_user_spec.rb
 - test_support/spec/lib/facet_paginator_spec.rb
-- test_support/spec/lib/global_configurable_spec.rb
 - test_support/spec/lib/marc_export_spec.rb
 - test_support/spec/lib/search_fields_spec.rb
 - test_support/spec/lib/solr_helper_spec.rb
@@ -480,6 +490,7 @@ files:
 - test_support/spec/models/search_spec.rb
 - test_support/spec/models/solr_docment_spec.rb
 - test_support/spec/rcov.opts
+- test_support/spec/requests/alternate_controller_spec.rb
 - test_support/spec/spec.opts
 - test_support/spec/spec_helper.rb
 - test_support/spec/support/assert_difference.rb
@@ -505,7 +516,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -528944564261981247
+      hash: -2302454488615889589
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -514,10 +525,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -528944564261981247
+      hash: -2302454488615889589
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)

data/config/locales/kaminari.yml

@@ -1,10 +0,0 @@
-# Sample localization file for Kaminari. You can override these values in your app's locales file if you want.
-
-en:
-  views:
-    pagination:
-      first: "« First"
-      last: "Last »"
-      previous: "« Previous"
-      next: "Next »"
-      truncate: "…"

data/lib/blacklight/global_configurable.rb

@@ -1,46 +0,0 @@
-module Blacklight::GlobalConfigurable
-  
-  # The config environment name used by the #config method
-  #
-  # Example:
-  #   class MyThing
-  #     extend Blacklight::GlobalConfigurable
-  #   end
-  # 
-  # Now MyThing.config will be the result of:
-  #   MyThing.configure(:production) {|config|}
-  #
-  # You set shared attributes by leaving the first argument blank or passing the :shared value:
-  #   MyThing.configure {|config|} 
-  # or
-  #   MyThing.cofigure(:shared) {|config|}
-  
-  # sets the @configs variable to a new Hash with empty Hash for :shared key and @config to nil
-  def reset_configs!
-    @config = nil
-    @configs = {:shared=>{}}
-  end
-  
-  # A hash of all environment configs
-  # The key is the environment name, the value a Hash
-  def configs
-    @configs ? @configs : (reset_configs! and @configs)
-  end
-  
-  # The main config accessor. It merges the current configs[::Rails.env] 
-  # with configs[:shared] and lazy-loads @config to the result.
-  def config
-    @config ||= configs[:shared].merge(configs[::Rails.env] ||= {})
-  end
-  alias_method :blacklight_config, :config
-  
-  # Accepts a value for the environment to configure and a block
-  # A hash is yielded to the block
-  # If the "env" != :shared,
-  # the hash is created by deep cloning the :shared environment config.
-  # This makes it possible to create defaults in the :shared config
-  def configure(env = :shared, &blk)
-    configs[env] = {}
-    yield configs[env]
-  end
-end

data/test_support/spec/lib/global_configurable_spec.rb

@@ -1,98 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Blacklight::GlobalConfigurable do
-  
-  class TestConfig
-    extend Blacklight::GlobalConfigurable
-  end
-  
-  before(:each) do
-    TestConfig.reset_configs!
-  end
-  
-  it "should respond to configure" do
-    TestConfig.respond_to? :configure
-  end
-  
-  describe "the default state" do
-    describe "config" do
-      it "should be a Hash" do
-          TestConfig.config.should be_a Hash      
-      end
-    end
-    describe "configs[:shared]" do
-      it "should be a Hash" do
-        TestConfig.configs[:shared].should be_a Hash
-      end
-    end
-  end
-  
-  describe "configs[:shared]" do
-    it "should not have the values of its members altered by other environments" do
-      TestConfig.configure do |config|
-        config[:key] = ":shared value"
-      end
-      TestConfig.configure(::Rails.env) do |config|
-        config[:key] = ":test value"
-      end
-      TestConfig.config[:key].should == ":test value"
-      TestConfig.configs[:shared][:key].should == ":shared value"
-      TestConfig.configs[::Rails.env][:key].should == ":test value"
-    end
-  end
-  
-  describe "the #configure method behavior" do
-    it "requires a block" do
-      lambda{TestConfig.configure}.should raise_error(LocalJumpError)
-    end
-    it "yields a hash" do
-      TestConfig.configure{|config| config.should be_a(Hash) }
-    end
-    it "should clear the configs if reset_configs! is called" do
-      TestConfig.configure do |config|
-        config[:asdf] = 'asdf'
-      end
-      TestConfig.configs[:shared][:asdf].should == 'asdf'
-      TestConfig.reset_configs!
-      TestConfig.configs[:shared][:asdf].should == nil
-    end
-    
-    it "should merge settings from the :shared environment" do
-      TestConfig.configure do |config|
-        config[:app_id] = 'Blacklight'
-        config[:mode] = :shared!
-      end
-      TestConfig.configure(::Rails.env) do |config|
-        config[:mode] = ::Rails.env
-      end
-      TestConfig.config[:app_id].should == 'Blacklight'
-      TestConfig.config[:mode].should_not == :shared!
-      TestConfig.config[:mode].should == ::Rails.env
-    end
-  end
-  
-  describe "config" do
-    it "should return an empty Hash if nothing was configured" do
-      TestConfig.config.should == {}
-    end
-    
-    it "should return only what is in configs[:shared] if no other environment was configured" do
-      TestConfig.configure(:shared) do |config|
-        config[:foo] = 'bar'
-        config[:baz] = 'dang'
-      end
-      TestConfig.config.should == {:foo => 'bar', :baz => 'dang'}
-      TestConfig.config.should == TestConfig.configs[:shared]
-    end
-    
-    it "should return a merge of configs[:shared] and configs[RAILS_ENV]" do
-      TestConfig.configure(:shared) do |config|
-        config[:foo] = 'bar'
-        config[:baz] = 'dang'
-      end
-    end
-  end
-  
-  
-end