barista 0.6.1 → 0.7.0.pre2

data/lib/barista/helpers.rb

@@ -0,0 +1,61 @@
+module Barista
+  module Helpers
+    
+    def coffeescript_interpreter_js
+      return if defined?(@coffeescript_embedded) && @coffeescript_embedded
+      check_for_helper_method! :javascript_include_tag
+      @coffeescript_embedded = true
+      if Barista.embedded_interpreter?
+        javascript_include_tag 'coffeescript'
+      end
+    end
+    
+    def coffeescript_include_tag(*names)
+      check_for_helper_method! :javascript_include_tag
+      if Barista.embedded_interpreter?
+        output = defined?(ActiveSupport::SafeBuffer) ? ActiveSupport::SafeBuffer.new : ""
+        output << coffeescript_interpreter_js
+        check_for_helper_method! :content_tag
+        Array(names).each do |name|
+          output << "\n"
+          output << content_tag(:script, '', :type => 'text/coffeescript', :src => normalise_coffeescript_path(name.to_s))
+        end
+        output
+      else
+        javascript_include_tag(*names)
+      end
+    end
+    
+    def coffeescript_tag(code, html_options = {})
+      check_for_helper_method! :javascript_tag
+      if Barista.embedded_interpreter?
+        check_for_helper_method! :content_tag
+        output = defined?(ActiveSupport::SafeBuffer) ? ActiveSupport::SafeBuffer.new : ""
+        output << coffeescript_interpreter_js 
+        embed = "\n#<![CDATA[\n#{code}\n#]]>\n"
+        embed = embed.html_safe if embed.respond_to?(:html_safe)  
+        output << content_tag(:script, embed, html_options.merge(:type => 'text/coffeescript'))
+        output
+      else
+        javascript_tag Barista::Compiler.compile(code), html_options
+      end
+    end
+    
+    protected
+    
+    def normalise_coffeescript_path(path)
+      if respond_to?(:compute_public_path)
+        compute_public_path path, 'coffeescript', 'coffee'
+      else
+        path = path.gsub(/\.(js|coffee)$/, '') + '.coffee'
+        path = "/coffeescripts/#{path}" unless path =~ /^\//
+        path
+      end
+    end
+    
+    def check_for_helper_method!(name)
+      raise "Please make sure #{name} is available." unless respond_to?(name)
+    end
+    
+  end
+end

data/lib/barista/integration.rb

@@ -0,0 +1,28 @@
+module Barista
+  module Integration
+    
+    autoload :Rails2,  'barista/integration/rails2'
+    autoload :Rails3,  'barista/integration/rails3'
+    autoload :Sinatra, 'barista/integration/sinatra'
+    
+    def self.setup
+      setup_rails   if defined?(Rails)
+      setup_sinatra if defined?(::Sinatra)
+    end
+    
+    def self.setup_rails
+      case Rails::VERSION::MAJOR
+      when 3
+        Rails3
+      when 2
+        # We need to manually call the initialiser stuff in Rails 2.
+        Rails2.setup
+      end
+    end
+    
+    def self.setup_sinatra
+      ::Sinatra::Base.register(Sinatra)
+    end
+    
+  end
+end

data/lib/barista/integration/rails2.rb

@@ -0,0 +1,16 @@
+module Barista
+  module Integration
+    module Rails2
+      
+      def self.setup
+        ActionController::Dispatcher.middleware.tap do |middleware|
+          middleware.use Barista::Filter if Barista.add_filter?
+          middleware.use Barista::Server::Proxy
+        end
+        Barista.setup_defaults
+        ActionController::Base.helper Barista::Helpers
+      end
+      
+    end
+  end
+end

data/lib/barista/integration/rails3.rb

@@ -0,0 +1,26 @@
+module Barista
+  module Integration
+    module Rails3    
+      class Railtie < Rails::Railtie
+        
+        rake_tasks do
+          load Barista.library_root.join('barista/tasks/barista.rake').to_s
+        end
+
+        initializer 'barista.wrap_filter' do
+          config.app_middleware.use Barista::Filter if Barista.add_filter?
+          config.app_middleware.use Barista::Server::Proxy
+        end
+
+        initializer 'barista.defaults' do
+          Barista.setup_defaults
+        end
+
+        initializer 'barista.helpers' do
+          ActionController::Base.helper Barista::Helpers
+        end
+        
+      end
+    end
+  end
+end

data/lib/barista/integration/sinatra.rb

@@ -0,0 +1,23 @@
+module Barista
+  module Integration
+    module Sinatra
+      
+      def self.registered(app)
+        app.configure do |inner_app|
+          setup_defaults inner_app
+          inner_app.use Barista::Filter if Barista.add_filter?
+          inner_app.use Barista::Server::Proxy
+          Barista.setup_defaults
+        end
+        
+      end
+      
+      def self.setup_defaults(app)
+        Barista.configure do |c|
+          c.env = app.environment.to_s
+        end
+      end
+      
+    end
+  end
+end

data/lib/barista/server.rb

@@ -0,0 +1,110 @@
+require 'rack/utils'
+
+module Barista
+  class Server
+
+    CACHE_FOR_SECONDS   = 300
+    JS_CONTENT_TYPE     = 'text/javascript'
+    COFFEE_CONTENT_TYPE = 'text/coffeescript'
+    PATH_REGEXP         = /^\/(coffee|java)scripts\//
+    
+    # Extensions to the type.
+    EXTENSION_MAPPING   = {
+      '.coffee' => :coffeescript,
+      '.js'     => :javascript
+    }
+    
+    # Content types for responses.
+    CONTENT_TYPE_MAPPING = {
+      :coffeescript => COFFEE_CONTENT_TYPE,
+      :javascript   => JS_CONTENT_TYPE
+    }
+    
+    class Proxy
+      
+      def initialize(app)
+        @app = app
+        @server = Server.new
+      end
+      
+      def call(env)
+        result = @server.call(env)
+        if result[0] == 404
+          @app.call(env)
+        else
+          result
+        end
+      end
+      
+    end
+
+    def initialize
+      # Cache the responses for common errors.
+      forbidden
+      not_found
+    end
+
+    def call(env)
+      dup._call(env)
+    end
+    
+    def _call(env)
+      @path_info = Rack::Utils.unescape(env['PATH_INFO'].to_s)
+      return not_found unless @path_info =~ PATH_REGEXP
+      # Strip the prefix.
+      @path_info.gsub! PATH_REGEXP, ''
+      # Check it's a valid path.
+      return forbidden if @path_info.include?('..')
+      
+      # If coffeescript.js is the request, render the coffeescript compiler code.
+      if @path_info == 'coffeescript.js'
+        return response_for_text(CoffeeScript::Source.contents)
+      end
+      # Look up the type of the file based off of the extension.
+      @result_type = EXTENSION_MAPPING[File.extname(@path_info)]
+      return not_found if @result_type.nil? || (@result_type == :coffeescript && !Barista.embedded_interpreter?)
+      # Process the difference in content type.
+      content, last_modified = Barista::Compiler.compile_as(@path_info, @result_type)
+      if content.nil?
+        not_found
+      else
+        response_for_text content, CONTENT_TYPE_MAPPING[@result_type], last_modified
+      end
+    end
+    
+    protected
+    
+    def forbidden
+      @_forbidden_response ||= begin
+        body = "Forbidden\n"
+        [403, {
+          'Content-Type'   => 'text/plain',
+          'Content-Length' => Rack::Utils.bytesize(body).to_s,
+          'X-Cascade'      => 'pass'
+        }, [body]]
+      end
+    end
+    
+    def not_found
+      @_not_found_response ||= begin
+        body = "Not Found\n"
+        [404, {
+          'Content-Type'   => 'text/plain',
+          'Content-Length' => Rack::Utils.bytesize(body).to_s,
+          'X-Cascade'      => 'pass'
+        }, [body]]
+      end
+    end
+    
+    def response_for_text(content, content_type = 'text/javascript', modified_at = nil)
+      headers = {
+        'Content-Type'   => content_type,
+        'Content-Length' => Rack::Utils.bytesize(content).to_s,
+        'Cache-Control'  => "public, max-age=#{CACHE_FOR_SECONDS}"  
+      }
+      headers.merge!('Last-Modified'  => modified_at.httpdate) unless modified_at.nil?
+      [200, headers, [content]]
+    end
+
+  end
+end

data/lib/barista/version.rb

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

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

@@ -42,19 +42,6 @@ Barista.configure do |c|
   # Or, make sure it is always on
   # c.verbose!
   
-  # Changing the compiler
-  
-  # To use a customer compiler class:
-  # c.compiler_klass = MyAwesomeCompilerClass
-  # c.compiler = :null # Barista::Compilers::Null
-  
-  # To switch between the built in compilers:
-  # c.compiler = :native
-  # or...
-  # c.compiler = :node
-  
-  # The default compiler is auto detected.
-  
   # If you want to use a custom JS file, you can as well
   # e.g. vendoring CoffeeScript in your application:
   # c.js_path = Rails.root.join('public', 'javascripts', 'coffee-script.js')

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: -1876988199
+  prerelease: true
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  - pre2
+  version: 0.7.0.pre2
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,60 +16,60 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +08:00
+date: 2010-11-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: coffee-script
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  name: jeweler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 15
         segments: 
-        - 3
+        - 1
         - 0
-        version: "3.0"
-  type: :runtime
-  version_requirements: *id002
+        version: "1.0"
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196431
+        hash: 1
         segments: 
         - 2
-        - 0
-        - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
-  type: :development
-  version_requirements: *id003
+        - 1
+        version: "2.1"
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rr
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,23 +79,15 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: therubyracer
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-description: Automatically compiles app/coffeescripts/*.coffee to javascript for rails awesomesauce.
+  requirement: *id004
+description: |-
+  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.
 email: sutto@sutto.net
 executables: []
 
@@ -105,29 +98,30 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - .rspec
 - .rvmrc
+- DESCRIPTION
 - 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/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/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
@@ -139,8 +133,8 @@ homepage: http://github.com/Sutto/barista
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -155,19 +149,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Transparent coffeescript support for rails 3.
+summary: Simple, transparent coffeescript integration for Rails and Rack applications.
 test_files: 
 - spec/barista_spec.rb
 - spec/spec_helper.rb