Merge pull request #11 from bolandrm/rmb/support_multiple_versions

bolandrm · bolandrm · commit cde62ef229b5 · 2015-05-03T15:19:32.000-04:00
Rmb/support multiple versions
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,20 @@
 language: ruby
 
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
+
 script: "bundle exec rake test"
+
+gemfile:
+  - gemfiles/sprockets_2_12.gemfile
+  - gemfiles/sprockets_3_0.gemfile
+  - gemfiles/rails_4_2.gemfile
+  - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_4_0.gemfile
+
 rvm:
   - 2.0.0
   - 2.1.5
   - 2.2.0
+
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+# for working locally
+# gem "sassc", :path => "../sassc"
+
 # Specify your gem's dependencies in sassc-rails.gemspec
 gemspec
diff --git a/Rakefile b/Rakefile
@@ -4,3 +4,31 @@ task :test do
   $LOAD_PATH.unshift('lib', 'test')
   Dir.glob('./test/**/*_test.rb') { |f| require f }
 end
+
+namespace :tests do
+  gemfiles = %w[
+    sprockets_2_12
+    sprockets_3_0
+    rails_4_2
+    rails_4_1
+    rails_4_0
+    with_sass_rails
+  ]
+
+  gemfiles.each do |gemfile|
+    desc "Run Tests against #{gemfile}"
+    task gemfile do
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake test"
+    end
+  end
+
+  desc "Run Tests against all ORMs"
+  task :all do
+    gemfiles.each do |gemfile|
+      puts "Running Tests against #{gemfile}"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake test"
+    end
+  end
+end
diff --git a/gemfiles/rails_4_0.gemfile b/gemfiles/rails_4_0.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 4.0.0"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"
diff --git a/gemfiles/rails_4_1.gemfile b/gemfiles/rails_4_1.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 4.1.0"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"
diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 4.2.0"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"
diff --git a/gemfiles/sprockets_2_12.gemfile b/gemfiles/sprockets_2_12.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "sprockets", "~> 2.12.0"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"
diff --git a/gemfiles/sprockets_3_0.gemfile b/gemfiles/sprockets_3_0.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "sprockets", "~> 3.0.0"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"
diff --git a/gemfiles/with_sass_rails.gemfile b/gemfiles/with_sass_rails.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "sass-rails"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"
diff --git a/lib/sassc/rails/functions.rb b/lib/sassc/rails/functions.rb
@@ -1,11 +1,11 @@
-require "sprockets/sass_template"
+require 'sprockets/sass_functions'
 
 module Sprockets
-  class SassTemplate
-    module Functions
-      def asset_data_url(path)
-        SassC::Script::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
-      end
+  module SassFunctions
+    def asset_data_url(path)
+      SassC::Script::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
     end
   end
 end
+
+::SassC::Script::Functions.send :include, Sprockets::SassFunctions
diff --git a/lib/sassc/rails/railtie.rb b/lib/sassc/rails/railtie.rb
@@ -24,6 +24,12 @@ class Railtie < ::Rails::Railtie
     # Remove the sass middleware if it gets inadvertently enabled by applications.
     config.after_initialize do |app|
       app.config.middleware.delete(Sass::Plugin::Rack) if defined?(Sass::Plugin::Rack)
+
+      if app.assets
+        # do this after initialize so sass-rails doesn't interfere with us
+        app.assets.register_engine '.sass', SassC::Rails::SassTemplate
+        app.assets.register_engine '.scss', SassC::Rails::ScssTemplate
+      end
     end
 
     initializer :setup_sass, group: :all do |app|
@@ -42,9 +48,6 @@ class Railtie < ::Rails::Railtie
       # end
 
       if app.assets
-        app.assets.register_engine '.sass', SassC::Rails::SassTemplate
-        app.assets.register_engine '.scss', SassC::Rails::ScssTemplate
-
         app.assets.context_class.class_eval do
           class_attribute :sass_config
           self.sass_config = app.config.sass
