sass-archive-importer 1.0.0.beta.3 → 1.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c0c4de769bbc705e7197d64484bba78ba8098e5
-  data.tar.gz: e0c329a73043ac55bff9959d583cfe85622597da
+  metadata.gz: 816b8dcd28b03d13a217371a7e9c016cf072627d
+  data.tar.gz: 60f28e295c57b891ee3285b54deb3db00e76bf3e
 SHA512:
-  metadata.gz: de5fc2052f4fec4c70ccf40084b01916f9148f129dea8dba3e64ec8906996a01e6cc4bd4d0870fc459d3c26ab9e555a96d03753ae4b3642f7e0585797921a749
-  data.tar.gz: 80b8e6457dbdae079bbba09b83e6cea16d72935431768a3b3f40ac25ada2e049d89d6c5e710dff21bd177e81eec65319c699449dd11213c524c0b964c5af85d0
+  metadata.gz: 27abeb2e298592b7deb55779567e5388afaf6c87ac557fdf7597c5b8b27625bd08ff391c29066b106800254a55a8e7d452fe6d5bb714c22f8aac5b4ea541e7de
+  data.tar.gz: a0c7cd625589e230babed7a9294a41f3df91726bb3b50532fde8d874b3d89113edb7398c0de0a051deb828fe8a863813e27d54b73fb54c53d83171a33932c9be

data/Gemfile

@@ -3,3 +3,4 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rake'
+gem 'compass', '~> 0.12.5'

data/Gemfile.lock

@@ -1,21 +1,28 @@
 PATH
   remote: .
   specs:
-    sass-archive-importer (1.0.0.beta.2)
+    sass-archive-importer (1.0.0.beta.3)
       rubyzip (~> 0.9.9)
       sass (>= 3.1, < 3.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    chunky_png (1.3.0)
+    compass (0.12.5)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.2.19)
+    fssm (0.2.10)
     rake (10.2.2)
     rubyzip (0.9.9)
-    sass (3.3.4)
+    sass (3.2.19)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
+  compass (~> 0.12.5)
   rake
   sass-archive-importer!

data/Rakefile

@@ -23,15 +23,55 @@ task :test => [:java_test, :mri_test]
 directory "test/fixtures/tmpjava"
 directory "test/fixtures/tmpjava/org/sass/archive_importer"
 
-file "test/fixtures/tmpjava/specifications/sass-3.2.19.gemspec" => "test/fixtures/tmpjava" do
-  cwd = Dir.getwd
-  Dir.chdir ".." do
-    # this is done withing a chdir because the Gemfile in this folder was causing issues
-    execute_or_fail("gem install sass-archive-importer/test/fixtures/sass-3.2.19.gem -i #{cwd}/test/fixtures/tmpjava  --no-rdoc --no-ri",
-                    "Sass 3.2 Install")
+class GemPackage < Struct.new(:name, :version, :location, :installable)
+  def gemspec_path
+    "test/fixtures/tmpjava/specifications/#{name}-#{version}.gemspec"
+  end
+
+  def gem_path
+    "#{location}/#{name}-#{version}.gem"
+  end
+end
+
+
+gems_to_install = {
+  :fssm => GemPackage.new("fssm", "0.2.10", "test/fixtures", true),
+  :chunky_png => GemPackage.new("chunky_png", "1.3.0", "test/fixtures", true),
+  :compass => GemPackage.new("compass", "0.12.5", "test/fixtures", true),
+  :sass => GemPackage.new("sass", "3.2.19", "test/fixtures", true),
+  :rubyzip => GemPackage.new("rubyzip", "0.9.9", "test/fixtures", true),
+  :"sass-archive-importer" => GemPackage.new("sass-archive-importer", SassArchiveImporter::VERSION, "pkg", false),
+}
+
+gems_to_install.values.each do |gem_definition|
+  directory File.dirname(gem_definition.gemspec_path)
+  directory File.dirname(gem_definition.gem_path)
+  if gem_definition.installable
+    file gem_definition.gem_path => File.dirname(gem_definition.gem_path) do
+      Dir.chdir File.dirname(gem_definition.gem_path) do
+        execute_or_fail("gem fetch #{gem_definition.name} --version #{gem_definition.version}",
+                        "Download #{gem_definition.name} version #{gem_definition.version}")
+      end
+    end
+  end
+  file gem_definition.gemspec_path => [
+         gem_definition.gem_path,
+         File.dirname(gem_definition.gemspec_path)
+       ] do
+    cwd = Dir.getwd
+    Dir.chdir ".." do
+      # this is done withing a chdir because the Gemfile in this folder was causing issues
+      execute_or_fail("gem install sass-archive-importer/#{gem_definition.gem_path} -i #{cwd}/test/fixtures/tmpjava  --no-rdoc --no-ri",
+                      "Gem install of #{gem_definition.name}")
+    end
   end
 end
 
+file "pkg/sass-archive-importer-#{SassArchiveImporter::VERSION}.gem" do
+  Rake::Task["build"].invoke
+end
+
+
 file "test/fixtures/tmpjava/org/sass/archive_importer/ClassLoaderImporter.rb" => 
        %w(test/fixtures/tmpjava/org/sass/archive_importer
           lib/org/sass/archive_importer/ClassLoaderImporter.rb) do
@@ -60,8 +100,8 @@ end
 
 desc "Build the java test jar"
 file "test/fixtures/class_loader_importer_test.jar" => 
-     %w(test/fixtures/tmpjava/org/sass/archive_importer/ClassLoaderImporter.rb
-        test/fixtures/tmpjava/specifications/sass-3.2.19.gemspec) +
+     %W(test/fixtures/tmpjava/org/sass/archive_importer/ClassLoaderImporter.rb) +
+       gems_to_install.values.map{|g| g.gemspec_path} +
       FileList["test/fixtures/zipped_files/**/*"] +
       FileList["test/class_loader_importer_test.java"] +
      [:copy_sass_artifacts] do
@@ -70,13 +110,15 @@ file "test/fixtures/class_loader_importer_test.jar" =>
                    "Java compilation")
    execute_or_fail("jar -cf test/fixtures/class_loader_importer_test.jar -C test/fixtures/tmpjava .",
                    "Jar creation")
- end
+end
+
 
- desc "Run java tests"
- task :java_test => "test/fixtures/class_loader_importer_test.jar" do
-   execute_or_fail("java -cp test/fixtures/jruby-complete-1.6.5.jar:test/fixtures/class_loader_importer_test.jar ClassLoaderImporterTest",
-                   "Java test")
- end
+desc "Run java tests"
+task :java_test => %W(test/fixtures/class_loader_importer_test.jar
+                      pkg/sass-archive-importer-#{SassArchiveImporter::VERSION}.gem) do
+  execute_or_fail("java -cp test/fixtures/jruby-complete-1.6.5.jar:test/fixtures/class_loader_importer_test.jar ClassLoaderImporterTest",
+                  "Java test")
+end
 
 Rake::TestTask.new(:mri_test) do |t|
   t.libs << 'lib'

data/lib/sass_archive_importer/monkey_patches.rb

@@ -29,3 +29,29 @@ class Sass::Engine
   end
 end
 
+begin
+  require 'compass'
+  module Compass
+    module Configuration
+      # The adapters module provides methods that make configuration data from a compass project
+      # adapt to various consumers of configuration data
+      module Adapters
+        alias sass_load_paths_without_archive_importer sass_load_paths
+        def sass_load_paths
+          sass_load_paths_without_archive_importer.map! do |importer|
+            if importer.respond_to?(:root) && importer.root =~ /^(?:file:)?(.*\.jar)!\/(.*)$/
+              if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+                require 'org/sass/archive_importer/ClassLoaderImporter'
+                ClassLoaderImporter.new($2)
+              else
+                SassArchiveImporter::Importer.new($1, $2)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+rescue LoadError
+  # Compass isn't present
+end

data/lib/sass_archive_importer/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module SassArchiveImporter
-  VERSION = "1.0.0.beta.3"
+  VERSION = "1.0.0.beta.4"
 end

data/test/class_loader_importer_test.java

@@ -2,10 +2,6 @@
 import org.jruby.Ruby;
 
 class ClassLoaderImporterTest {
-  //public void testJavaInstantiation() {
-    //ClassLoaderImporter importer = new ClassLoaderImporter(null);
-  //}
-
   public void testClassLoaderImporter() {
     final Ruby runtime = Ruby.newInstance();
     String script =
@@ -155,12 +151,45 @@ class ClassLoaderImporterTest {
     runtime.evalScriptlet(script);
   }
 
+  public void testClassLoaderImporterWithCompass() {
+    final Ruby runtime = Ruby.newInstance();
+    String script =
+      "# The next three lines make sure no system gems are loaded.\n" +
+      "$:.reject!{|f| !f.start_with?('file:') }\n" +
+      "ENV['GEM_HOME'] = nil\n" +
+      "ENV['GEM_PATH'] = nil\n" +
+      "require 'rubygems'\n" +
+      "require 'compass'\n" +
+      "require 'sass_archive_importer'\n" +
+      "sass_file_contents = %Q{\n" +
+      "@import \"compass\";\n" +
+      ".test { @include border-radius(5px) };\n" +
+      "}\n" +
+      "engine = Sass::Engine.new(sass_file_contents,\n" +
+      "                          :syntax => :scss,\n" +
+      "                          :filename => 'class_loader_compass_test.java',\n" +
+      "                          :cache => false,\n" +
+      "                          :read_cache => false,\n" +
+      "                          :load_paths => Compass.configuration.sass_load_paths)\n" +
+      "result = engine.render\n" +
+      "fail %Q{Unexpected output: #{result}} unless result == <<CSS\n" +
+      ".test {\n" +
+      "  -webkit-border-radius: 5px;\n" +
+      "  -moz-border-radius: 5px;\n" +
+      "  -ms-border-radius: 5px;\n" +
+      "  -o-border-radius: 5px;\n" +
+      "  border-radius: 5px; }\n" +
+      "CSS\n"+
+      "\n";
+    runtime.evalScriptlet(script);
+  }
+
   public static void main(String [] args) {
     ClassLoaderImporterTest test = new ClassLoaderImporterTest();
-    //test.testJavaInstantiation();
     test.testClassLoaderImporter();
     test.testClassLoaderImporterNestedContext();
     test.testClassLoaderImporterMissingImport();
+    test.testClassLoaderImporterWithCompass();
     System.out.println("ALL Java Tests Passed");
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-archive-importer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.3
+  version: 1.0.0.beta.4
 platform: ruby
 authors:
 - Chris Eppstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -62,7 +62,6 @@ files:
 - Rakefile
 - lib/org/sass/archive_importer/ClassLoaderImporter.rb
 - lib/sass-archive-importer.rb
-- lib/sass/archive_importer.rb
 - lib/sass_archive_importer.rb
 - lib/sass_archive_importer/importer.rb
 - lib/sass_archive_importer/monkey_patches.rb

data/lib/sass/archive_importer.rb

@@ -1,21 +0,0 @@
-# Copyright 2013 LinkedIn Corp. All rights reserved.
-#
-# 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.
-
-module Sass
-  module ArchiveImporter
-  end
-end
-
-require 'sass/archive_importer/importer';
-require 'sass/archive_importer/monkey_patches';