barista 0.2.0 → 0.2.1

data/README.md

@@ -1,4 +1,4 @@
-# Barista
+# Barista #
 
 Barista is very, very similar to [bistro\_car](http://github.com/jnicklas/bistro_car) (infact, credit where credit is due - it shares similar
 code / is almost a fork).
@@ -14,7 +14,7 @@ your coffeescripts will be automatically provided, ready for bundling.
 
 To add to your project, simply add:
 
-    gem 'barista', '>= 0.1.2'
+    gem 'barista', '>= 0.2.1'
     
 To your Gemfile and run bundle install.
 
@@ -25,6 +25,35 @@ automatically compile all coffeescripts that have changed before rendering the p
 
 Barista require rails 3+ (but patches for Rails 2 will be accepted.)
 
+## Frameworks ##
+
+One of the other main features Barista adds (over bistro\_car) is frameworks similar
+to Compass. The idea being, you add coffeescripts at runtime from gems etc. To do this,
+in your gem just have a coffeescript directory and then in you gem add the following code:
+
+    Barista::Framework.register 'name', 'full-path-to-directory' if defined?(Barista::Framework)
+    
+For an example of this in practice, check out [bhm-google-maps](http://github.com/YouthTree/bhm-google-maps)
+or, the currently-in-development, [shuriken](http://github.com/Sutto/shuriken). The biggest advantage of this
+is you can then manage js dependencies using existing tools like bundler.
+
+In your `Barista.configure` block, you can also configure on a per-application basis the output directory
+for individual frameworks (e.g. put shuriken into vendor/shuriken, bhm-google-maps into vendor/bhm-google-maps):
+
+    Barista.configure do |config|
+      config.change_output_prefix! 'shuriken',        'vendor/shuriken'
+      config.change_output_prefix! 'bhm-google-maps', 'vendor/bhm-google-maps'
+    end
+    
+Alternatively, to prefix all, you can use `Barista.each_framework` (if you pass true, it includes the 'default' framework
+which is your application root).
+
+    Barista.configure do |config|
+      config.each_framework do |framework|
+        config.change_output_prefix! framework.name, "vendor/#{framework.name}"
+      end
+    end
+
 ## Configuration ##
 
 Please note that barista lets you configure several options. To do this,
@@ -39,4 +68,5 @@ Currently available options are:
 * root - the folder path to read coffeescripts from, defaults to app/coffeescripts
 * output\_root - the folder to write them into, defautls to public/javascripts.
 * no\_wrap - stop coffee from automatically wrapping JS in a closure.
+* change\_output\_prefix! - method to change the output prefix for a framework.
 

data/barista.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-05-02}
+  s.date = %q{2010-05-03}
   s.description = %q{Automatically compiles app/scripts/*.coffee to javascript for rails awesomesauce.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ 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.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Transparent coffeescript support for rails 3}
 
   if s.respond_to? :specification_version then

data/lib/barista.rb

@@ -53,6 +53,16 @@ module Barista
       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
+    end
+    
+    def each_framework(include_default = false)
+      Framework.all(include_default).each { yield if block_given? }
+    end
+    
     def output_path_for(file)
       output_root.join(file.to_s.gsub(/^\/+/, '')).to_s.gsub(/\.coffee$/, '.js')
     end

data/lib/barista/framework.rb

@@ -9,19 +9,21 @@ module Barista
       @default_framework = value
     end
     
-    def self.all
-      [default_framework] + (@all ||= [])
+    def self.all(include_default = false)
+      all = (@all ||= [])
+      all = [default_framework] + all if include_default
+      all
     end
     
     def self.exposed_coffeescripts
-      all.inject([]) do |collection, fw|
+      all(true).inject([]) do |collection, fw|
         collection + fw.exposed_coffeescripts
-      end.uniq
+      end.uniq.sort_by { |f| f.length }
     end
     
     def self.full_path_for(script)
       script = script.to_s.gsub(/\.js$/, '.coffee').gsub(/^\/+/, '')
-      all.each do |fw|
+      all(true).each do |fw|
         full_path = fw.full_path_for(script)
         return full_path, fw if full_path
       end
@@ -32,10 +34,16 @@ module Barista
       (@all ||= []) << self.new(name, root)
     end
     
-    attr_reader :name, :framework_root
+    def self.[](name)
+      name = name.to_s
+      (@all ||= []).detect { |fw| fw.name == name }
+    end
+    
+    attr_reader :name, :framework_root, :output_prefix
     
-    def initialize(name, root)
-      @name           = name
+    def initialize(name, root, output_prefix = nil)
+      @name           = name.to_s
+      @output_prefix  = nil
       @framework_root = File.expand_path(root)
     end
     
@@ -44,17 +52,29 @@ module Barista
     end
     
     def short_name(script)
-      File.expand_path(script).gsub /^#{Regexp.escape(@framework_root)}\/?/, ''
+      short_name = remove_prefix script, @framework_root
+      File.join *[@output_prefix, short_name].compact
     end
     
     def exposed_coffeescripts
       coffeescripts.map { |script| short_name(script) }
     end
     
+    def output_prefix=(value)
+      value = value.to_s.gsub /(^\/|\/$)/, ''
+      @output_prefix = value.blank? ? nil : value
+    end
+    
     def full_path_for(name)
-      full_path = File.join(@framework_root, name)
+      full_path = File.join(@framework_root, remove_prefix(name, @output_prefix.to_s))
       File.exist?(full_path) ? full_path : nil
     end
     
+    protected
+    
+    def remove_prefix(path, prefix)
+      path.to_s.gsub /^#{Regexp.escape(prefix.to_s)}\/?/, ''
+    end
+    
   end
 end

data/lib/barista/version.rb

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

data/lib/generators/barista_install/templates/initializer.rb

@@ -12,4 +12,18 @@ Barista.configure do |c|
   # ... or ...
   # c.no_wrap!
   
+  # Change the output root for a framework:
+  
+  # config.change_output_prefix! 'framework-name', 'output-prefix'
+  
+  # or for all frameworks...
+  
+  # config.each_framework do |framework|
+  #   config.change_output_prefix! framework.name, "vendor/#{framework.name}"
+  # end
+  
+  # or, prefix the path for the app files:
+  
+  # config.change_output_prefix! :default, 'my-app-name'
+  
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +08:00
+date: 2010-05-03 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -53,18 +58,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Transparent coffeescript support for rails 3