diff --git a/lib/sassc/rails/template.rb b/lib/sassc/rails/template.rb
@@ -1,38 +1,78 @@
-require 'sassc'
+require "sprockets/version"
 require "sprockets/sass_template"
 require "sprockets/utils"
 
 module SassC::Rails
   class SassTemplate < Sprockets::SassTemplate
-    def call(input)
-      context = input[:environment].context_class.new(input)
-
-      options = {
-        filename: input[:filename],
-        syntax: self.class.syntax,
-        load_paths: input[:environment].paths,
-        importer: SassC::Rails::Importer,
-        sprockets: {
-          context: context,
-          environment: input[:environment],
-          dependencies: context.metadata[:dependency_paths]
+    module Sprockets3
+      def call(input)
+        context = input[:environment].context_class.new(input)
+
+        options = {
+          filename: input[:filename],
+          syntax: self.class.syntax,
+          load_paths: input[:environment].paths,
+          importer: SassC::Rails::Importer,
+          sprockets: {
+            context: context,
+            environment: input[:environment],
+            dependencies: context.metadata[:dependency_paths]
+          }
         }
-      }
 
-      engine = ::SassC::Engine.new(input[:data], options)
+        engine = ::SassC::Engine.new(input[:data], options)
+
+        css = Sprockets::Utils.module_include(::SassC::Script::Functions, @functions) do
+          engine.render
+        end
 
-      css = Sprockets::Utils.module_include(::SassC::Script::Functions, @functions) do
-        engine.render
+        context.metadata.merge(data: css)
       end
+    end
+
+    module Sprockets2
+      def self.included(base)
+        base.class_eval do
+          self.default_mime_type = "text/css"
+        end
+      end
+
+      def evaluate(context, locals, &block)
+        options = {
+          filename: eval_file,
+          syntax: syntax,
+          load_paths: context.environment.paths,
+          importer: SassC::Rails::Importer,
+          sprockets: {
+            context: context,
+            environment: context.environment
+          }
+        }
 
-      context.metadata.merge(data: css)
+        ::SassC::Engine.new(data, options).render
+      end
     end
 
+    if Sprockets::VERSION > "3.0.0"
+      include Sprockets3
+    else
+      include Sprockets2
+    end
   end
 
   class ScssTemplate < SassTemplate
+    unless Sprockets::VERSION > "3.0.0"
+      self.default_mime_type = 'text/css'
+    end
+
+    # Sprockets 3
     def self.syntax
       :scss
     end
+
+    # Sprockets 2
+    def syntax
+      :scss
+    end
   end
 end
diff --git a/sassc-rails.gemspec b/sassc-rails.gemspec
@@ -21,17 +21,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.5.1"
-  spec.add_development_dependency 'rails'
   spec.add_development_dependency 'mocha'
 
   # unfortunately we require sass for now, so that we can
   # reuse portions of the sprockets template
   spec.add_dependency 'sass'
+  spec.add_dependency "sassc", "1.1.1"
 
-  spec.add_dependency 'tilt' # For ERB
+  spec.add_dependency "tilt"
 
-  spec.add_dependency "sassc", "1.1.1"
-  spec.add_dependency 'railties'
-  spec.add_dependency 'sprockets', '3.0.0.beta.6'
+  spec.add_dependency 'rails', '>= 4.0.0'
+  spec.add_dependency 'sprockets', '> 2.11'
 end
diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb
@@ -1,9 +1,11 @@
 require "test_helper"
 
-class SassRailsTest < MiniTest::Test
+class SassRailsTest < MiniTest::Unit::TestCase
   attr_reader :app
 
   def setup
+    Rails.application = nil
+
     @app = Class.new(Rails::Application)
     @app.config.active_support.deprecation = :log
     @app.config.eager_load = false
@@ -164,6 +166,10 @@ def test_special_characters_compile
     css_output = render_asset("special_characters.scss")
   end
 
+  def test_compression_works
+    skip
+  end
+
   #test 'sprockets require works correctly' do
   #  skip
 
diff --git a/test/smoke_test.rb b/test/smoke_test.rb
