sassc-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8880a6aaa095abf408043fe8feeb9b5aa81605
-  data.tar.gz: 385c747ade7814cbd38fde09a0fe3158ae6b3fc5
+  metadata.gz: 607d6ebf5f495a80e3d4cada4f6ee28939db8221
+  data.tar.gz: 846873d730c106fd751f70fe94db8adff1864465
 SHA512:
-  metadata.gz: c6183e03a91e0dfc8ffd06c50126f9edfd11c3f5cbcbce8fedcd73d940c76daaea655c9af393c85c7d11a9b77d46c6f65d638e57e4ca48ae681ec85baae2ea02
-  data.tar.gz: e240e8a6322b9ab5491e0616fce649da6e6fa775d247321f7ce545a9c4fb2fcc162ee257ba59fb950aca4d1de70706dc9b072eaacd06aa11dab375ed7d755453
+  metadata.gz: 9d7bcd45f41f36c9cbbce561dba0746ac67ae3f233a86c6ff3165f665f4e0fa47bca4198302313a4fb6acb6e2a156bfbddd4efbaaa89e8c765388165244e7fcf
+  data.tar.gz: 2f6b7d28784bd732876b831d75959b285968b4b26b585e8edc55e5ceefdcb7c5551fbebd8b0ff34a75a1b9518dcafeb5855a3d9f31d01b128a6498b43aef469f

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/

data/.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

data/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

data/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

data/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: "../"

data/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: "../"

data/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: "../"

data/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: "../"

data/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: "../"

data/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: "../"

data/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

data/lib/sassc/rails/railtie.rb

@@ -24,6 +24,12 @@ module SassC::Rails
     # 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 @@ module SassC::Rails
       # 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

data/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

data/lib/sassc/rails/version.rb

@@ -1,5 +1,5 @@
 module SassC
   module Rails
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/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

data/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 @@ class SassRailsTest < MiniTest::Test
     css_output = render_asset("special_characters.scss")
   end
 
+  def test_compression_works
+    skip
+  end
+
   #test 'sprockets require works correctly' do
   #  skip
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassc-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ryan Boland
@@ -53,21 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.5.1
-- !ruby/object:Gem::Dependency
-  name: rails
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -123,47 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta.6
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta.6
+        version: '2.11'
 description: Integrate SassC-Ruby into Rails.
 email:
 - bolandryanm@gmail.com
@@ -177,6 +149,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
+- gemfiles/sprockets_2_12.gemfile
+- gemfiles/sprockets_3_0.gemfile
+- gemfiles/with_sass_rails.gemfile
 - lib/sassc-rails.rb
 - lib/sassc/rails.rb
 - lib/sassc/rails/functions.rb
@@ -218,7 +196,6 @@ files:
 - test/dummy/app/assets/stylesheets/subfolder/second_level.scss
 - test/dummy/app/assets/stylesheets/syntax_error.scss
 - test/sassc_rails_test.rb
-- test/smoke_test.rb
 - test/test_helper.rb
 - test_old/fixtures/alternate_config_project/.gitignore
 - test_old/fixtures/alternate_config_project/Gemfile
@@ -490,5 +467,4 @@ test_files:
 - test/dummy/app/assets/stylesheets/subfolder/second_level.scss
 - test/dummy/app/assets/stylesheets/syntax_error.scss
 - test/sassc_rails_test.rb
-- test/smoke_test.rb
 - test/test_helper.rb

data/test/smoke_test.rb

@@ -1,20 +0,0 @@
-require "test_helper"
-require "sassc"
-
-SAMPLE_SASS_STRING = "$size: 30px; .hi { width: $size; }"
-SAMPLE_CSS_OUTPUT = ".hi {\n  width: 30px; }\n"
-
-class DataContextTest < MiniTest::Test
-  def teardown
-    SassC::Native.delete_data_context(@data_context)
-  end
-
-  def test_compiled_css_is_correct
-    @data_context = SassC::Native.make_data_context(SAMPLE_SASS_STRING)
-    context = SassC::Native.data_context_get_context(@data_context)
-    SassC::Native.compile_data_context(@data_context)
-
-    css = SassC::Native.context_get_output_string(context)
-    assert_equal SAMPLE_CSS_OUTPUT, css
-  end
-end