blacklight_cql 1.1.0 → 1.2.0

data/spec/lib/blacklight_to_solr_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require 'spec_helper'
 
 describe "blacklight_to_solr" do
   before do

data/spec/spec_helper.rb

@@ -1,13 +1,19 @@
 #RAILS_ROOT = "#{File.dirname(__FILE__)}/.."
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
 
 # Set the default environment to sqlite3's in_memory database
 ENV['RAILS_ENV'] ||= 'test'
 
-# Load the Rails environment from our dummy test_app. 
-require File.expand_path("../app_root/config/environment", __FILE__)
+
+require 'blacklight/engine'
+Combustion.initialize!
 
 require 'rspec/rails'
-require 'rspec/autorun'
+require 'capybara/rspec'
+require 'capybara/rails'
 
 
 # Requires supporting ruby files with custom matchers and macros, etc,
@@ -34,7 +40,7 @@ RSpec.configure do |config|
   config.mock_with :rspec
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = "#{File.expand_path(File.dirname(__FILE__))}/spec/fixtures"
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -45,13 +51,12 @@ RSpec.configure do |config|
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
-  
+
   
   ##
   # Load CqlRuby and our local patches to it, so available for tests
   # 
   require 'cql_ruby'  
   require File.expand_path(File.dirname(__FILE__) + '/../lib/blacklight_cql/blacklight_to_solr.rb')
-
 end
 

data/spec/views/explain.xml.builder_spec.rb

@@ -1,19 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 require 'nokogiri'
 
-# I'm sorry, this isn't working yet, trying to switch up to rspec2/rails3....
-# got the embedded dummy app working in spec_helper.rb, but
-# the markup_validity gem we were using to test XML was valid isn't
-# working anymore, have to do it manually with nokogiri. 
-# Also, testing selectors against xpath isn't supported by rspec2/capybara,
-# have to do it ourselves with nokogiri, which is a huge pain. 
-#
-# Spent a bunch of hours on it, got this far, had to give up due to
-# lack of time sorry. --jrochkind 14 Dec 2011
-
-#require 'markup_validity' # for validating against XML Schema
-
 describe "SRU/ZeeRex explain view" do
   before(:all) do
     # generic routing, so our view can generate routes without raising.
@@ -44,19 +32,19 @@ describe "SRU/ZeeRex explain view" do
       YAML::load( File.open( File.expand_path(File.dirname(__FILE__) + '/../data/luke.yaml') ) )
     )
 
-    render :template => "blacklight_cql/explain/explain.xml.builder"
+    render :template => "blacklight_cql/explain/explain", :formats => [:xml]
     @rendered_xml = Nokogiri::XML(rendered.to_s)
     @ns = {"ex" => "http://explain.z3950.org/dtd/2.0/"}
 
     # Put it in a rexml doc for things that can't be easily tested
     # with have_tag
-    ##@response_xml = REXML::Document.new(rendered.to_s)
+    ##@rendered_xml = REXML::Document.new(rendered.to_s)
   end
 
   it "should render a valid ZeeRex 2.0 xml document" do
-    schema = File.open(File.expand_path(File.dirname(__FILE__) + "/../data/zeerex-2.0.xsd")).read
+    xsd = Nokogiri::XML::Schema(File.read(File.expand_path(File.dirname(__FILE__) + "/../data/zeerex-2.0.xsd")))
     
-    #response.body.should be_valid_with_schema(schema)
+    assert (xsd.valid? @rendered_xml)        
   end
   
   it "should start with an explain element" do
@@ -82,69 +70,54 @@ describe "SRU/ZeeRex explain view" do
   end
 
   it "should include an indexInfo with context set prefixes" do
+    
     indexInfo = @rendered_xml.at_xpath("//ex:indexInfo", @ns)
     
     indexInfo.should_not be_nil
-    
-    index_info
-    
-    response.should have_tag("indexInfo") do
-      with_tag("set[name=#{CqlRuby.to_solr_defaults[:solr_field_prefix]}][identifier='#{ 
+
+    indexInfo.xpath("ex:set[@name=#{CqlRuby.to_solr_defaults[:solr_field_prefix]}][@identifier='#{ 
               url_for(:controller => "/catalog",
                       :action => "index",
                       :anchor => "local_solr_field",
-                      :only_path => false)}']")
-      with_tag("set[name=#{CqlRuby.to_solr_defaults[:blacklight_field_prefix]}][identifier='#{ 
+                      :only_path => false)}']", @ns).should_not be_nil
+     indexInfo.xpath("ex:set[@name=#{CqlRuby.to_solr_defaults[:blacklight_field_prefix]}][@identifier='#{ 
               url_for(:controller => "/catalog",
                       :action => "index",
                       :anchor => "local_app_field",
-                      :only_path => false)}']")
-      with_tag("set[name=solr][identifier='http://purl.org/net/cql-context-set/solr']")
-    end
+                      :only_path => false)}']", @ns).should_not be_nil
+      indexInfo.xpath("ex:set[name=solr][identifier='http://purl.org/net/cql-context-set/solr']", @ns).should_not be_nil
   end
 
   describe "for the config'd dismax field with :key 'title'" do
+    
     before do
-      @title_index_el =  @response_xml.get_elements("/explain/indexInfo/index").find {|e| e.elements["title"].text == "Title" }.to_s  
+      @title_index_el =  @rendered_xml.xpath("/ex:explain/ex:indexInfo/ex:index[ex:title/text() = 'Title']", @ns).first
     end
     
     it "should have an indexInfo block" do    
       @title_index_el.should_not be_nil
     end
     it "should have explain title 'Title'" do
-      @title_index_el.should have_tag("title", :text => "Title")
+      @title_index_el.xpath('ex:title', @ns).first.text.should == "Title"
     end
     it "should have a map element with proper context set" do
-      @title_index_el.should have_tag("map") do
-        with_tag("name[set=#{CqlRuby.to_solr_defaults[:blacklight_field_prefix]}]", 
-                  :text => "title")            
-      end
+      @title_index_el.xpath("ex:map/ex:name[@set='#{CqlRuby.to_solr_defaults[:blacklight_field_prefix]}']", @ns).first.text.should ==  "title"
     end
     it "should have configInfo with exactly two relations" do
-      @title_index_el.should have_tag("configInfo") do
-        with_tag("supports", :count => 2)
-        with_tag("supports[type=relation]", :text=> "=")
-        with_tag("supports[type=relation]", :text=> "solr.dismax")
-      end
+      @title_index_el.xpath("ex:configInfo/ex:supports", @ns).length.should == 2
+      @title_index_el.xpath("ex:configInfo/ex:supports[@type='relation']", @ns).map { |x| x.text }.should include('=', 'solr.dismax')
     end
   end
 
   it "should include an indexed solr field from luke response" do
-    solr_index_el =  @response_xml.get_elements("/explain/indexInfo/index").find {|e| e.elements["title"].text == "subject_unstem_search" }.to_s
+    solr_index_el =  @rendered_xml.xpath("/ex:explain/ex:indexInfo/ex:index[ex:title='subject_unstem_search']", @ns).first
 
-    solr_index_el.should have_tag("map") do
-      with_tag("name[set=#{CqlRuby.to_solr_defaults[:solr_field_prefix]}]", 
-                :text => "subject_unstem_search")
-    end
+    solr_index_el.xpath("ex:map/ex:name[@set='#{CqlRuby.to_solr_defaults[:solr_field_prefix]}']", @ns).text.should == "subject_unstem_search"
 
-    solr_index_el.should have_tag("configInfo") do
-      ["==", "=", ">=", ">", "<=", "<", "<>", "within", "adj", "all", "any"].each do |relation|
-        with_tag("supports[type=relation]", :text => relation)
-      end
-    end
+    solr_index_el.xpath("ex:configInfo/ex:supports[@type='relation']", @ns).map { |x| x.text }.should include("==", "=", ">=", ">", "<=", "<", "<>", "within", "adj", "all", "any")
   end
 
   it "should not include a non-indexed solr field from luke response" do
-    @response_xml.get_elements("/explain/indexInfo/index").find {|e| e.elements["title"].text == "url_suppl_display" }.should be_nil
+    @rendered_xml.xpath("/explain/indexInfo/index").find {|e| e.elements["title"].text == "url_suppl_display" }.should be_nil
   end
 end

metadata

@@ -1,256 +1,200 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: blacklight_cql
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  version_requirements: *id001
-  prerelease: false
-  name: rails
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1923832045
-        segments: 
-        - 3
-        - 2
-        - 0
-        - pre
-        - 2
-        version: 3.2.0pre2
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 4
-        - 0
-        - 0
-        version: 4.0.0
-  version_requirements: *id002
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: blacklight
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
-        version: 0.8.1
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
   name: cql-ruby
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - blacklight-development@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/blacklight_cql/blacklight_to_solr.rb
-- lib/blacklight_cql/template_helper_extension.rb
-- lib/blacklight_cql/version.rb
+- lib/blacklight_cql/engine.rb
 - lib/blacklight_cql/route_sets.rb
 - lib/blacklight_cql/solr_helper_extension.rb
-- lib/blacklight_cql/engine.rb
+- lib/blacklight_cql/template_helper_extension.rb
+- lib/blacklight_cql/version.rb
 - lib/blacklight_cql.rb
 - app/controllers/blacklight_cql/explain_controller.rb
-- app/views/blacklight_cql/explain/explain.xml.builder
 - app/helpers/blacklight_cql/explain_helper.rb
+- app/views/blacklight_cql/explain/explain.xml.builder
 - VERSION
-- spec/lib/blacklight_to_solr_spec.rb
-- spec/rcov.opts
-- spec/data/zeerex-2.0.xsd
 - spec/data/luke.yaml
-- spec/spec_helper.rb
+- spec/data/zeerex-2.0.xsd
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/models/solr_document.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/config/solr.yml
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/test.log
+- spec/internal/public/favicon.ico
+- spec/lib/blacklight_to_solr_spec.rb
 - spec/marc_data/chomsky.mrc
 - spec/marc_data/social_journal.mrc
+- spec/rcov.opts
 - spec/spec.opts
-- spec/app_root/app/controllers/application_controller.rb
-- spec/app_root/app/assets/javascripts/application.js
-- spec/app_root/app/assets/stylesheets/application.css
-- spec/app_root/app/views/layouts/application.html.erb
-- spec/app_root/app/helpers/application_helper.rb
-- spec/app_root/spec/spec_helper.rb
-- spec/app_root/public/404.html
-- spec/app_root/public/422.html
-- spec/app_root/public/favicon.ico
-- spec/app_root/public/500.html
-- spec/app_root/config/environments/development.rb
-- spec/app_root/config/environments/production.rb
-- spec/app_root/config/environments/test.rb
-- spec/app_root/config/application.rb
-- spec/app_root/config/environment.rb
-- spec/app_root/config/database.yml
-- spec/app_root/config/routes.rb
-- spec/app_root/config/locales/en.yml
-- spec/app_root/config/boot.rb
-- spec/app_root/config/initializers/inflections.rb
-- spec/app_root/config/initializers/backtrace_silencers.rb
-- spec/app_root/config/initializers/wrap_parameters.rb
-- spec/app_root/config/initializers/mime_types.rb
-- spec/app_root/config/initializers/session_store.rb
-- spec/app_root/config/initializers/secret_token.rb
-- spec/app_root/Rakefile
-- spec/app_root/script/rails
-- spec/app_root/config.ru
-- spec/app_root/db/test.sqlite3
-- spec/app_root/log/test.log
-- spec/app_root/log/development.log
-- spec/app_root/log/in_memory.log
+- spec/spec_helper.rb
 - spec/views/explain.xml.builder_spec.rb
 homepage: http://projectblacklight.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2921589717200894324
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2921589717200894324
 requirements: []
-
 rubyforge_project: blacklight
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Blacklight CQL plugin
-test_files: 
-- spec/lib/blacklight_to_solr_spec.rb
-- spec/rcov.opts
-- spec/data/zeerex-2.0.xsd
+test_files:
 - spec/data/luke.yaml
-- spec/spec_helper.rb
+- spec/data/zeerex-2.0.xsd
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/models/solr_document.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/config/solr.yml
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/test.log
+- spec/internal/public/favicon.ico
+- spec/lib/blacklight_to_solr_spec.rb
 - spec/marc_data/chomsky.mrc
 - spec/marc_data/social_journal.mrc
+- spec/rcov.opts
 - spec/spec.opts
-- spec/app_root/app/controllers/application_controller.rb
-- spec/app_root/app/assets/javascripts/application.js
-- spec/app_root/app/assets/stylesheets/application.css
-- spec/app_root/app/views/layouts/application.html.erb
-- spec/app_root/app/helpers/application_helper.rb
-- spec/app_root/spec/spec_helper.rb
-- spec/app_root/public/404.html
-- spec/app_root/public/422.html
-- spec/app_root/public/favicon.ico
-- spec/app_root/public/500.html
-- spec/app_root/config/environments/development.rb
-- spec/app_root/config/environments/production.rb
-- spec/app_root/config/environments/test.rb
-- spec/app_root/config/application.rb
-- spec/app_root/config/environment.rb
-- spec/app_root/config/database.yml
-- spec/app_root/config/routes.rb
-- spec/app_root/config/locales/en.yml
-- spec/app_root/config/boot.rb
-- spec/app_root/config/initializers/inflections.rb
-- spec/app_root/config/initializers/backtrace_silencers.rb
-- spec/app_root/config/initializers/wrap_parameters.rb
-- spec/app_root/config/initializers/mime_types.rb
-- spec/app_root/config/initializers/session_store.rb
-- spec/app_root/config/initializers/secret_token.rb
-- spec/app_root/Rakefile
-- spec/app_root/script/rails
-- spec/app_root/config.ru
-- spec/app_root/db/test.sqlite3
-- spec/app_root/log/test.log
-- spec/app_root/log/development.log
-- spec/app_root/log/in_memory.log
+- spec/spec_helper.rb
 - spec/views/explain.xml.builder_spec.rb

data/spec/app_root/Rakefile

@@ -1,7 +0,0 @@
-#!/usr/bin/env rake
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Dummy::Application.load_tasks

data/spec/app_root/app/assets/javascripts/application.js

@@ -1,9 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/spec/app_root/app/assets/stylesheets/application.css

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree . 
-*/

data/spec/app_root/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/spec/app_root/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>