sass-archive-importer 1.0.0.beta.9 → 1.0.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac6c838b0f375c4a7a609fafd941de6d4626a8a6
-  data.tar.gz: 091f468ba57d3e670db90cdf371afc89dfec2d50
+  metadata.gz: 8f86a744c881dbce36fc9761871661e3c9acd0fe
+  data.tar.gz: 4de0e4bbcaea6ffd885daec0cfa1351a5955f22e
 SHA512:
-  metadata.gz: f23f9e3ea26a0423ee73c014f9d0eb53e28138b457810ca55baf0b3dca81c9fff0c80b503ca7e2f4d1dbe29692de6ffcf11df6e6780c21dd2831da558eea1318
-  data.tar.gz: 4efe15b0dc7fe4bd4a657b3e4b61329152c57221f3c0af97a2e16440453b5f99a39f7272e3b1159b872dfc69e6103f5c0ec6d03d720d5bd902e9076ed0fee7e8
+  metadata.gz: 915a1fdebb17564a9a1c475c3f22bc4663ada3b6aa795c8f68cb7b1ff3c72124ab52186a70323a30669eff76e6494ede317e9b40d1d61631901b7f0eff03b55c
+  data.tar.gz: 5ed1ded3621ee4c1e6f1de18fd6cf716f44559b88c4b4b994466f085724e74b85356e570af9a6dfe02e698f5dd9652ea46410793de22e0d1fdba7e523fe89d4e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sass-archive-importer (1.0.0.beta.9)
+    sass-archive-importer (1.0.0.beta.10)
       rubyzip (~> 0.9.9)
       sass (>= 3.1, < 3.4)
 

data/lib/org/sass/archive_importer/ClassLoaderImporter.rb

@@ -93,7 +93,6 @@ class ClassLoaderImporter < Sass::Importers::Base
 
 
   def mtime(name, options)
-    name = normalize_name(name)
     if entry = find_entry(name)
       entry.time
     else
@@ -125,6 +124,9 @@ class ClassLoaderImporter < Sass::Importers::Base
     name
   end
 
+  def resource_name(name)
+    [nil, *[sub_folder, name].compact].join("/")
+  end
 
   def full_filename(entry)
     "#{to_s}/#{normalize_name(entry.name)}"
@@ -132,7 +134,6 @@ class ClassLoaderImporter < Sass::Importers::Base
 
   def entry_for(name, base = nil)
     possible_names(name, base).each do |n|
-      n = "#{sub_folder}/#{n}" if sub_folder
       if entry = find_entry(n)
         return entry
       end
@@ -141,9 +142,10 @@ class ClassLoaderImporter < Sass::Importers::Base
   end
 
   def find_entry(name)
-    stream = self.to_java.java_class.getResourceAsStream("/"+name)
+    name = resource_name(normalize_name(name))
+    stream = self.to_java.java_class.getResourceAsStream(name)
     return unless stream
-    url = self.to_java.java_class.getResource("/"+name)
+    url = self.to_java.java_class.getResource(name)
     Entry.new(name, stream, url)
   end
 

data/lib/sass_archive_importer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-archive-importer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.9
+  version: 1.0.0.beta.10
 platform: ruby
 authors:
 - Chris Eppstein