rapper_lite 0.1.4 → 0.2.0

data/Gemfile

@@ -4,6 +4,7 @@ gem "yui-compressor", "~> 0.9.6"
 gem "fssm", "~> 0.2.7"
 gem "rb-fsevent"
 gem "coffee-script", "~> 2.2.0"
+gem "sass", "~> 3.1.10"
 
 group :development do
   gem "rake", "= 0.9.2"

data/Gemfile.lock

@@ -23,6 +23,7 @@ GEM
     rb-fsevent (0.4.3.1)
     rdiscount (1.6.8)
     rspec (1.3.2)
+    sass (3.1.10)
     yard (0.7.2)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
@@ -39,5 +40,6 @@ DEPENDENCIES
   rb-fsevent
   rdiscount (~> 1.6.8)
   rspec (~> 1.3.2)
+  sass (~> 3.1.10)
   yard
   yui-compressor (~> 0.9.6)

data/README.markdown

@@ -107,6 +107,7 @@ Rapper's got a Gemfile. You know what to do.
 
 ## Version history
 
+* **0.2.0** - Add Sass support.
 * **0.1.4** - Prevent premature unlinking of temp files used when processing CoffeesScript files. Bad GC, bad!
 * **0.1.3** - Don't crash when errors are raised while watching for changes.
 * **0.1.2** - Update Gemfile, add "rapper-lite" command.

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/rapper_lite/build.rb

@@ -1,4 +1,5 @@
 require "coffee-script"
+require "sass"
 
 module RapperLite::Build
   
@@ -7,20 +8,11 @@ module RapperLite::Build
     destination_file = self.destination_path( type, name )
     tempfiles = []
     
-    # Convert any CoffeeScript to JS
-    if type == :js
-      source_paths.map! do |source_path|
-        if File.extname( source_path ) == ".coffee"
-          tempfile = Tempfile.new( "rapper_lite_coffee" )
-          # Keep reference to prevent GC (premature unlinking)
-          tempfiles << tempfile
-          tempfile.write( CoffeeScript.compile( File.read( source_path ) ) )
-          tempfile.close
-          tempfile.path
-        else
-          source_path
-        end
-      end
+    source_paths.map! do |source_path|
+      tempfile, path = self.process( source_path )
+      # Keep reference so GC doesn't unlink file
+      tempfiles << tempfile if tempfile
+      path
     end
     
     # Join files and compress if needed
@@ -30,4 +22,33 @@ module RapperLite::Build
     # Cleanup
     tempfiles.each{ |tempfile| tempfile.unlink }
   end
+  
+  protected
+  
+  # Returns tuple: [nil or Tempfile, path to file]
+  def process( source_path )
+    tempfile = nil
+    path = source_path
+    
+    if engine = self.conversion_engine( source_path )
+      tempfile = Tempfile.new( "rapper_lite_source" )
+      if engine == Sass
+        tempfile.write( engine.compile( File.read( source_path ), :syntax => :sass ) )
+      else
+        tempfile.write( engine.compile( File.read( source_path ) ) )
+      end
+      tempfile.close
+      path = tempfile.path
+    end
+    
+    [tempfile, path]
+  end
+  
+  def conversion_engine( source_path )
+    {
+      ".sass" => Sass,
+      ".coffee" => CoffeeScript
+    }[File.extname( source_path )]
+  end
+  
 end

data/lib/rapper_lite/config.rb

@@ -34,8 +34,10 @@ module RapperLite::Config
         coffee_path = File.join( self.root( type ), "#{file}.coffee" )
         js_path = File.join( self.root( type ), "#{file}.js" )
         File.exists?( coffee_path ) ? coffee_path : js_path
-      else
-        File.join( self.root( type ), "#{file}.#{type}" )
+      else # CSS
+        sass_path = File.join( self.root( type ), "#{file}.sass" )
+        css_path = File.join( self.root( type ), "#{file}.css" )
+        File.exists?( sass_path ) ? sass_path : css_path
       end
     end.flatten
   end

data/rapper_lite.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rapper_lite"
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyson Tate"]
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/src/coffeescript.coffee",
     "spec/fixtures/src/simple_1.css",
     "spec/fixtures/src/simple_1.js",
-    "spec/fixtures/src/simple_2.css",
+    "spec/fixtures/src/simple_2.sass",
     "spec/fixtures/src/subfolder/simple_2.js",
     "spec/fixtures/testcases/combination/expected/base.css",
     "spec/fixtures/testcases/combination/expected/base.js",
@@ -123,6 +123,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<fssm>, ["~> 0.2.7"])
       s.add_runtime_dependency(%q<rb-fsevent>, [">= 0"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2.2.0"])
+      s.add_runtime_dependency(%q<sass>, ["~> 3.1.10"])
       s.add_development_dependency(%q<rake>, ["= 0.9.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -133,6 +134,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<fssm>, ["~> 0.2.7"])
       s.add_dependency(%q<rb-fsevent>, [">= 0"])
       s.add_dependency(%q<coffee-script>, ["~> 2.2.0"])
+      s.add_dependency(%q<sass>, ["~> 3.1.10"])
       s.add_dependency(%q<rake>, ["= 0.9.2"])
       s.add_dependency(%q<rspec>, ["~> 1.3.2"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -144,6 +146,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fssm>, ["~> 0.2.7"])
     s.add_dependency(%q<rb-fsevent>, [">= 0"])
     s.add_dependency(%q<coffee-script>, ["~> 2.2.0"])
+    s.add_dependency(%q<sass>, ["~> 3.1.10"])
     s.add_dependency(%q<rake>, ["= 0.9.2"])
     s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     s.add_dependency(%q<yard>, [">= 0"])

data/spec/fixtures/src/simple_2.sass

@@ -0,0 +1,3 @@
+*
+  margin: 0px 0px 0px 0px
+  color: #ffffff

data/spec/fixtures/testcases/combination/expected/base.css

@@ -1 +1 @@
-body{margin:0;color:#333}*{margin:0;color:#fff}
+body{margin:0;color:#333}*{margin:0;color:white}

data/spec/fixtures/testcases/combination/expected/base_combined.css

@@ -1 +1 @@
-body{margin:0;color:#333}*{margin:0;color:#fff}body{margin:0;color:#333}
+body{margin:0;color:#333}*{margin:0;color:white}body{margin:0;color:#333}

data/spec/fixtures/testcases/combination/rapper.yml

@@ -7,12 +7,12 @@
     - files:
       - simple_1
       - simple_2
-    - version: 683e7ae
+    - version: 4f2b49d
   - base_combined: !omap
     - files:
       - +base
       - simple_1
-    - version: 0bb9443
+    - version: 1fecd63
 - js: !omap
   - base: !omap
     - files:

data/spec/fixtures/testcases/concatenation/expected/base.css

@@ -4,5 +4,4 @@ body {
 }
 * {
   margin: 0px 0px 0px 0px;
-  color: #ffffff;
-}
+  color: white; }

data/spec/fixtures/testcases/concatenation/expected/base_combined.css

@@ -4,8 +4,7 @@ body {
 }
 * {
   margin: 0px 0px 0px 0px;
-  color: #ffffff;
-}
+  color: white; }
 body {
   margin: 0px 0px 0px 0px;
   color: #333333;

data/spec/fixtures/testcases/concatenation/rapper.yml

@@ -7,12 +7,12 @@
     - files:
       - simple_1
       - simple_2
-    - version: 683e7ae
+    - version: 4f2b49d
   - base_combined: !omap
     - files:
       - +base
       - simple_1
-    - version: 0bb9443
+    - version: 1fecd63
 - js: !omap
   - base: !omap
     - files:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapper_lite
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &70281444735360 !ruby/object:Gem::Requirement
+  requirement: &70353465397060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70281444735360
+  version_requirements: *70353465397060
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70281444732040 !ruby/object:Gem::Requirement
+  requirement: &70353465395900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70281444732040
+  version_requirements: *70353465395900
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70281444731200 !ruby/object:Gem::Requirement
+  requirement: &70353465394400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281444731200
+  version_requirements: *70353465394400
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70281444730640 !ruby/object:Gem::Requirement
+  requirement: &70353465391800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,21 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70281444730640
+  version_requirements: *70353465391800
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70353465390700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: *70353465390700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70281444730080 !ruby/object:Gem::Requirement
+  requirement: &70353465390060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70281444730080
+  version_requirements: *70353465390060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281444729540 !ruby/object:Gem::Requirement
+  requirement: &70353465389360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70281444729540
+  version_requirements: *70353465389360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70281444728740 !ruby/object:Gem::Requirement
+  requirement: &70353465388680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281444728740
+  version_requirements: *70353465388680
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70281444728060 !ruby/object:Gem::Requirement
+  requirement: &70353465388060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *70281444728060
+  version_requirements: *70353465388060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70281444727380 !ruby/object:Gem::Requirement
+  requirement: &70353465387400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +120,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70281444727380
+  version_requirements: *70353465387400
 description: Simple static asset packaging. Compresses files only when they're updated.
 email: tyson@tysontate.com
 executables:
@@ -141,7 +152,7 @@ files:
 - spec/fixtures/src/coffeescript.coffee
 - spec/fixtures/src/simple_1.css
 - spec/fixtures/src/simple_1.js
-- spec/fixtures/src/simple_2.css
+- spec/fixtures/src/simple_2.sass
 - spec/fixtures/src/subfolder/simple_2.js
 - spec/fixtures/testcases/combination/expected/base.css
 - spec/fixtures/testcases/combination/expected/base.js
@@ -225,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1529530463017386165
+      hash: -179179325362599579
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/fixtures/src/simple_2.css

@@ -1,4 +0,0 @@
-* {
-  margin: 0px 0px 0px 0px;
-  color: #ffffff;
-}