blacklight_range_limit 5.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370e3efeb2a4d7b7256ed5110183816b00291c7a
-  data.tar.gz: a483e4d5767c82b12ba43445bf9d071ef318210d
+  metadata.gz: 88ce4d1a9977401229bc5968d114d72ffcb78300
+  data.tar.gz: d74d58e4259a6308a77738fc612c6b25e8e33747
 SHA512:
-  metadata.gz: 280bc39080fd5ec46d354422505ea09a2dec4a978f2ef8e6aef7ece8d4e974250aea22e412b9f91378b6a978132c6bb7d76cd98cb136186720a454daaaf99521
-  data.tar.gz: 5b393841ea0a2c52452b75b84d0bd4f5c5f69bc2846f652877054bd49f94027930ce59d30b98d4bf638312c0041292460968a7b441b193d76ea5d68e0b848e91
+  metadata.gz: 90d24009d5a9c91e3dd11c49f730367e923d8ab175fa5948d4f4f232af0ec8a99827a1b708b78793ab2ab357539220e760719f87c8104aed9567e900b7ee95e5
+  data.tar.gz: d329af1791c03d119e8b22855c03783edbdd643fbd688d00babb9b4b4d0819c15e6d33e3310e2807476329a5fe37d65442691fd1e082dbed3580a74e5eb50a06

data/.gitignore

@@ -22,6 +22,7 @@ Gemfile.lock
 ## PROJECT::SPECIFIC
 
 /spec/internal
+.internal_test_app
 /jetty
 /pkg
 /tmp

data/Gemfile

@@ -2,24 +2,30 @@ source 'https://rubygems.org'
 
 gemspec
 
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 0.8.0
+# 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__)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
 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'] and ENV['RAILS_VERSION'] =~ /^4.2/
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'bootstrap-sass', '>= 3.3.5.1'
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
   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"
   end
 end
-
-# I'm sorry, this is harsh and I think ought to be done some other way with
-# engine_cart, but I don't understand how or what's going on, and this
-# is all I could to avoid:
-# undefined method `type' for .focus:Sass::Selector::Class
-#         (in .../blacklight_range_limit/spec/internal/app/assets/stylesheets/blacklight.css.scss)
-gem 'sass', "~> 3.4"
+# END ENGINE_CART BLOCK

data/README.md

@@ -37,7 +37,7 @@ to your Gemfile. Run "bundle install".
 
 Then run 
 
-    rails generate blacklight_range_limit 
+    rails generate blacklight_range_limit:install
 
 This will install some asset references in your application.js and application.css.
 
@@ -45,20 +45,23 @@ This will install some asset references in your application.js and application.c
 
 You have at least one solr field you want to display as a range limit, that's why you've installed this plugin. In your CatalogController, the facet configuration should look like:
 
-    config.add_facet_field 'pub_date', :label => 'Publication Year', :range => true 
+```ruby
+config.add_facet_field 'pub_date', label: 'Publication Year', range: true 
+```
   
 You should now get range limit display. More complicated configuration is available if desired, see Range Facet Configuration below. 
 
 
 You can also configure the look and feel of the Flot chart using the jQuery .data() method. On the `.facet_limit` container you want to configure, add a Flot options associative array (documented at http://people.iola.dk/olau/flot/API.txt) as the `plot-config` key. The `plot-config` key to set the `plot-config` key on the appropriate `.facet_limit` container. In order to customize the plot colors, for example, you could use this code:
 
-    $('.blacklight-year_i').data('plot-config', { 
-      selection: { color: '#C0FF83' }, 
-      colors: ['#ffffff'], 
-      series: { lines: { fillColor: 'rgba(255,255,255, 0.5)' }}, 
-      grid: { color: '#aaaaaa', tickColor: '#aaaaaa', borderWidth: 0 }  
-    });
-
+```javascript
+$('.blacklight-year_i').data('plot-config', { 
+    selection: { color: '#C0FF83' }, 
+    colors: ['#ffffff'], 
+    series: { lines: { fillColor: 'rgba(255,255,255, 0.5)' }}, 
+    grid: { color: '#aaaaaa', tickColor: '#aaaaaa', borderWidth: 0 }  
+});
+```
 You can add this configuration in app/assets/javascript/application.js, or anywhere else loaded before the blacklight range limit javascript.
 
 ## A note on AJAX use
@@ -78,12 +81,15 @@ Note that a drill-down will never require the second request, because boundaries
 
 Instead of simply passing "true", you can pass a hash with additional configuration. Here's an example with all the available keys, you don't need to use them all, just the ones you want to set to non-default values. 
 
-    config.add_facet_field 'pub_date', :label => 'Publication Year', :range => {
-      :num_segments => 6,
-      :assumed_boundaries => [1100, Time.now.year + 2],
-      :segments => false    
-    }
-  
+```ruby
+config.add_facet_field 'pub_date', label: 'Publication Year', 
+                       range: {
+                         num_segments: 6,
+                         assumed_boundaries: [1100, Time.now.year + 2],
+                         segments: false    
+                       }
+```
+
 * **:num_segments** :
   * Default 10. Approximately how many segments to divide the range into for segment facets, which become segments on the chart. Actual segments are calculated to be 'nice' values, so may not exactly match your setting.  
 * **:assumed_boundaries** :
@@ -126,36 +132,6 @@ ourselves yet.
 Also not sure how well the flot select UI works on a touch screen. The slider
 is probably the best touch UI anyway, if it can be made to work well. 
 
-
-## Injection
-
-The plugin assumes it is in a Blacklight Rails app, and uses Blacklight methods, Rails methods, and standard ruby module includes to inject it's behaviors into the app.  
-
-You can turn off this injection if you like, although it will make the plugin less (or non-) functional unless you manually do similar injection. See lib/blacklight_range_limit.rb#inject! to see exactly what's going on. 
-
-In any initializer, you can set:
-
-    BlacklightRangeLimit.omit_inject = true
-  
-to turn off all injection. The plugin will be completely non-functional if you do this, of course. But perhaps you could try to re-use some of it's classes in a non-Blacklight, highly hacked Blacklight, or even non-Rails application this way. 
-
-You can also turn off injection of individual components, which could be more useful:
-   
-    BlacklightRangeLimit.omit_inject = {
-      :view_helpers => false,
-      :controller_mixin => false,
-      :routes => false
-    }
-
-* **:view_helpers** :
-  * Set to false and the plugin will not insert it's own rails view helpers into the app. It will raise lots of errors if you do this, you probably don't want to. 
-* **:controller_mixin** :
-  * The plugin mixes some methods into CatalogController, both over-riding Blacklight methods, and providing a new action of it's own. Set to false, and the plugin won't. You've basically disabled the plugin if you do this.  
-* **:routes** :
-  * Disable automatic routes loading
-  
-See Javascript Dependencies above for disabling injection of gem's js.   
-  
 # Tests
 
 Test coverage is not great, but there are some tests, using rspec.  Run `rake ci` or just `rake` to seed and

data/Rakefile

@@ -10,7 +10,7 @@ require 'engine_cart/rake_task'
 
 EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip"
 
 require 'jettywrapper'
 
@@ -37,7 +37,7 @@ namespace :test do
   task :seed => ['engine_cart:generate'] do
     within_test_app do
       ENV['RAILS_ENV'] ||= 'test'
-      system "rake blacklight:solr:seed"
+      system "rake blacklight:index:seed"
       system "rake blacklight_range_limit:seed"
     end
   end

data/VERSION

@@ -1 +1 @@
-5.2.0
+6.0.0

data/app/views/blacklight_range_limit/_range_limit_panel.html.erb

@@ -1,7 +1,7 @@
 <%- # requires solr_config local passed in
 
   field_config = range_config(solr_field)  
-  label = blacklight_config.facet_fields[solr_field].label
+  label = facet_field_label(solr_field)
   
   input_label_range_begin = field_config[:input_label_range_begin] || t("blacklight.range_limit.range_begin", field_label: label)
   input_label_range_end   = field_config[:input_label_range_end] || t("blacklight.range_limit.range_end", field_label: label)
@@ -29,8 +29,8 @@
   <% end %>
 
   <% unless params["range"] && params["range"][solr_field] && params["range"][solr_field]["missing"] %>  
-    <%= form_tag catalog_index_path, :method => :get, :class=>"range_limit subsection range_#{solr_field} form-inline" do %>
-      <%= render_hash_as_hidden_fields(params_for_search) %>
+    <%= form_tag search_action_path, :method => :get, :class=>"range_limit subsection range_#{solr_field} form-inline" do %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search) %>
       
       <!-- we need to include a dummy search_field parameter if none exists,
            to trick blacklight into displaying actual search results instead

data/blacklight_range_limit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.0", "< 5.0"
   s.add_dependency "jquery-rails" # our JS needs jquery_rails  
-  s.add_dependency "blacklight", "~> 5.15"
+  s.add_dependency "blacklight", ">= 6.0.0.pre2", "< 7"
 
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rspec-rails"
@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "sqlite3"
   s.add_development_dependency 'launchy'
   s.add_development_dependency "jettywrapper", "~> 1.5", ">= 1.5.2"
-  s.add_development_dependency "engine_cart", "~> 0.6"
+  s.add_development_dependency "engine_cart", "~> 0.8"
 end

data/config/jetty.yml

@@ -1,6 +1,6 @@
 development:
   startup_wait: 15
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
+  jetty_port: 8983
   <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
 
 test:

data/lib/blacklight_range_limit.rb

@@ -4,50 +4,17 @@ module BlacklightRangeLimit
   require 'blacklight_range_limit/range_limit_builder'
   require 'blacklight_range_limit/controller_override'
   require 'blacklight_range_limit/view_helper_override'
-  require 'blacklight_range_limit/route_sets'
 
   require 'blacklight_range_limit/version'
   require 'blacklight_range_limit/engine'
 
+  autoload :Routes, 'blacklight_range_limit/routes'
+
   mattr_accessor :labels
   self.labels = {
     :missing => "Unknown"
   }
-
-  
-  @omit_inject = {}
-  def self.omit_inject=(value)
-    value = Hash.new(true) if value == true
-    @omit_inject = value      
-  end
-  def self.omit_inject ; @omit_inject ; end
   
-  def self.inject!
-    unless omit_inject[:controller_mixin]
-        CatalogController.send(:include, BlacklightRangeLimit::ControllerOverride) unless Blacklight::Catalog.include?(BlacklightRangeLimit::ControllerOverride)
-      end
-
-      unless omit_inject[:view_helpers]
-        SearchHistoryController.send(:helper, 
-          BlacklightRangeLimit::ViewHelperOverride
-        ) unless
-          SearchHistoryController.helpers.is_a?( 
-            BlacklightRangeLimit::ViewHelperOverride
-          )
-         
-        SearchHistoryController.send(:helper, 
-          RangeLimitHelper
-        ) unless
-          SearchHistoryController.helpers.is_a?( 
-            RangeLimitHelper
-          )
-      end
-      
-      unless BlacklightRangeLimit.omit_inject[:routes]
-        Blacklight::Routes.send(:include, BlacklightRangeLimit::RouteSets)
-      end
-  end
-
   # Add element to array only if it's not already there
   def self.safe_arr_add(array, element)
     array << element unless array.include?(element)
@@ -70,5 +37,4 @@ module BlacklightRangeLimit
 
     config
   end
-  
 end

data/lib/blacklight_range_limit/controller_override.rb

@@ -1,34 +1,20 @@
 # Meant to be applied on top of a controller that implements
 # Blacklight::SolrHelper. Will inject range limiting behaviors
-# to solr parameters creation. 
+# to solr parameters creation.
 require 'blacklight_range_limit/segment_calculation'
 module BlacklightRangeLimit
   module ControllerOverride
     extend ActiveSupport::Concern
-  
-    included do        
-      unless BlacklightRangeLimit.omit_inject[:view_helpers]
-        helper BlacklightRangeLimit::ViewHelperOverride
-        helper RangeLimitHelper
-      end
 
-      if self.respond_to? :search_params_logic
-        search_params_logic << :add_range_limit_params
-      end
-      if self.blacklight_config.search_builder_class
-        unless self.blacklight_config.search_builder_class.include?(BlacklightRangeLimit::RangeLimitBuilder)
-          self.blacklight_config.search_builder_class.send(:include,  
-              BlacklightRangeLimit::RangeLimitBuilder  
-          ) 
-          self.blacklight_config.search_builder_class.default_processor_chain << :add_range_limit_params
-        end
-      end
+    included do
+      helper BlacklightRangeLimit::ViewHelperOverride
+      helper RangeLimitHelper
     end
-  
+
     # Action method of our own!
     # Delivers a _partial_ that's a display of a single fields range facets.
     # Used when we need a second Solr query to get range facets, after the
-    # first found min/max from result set. 
+    # first found min/max from result set.
     def range_limit
       # We need to swap out the add_range_limit_params search param filter,
       # and instead add in our fetch_specific_range_limit filter,
@@ -36,7 +22,7 @@ module BlacklightRangeLimit
       # field (with start/end params) mentioned in query params
       # range_field, range_start, and range_end
 
-      @response, _ = search_results(params, search_params_logic) do |search_builder|
+      @response, _ = search_results(params) do |search_builder|
         search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
       end
 

data/lib/blacklight_range_limit/engine.rb

@@ -4,20 +4,10 @@ require 'rails'
 
 module BlacklightRangeLimit
   class Engine < Rails::Engine
-  
     # Need to tell asset pipeline to precompile the excanvas
-    # we use for IE. 
+    # we use for IE.
     initializer "blacklight_range_limit.assets", :after => "assets" do
       Rails.application.config.assets.precompile += %w( flot/excanvas.min.js )
     end
-    
-    # Do these things in a to_prepare block, to try and make them work
-    # in development mode with class-reloading. The trick is we can't
-    # be sure if the controllers we're modifying are being reloaded in
-    # dev mode, if they are in the BL plugin and haven't been copied to
-    # local, they won't be. But we do our best. 
-    config.to_prepare do
-      BlacklightRangeLimit.inject!
-    end
   end
 end

data/lib/blacklight_range_limit/range_limit_builder.rb

@@ -2,11 +2,15 @@ require 'blacklight_range_limit/segment_calculation'
 
 module BlacklightRangeLimit
   module RangeLimitBuilder
+    extend ActiveSupport::Concern
     include BlacklightRangeLimit::SegmentCalculation
 
-    # Method added to solr_search_params_logic to fetch
-    # proper things for date ranges. This should be added in by default to standard
-    # processing chain. 
+    included do
+      # Use setters so not to propagate changes
+      self.default_processor_chain += [:add_range_limit_params]
+    end
+
+    # Method added to to fetch proper things for date ranges.
     def add_range_limit_params(solr_params)
        ranged_facet_configs = 
          blacklight_config.facet_fields.select { |key, config| config.range } 
@@ -80,4 +84,4 @@ module BlacklightRangeLimit
     end
 
   end
-end
+end

data/lib/blacklight_range_limit/routes.rb

@@ -0,0 +1,5 @@
+module BlacklightRangeLimit
+  module Routes
+    require 'blacklight_range_limit/routes/range_searchable'
+  end
+end

data/lib/blacklight_range_limit/routes/range_searchable.rb

