stylus_rails 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 0.1.3 (2011-04-20)
+[Compare view](http://github.com/lucasmazza/stylus_rails/compare/v0.1.2...v0.1.3)
+
+* `Stylus` will raise an exception if the compilation fails. You can turn this off with `Stylus.silent = true`.
+* Added `Stylus.logger` to handle the output from stylus. On Rails applications this will be the standard Rails logger.
+
 ### 0.1.2 (2011-04-10)
 [Compare view](http://github.com/lucasmazza/stylus_rails/compare/v0.1.1...v0.1.2)
 

data/README.md

@@ -68,6 +68,13 @@ And a `application.styl`
 
 Stylus will compile your `application.styl` into a `application.css` and your `_vendor.styl` will be ignored.
 
+## Error Handling
+
+If the stylus binary exits with error code 1 stylus_rails will throw an error exception. In case you don't want
+this the behaviour can be switched to silent by setting the following variable to false:
+
+    Stylus.silent = true
+
 ## Changelog
 [here.](https://github.com/lucasmazza/stylus_rails/blob/master/CHANGELOG.md)
 

data/lib/stylus_rails.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'stylus_rails/core_ext'
 require 'stylus_rails/stylus'
 require 'stylus_rails/runner'

data/lib/stylus_rails/railtie.rb

@@ -8,12 +8,13 @@ module Stylus
     initializer "stylus.reloader" do
       Stylus.root = File.join(Rails.public_path,"stylesheets")
       Stylus.compile_directory ||= File.join(Rails.public_path, 'stylesheets')
+      Stylus.logger = Rails.logger
       if !$rails_rake_task
         config.to_prepare do
           if `which stylus` && $?.success?
             Stylus.compile
           else
-            Rails.logger.warn(Stylus.warning)
+            Stylus.logger.warn(Stylus.warning)
           end
         end
       end

data/lib/stylus_rails/runner.rb

@@ -11,11 +11,30 @@ module Stylus
 
       directories.each_pair do |directory, files|
         FileUtils.mkdir_p(directory) unless File.directory?(directory)
-        system("stylus #{files.join(" ")} -o #{directory}#{' -c' if Stylus.compress?}")
+        output = `stylus #{files.join(" ")} -o #{directory}#{' -c' if Stylus.compress?} 2>&1`
+
+        if failed?
+          handle_failure(output)
+        else
+          Stylus.logger.info(output)
+        end
       end
     end
 
     private
+
+    def handle_failure(output)
+      if Stylus.silent?
+        Stylus.logger.error(output)
+      else
+        raise CompilationError, "Stylus compilation error #{output}"
+      end
+    end
+
+    def failed?
+      !$?.success?
+    end
+
     def output_folder(path)
       dirname = File.dirname(path)
       if Stylus.compile_directory.nil?

data/lib/stylus_rails/stylus.rb

@@ -1,6 +1,11 @@
 module Stylus
   extend CoreExt
-  # Directory to look for .stylus files
+
+  # Error messages
+  Error                    = Class.new(StandardError)
+  CompilationError         = Class.new(Error)
+
+  # Directory to look for .stylus files.
   mattr_accessor :directory
   @@directory = "stylus"
 
@@ -8,18 +13,31 @@ module Stylus
   mattr_accessor :root
   @@root = Dir.pwd
 
-  # Root path for the output
+  # Root path for the generated output.
   mattr_accessor :compile_directory
   @@compile_directory = nil
 
   mattr_accessor :extension
   @@extension = "styl"
 
+  # Checks if the -c flag should be passed to Stylus to render single line CSS statements.
   mattr_accessor :compress
   @@compress = true
 
+  # Checks if an CompilationError should be raised if the compilation fails.
+  mattr_accessor :silent
+  @@silent = false
+
+  # Logger instance to write the stylus output.
+  mattr_accessor :logger
+
   class << self
     alias_method :compress?, :compress
+    alias_method :silent?, :silent
+
+    def logger
+      @@logger ||= Logger.new($stdout)
+    end
 
     def compile
       paths = Dir[File.join(folder, "**", "*.#{extension}")]

data/lib/stylus_rails/version.rb

@@ -1,3 +1,3 @@
 module Stylus
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/runner_spec.rb

@@ -34,22 +34,55 @@ describe Stylus::Runner do
     end
 
     it "calls the stylus cli" do
-      subject.should_receive(:system).with("stylus #{stylus_file} -o #{target_folder}")
+      subject.should_receive(:`).with("stylus #{stylus_file} -o #{target_folder} 2>&1")
       subject.call
     end
 
     it "runs files on the same folder on a single command" do
       paths = fixtures("stylus/simple.styl", "stylus/foo.styl")
       subject = Stylus::Runner.new(paths)
-      subject.should_receive(:system).with("stylus #{paths.join(" ")} -o #{target_folder}")
+      subject.should_receive(:`).with("stylus #{paths.join(" ")} -o #{target_folder} 2>&1")
       subject.call
     end
 
     it "uses the compress flag when configured to" do
       Stylus.compress = true
-      subject.should_receive(:system).with("stylus #{stylus_file} -o #{target_folder} -c")
+      subject.should_receive(:`).with("stylus #{stylus_file} -o #{target_folder} -c 2>&1")
       subject.call
     end
+
+    it "writes the output to the associated logger" do
+      subject.stub(:`) { "some output" }
+      Stylus.logger.should_receive(:info).with("some output")
+      subject.call
+    end
+
+    context "#call when stylus(1) fails" do
+      before do
+        subject.stub!(:failed?).and_return(true)
+      end
+
+      context "when Stylus.silent is false" do
+        before { Stylus.silent = false }
+        it "raises an exception" do
+         expect { subject.call }.to raise_error Stylus::CompilationError
+        end
+      end
+
+       context "when Stylus.silent is true" do
+         before { Stylus.silent = true }
+
+         it "doesn't raise an exception" do
+           expect { subject.call }.to_not raise_error Stylus::CompilationError
+         end
+
+         it "writes the error output to the logger" do
+           subject.stub(:`) { "FAIL" }
+           Stylus.logger.should_receive(:error).with("FAIL")
+           subject.call
+         end
+       end
+    end
   end
 
   describe "#call with different compile_dir" do
@@ -65,20 +98,20 @@ describe Stylus::Runner do
     end
 
     it "calls the stylus cli" do
-      subject.should_receive(:system).with("stylus #{stylus_file} -o #{target_folder}")
+      subject.should_receive(:`).with("stylus #{stylus_file} -o #{target_folder} 2>&1")
       subject.call
     end
 
     it "runs files on the same folder on a single command" do
       paths = fixtures("stylus/simple.styl", "stylus/foo.styl")
       subject = Stylus::Runner.new(paths)
-      subject.should_receive(:system).with("stylus #{paths.join(" ")} -o #{target_folder}")
+      subject.should_receive(:`).with("stylus #{paths.join(" ")} -o #{target_folder} 2>&1")
       subject.call
     end
 
     it "uses the compress flag when configured to" do
       Stylus.compress = true
-      subject.should_receive(:system).with("stylus #{stylus_file} -o #{target_folder} -c")
+      subject.should_receive(:`).with("stylus #{stylus_file} -o #{target_folder} -c 2>&1")
       subject.call
     end
   end

data/spec/spec_helper.rb

@@ -2,9 +2,12 @@ require 'stylus_rails'
 
 RSpec.configure do |config|
 
+  Stylus.logger = Logger.new("/dev/null")
+
   def fixtures(*paths)
     paths.map { |path| File.expand_path(path, "spec/fixtures") }
   end
+
   alias :fixture :fixtures
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stylus_rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Lucas Mazza
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -03:00
+date: 2011-04-20 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency