barista 0.2.1 → 0.3.0

data/README.md

@@ -70,3 +70,14 @@ Currently available options are:
 * no\_wrap - stop coffee from automatically wrapping JS in a closure.
 * change\_output\_prefix! - method to change the output prefix for a framework.
 
+## Note on Patches/Pull Requests ##
+ 
+1. Fork the project.
+2. Make your feature addition or bug fix.
+3. Add tests for it. This is important so I don't break it in a future version unintentionally.
+4. Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+5. Send me a pull request. Bonus points for topic branches.
+
+## Copyright ##
+
+Copyright (c) 2010 Darcy Laycock. See LICENSE for details.

data/app/controllers/barista_controller.rb

@@ -8,7 +8,7 @@ class BaristaController < ActionController::Base
     path = normalize_path(params[:js_path])
     p path
     return head(:forbidden) unless can_render_path?(path)
-    compiled = Barista.render_path(path)
+    compiled = Barista.compile_file!(path)
     compiled.nil? ? head(:not_found) : render(:text => compiled.to_s)
   end
   
@@ -22,4 +22,4 @@ class BaristaController < ActionController::Base
     !path.include?("..")
   end
   
-end
+end

data/barista.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2010-06-11}
   s.description = %q{Automatically compiles app/scripts/*.coffee to javascript for rails awesomesauce.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [
@@ -38,14 +38,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/Sutto/barista}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Transparent coffeescript support for rails 3}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/barista.rb

@@ -2,34 +2,34 @@ require 'active_support'
 require 'pathname'
 
 module Barista
-  
+
   autoload :Compiler,  'barista/compiler'
   autoload :Filter,    'barista/filter'
   autoload :Framework, 'barista/framework'
-  
+
   class << self
-    
+
     def configure
       yield self if block_given?
     end
-    
+
     def root
       @root ||= Rails.root.join("app", "coffeescripts")
     end
-    
+
     def root=(value)
       @root = Pathname(value.to_s)
       Framework.default_framework = nil
     end
-    
+
     def output_root
       @output_root ||= Rails.root.join("public", "javascripts")
     end
-    
+
     def output_root=(value)
       @output_root = Pathname(value.to_s)
     end
-    
+
     def compile_file!(file, force = false)
       origin_path, framework = Framework.full_path_for(file)
       return if origin_path.blank?
@@ -37,12 +37,12 @@ module Barista
       return unless force || Compiler.dirty?(origin_path, destination_path)
       debug "Compiling #{file} from framework '#{framework.name}'"
       FileUtils.mkdir_p File.dirname(destination_path)
-      File.open(destination_path, "w+") do |f|
-        f.write Compiler.compile(File.read(origin_path))
-      end
-      true
+      content = Compiler.compile(origin_path)
+      # Write the rendered content to file.
+      File.open(destination_path, "w+") { |f| f.write content }
+      content
     rescue SystemCallError
-      false
+      ""
     end
     
     def compile_all!(force = false)
@@ -104,4 +104,4 @@ module Barista
     end
   end
   
-end
+end

data/lib/barista/compiler.rb

@@ -6,22 +6,19 @@ module Barista
     class << self; attr_accessor :bin_path; end
     self.bin_path ||= "coffee"
     
-    def self.compile(content)
-      new(content).to_js
+    def self.compile(path)
+      new(path).to_js
     end
     
-    def initialize(content)
+    def initialize(path)
       @compiled = false
-      @content  = content
+      @path     = path
     end
     
     def compile!
       # Compiler code thanks to bistro_car.
-      tf = temp_file_for_content
-      @compiled_content = invoke_coffee(temp_file_for_content.path)
+      @compiled_content = invoke_coffee(@path)
       @compiled = true
-    ensure
-      tf.unlink rescue nil
     end
     
     def to_js
@@ -41,13 +38,6 @@ module Barista
       end.join(" ")
     end
     
-    def temp_file_for_content(content = @content)
-      tf = Tempfile.new("barista-#{content_hash}.coffee")
-      tf.write content
-      tf.close
-      tf
-    end
-    
     def invoke_coffee(path)
       command = "#{self.class.bin_path} #{coffee_options} '#{path}'".squeeze(' ')
       %x(#{command})
@@ -58,4 +48,4 @@ module Barista
     end
     
   end
-end
+end

data/lib/barista/version.rb

@@ -1,8 +1,8 @@
 module Barista
   module Version
     MAJOR  = 0
-    MINOR  = 2
-    PATCH  = 1
+    MINOR  = 3
+    PATCH  = 0
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +08:00
+date: 2010-06-11 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -55,23 +56,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Transparent coffeescript support for rails 3