graphite-sass 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83a2c263986ff2a7713352ae9ff8da343ffd401
-  data.tar.gz: 53a308a5ba232df2e0ea833bd3ab3f6fc73e1f96
+  metadata.gz: 58a9a1ad71ae66275e238b9313e0d55c747b0a01
+  data.tar.gz: 08990247011ae05879404065d3b2942ad22fd528
 SHA512:
-  metadata.gz: c27b66d8cb9175a74e9172cd026b7950ac1fb2e645af364b5d7e90673231c06326f6b26b7ef15600ec43080904e35186d512509ec5b73a97b00381a68dc8cbf1
-  data.tar.gz: bda13e55849cbe21ae7fea791624266d9bd0e3ea1e53a84b33546337f4ffaad76795b5e7f998f202ff9c3489b575b4a2cfd7018c05a6a90126eb5c6f90b9edad
+  metadata.gz: c1eb1fb4b782bcdaeddcf421667470d20117c190dd3d7260b2d1c716d253606c53eddef793116d56eaaffe261fde018f79f7edfdfb92ea12c3d5b1e092204795
+  data.tar.gz: 832cd1de591aafeccec9b6688a06fe155f2397d818e1c120c141ec00920f2a2625c788ac1b0fbdfe4ed5bf223713e432e7610351c1cba8b9334e70835ab130f0

data/README.md

@@ -1,6 +1,6 @@
 # Graphite [![Gem Version](https://badge.fury.io/rb/graphite-sass.svg)](http://badge.fury.io/rb/graphite-sass)
 
-Graphite allows you to import fonts into your stylesheet in a syntax similar to Google Fonts. Quick and simple.
+Graphite allows you to import fonts into your stylesheet in a syntax similar to Google Fonts. Quick and simple. _Graphite is completely Ruby-based, so if you're not using a Ruby compiler (like libsass), then the plugin will not work without a Ruby wrapper._
 
 ## Requirements
 
@@ -19,18 +19,21 @@ Graphite allows you to import fonts into your stylesheet in a syntax similar to
 Each font-family should have it's own folder inside of the top-level fonts directory. The font-family directory name should match the name specified in the actual font filename.
 
 ```
-root
-├── fonts
-│   ├── helvetica-neue
+root/
+├── fonts/
+│   ├── helvetica-neue/
 │   │   ├── helvetica-neue-400-italic.woff
 │   │   ├── helvetica-neue-400-normal.woff
 │   │   ├── helvetica-neue-700-italic.woff
 │   │   ├── helvetica-neue-700-normal.woff
 │   │   ├── ...
-│   ├── font-family...
-│   │   ├── fonts...
-├── sass
+│   ├── another-font-family/
+│   │   ├── ...
+├── sass/
 │   ├── style.scss
+├── css/
+│   ├── style.css
+...
 ```
 
 ### File naming convention
@@ -49,6 +52,8 @@ Example,
 
 ### Usage
 
+Font paths are relative to your `config.rb` or your `$LOAD_PATH`, so not necessarily the Sass file you're importing from. Graphite will automatically exit your Sass directory with `../` when outputting your fonts.
+
 ```scss
 @import "fonts/lato?styles=200,700,200-italic,700-italic";
 @import "fonts/helvetica-neue?styles=500";
@@ -88,7 +93,7 @@ The output is similar to what Google Fonts does with their CSS. All fonts share
   font-weight: 500;
   font-style: normal;
   src: url("../fonts/helvetica-neue/helvetica-neue-500.eot");
-  src: url("../fonts/helvetica-neue/helvetica-neue-500.eot?#iefix") format("embedded-opentype"), url("fonts/helvetica-neue/helvetica-neue-500.woff") format("woff"), url("fonts/helvetica-neue/helvetica-neue-500.ttf") format("truetype"), url("fonts/helvetica-neue/helvetica-neue-500.svg#helvetica-neue") format("svg");
+  src: url("../fonts/helvetica-neue/helvetica-neue-500.eot?#iefix") format("embedded-opentype"), url("../fonts/helvetica-neue/helvetica-neue-500.woff") format("woff"), url("../fonts/helvetica-neue/helvetica-neue-500.ttf") format("truetype"), url("../fonts/helvetica-neue/helvetica-neue-500.svg#helvetica-neue") format("svg");
 }
 ```
 

data/lib/graphite/importer.rb

@@ -85,12 +85,18 @@ module Graphite
 
                     # Loop over each extension
                     FONT_EXTENSIONS.each do |ext|
+                        # Build out the file path
+                        file = "#{@font_family_path}/#{@font_family_name}-#{style}.#{ext}"
                         # Check if the file exists with passed param
-                        if File.exists?("#{@font_family_path}/#{@font_family_name}-#{style}.#{ext}")
+                        if File.exists? file
                             # Save ext
                             extensions << ext unless extensions.include? ext
-                            # Grab path
-                            path = "#{@font_family_path}/#{@font_family_name}-#{style}"
+                            # Absolute path of font file
+                            font_dir = Pathname.new(file).dirname.expand_path
+                            # Absolute path of sass file
+                            sass_dir = Pathname.new(base).dirname.expand_path
+                            # Get relative path from Sass dir to font dir
+                            path = "#{font_dir.relative_path_from(sass_dir)}/#{@font_family_name}-#{style}" if path.empty?
                         end
                     end
 
@@ -164,7 +170,7 @@ module Graphite
 
                     # Include this for IE9
                     if atts["extensions"].include? "eot"
-                        content += "\tsrc: url('../#{atts["path"]}.eot');\n"
+                        content += "\tsrc: url('#{atts["path"]}.eot');\n"
                     end
 
                     # Create array of src urls
@@ -172,22 +178,22 @@ module Graphite
 
                     # Push extensions to src arr if match
                     if atts["extensions"].include? "eot"
-                        src << "url('../#{atts["path"]}.eot?#iefix') format('embedded-opentype')"
+                        src << "url('#{atts["path"]}.eot?#iefix') format('embedded-opentype')"
                     end
                     if atts["extensions"].include? "woff2"
-                        src << "url('../#{atts["path"]}.woff2') format('woff2')"
+                        src << "url('#{atts["path"]}.woff2') format('woff2')"
                     end
                     if atts["extensions"].include? "woff"
-                        src << "url('../#{atts["path"]}.woff') format('woff')"
+                        src << "url('#{atts["path"]}.woff') format('woff')"
                     end
                     if atts["extensions"].include? "otf"
-                        src << "url('../#{atts["path"]}.otf') format('opentype')"
+                        src << "url('#{atts["path"]}.otf') format('opentype')"
                     end
                     if atts["extensions"].include? "ttf"
-                        src << "url('../#{atts["path"]}.ttf') format('truetype')"
+                        src << "url('#{atts["path"]}.ttf') format('truetype')"
                     end
                     if atts["extensions"].include? "svg"
-                        src << "url('../#{atts["path"]}.svg##{font}') format('svg')"
+                        src << "url('#{atts["path"]}.svg##{font}') format('svg')"
                     end
 
                     # Join src together

data/lib/graphite/version.rb

@@ -1,4 +1,3 @@
 module Graphite
-    VERSION = "0.5.1"
-    DATE = "2014-10-07"
+    VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphite-sass
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass