turbosass 0.1.0 → 0.2.0

data/CHANGELOG.markdown

@@ -0,0 +1,10 @@
+# TurboSass release history
+
+## 0.2.0
+
+* Added support for Rails 3
+* Made the @font-face wrapper more compatible by using the Fontspring bulletproof syntax
+
+## 0.1.0
+
+* Initial release

data/README.markdown

@@ -8,7 +8,7 @@ The mixins are divided in the following categories:
 
 * A grid system loosely based on 960.gs but using a configurable gutter width, amount of columns and column width.
 
-* A web font wrapper.
+* A web font wrapper using the bulletproof font syntax.
 
 * The HTML5 Boilerplate reset CSS.
 
@@ -24,11 +24,21 @@ and then you're ready to go.
 
 # Usage
 
+## Rails 3
+
+To use TurboSass in Rails 3 all you have to do is add the following line to your Gemfile:
+
+    gem 'turbosass', '>= 0.2.0'
+
+To make TurboSass work correctly you have to comment out the `haml` gem in your Gemfile. TurboSass automatically loads it for you.
+
+If you want to make use of other gems that utilize either Haml or Sass (such as `haml-rails`) you have to add these gems after the TurboSass gem definition.
+
 ## Sinatra
 
 TurboSass was built mainly for use in Sinatra applications, so using it here is really simple.
 
-All you have to do is `require "turbosass"` in either your `config.ru` file or your main application file. Then you can use `@import "turbosass";` in any SCSS file where you want to use TurboSass. 
+All you have to do is `require "turbosass"` in either your `config.ru` file or your main application file. Then you can use `@import "turbosass";` in any SCSS file where you want to use TurboSass.
 
 See the `examples/sinatra` directory for a fully working example.
 

data/lib/turbosass.rb

@@ -1,5 +1,9 @@
-require "sass"
-require "sass/plugin"
+if defined? Rails
+  require "haml"
+else
+  require "sass"
+  require "sass/plugin"
+end
 
 module TurboSass
   def self.path
@@ -8,11 +12,17 @@ module TurboSass
 end
 
 module Sass
-  class Engine
-    new_default_options = DEFAULT_OPTIONS.clone
-    new_default_options[:load_paths] << ::TurboSass.path
+  if defined? Engine
+    class Engine
+      new_default_options = DEFAULT_OPTIONS.clone
+      new_default_options[:load_paths] << ::TurboSass.path
 
-    remove_const(:DEFAULT_OPTIONS)
-    DEFAULT_OPTIONS = new_default_options.freeze
+      remove_const(:DEFAULT_OPTIONS)
+      DEFAULT_OPTIONS = new_default_options.freeze
+    end
+  elsif defined? Plugin
+    module Plugin
+      @options[:load_paths] = [::TurboSass.path]
+    end
   end
 end

data/lib/turbosass/scss/turbosass/_fonts.scss

@@ -12,9 +12,10 @@ $fontpath: "/fonts" !default;
 @mixin webfont($family, $filename) {
     @font-face {
         font-family: '#{$family}';
-        src: url('#{$fontpath}/#{$filename}.eot');
-        src: local('☺'), url('#{$fontpath}/#{$filename}.woff') format('woff'), url('#{$fontpath}/#{$filename}.ttf') format('truetype'), url('#{$fontpath}/#{$filename}.svg#webfont') format('svg');
-        font-weight: normal;
-        font-style: normal;
+        src: url('#{$fontpath}/#{$filename}.eot'); // IE9 Compat Modes
+        src: url('#{$fontpath}/#{$filename}.eot?iefix') format('eot'), // IE6-IE8
+             url('#{$fontpath}/#{$filename}.woff') format('woff'), // Modern Browsers
+             url('#{$fontpath}/#{$filename}.ttf')  format('truetype'), // Safari, Android, iOS
+             url('#{$fontpath}/#{$filename}.svg#svgFontName') format('svg'); // Legacy iOS
     }
 }

data/lib/turbosass/version.rb

@@ -1,3 +1,3 @@
 module TurboSass
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: turbosass
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Emil Loer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +01:00
+date: 2011-03-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.markdown
 - Gemfile
 - README.markdown
 - Rakefile
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: turbosass
-rubygems_version: 1.4.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Sass framework for ninjas