@@ -0,0 +1,15 @@
+module BlacklightRangeLimit
+  module Routes
+    class RangeSearchable
+      def initialize(defaults = {})
+        @defaults = defaults
+      end
+
+      def call(mapper, options = {})
+        options = @defaults.merge(options)
+
+        mapper.get 'range_limit', action: 'range_limit'
+      end
+    end
+  end
+end

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -48,7 +48,7 @@
 
           next unless hash["missing"] || (!hash["begin"].blank?) || (!hash["end"].blank?)
           content << render_constraint_element(
-            blacklight_config.facet_fields[solr_field].label,
+            facet_field_label(solr_field),
             range_display(solr_field, my_params),
             :escape_value => false,
             :remove => remove_range_param(solr_field, my_params)
@@ -66,7 +66,7 @@
           next unless hash["missing"] || (!hash["begin"].blank?) || (! hash["end"].blank?)        
           
           content << render_search_to_s_element(
-            blacklight_config.facet_fields[solr_field].label,
+            facet_field_label(solr_field),
             range_display(solr_field, my_params),
             :escape_value => false
           )          

data/lib/generators/blacklight_range_limit/install_generator.rb

@@ -0,0 +1,44 @@
+require 'rails/generators'
+
+module BlacklightRangeLimit
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def copy_public_assets
+      generate 'blacklight_range_limit:assets'
+    end
+
+    def install_catalog_controller_mixin
+      inject_into_class 'app/controllers/catalog_controller.rb', CatalogController do
+        "\n  include BlacklightRangeLimit::ControllerOverride\n"
+      end
+    end
+
+    def install_search_builder
+      path = 'app/models/search_builder.rb'
+      if File.exists? path
+        inject_into_file path, after: /include Blacklight::Solr::SearchBuilderBehavior.*$/ do
+          "\n  include BlacklightRangeLimit::RangeLimitBuilder\n"
+        end
+      else
+        say_status("error", "Unable to find #{path}. You must manually add the 'include BlacklightRangeLimit::RangeLimitBuilder' to your SearchBuilder", :red)
+      end
+    end
+
+    def install_search_history_controller
+     copy_file "search_history_controller.rb", "app/controllers/search_history_controller.rb"
+    end
+
+    def install_routing_concern
+      route('concern :range_searchable, BlacklightRangeLimit::Routes::RangeSearchable.new')
+    end
+
+    def add_range_limit_concern_to_catalog
+      sentinel = /concerns :searchable.*$/
+
+      inject_into_file 'config/routes.rb', after: sentinel do
+        "\n    concerns :range_searchable\n"
+      end
+    end
+  end
+end

data/lib/generators/blacklight_range_limit/templates/search_history_controller.rb

@@ -0,0 +1,6 @@
+class SearchHistoryController < ApplicationController
+  include Blacklight::SearchHistory
+
+  helper BlacklightRangeLimit::ViewHelperOverride
+  helper RangeLimitHelper
+end

data/lib/tasks/blacklight_range_limit.rake

@@ -3,8 +3,9 @@ require 'rails/generators'
 namespace :blacklight_range_limit do
   desc 'Add in additional Solr docs'
   task seed: :environment do
+    solr = CatalogController.new.repository.connection
     docs = Dir['spec/fixtures/solr_documents/*.yml'].map { |f| YAML.load File.read(f) }.flatten
-    Blacklight.solr.add docs
-    Blacklight.solr.commit
+    solr.add docs
+    solr.commit
   end
 end

data/spec/features/blacklight_range_limit_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Blacklight Range Limit" do
 
   it "should show the range limit facet" do
-    visit catalog_index_path
+    visit search_catalog_path
     expect(page).to have_selector 'input.range_begin'
     expect(page).to have_selector 'input.range_end'
     expect(page).to have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'Publication Date Sort range begin'
@@ -12,7 +12,7 @@ describe "Blacklight Range Limit" do
   end
 
   it "should provide distribution information" do
-    visit catalog_index_path
+    visit search_catalog_path
     click_link 'View distribution'
 
     expect(page).to have_content("1500 to 1599 0")
@@ -20,12 +20,27 @@ describe "Blacklight Range Limit" do
   end
 
   it "should limit appropriately" do
-    visit catalog_index_path
+    visit search_catalog_path
     click_link 'View distribution'
     click_link '2000 to 2008'
 
     expect(page).to have_content "2000 to 2008 [remove] 12"
   end
+
+  context 'when I18n translation is available' do
+    before do
+      I18n.backend.store_translations(:en, blacklight: {search: {fields: {facet: {pub_date_sort: 'Publication Date I18n'}}}})
+    end
+
+    it 'should render the I18n label' do
+      visit search_catalog_path
+      click_link 'View distribution'
+      click_link '2000 to 2008'
+
+      expect(page).to have_content 'Publication Date I18n'
+      expect(page).to_not have_content 'Publication Date Sort'
+    end
+  end
 end
 
 describe "Blacklight Range Limit with configured input labels" do

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,7 +1,7 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+  source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
 
   # This is only necessary for Rails 3
   def remove_index
@@ -17,7 +17,7 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_range_limit_generator
     say_status("warning", "GENERATING BL", :yellow)       
 
-    generate 'blacklight_range_limit'
+    generate 'blacklight_range_limit:install'
   end
 
   def fixtures
@@ -26,8 +26,8 @@ class TestAppGenerator < Rails::Generators::Base
   end
 
   def inject_into_catalog_controller
-    inject_into_file 'app/controllers/catalog_controller.rb', after: "config.add_facet_field 'example_pivot_field', :label => 'Pivot Field', :pivot => ['format', 'language_facet']" do
-      "\n    config.add_facet_field 'pub_date_sort', :label => 'Publication Date Sort', :range => true"
+    inject_into_file 'app/controllers/catalog_controller.rb', after: /config.add_facet_field 'format'.*$/ do
+      "\n    config.add_facet_field 'pub_date_sort', label: 'Publication Date Sort', range: true"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -49,16 +49,22 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0.pre2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0.pre2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -155,14 +161,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -198,11 +204,14 @@ files:
 - lib/blacklight_range_limit/engine.rb
 - lib/blacklight_range_limit/range_limit_builder.rb
 - lib/blacklight_range_limit/route_sets.rb
+- lib/blacklight_range_limit/routes.rb
+- lib/blacklight_range_limit/routes/range_searchable.rb
 - lib/blacklight_range_limit/segment_calculation.rb
 - lib/blacklight_range_limit/version.rb
 - lib/blacklight_range_limit/view_helper_override.rb
 - lib/generators/blacklight_range_limit/assets_generator.rb
-- lib/generators/blacklight_range_limit/blacklight_range_limit_generator.rb
+- lib/generators/blacklight_range_limit/install_generator.rb
+- lib/generators/blacklight_range_limit/templates/search_history_controller.rb
 - lib/tasks/blacklight_range_limit.rake
 - spec/features/blacklight_range_limit_spec.rb
 - spec/fixtures/solr_documents/zero_year.yml
@@ -234,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin

data/lib/generators/blacklight_range_limit/blacklight_range_limit_generator.rb

@@ -1,10 +0,0 @@
-require 'rails/generators'
-
-class BlacklightRangeLimitGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-
-  require File.expand_path('../assets_generator.rb', __FILE__)
-  def copy_public_assets
-    BlacklightRangeLimit::AssetsGenerator.start
-  end
-end