blacklight_cql 1.0.1 → 1.1.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight_cql
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jonathan Rochkind
@@ -15,12 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 -04:00
-default_executable: 
+date: 2011-12-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,24 +28,24 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: blacklight
   prerelease: false
+  name: rails
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1923832001
+        hash: 1923832045
         segments: 
         - 3
-        - 0
+        - 2
         - 0
         - pre
-        - 4
-        version: 3.0.0pre4
+        - 2
+        version: 3.2.0pre2
     - - <
       - !ruby/object:Gem::Version 
         hash: 63
@@ -57,11 +54,11 @@ dependencies:
         - 0
         - 0
         version: 4.0.0
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cql-ruby
   prerelease: false
+  name: blacklight
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,8 +70,53 @@ dependencies:
         - 8
         - 1
         version: 0.8.1
-  type: :runtime
   version_requirements: *id003
+  prerelease: false
+  name: cql-ruby
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
+  prerelease: false
+  name: sqlite3
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  version_requirements: *id005
+  prerelease: false
+  name: rspec-rails
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id006
+  prerelease: false
+  name: nokogiri
+  type: :development
 description: 
 email: 
 - blacklight-development@googlegroups.com
@@ -105,19 +147,38 @@ files:
 - spec/marc_data/social_journal.mrc
 - spec/spec.opts
 - spec/app_root/app/controllers/application_controller.rb
-- spec/app_root/lib/console_with_fixtures.rb
-- spec/app_root/lib/blacklight/search_fields.rb
-- spec/app_root/config/environments/postgresql.rb
-- spec/app_root/config/environments/sqlite3.rb
-- spec/app_root/config/environments/sqlite.rb
-- spec/app_root/config/environments/in_memory.rb
-- spec/app_root/config/environments/mysql.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/views/explain.xml.builder_spec.rb
-has_rdoc: true
 homepage: http://projectblacklight.org/
 licenses: []
 
@@ -147,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: blacklight
-rubygems_version: 1.6.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Blacklight CQL plugin
@@ -161,15 +222,35 @@ test_files:
 - spec/marc_data/social_journal.mrc
 - spec/spec.opts
 - spec/app_root/app/controllers/application_controller.rb
-- spec/app_root/lib/console_with_fixtures.rb
-- spec/app_root/lib/blacklight/search_fields.rb
-- spec/app_root/config/environments/postgresql.rb
-- spec/app_root/config/environments/sqlite3.rb
-- spec/app_root/config/environments/sqlite.rb
-- spec/app_root/config/environments/in_memory.rb
-- spec/app_root/config/environments/mysql.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/views/explain.xml.builder_spec.rb

data/spec/app_root/lib/blacklight/search_fields.rb

@@ -1,97 +0,0 @@
-##
-# Module to deal with accessing (and setting some defaults) in an array of
-# hashes that describe Blacklight search fields.  Requires the base class this
-# module is added to implements a #config method that returns a hash, where
-# config[:search_fields] will be an array of hashes describing search fields.
-#
-# = Search Field Configuration Hash =
-# [:display_label]
-#   "Title",  # user-displayable label
-# [:qt]
-#   "search", # Solr qt param, request handler, defaults to Blacklight.config[:default_qt] if left blank.
-# [:solr_parameters]
-#   {:qf => "something"} # optional hash of additional parameters to pass to solr for searches on this field.
-# [:solr_local_parameters]
-#   {:qf => "$something"} # optional hash of additional parameters that will be passed using Solr LocalParams syntax, that can use dollar sign to reference other solr variables.
-# [:include_in_simple_select]
-#   false.  Defaults to true, but you can set to false to have a search field defined for deep-links or BL extensions, but not actually included in the HTML select for simple search choice.
-# 
-# Optionally you can supply a :key, which is what Blacklight will use
-# to identify this search field in HTTP query params. If no :key is
-# supplied, one will be computed from the :display_label. If that will
-# result in a collision of keys, you should supply one explicitly. 
-#
-##
-module Blacklight::SearchFields
-  extend ActiveSupport::Memoizable
-
-  # Looks up search field config list from config[:search_fields], and
-  # 'normalizes' all field config hashes using normalize_config method. 
-  # Memoized for efficiency of normalization. 
-  def search_field_list
-    config[:search_fields].collect {|obj| normalize_config(obj)}
-  end
-  memoize :search_field_list
-
-  # Returns suitable argument to options_for_select method, to create
-  # an html select based on #search_field_list. Skips search_fields
-  # marked :include_in_simple_select => false
-  def search_field_options_for_select
-    search_field_list.collect do |field_def|
-      [field_def[:display_label],  field_def[:key]] unless field_def[:include_in_simple_select] == false
-    end.compact
-  end
-
-  # Looks up a search field config hash from search_field_list having
-  # a certain supplied :key. 
-  def search_field_def_for_key(key)
-    return nil if key.blank?
-    search_field_list.find {|c| c[:key] == key}
-  end
-
-  # Returns default search field, used for simpler display in history, etc.
-  # if not set in config, defaults to first field listed in #search_field_list
-  def default_search_field
-    config[:default_search_field] || search_field_list[0]
-  end
-  memoize :default_search_field
-
-  # Shortcut for commonly needed operation, look up display
-  # label for the key specified. Returns "Keyword" if a label
-  # can't be found. 
-  def label_for_search_field(key)
-    field_def = search_field_def_for_key(key)
-    if field_def && field_def[:display_label]
-       field_def[:display_label]
-    else
-       "Keyword"
-    end            
-  end
-
-  protected
-  # Fill in missing default values in a search_field config hash.
-  def normalize_config(field_hash)
-
-
-    # Accept legacy two-element array, if it's not a Hash, assume it's legacy.
-    # No great way to 'duck type' here. 
-    unless ( field_hash.kind_of?(Hash))      
-      # Consistent with legacy behavior where two fields can have the same label,
-      # as long as they have different qt's, we base the unique :key on :qt. 
-      field_hash = {:display_label => field_hash[0], :key => field_hash[1], :qt => field_hash[1]}
-    else
-      # Make a copy of passed in Hash so we don't alter original. 
-      field_hash = field_hash.clone
-    end
-    
-    # If no key was provided, turn the display label into one.      
-    field_hash[:key] ||= field_hash[:display_label].downcase.gsub(/[^a-z0-9]+/,'_')
-
-    # If no :qt was provided, take from config default
-    field_hash[:qt] ||= config[:default_qt]
-  
-    field_hash
-  end
-  
-  
-end

data/spec/app_root/lib/console_with_fixtures.rb

@@ -1,4 +0,0 @@
-# Loads fixtures into the database when running the test app via the console
-(ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, '../fixtures/*.{yml,csv}'))).each do |fixture_file|
-  Fixtures.create_fixtures(File.join(Rails.root, '../fixtures'), File.basename(fixture_file, '.*'))
-end