blacklight_range_limit 1.0.0pre4 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0pre4
+1.1.0

data/lib/blacklight_range_limit.rb

@@ -52,4 +52,8 @@ module BlacklightRangeLimit
     array << element unless array.include?(element)
   end
   
+  def self.use_asset_pipeline?
+    (Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR >= 1) and Rails.application.config.assets.enabled
+  end
+  
 end

data/lib/blacklight_range_limit/controller_override.rb

@@ -19,23 +19,23 @@ module BlacklightRangeLimit
       end
   
       before_filter do |controller|
-        unless BlacklightRangeLimit.omit_inject[:css]
+        unless BlacklightRangeLimit.omit_inject[:css] || use_asset_pipeline?
           controller.stylesheet_links << "blacklight_range_limit"
         end
   
         unless BlacklightRangeLimit.omit_inject[:flot]
-          # Replace with local version. 
-          controller.javascript_includes << "flot/jquery.flot.js"
-          controller.javascript_includes << "flot/jquery.flot.selection.js"
-          # canvas for IE
-  
-          # Hacky hack to insert URL to plugin asset when we don't have
-          # access to helper methods, bah, will break if you change plugin
-          # defaults. We need Rails 3.0 please.           
+          unless use_asset_pipeline?
+            controller.javascript_includes << "flot/jquery.flot.js"
+            controller.javascript_includes << "flot/jquery.flot.selection.js"
+          end
+          
+          # canvas for IE. Need to inject it like this even with asset pipeline
+          # cause it needs IE conditional include. view_context hacky way
+          # to get asset url helpers. 
           controller.extra_head_content << ('<!--[if IE]>' + view_context.javascript_include_tag("flot/excanvas.min.js") + '<![endif]-->').html_safe
         end
           
-        unless BlacklightRangeLimit.omit_inject[:js]
+        unless BlacklightRangeLimit.omit_inject[:js] || use_asset_pipeline?
           controller.javascript_includes << "range_limit_slider"
           controller.javascript_includes << "range_limit_distro_facets"
         end
@@ -131,5 +131,10 @@ module BlacklightRangeLimit
     def all_range_config
       Blacklight.config[:facet][:range] || {}
     end
+    
+    private 
+    def use_asset_pipeline?
+      BlacklightRangeLimit.use_asset_pipeline?
+    end
   end
 end

data/lib/generators/blacklight_range_limit/assets_generator.rb

@@ -13,12 +13,39 @@ require 'rails/generators'
 require 'rails/generators/base'
 module BlacklightRangeLimit
   class AssetsGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.join(BlacklightRangeLimit::Engine.root, 'app', 'assets')
 
     def assets
-      directory("public/stylesheets")
-      directory("public/javascripts")
+      if BlacklightRangeLimit.use_asset_pipeline?
+        insert_into_file "app/assets/stylesheets/application.css", :before => "*/" do
+%q{
+ *
+ * Used by blacklight_range_limit
+ *= require  'blacklight_range_limit/blacklight_range_limit'
+ *         
+}
+        end
+
+        insert_into_file "app/assets/javascripts/application.js", :after => "//= require jquery" do
+%q{
+
+// Used by blacklight_range_limit
+//= require 'flot/jquery.flot.js'
+//= require 'flot/jquery.flot.selection.js'
+// You can elmiminate one or both of these if you don't want their functionality
+//= require 'blacklight_range_limit/range_limit_slider'
+//= require 'blacklight_range_limit/range_limit_distro_facets'
+
+}          
+        end
+      else
+        directory("stylesheets/blacklight_range_limit", "public/stylesheets")        
+        directory("javascripts/blacklight_range_limit", "public/javascripts")
+        directory("javascripts/flot", "public/javascripts/flot")
+      end
     end
+    
+
 
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version 
-  hash: 1923831937
-  prerelease: 5
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  - pre
-  - 4
-  version: 1.0.0pre4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jonathan Rochkind
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -04:00
+date: 2011-09-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +62,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
+- app/assets/javascripts/blacklight_range_limit/range_limit_slider.js
+- app/assets/javascripts/flot/excanvas.min.js
+- app/assets/javascripts/flot/jquery.flot.js
+- app/assets/javascripts/flot/jquery.flot.selection.js
+- app/assets/stylesheets/blacklight_range_limit/blacklight_range_limit.css
 - app/helpers/range_limit_helper.rb
 - app/views/blacklight_range_limit/_range_limit_panel.html.erb
 - app/views/blacklight_range_limit/_range_segments.html.erb
@@ -79,12 +83,6 @@ files:
 - 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/templates/public/javascripts/flot/excanvas.min.js
-- lib/generators/blacklight_range_limit/templates/public/javascripts/flot/jquery.flot.js
-- lib/generators/blacklight_range_limit/templates/public/javascripts/flot/jquery.flot.selection.js
-- lib/generators/blacklight_range_limit/templates/public/javascripts/range_limit_distro_facets.js
-- lib/generators/blacklight_range_limit/templates/public/javascripts/range_limit_slider.js
-- lib/generators/blacklight_range_limit/templates/public/stylesheets/blacklight_range_limit.css
 has_rdoc: true
 homepage: http://projectblacklight.org/
 licenses: []
@@ -106,14 +104,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: blacklight