sass-globbing 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865d10a42fbe093a517f11ea886c98c8fcd150f4
-  data.tar.gz: aa7655463f75ff566929a97a9ef4ad2655cc501a
+  metadata.gz: 716947e6a3f5388e1f9ffe9aa048edda6b92f91f
+  data.tar.gz: f78821bf5ec7439d00562a6c40e855d0dd0fad7e
 SHA512:
-  metadata.gz: fd3eca7d7dcd91c986078afdecbced4ceea735f4b0d7a76bdae136783db2680aeb2351535fb3a456b9879bcbd055974e76c19f96e93524d08ff7048baa9c25f1
-  data.tar.gz: 894d0bd2a62d6c1344e01fa03b34684f9a1b4e7f11506dee982b5741027060232b7d94f906d6a566362adaf0a1563e39b2ed42842f59ccd91ce7de922bcfbdd6
+  metadata.gz: dffcab28c807fc9b199400971e700d47193af56cd76c5a59369a03de806f61ecd955fb8c5e39838a90c5627da8ecc5b0379f0b1a5ac36f49358cf8e7ce06917a
+  data.tar.gz: 62539cc84b63f290f1a48dafdf284f3b7043b5a59e5ef88807101b7c316f30fa4508973eb46b07389935f3158f7cd945761d7fdecf76c01a1387b344c891df40

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+.gems
 .bundle
 Gemfile.lock
 pkg/*

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+script: rake test
+rvm:
+  - 2.1.2
+  - 2.0.0
+  - 1.9.3

data/CHANGELOG.markdown

@@ -1,3 +1,11 @@
+# 1.1.3
+
+* Fix globbing importing path correctly.
+
+# 1.1.2
+
+* Fix globbing importing path
+
 # 1.1.1
 
 * Fix importing issues when using import-once with sass-globbing
@@ -9,7 +17,7 @@
 * Add the ability for a glob to not match any files. Instead a css
   comment is generated that explains that nothing was found (to enable
   debugging).
-  
+
   Because of this behavior, it is imperitive that the globbing importer
   come after the compass sprite importer in the sass load path. This is
   done for you automatically, but it is something to keep in mind.

data/README.markdown

@@ -39,4 +39,4 @@ Ruby on Rails has this capability out of the box starting in Rails 3.1. Do not i
 CSS is order dependent, as such, using this approach within your stylesheets to import styles that depend on the stylesheet's cascade creates an opportunity for styles to change more unpredictably than a manually asserted order. It is recommended that you only use globbing where order is unimportant; E.g. importing of library files.
 
 
-[globbing_docs]: http://ruby-doc.org/core/classes/Dir.html#M000629
+[globbing_docs]: http://ruby-doc.org/core/classes/Dir.html#method-c-glob

data/lib/sass/globbing/importer.rb

@@ -19,11 +19,11 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
   def sass_file?(filename)
     SASS_EXTENSIONS.has_key?(File.extname(filename.to_s))
   end
-  
+
   def syntax(filename)
     SASS_EXTENSIONS[File.extname(filename.to_s)]
   end
-  
+
   def find_relative(name, base, options)
     if name =~ GLOB
       find_glob(name, base, options) { nil }
@@ -31,7 +31,7 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
       super(name, base, options)
     end
   end
-  
+
   def find(name, options)
     if options[:filename] # globs must be relative
       if name =~ GLOB
@@ -43,14 +43,14 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
       nil
     end
   end
-  
+
   def each_globbed_file(glob, base_pathname, options)
     Dir["#{base_pathname.dirname}/#{glob}"].sort.each do |filename|
       next if filename == options[:filename]
       yield filename if sass_file?(filename)
     end
   end
-  
+
   def mtime(name, options)
     if name =~ GLOB && options[:filename]
       mtime = nil
@@ -69,11 +69,11 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
       mtime
     end
   end
-  
+
   def key(name, options)
     ["Glob:" + File.dirname(File.expand_path(name)), File.basename(name)]
   end
-  
+
   def to_s
     "Sass::Globbing::Importer"
   end
@@ -85,12 +85,19 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
     base = base.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
     base_pathname = Pathname.new(base)
     each_globbed_file(name, base_pathname, options) do |filename|
-      contents << "@import #{Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s.inspect};\n"
+      pathname = Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s
+      contents << "@import #{pathname.inspect};\n"
     end
     contents = yield if contents.empty?
     return nil if contents.nil? || contents.empty?
+    cleaned_glob_name = name.
+      gsub("*", "-star-").
+      gsub("/", "-slash-").
+      gsub(".", "-dot-").
+      gsub("--", "-").
+      gsub(/-$/,"")
     Sass::Engine.new(contents, options.merge(
-      :filename => base_pathname.dirname.join(Pathname.new(name)).to_s,
+      :filename => base_pathname.dirname.join(Pathname.new(cleaned_glob_name)).to_s,
       :importer => self,
       :syntax => :scss
     ))

data/lib/sass/globbing/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Globbing
-    VERSION = "1.1.1"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sass-globbing
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Chris Eppstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Allows use of globs in Sass @import directives.
@@ -31,7 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - README.markdown
@@ -57,17 +58,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Allows use of globs in Sass @import directives.
@@ -78,4 +79,3 @@ test_files:
 - test/fixtures/partials/nested/_nested_2.sass
 - test/fixtures/partials/nested/deeply_nested/_deeply.scss
 - test/sass_globbing_test.rb
-has_rdoc: