barista 0.6.1 → 0.7.0.pre2

data/DESCRIPTION

@@ -0,0 +1,7 @@
+Barista provides simple, integrated support for CoffeeScript in Rack and Rails applications.
+
+Much like Compass does for Sass, It also provides Frameworks (bundleable code which can be shared via Gems).
+
+Lastly, it also provides a Rack Application (which can be used to server compiled code), a around_filter-style precompiler (as Rack middleware) and simple helpers for rails and Haml.
+
+For more details, please see the the README file bundled with it.

data/Gemfile

@@ -1,7 +1,9 @@
 source "http://rubygems.org"
 
-group :development do
-  gem 'jeweler'
-end
+gem 'coffee-script', '~> 2.1.1'
 
-gemspec
+group :development, :test do
+  gem 'jeweler', '~> 1.0'
+  gem 'rspec',   '~> 2.1'
+  gem 'rr',      '~> 1.0'
+end

data/Gemfile.lock

@@ -1,27 +1,38 @@
 PATH
   remote: .
   specs:
-    barista (0.5.1)
-      open4
+    barista (0.7.0.pre)
+      coffee-script (~> 2.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    gemcutter (0.6.1)
+    coffee-script (2.1.1)
+      coffee-script-source
+    coffee-script-source (0.9.5)
+    diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    open4 (1.0.1)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
+      rake
+    rake (0.8.7)
+    rr (1.0.2)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   barista!
-  jeweler
-  open4
+  coffee-script (~> 2.1.1)
+  jeweler (~> 1.0)
+  rr (~> 1.0)
+  rspec (~> 2.1)

data/Rakefile

@@ -7,19 +7,12 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name        = "barista"
-    gem.summary     = %Q{Transparent coffeescript support for rails 3.}
-    gem.description = %Q{Automatically compiles app/coffeescripts/*.coffee to javascript for rails awesomesauce.}
+    gem.summary     = %Q{Simple, transparent coffeescript integration for Rails and Rack applications.}
+    gem.description = File.read(File.expand_path('DESCRIPTION', File.dirname(__FILE__)))
     gem.email       = "sutto@sutto.net"
     gem.homepage    = "http://github.com/Sutto/barista"
     gem.version     = Barista::Version::STRING
     gem.authors     = ["Darcy Laycock"]
-    gem.add_dependency 'open4'
-    gem.add_dependency 'railties', '~> 3.0'
-    
-    gem.add_development_dependency 'rspec', '~> 2.0.0.beta.22'
-    gem.add_development_dependency 'rr', '~> 1.0'
-    gem.add_development_dependency 'therubyracer'
-    
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -28,8 +21,7 @@ end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
+  version = Barista::Version::STRING
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "barista #{version}"
   rdoc.rdoc_files.include('README*')

data/barista.gemspec

@@ -1,61 +1,67 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "0.6.1"
+  s.version = "0.7.0.pre2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-11-22}
-  s.description = %q{Automatically compiles app/coffeescripts/*.coffee to javascript for rails awesomesauce.}
+  s.date = %q{2010-11-26}
+  s.description = %q{Barista provides simple, integrated support for CoffeeScript in Rack and Rails applications.
+
+Much like Compass does for Sass, It also provides Frameworks (bundleable code which can be shared via Gems).
+
+Lastly, it also provides a Rack Application (which can be used to server compiled code), a around_filter-style precompiler (as Rack middleware) and simple helpers for rails and Haml.
+
+For more details, please see the the README file bundled with it.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     ".rspec",
-     ".rvmrc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "app/controllers/barista_controller.rb",
-     "barista.gemspec",
-     "config/routes.rb",
-     "lib/barista.rb",
-     "lib/barista/compiler.rb",
-     "lib/barista/compilers.rb",
-     "lib/barista/compilers/base.rb",
-     "lib/barista/compilers/native.rb",
-     "lib/barista/compilers/node.rb",
-     "lib/barista/filter.rb",
-     "lib/barista/framework.rb",
-     "lib/barista/hooks.rb",
-     "lib/barista/tasks/barista.rake",
-     "lib/barista/version.rb",
-     "lib/coffee-script/coffee-script-0.9.4.js",
-     "lib/generators/barista/install/USAGE",
-     "lib/generators/barista/install/install_generator.rb",
-     "lib/generators/barista/install/templates/initializer.rb",
-     "lib/generators/barista_install_generator.rb",
-     "spec/barista_spec.rb",
-     "spec/spec_helper.rb"
+    ".rspec",
+    ".rvmrc",
+    "DESCRIPTION",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "barista.gemspec",
+    "lib/barista.rb",
+    "lib/barista/compiler.rb",
+    "lib/barista/extensions.rb",
+    "lib/barista/filter.rb",
+    "lib/barista/framework.rb",
+    "lib/barista/haml_filter.rb",
+    "lib/barista/helpers.rb",
+    "lib/barista/hooks.rb",
+    "lib/barista/integration.rb",
+    "lib/barista/integration/rails2.rb",
+    "lib/barista/integration/rails3.rb",
+    "lib/barista/integration/sinatra.rb",
+    "lib/barista/server.rb",
+    "lib/barista/tasks/barista.rake",
+    "lib/barista/version.rb",
+    "lib/generators/barista/install/USAGE",
+    "lib/generators/barista/install/install_generator.rb",
+    "lib/generators/barista/install/templates/initializer.rb",
+    "lib/generators/barista_install_generator.rb",
+    "spec/barista_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/Sutto/barista}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Transparent coffeescript support for rails 3.}
+  s.summary = %q{Simple, transparent coffeescript integration for Rails and Rack applications.}
   s.test_files = [
     "spec/barista_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -63,24 +69,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<railties>, ["~> 3.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_runtime_dependency(%q<coffee-script>, ["~> 2.1.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.1"])
       s.add_development_dependency(%q<rr>, ["~> 1.0"])
-      s.add_development_dependency(%q<therubyracer>, [">= 0"])
     else
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<railties>, ["~> 3.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<coffee-script>, ["~> 2.1.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.1"])
       s.add_dependency(%q<rr>, ["~> 1.0"])
-      s.add_dependency(%q<therubyracer>, [">= 0"])
     end
   else
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<railties>, ["~> 3.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<coffee-script>, ["~> 2.1.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.1"])
     s.add_dependency(%q<rr>, ["~> 1.0"])
-    s.add_dependency(%q<therubyracer>, [">= 0"])
   end
 end
 

data/lib/barista.rb

@@ -1,19 +1,34 @@
-require 'active_support'
 require 'pathname'
 
+require 'coffee_script'
+
 module Barista
 
   Error                    = Class.new(StandardError)
   CompilationError         = Class.new(Error)
   CompilerUnavailableError = Class.new(Error)
 
-  autoload :Compiler,  'barista/compiler'
-  autoload :Compilers, 'barista/compilers'
-  autoload :Filter,    'barista/filter'
-  autoload :Framework, 'barista/framework'
-  autoload :Hooks,     'barista/hooks'
+  autoload :Compiler,    'barista/compiler'
+  autoload :Extensions,  'barista/extensions'
+  autoload :Filter,      'barista/filter'
+  autoload :Framework,   'barista/framework'
+  autoload :HamlFilter,  'barista/haml_filter'
+  autoload :Helpers,     'barista/helpers'
+  autoload :Hooks,       'barista/hooks'
+  autoload :Integration, 'barista/integration'
+  autoload :Server,      'barista/server'
 
   class << self
+    include Extensions
+
+    def library_root
+      @library_root ||= Pathname(__FILE__).dirname
+    end
+
+    # Hook methods
+    #
+    # Hooks are a generic way to define blocks that are executed at run time.
+    # For a full list of hooks, see the readme.
 
     def hooks
       @hooks ||= Hooks.new
@@ -27,105 +42,152 @@ module Barista
       hooks.invoke(name, *args)
     end
     
-    def on_compilation_error(&blk)
-      on_hook :compilation_failed, &blk
-    end
+    has_hook_method :on_compilation_error        => :compilation_failed,
+                    :on_compilation              => :compiled,
+                    :on_compilation_complete     => :all_compiled,
+                    :on_compilation_with_warning => :compiled_with_warning,
+                    :before_full_compilation     => :before_full_compilation,
+                    :before_compilation          => :before_compilation
+
+
+    # Configuration - Tweak how you use Barista.
     
-    def on_compilation(&blk)
-      on_hook :compiled, &blk
-    end
+    has_boolean_options    :verbose, :bare, :add_filter, :add_preamble, :exception_on_error, :embedded_interpreter    
+    has_delegate_methods   Compiler, :bin_path, :bin_path=, :js_path, :js_path=
+    has_deprecated_methods :compiler, :compiler=, :compiler_klass, :compiler_klass=
     
-    def on_compilation_complete(&blk)
-      on_hook :all_compiled, &blk
+    def configure
+      yield self if block_given?
     end
-
-    def on_compilation_with_warning(&blk)
-      on_hook :compiled_with_warning, &blk 
+    
+    def env
+      @env ||= default_for_env
     end
 
-    def before_full_compilation(&blk)
-      on_hook :before_full_compilation, &blk
+    def env=(value)
+      @env = value.to_s.strip
+      @env = nil if @env == ''
     end
     
-    def before_compilation(&blk)
-      on_hook :before_compilation, &blk
+    def logger
+      @logger ||= default_for_logger
     end
 
-    def configure
-      yield self if block_given?
+    def logger=(value)
+      @logger = value
     end
 
-    def exception_on_error?
-      @exception_on_error = true if !defined?(@exception_on_error)
-      !!@exception_on_error
+    def app_root
+      @app_root ||= default_for_app_root
     end
 
-    def exception_on_error=(value)
-      @exception_on_error = value
+    def app_root=(value)
+      @app_root = value.nil? ? nil : Pathname(value.to_s)
     end
 
     def root
-      @root ||= Rails.root.join("app", "coffeescripts")
+      @root ||= app_root.join("app", "coffeescripts")
     end
 
     def root=(value)
-      @root = Pathname(value.to_s)
+      @root = value.nil? ? nil : Pathname(value.to_s)
       Framework.default_framework = nil
     end
 
     def output_root
-      @output_root ||= Rails.root.join("public", "javascripts")
+      @output_root ||= app_root.join("public", "javascripts")
     end
 
     def output_root=(value)
-      @output_root = Pathname(value.to_s)
+      @output_root = value.nil? ? nil : Pathname(value.to_s)
     end
 
-    def compile_file!(file, force = false, silence_error = false)
-      # Ensure we have a coffeescript compiler available.
-      if !Compiler.check_availability!(silence_error)
-        debug "The coffeescript compiler at '#{Compiler.bin_path}' is currently unavailable."
-        return ""
+    def no_wrap?
+      deprecate! self, :no_wrap?, 'Please use bare? instead.'
+      bare?
+    end
+
+    def no_wrap!
+      deprecate! self, :no_wrap!, 'Please use bare! instead.'
+      bare!
+    end
+
+    def no_wrap=(value)
+      deprecate! self, :no_wrap=, 'Please use bare= instead.'
+      self.bare = value
+    end
+
+    # Default configuration options
+
+    def local_env?
+      %w(test development).include? Barista.env
+    end
+
+    def default_for_env
+      return Rails.env.to_s if defined?(Rails.env)
+      ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+    end
+
+    def default_for_app_root
+      if defined?(Rails.root)
+        Rails.root
+      else
+        Pathname(Dir.pwd)
       end
-      # Expand the path from the framework.
-      origin_path, framework = Framework.full_path_for(file)
-      return if origin_path.blank?
-      destination_path = self.output_path_for(file)
-      return unless force || Compiler.dirty?(origin_path, destination_path)
-      debug "Compiling #{file} from framework '#{framework.name}'"
-      FileUtils.mkdir_p File.dirname(destination_path)
-      content = Compiler.compile(origin_path, :silence_error => silence_error)
-      # Write the rendered content to file.
-      # nil is only when silence_error is true.
-      if content.nil?
-        debug "An error occured compiling '#{file}' - Leaving file as is."
+    end
+
+    def default_for_logger
+      if defined?(Rails.logger)
+        Rails.logger
       else
-        File.open(destination_path, "w+") { |f| f.write content }
-        content
+        require 'logger'
+        Logger.new(STDOUT)
       end
-    rescue SystemCallError
-      debug "An unknown error occured attempting to compile '#{file}'"
-      ""
+    end
+
+    def default_for_verbose
+      local_env?
+    end
+
+    def default_for_add_filter
+      local_env?
+    end
+
+    def default_for_add_preamble
+      local_env?
+    end
+
+    def default_for_exception_on_error
+      true
+    end
+    
+    def default_for_embedded_interpreter
+      local_env?
+    end
+
+    # Actual tasks on the barista module.
+
+    def compile_file!(file, force = false, silence_error = false)
+      Compiler.autocompile_file file, force, silence_error
     end
 
     def compile_all!(force = false, silence_error = true)
       debug "Compiling all coffeescripts"
       Barista.invoke_hook :before_full_compilation
       Framework.exposed_coffeescripts.each do |coffeescript|
-        compile_file! coffeescript, force, silence_error
+        Compiler.autocompile_file coffeescript, force, silence_error
       end
       Barista.invoke_hook :all_compiled
       true
     end
 
     def change_output_prefix!(framework, prefix = nil)
-      framework = framework.is_a?(Barista::Framework) ? framework : Barista::Framework[framework]
-      return unless framework
-      framework.output_prefix = prefix
+      framework = Barista::Framework[framework] unless framework.is_a?(Barista::Framework)
+      framework.output_prefix = prefix if framework.present?
     end
 
-    def each_framework(include_default = false)
-      Framework.all(include_default).each { |f| yield f if block_given? }
+    def each_framework(include_default = false, &blk)
+      Framework.all(include_default).each(&blk)
     end
 
     def output_path_for(file)
@@ -133,56 +195,17 @@ module Barista
     end
 
     def debug(message)
-      Rails.logger.debug "[Barista] #{message}" if defined?(Rails.logger) && Rails.logger
-    end
-
-    def verbose?
-      @verbose ||= (defined?(Rails) && (Rails.env.test? || Rails.env.development?))
+      logger.debug "[Barista] #{message}"
     end
     
-    def verbose!
-      self.verbose = true
-    end
-    
-    def verbose=(value)
-      @verbose = !!value
+    def setup_defaults
+      Barista::HamlFilter.setup
+      Barista::Compiler.setup_default_error_logger
     end
 
-    alias add_filter? verbose?
-    alias add_preamble? verbose?
-
-    def no_wrap?
-      defined?(@no_wrap) && @no_wrap
-    end
-    alias bare? no_wrap?
-
-    def no_wrap!
-      self.no_wrap = true
-    end
-    alias bare! no_wrap!
-
-    def no_wrap=(value)
-      @no_wrap = !!value
-    end
-    alias bare= no_wrap= 
-
-    delegate :bin_path, :bin_path=, :js_path, :js_path=, :compiler, :compiler=,
-             :compiler_klass, :compiler_klass=, :to => Compiler
-
-  end
-
-  if defined?(Rails::Engine)
-    class Engine < Rails::Engine
-
-      rake_tasks do
-        load File.expand_path('./barista/tasks/barista.rake', File.dirname(__FILE__))
-      end
-
-      initializer "barista.wrap_filter" do
-        ActionController::Base.before_filter(Barista::Filter) if Barista.add_filter?
-      end
-
-    end
   end
+  
+  # Setup integration by default.
+  Integration.setup
 
 end