barista 1.1.0.pre1 → 1.1.0

data/README.md

@@ -146,6 +146,7 @@ and `#option!` (to set the value to true):
 * `root` – The folder path to read CoffeeScripts from. (Defaults to `app/coffeescripts`.)
 * `output_root` – The folder to write compiled JS files to. (Defaults to `public/javascripts`.)
 * `change_output_prefix!` – Method to change the output prefix for a framework.
+* `change_output_root!` - Method to change the output root for a given framework.
 * `verbose` – Whether or not Barista will add a preamble to files.
 * `js_path` – Path to the pure-JavaScript compiler.
 * `env` – The application environment. (Defaults to `Rails.env`.)

data/barista.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "1.1.0.pre1"
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-06-01}
   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).

data/lib/barista.rb

@@ -1,7 +1,12 @@
 require 'pathname'
-
+require 'time' # Required for httpdate
 require 'coffee_script'
 
+# Setup ExecJS extras if present
+if defined?(ExecJS::ExternalRuntime)
+  ExecJS::ExternalRuntime.send :attr_accessor, :binary
+end
+
 module Barista
 
   Error                    = Class.new(StandardError)
@@ -54,6 +59,7 @@ module Barista
 
     has_boolean_options    :verbose, :bare, :add_filter, :add_preamble, :exception_on_error, :embedded_interpreter, :auto_compile
     has_delegate_methods   Compiler, :bin_path, :bin_path=, :js_path, :js_path=
+    has_delegate_methods   Framework, :register
     has_deprecated_methods :compiler, :compiler=, :compiler_klass, :compiler_klass=
 
     def configure
@@ -182,6 +188,10 @@ module Barista
       Framework.exposed_coffeescripts.each do |coffeescript|
         Compiler.autocompile_file coffeescript, force, silence_error
       end
+      debug "Copying all javascripts"
+      Framework.exposed_javascripts.each do |javascript|
+        Compiler.autocompile_file javascript, force, silence_error
+      end
       Barista.invoke_hook :all_compiled
       true
     end
@@ -191,6 +201,11 @@ module Barista
       framework.output_prefix = prefix if framework
     end
 
+    def change_output_root!(framework, root)
+      framework = Barista::Framework[framework] unless framework.is_a?(Barista::Framework)
+      framework.output_root = root if framework
+    end
+
     def each_framework(include_default = false, &blk)
       Framework.all(include_default).each(&blk)
     end

data/lib/barista/compiler.rb

@@ -13,21 +13,38 @@ module Barista
       def js_path=(value)
         CoffeeScript::Source.path = value
       end
-      
+
       def bin_path
-        CoffeeScript::Engines::Node.binary
+        if defined?(CoffeeScript::Engines::Node)
+          CoffeeScript::Engines::Node.binary
+        else
+          execjs_runtime_call :binary
+        end
       end
-      
+
       def bin_path=(path)
-        CoffeeScript::Engines::Node.binary = path
+        if defined?(CoffeeScript::Engines::Node)
+          CoffeeScript::Engines::Node.binary = path
+        else
+          execjs_runtime_call :binary=, path
+        end
       end
-      
+
+      def execjs_runtime_call(method, *args)
+        runtime = ExecJS.runtime
+        if runtime.respond_to?(method, true)
+          runtime.send method, *args
+        else
+          nil
+        end
+      end
+
       def available?
         CoffeeScript.engine && CoffeeScript.engine.supported?
       end
 
       def check_availability!(silence = false)
-        available = available?        
+        available = available?
         if !available && Barista.exception_on_error? && !silence
           raise CompilerUnavailableError, "No method of compiling cofffescript is currently available. Please install therubyracer or node."
         end
@@ -43,12 +60,12 @@ module Barista
         origin_path, framework = Framework.full_path_for(file)
         return if origin_path.nil?
         destination_path = framework.output_path_for(file)
-      
+
         # read file directly if auto_compile is disabled
-        if !Barista.auto_compile? 
-          if File.exist?(destination_path) 
+        if !Barista.auto_compile?
+          if File.exist?(destination_path)
             return File.read(destination_path)
-          else 
+          else
             return nil
           end
         end
@@ -65,7 +82,7 @@ module Barista
         compiler.save
         content
       end
-      
+
       def compile_as(file, type)
         origin_path, framework = Framework.full_path_for(file)
         return if origin_path.nil?
@@ -75,11 +92,11 @@ module Barista
           return autocompile_file(file), Time.now
         end
       end
-      
+
       def dirty?(from, to)
         File.exist?(from) && (!File.exist?(to) || File.mtime(to) < File.mtime(from))
       end
-      
+
       def setup_default_error_logger
         Barista.on_compilation_error do |where, message|
           if Barista.verbose?
@@ -88,9 +105,9 @@ module Barista
           end
         end
       end
-      
+
     end
-    
+
     def initialize(context, options = {})
       @compiled = false
       @options  = options
@@ -108,11 +125,19 @@ module Barista
       compile! unless defined?(@compiled) && @compiled
       @compiled_content
     end
-    
+
+    def copyable?(location)
+      location != 'inline' && File.extname(location) == '.js'
+    end
+
     def compile(script, where = 'inline')
-      Barista.invoke_hook :before_compilation, where
-      out = CoffeeScript.compile script, :bare => Barista.bare?
-      Barista.invoke_hook :compiled, where
+      if copyable?(where)
+        out = script
+      else
+        Barista.invoke_hook :before_compilation, where
+        out = CoffeeScript.compile script, :bare => Barista.bare?
+        Barista.invoke_hook :compiled, where
+      end
       out
     rescue CoffeeScript::Error => e
       Barista.invoke_hook :compilation_failed, where, e.message
