blacklight_range_limit 2.3.0 → 5.0.0

data/lib/generators/blacklight_range_limit/assets_generator.rb

@@ -16,16 +16,23 @@ module BlacklightRangeLimit
     source_root File.join(BlacklightRangeLimit::Engine.root, 'app', 'assets')
 
     def assets
-      insert_into_file "app/assets/stylesheets/application.css", :before => "*/" do
+      application_css = Dir["app/assets/stylesheets/application{.css,.scss,.css.scs}"].first
+
+      if application_css
+
+        insert_into_file application_css, :before => "*/" do
 %q{
  *
  * Used by blacklight_range_limit
  *= require  'blacklight_range_limit'
  *         
 }
+        end
+      else
+        say_status "warning", "Can not find application.css, did not insert our require", :red
       end
 
-      insert_into_file "app/assets/javascripts/application.js", :after => %r{//= +require +['"]?jquery['"]? *\n} do
+      append_to_file "app/assets/javascripts/application.js" do
 %q{
 
 // For blacklight_range_limit built-in JS, if you don't want it you don't need

data/spec/features/blacklight_range_limit_spec.rb

@@ -12,16 +12,16 @@ describe "Blacklight Range Limit" do
 
   it "should show the range limit facet" do
     visit '/catalog'
-    expect(page).to have_selector 'input.range_begin'
-    expect(page).to have_selector 'input.range_end'
+    page.should have_selector 'input.range_begin'
+    page.should have_selector 'input.range_end'
   end
 
   it "should provide distribution information" do
     visit '/catalog'
     click_link 'View distribution'
 
-    expect(page).to have_content("1941 to 1944 (1)")
-    expect(page).to have_content("2005 to 2008 (7)")
+    page.should have_content("1941 to 1944 1")
+    page.should have_content("2005 to 2008 7")
   end
 
   it "should limit appropriately" do
@@ -29,6 +29,6 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '1941 to 1944'
 
-    expect(page).to have_content "1941 to 1944 (1) [remove]"
+    page.should have_content "1941 to 1944 [remove] 1"
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,18 @@
+require 'rubygems'
+require 'bundler/setup'
+
 ENV["RAILS_ENV"] ||= 'test'
 
 require 'rsolr'
+
 require 'engine_cart'
 EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara/rspec'
 
+
 RSpec.configure do |config|
-  config.infer_spec_type_from_file_location!
+
 end
+

data/spec/test_app_templates/Gemfile.extra

@@ -1,3 +1,9 @@
+platforms :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'mediashelf-loggable', '>= 0.4.8'
+  gem 'therubyrhino'
+end
+
 platforms :ruby do
  gem 'sqlite3'
 end
@@ -5,8 +11,15 @@ end
 gem 'jquery-rails'
 
 group :test do
+  gem 'rspec-rails', '~> 2.13'
   gem 'generator_spec'
-  gem 'capybara'
+  if defined? :JRUBY_VERSION
+    gem 'capybara', '~> 1.0'
+  else
+    gem 'capybara'
+  end
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
 end
 
 gem 'jettywrapper', '>= 1.2.0'

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

@@ -1,32 +1,21 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root '../spec/test_app_templates'
+  source_root File.expand_path("../../../../test_app_templates", __FILE__)
 
   def copy_blacklight_test_app_rake_task
     copy_file "lib/tasks/blacklight_test_app.rake"
   end
 
   def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)
+    say_status("warning", "GENERATING BL", :yellow)       
 
-    generate 'blacklight', '--devise'
+    generate 'blacklight:install', '--devise'
   end
 
   def run_blacklight_range_limit_generator
-    say_status("warning", "GENERATING BL", :yellow)
+    say_status("warning", "GENERATING BL", :yellow)       
 
     generate 'blacklight_range_limit'
   end
-
-  # Add favicon.ico to asset path
-  # ADD THIS LINE Rails.application.config.assets.precompile += %w( favicon.ico )
-  # TO config/assets.rb
-  def add_favicon_to_asset_path
-    say_status("warning", "ADDING FAVICON TO ASSET PATH", :yellow)
-
-    append_to_file 'config/initializers/assets.rb' do
-      'Rails.application.config.assets.precompile += %w( favicon.ico )'
-    end
-  end
 end

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -11,10 +11,4 @@ namespace :blacklight_test_app do
     t.ruby_opts = "-I#{gem_home}/spec"
   end
 
-  task :seed do
-    docs = YAML::load(File.open(ENV['DOC_PATH']))
-    puts "Seeding solr with documents from #{ENV['DOC_PATH']}"
-    Blacklight.solr.add docs
-    Blacklight.solr.commit
-  end
 end

data/vendor/assets/javascripts/bootstrap-slider.js

@@ -0,0 +1,388 @@
+/* =========================================================
+ * bootstrap-slider.js v2.0.0
+ * http://www.eyecon.ro/bootstrap-slider
+ * =========================================================
+ * Copyright 2012 Stefan Petre
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+ 
+!function( $ ) {
+
+  var Slider = function(element, options) {
+    this.element = $(element);
+    this.picker = $('<div class="slider">'+
+              '<div class="slider-track">'+
+                '<div class="slider-selection"></div>'+
+                '<div class="slider-handle"></div>'+
+                '<div class="slider-handle"></div>'+
+              '</div>'+
+              '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'+
+            '</div>')
+              .insertBefore(this.element)
+              .append(this.element);
+    this.id = this.element.data('slider-id')||options.id;
+    if (this.id) {
+      this.picker[0].id = this.id;
+    }
+
+    if (typeof Modernizr !== 'undefined' && Modernizr.touch) {
+      this.touchCapable = true;
+    }
+
+    var tooltip = this.element.data('slider-tooltip')||options.tooltip;
+
+    this.tooltip = this.picker.find('.tooltip');
+    this.tooltipInner = this.tooltip.find('div.tooltip-inner');
+
+    this.orientation = this.element.data('slider-orientation')||options.orientation;
+    switch(this.orientation) {
+      case 'vertical':
+        this.picker.addClass('slider-vertical');
+        this.stylePos = 'top';
+        this.mousePos = 'pageY';
+        this.sizePos = 'offsetHeight';
+        this.tooltip.addClass('right')[0].style.left = '100%';
+        break;
+      default:
+        this.picker
+          .addClass('slider-horizontal')
+          .css('width', this.element.outerWidth());
+        this.orientation = 'horizontal';
+        this.stylePos = 'left';
+        this.mousePos = 'pageX';
+        this.sizePos = 'offsetWidth';
+        this.tooltip.addClass('top')[0].style.top = -this.tooltip.outerHeight() - 14 + 'px';
+        break;
+    }
+
+    this.min = this.element.data('slider-min')||options.min;
+    this.max = this.element.data('slider-max')||options.max;
+    this.step = this.element.data('slider-step')||options.step;
+    this.value = this.element.data('slider-value')||options.value;
+    if (this.value[1]) {
+      this.range = true;
+    }
+
+    this.selection = this.element.data('slider-selection')||options.selection;
+    this.selectionEl = this.picker.find('.slider-selection');
+    if (this.selection === 'none') {
+      this.selectionEl.addClass('hide');
+    }
+    this.selectionElStyle = this.selectionEl[0].style;
+
+
+    this.handle1 = this.picker.find('.slider-handle:first');
+    this.handle1Stype = this.handle1[0].style;
+    this.handle2 = this.picker.find('.slider-handle:last');
+    this.handle2Stype = this.handle2[0].style;
+
+    var handle = this.element.data('slider-handle')||options.handle;
+    switch(handle) {
+      case 'round':
+        this.handle1.addClass('round');
+        this.handle2.addClass('round');
+        break
+      case 'triangle':
+        this.handle1.addClass('triangle');
+        this.handle2.addClass('triangle');
+        break
+    }
+
+    if (this.range) {
+      this.value[0] = Math.max(this.min, Math.min(this.max, this.value[0]));
+      this.value[1] = Math.max(this.min, Math.min(this.max, this.value[1]));
+    } else {
+      this.value = [ Math.max(this.min, Math.min(this.max, this.value))];
+      this.handle2.addClass('hide');
+      if (this.selection == 'after') {
+        this.value[1] = this.max;
+      } else {
+        this.value[1] = this.min;
+      }
+    }
+    this.diff = this.max - this.min;
+    this.percentage = [
+      (this.value[0]-this.min)*100/this.diff,
+      (this.value[1]-this.min)*100/this.diff,
+      this.step*100/this.diff
+    ];
+
+    this.offset = this.picker.offset();
+    this.size = this.picker[0][this.sizePos];
+
+    this.formater = options.formater;
+
+    this.layout();
+
+    if (this.touchCapable) {
+      // Touch: Bind touch events:
+      this.picker.on({
+        touchstart: $.proxy(this.mousedown, this)
+      });
+    } else {
+      this.picker.on({
+        mousedown: $.proxy(this.mousedown, this)
+      });
+    }
+
+    if (tooltip === 'show') {
+      this.picker.on({
+        mouseenter: $.proxy(this.showTooltip, this),
+        mouseleave: $.proxy(this.hideTooltip, this)
+      });
+    } else {
+      this.tooltip.addClass('hide');
+    }
+  };
+
+  Slider.prototype = {
+    constructor: Slider,
+
+    over: false,
+    inDrag: false,
+    
+    showTooltip: function(){
+      this.tooltip.addClass('in');
+      //var left = Math.round(this.percent*this.width);
+      //this.tooltip.css('left', left - this.tooltip.outerWidth()/2);
+      this.over = true;
+    },
+    
+    hideTooltip: function(){
+      if (this.inDrag === false) {
+        this.tooltip.removeClass('in');
+      }
+      this.over = false;
+    },
+
+    layout: function(){
+      this.handle1Stype[this.stylePos] = this.percentage[0]+'%';
+      this.handle2Stype[this.stylePos] = this.percentage[1]+'%';
+      if (this.orientation == 'vertical') {
+        this.selectionElStyle.top = Math.min(this.percentage[0], this.percentage[1]) +'%';
+        this.selectionElStyle.height = Math.abs(this.percentage[0] - this.percentage[1]) +'%';
+      } else {
+        this.selectionElStyle.left = Math.min(this.percentage[0], this.percentage[1]) +'%';
+        this.selectionElStyle.width = Math.abs(this.percentage[0] - this.percentage[1]) +'%';
+      }
+      if (this.range) {
+        this.tooltipInner.text(
+          this.formater(this.value[0]) + 
+          ' : ' + 
+          this.formater(this.value[1])
+        );
+        this.tooltip[0].style[this.stylePos] = this.size * (this.percentage[0] + (this.percentage[1] - this.percentage[0])/2)/100 - (this.orientation === 'vertical' ? this.tooltip.outerHeight()/2 : this.tooltip.outerWidth()/2) +'px';
+      } else {
+        this.tooltipInner.text(
+          this.formater(this.value[0])
+        );
+        this.tooltip[0].style[this.stylePos] = this.size * this.percentage[0]/100 - (this.orientation === 'vertical' ? this.tooltip.outerHeight()/2 : this.tooltip.outerWidth()/2) +'px';
+      }
+    },
+
+    mousedown: function(ev) {
+
+      // Touch: Get the original event:
+      if (this.touchCapable && ev.type === 'touchstart') {
+        ev = ev.originalEvent;
+      }
+
+      this.offset = this.picker.offset();
+      this.size = this.picker[0][this.sizePos];
+
+      var percentage = this.getPercentage(ev);
+
+      if (this.range) {
+        var diff1 = Math.abs(this.percentage[0] - percentage);
+        var diff2 = Math.abs(this.percentage[1] - percentage);
+        this.dragged = (diff1 < diff2) ? 0 : 1;
+      } else {
+        this.dragged = 0;
+      }
+
+      this.percentage[this.dragged] = percentage;
+      this.layout();
+
+      if (this.touchCapable) {
+        // Touch: Bind touch events:
+        $(document).on({
+          touchmove: $.proxy(this.mousemove, this),
+          touchend: $.proxy(this.mouseup, this)
+        });
+      } else {
+        $(document).on({
+          mousemove: $.proxy(this.mousemove, this),
+          mouseup: $.proxy(this.mouseup, this)
+        });
+      }
+
+      this.inDrag = true;
+      var val = this.calculateValue();
+      this.element.trigger({
+          type: 'slideStart',
+          value: val
+        }).trigger({
+          type: 'slide',
+          value: val
+        });
+      return false;
+    },
+
+    mousemove: function(ev) {
+      
+      // Touch: Get the original event:
+      if (this.touchCapable && ev.type === 'touchmove') {
+        ev = ev.originalEvent;
+      }
+
+      var percentage = this.getPercentage(ev);
+      if (this.range) {
+        if (this.dragged === 0 && this.percentage[1] < percentage) {
+          this.percentage[0] = this.percentage[1];
+          this.dragged = 1;
+        } else if (this.dragged === 1 && this.percentage[0] > percentage) {
+          this.percentage[1] = this.percentage[0];
+          this.dragged = 0;
+        }
+      }
+      this.percentage[this.dragged] = percentage;
+      this.layout();
+      var val = this.calculateValue();
+      this.element
+        .trigger({
+          type: 'slide',
+          value: val
+        })
+        .data('value', val)
+        .prop('value', val);
+      return false;
+    },
+
+    mouseup: function(ev) {
+      if (this.touchCapable) {
+        // Touch: Bind touch events:
+        $(document).off({
+          touchmove: this.mousemove,
+          touchend: this.mouseup
+        });
+      } else {
+        $(document).off({
+          mousemove: this.mousemove,
+          mouseup: this.mouseup
+        });
+      }
+
+      this.inDrag = false;
+      if (this.over == false) {
+        this.hideTooltip();
+      }
+      this.element;
+      var val = this.calculateValue();
+      this.element
+        .trigger({
+          type: 'slideStop',
+          value: val
+        })
+        .data('value', val)
+        .prop('value', val);
+      return false;
+    },
+
+    calculateValue: function() {
+      var val;
+      if (this.range) {
+        val = [
+          (this.min + Math.round((this.diff * this.percentage[0]/100)/this.step)*this.step),
+          (this.min + Math.round((this.diff * this.percentage[1]/100)/this.step)*this.step)
+        ];
+        this.value = val;
+      } else {
+        val = (this.min + Math.round((this.diff * this.percentage[0]/100)/this.step)*this.step);
+        this.value = [val, this.value[1]];
+      }
+      return val;
+    },
+
+    getPercentage: function(ev) {
+      if (this.touchCapable) {
+        ev = ev.touches[0];
+      }
+      var percentage = (ev[this.mousePos] - this.offset[this.stylePos])*100/this.size;
+      percentage = Math.round(percentage/this.percentage[2])*this.percentage[2];
+      return Math.max(0, Math.min(100, percentage));
+    },
+
+    getValue: function() {
+      if (this.range) {
+        return this.value;
+      }
+      return this.value[0];
+    },
+
+    setValue: function(val) {
+      this.value = val;
+
+      if (this.range) {
+        this.value[0] = Math.max(this.min, Math.min(this.max, this.value[0]));
+        this.value[1] = Math.max(this.min, Math.min(this.max, this.value[1]));
+      } else {
+        this.value = [ Math.max(this.min, Math.min(this.max, this.value))];
+        this.handle2.addClass('hide');
+        if (this.selection == 'after') {
+          this.value[1] = this.max;
+        } else {
+          this.value[1] = this.min;
+        }
+      }
+      this.diff = this.max - this.min;
+      this.percentage = [
+        (this.value[0]-this.min)*100/this.diff,
+        (this.value[1]-this.min)*100/this.diff,
+        this.step*100/this.diff
+      ];
+      this.layout();
+    }
+  };
+
+  $.fn.slider = function ( option, val ) {
+    return this.each(function () {
+      var $this = $(this),
+        data = $this.data('slider'),
+        options = typeof option === 'object' && option;
+      if (!data)  {
+        $this.data('slider', (data = new Slider(this, $.extend({}, $.fn.slider.defaults,options))));
+      }
+      if (typeof option == 'string') {
+        data[option](val);
+      }
+    })
+  };
+
+  $.fn.slider.defaults = {
+    min: 0,
+    max: 10,
+    step: 1,
+    orientation: 'horizontal',
+    value: 5,
+    selection: 'before',
+    tooltip: 'show',
+    handle: 'round',
+    formater: function(value) {
+      return value;
+    }
+  };
+
+  $.fn.slider.Constructor = Slider;
+
+}( window.jQuery );