remove gem dependency of rails-assets

geoblacklight · Feb 2, 2015 · d5d95af · d5d95af
1 parent 953bfe4
commit d5d95af
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
-source 'https://rails-assets.org' do
-  gem 'rails-assets-leaflet-iiif', '~> 0.0.3'
-  gem 'rails-assets-readmore'
-end
-
 # Specify your gem's dependencies in geoblacklight.gemspec
 gemspec
 

diff --git a/app/assets/javascripts/geoblacklight/geoblacklight.js b/app/assets/javascripts/geoblacklight/geoblacklight.js
@@ -1,7 +1,5 @@
 //= require leaflet
-//= require leaflet-iiif
 //= require native.history
-//= require readmore
 
 !function(global) {
   'use strict';

diff --git a/geoblacklight.gemspec b/geoblacklight.gemspec
@@ -24,8 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'
   spec.add_dependency 'rails_config'
   spec.add_dependency 'faraday'
-  spec.add_dependency 'rails-assets-leaflet-iiif', '~> 0.0.3'
-  spec.add_dependency 'rails-assets-readmore'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.3.2'

diff --git a/lib/generators/geoblacklight/install_generator.rb b/lib/generators/geoblacklight/install_generator.rb
@@ -9,6 +9,11 @@ class Install < Rails::Generators::Base
 
     desc "Install Geoblacklight"
 
+    def install_rails_assets_gems
+      gem 'rails-assets-leaflet-iiif', '~> 0.0.3', source: 'https://rails-assets.org'
+      gem 'rails-assets-readmore', source: 'https://rails-assets.org'
+    end
+
     def install_jettywrapper
       return unless options[:jettywrapper]
       copy_file 'config/jetty.yml'

diff --git a/lib/generators/geoblacklight/templates/geoblacklight.js b/lib/generators/geoblacklight/templates/geoblacklight.js
@@ -2,4 +2,6 @@
 //= require geoblacklight/viewers
 //= require geoblacklight/modules
 //= require geoblacklight/downloaders
-//= require blacklight_range_limit
+//= require blacklight_range_limit
+//= require leaflet-iiif
+//= require readmore
diff --git a/lib/geoblacklight/engine.rb b/lib/geoblacklight/engine.rb
@@ -1,7 +1,5 @@
 require 'blacklight'
 require 'leaflet-rails'
-require 'rails-assets-leaflet-iiif'
-require 'rails-assets-readmore'
 require 'font-awesome-rails'
 require 'rails_config'
 require 'faraday'

diff --git a/template.rb b/template.rb
@@ -2,8 +2,6 @@
 gem 'geoblacklight'
 gem 'jettywrapper'
 
-add_source 'https://rails-assets.org'
-
 run 'bundle install'
 
 generate 'blacklight:install', '--devise'