@@ -139,14 +164,15 @@ module Barista
     protected
 
     def preamble(location)
-      "/* DO NOT MODIFY. This file was compiled #{Time.now.httpdate} from\n * #{location.strip}\n */\n\n"
+      inner_message = copyable?(location) ? "copied" : "compiled"
+      "/* DO NOT MODIFY. This file was #{inner_message} #{Time.now.httpdate} from\n * #{location.strip}\n */\n\n"
     end
-        
+
     def compilation_error_for(location, message)
       details = "Compilation of '#{location}' failed:\n#{message}"
       Barista.verbose? ?  "alert(#{details.to_json});" : nil
     end
-    
+
     def setup_compiler_context(context)
       if context.respond_to?(:read)
         @context = context.read
@@ -163,6 +189,6 @@ module Barista
         @options[:origin] ||= 'inline'
       end
     end
-    
+
   end
 end

data/lib/barista/framework.rb

@@ -21,21 +21,33 @@ module Barista
       end.uniq.sort_by { |f| f.length }
     end
 
+    def self.exposed_javascripts
+      all(true).inject([]) do |collection, fw|
+        collection + fw.exposed_javascripts
+      end.uniq.sort_by { |f| f.length }
+    end
+
     def self.coffeescript_glob_paths
       all(true).map { |fw| fw.coffeescript_glob_path }
     end
 
     def self.full_path_for(script)
-      script = script.to_s.gsub(/\.js$/, '.coffee').gsub(/^\/+/, '')
+      javascript   = script.to_s.gsub(/\.coffee$/, '.js').gsub(/^\/+/, '')
+      coffeescript = script.to_s.gsub(/\.js$/, '.coffee').gsub(/^\/+/, '')
       all(true).each do |fw|
-        full_path = fw.full_path_for(script)
+        full_path = fw.full_path_for(coffeescript) || fw.full_path_for(javascript)
         return full_path, fw if full_path
       end
       nil
     end
 
-    def self.register(name, root)
-      (@all ||= []) << self.new(:name => name, :root => root)
+    def self.register(name, options = nil)
+      if options.is_a?(Hash)
+        framework = self.new(options.merge(:name => name))
+      else
+        framework = self.new(:name => name, :root => options)
+      end
+      (@all ||= []) << framework
     end
 
     def self.[](name)
@@ -56,20 +68,28 @@ module Barista
       end
       # actually setup the framework.
       check_options! options, :name, :root
-      @name           = options[:name].to_s
-      @output_prefix  = options[:output_prefix]
-      @framework_root = File.expand_path(options[:root].to_s)
-      @output_root    = options[:output_root] && Pathname(options[:output_root])
+      @name            = options[:name].to_s
+      @output_prefix   = options[:output_prefix]
+      @framework_root  = File.expand_path(options[:root].to_s)
+      self.output_root = options[:output_root]
     end
 
     def coffeescripts
       Dir[coffeescript_glob_path]
     end
 
+    def javascripts
+      Dir[javascript_glob_path]
+    end
+
     def coffeescript_glob_path
       @coffeescript_glob_path ||= File.join(@framework_root, "**", "*.coffee")
     end
 
+    def javascript_glob_path
+      @javascript_glob_path ||= File.join(@framework_root, "**", "*.js")
+    end
+
     def short_name(script)
       short_name = remove_prefix script, @framework_root
       File.join(*[@output_prefix, short_name].compact)
@@ -79,6 +99,10 @@ module Barista
       coffeescripts.map { |script| short_name(script) }
     end
 
+    def exposed_javascripts
+      javascripts.map { |script| short_name(script) }
+    end
+
     def output_prefix=(value)
       value = value.to_s.gsub(/(^\/|\/$)/, '').strip
       @output_prefix = value.empty? ? nil : value
@@ -93,6 +117,14 @@ module Barista
       @output_root || Barista.output_root
     end
 
+    def output_root=(value)
+      if value.nil?
+        @output_root = nil
+      else
+        @output_root = Pathname(value.to_s)
+      end
+    end
+
     def output_path_for(file, format = 'js')
       # Strip the leading slashes
       file = file.to_s.gsub(/^\/+/, '')

data/lib/barista/version.rb

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

data/lib/generators/barista/install/templates/initializer.rb

@@ -10,12 +10,14 @@ Barista.configure do |c|
   # Disable auto compile, use generated file directly:
   # c.auto_compile = false
 
-  # Set the compiler
+  # Add a new framework:
+
+  # c.register :tests, :root => Rails.root.join('test', 'coffeescript'), :output_prefix => 'test'
 
   # Disable wrapping in a closure:
-  # c.no_wrap = true
+  # c.bare = true
   # ... or ...
-  # c.no_wrap!
+  # c.bare!
 
   # Change the output root for a framework:
 
@@ -24,13 +26,17 @@ Barista.configure do |c|
   # or for all frameworks...
 
   # c.each_framework do |framework|
-  #   c.change_output_prefix! framework.name, "vendor/#{framework.name}"
+  #   c.change_output_prefix! framework, "vendor/#{framework.name}"
   # end
 
   # or, prefix the path for the app files:
 
   # c.change_output_prefix! :default, 'my-app-name'
 
+  # or, change the directory the framework goes into full stop:
+
+  # c.change_output_prefix! :tests, Rails.root.join('spec', 'javascripts')
+
   # or, hook into the compilation:
 
   # c.before_compilation   { |path|         puts "Barista: Compiling #{path}" }

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  hash: 1923831963
-  prerelease: 6
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 1
   - 0
-  - pre
-  - 1
-  version: 1.1.0.pre1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 +08:00
+date: 2011-06-01 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,14 +148,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: