bistro_car 0.1.1 → 0.2.0

data/README.rdoc

@@ -9,6 +9,9 @@ from within your Rails application.
 
 == Install:
 
+You'll need to install {node.js}[http://nodejs.org/#download] and
+{CoffeeScript}[http://jashkenas.github.com/coffee-script/#installation].
+
 Add it as a gem dependency to you Rails application:
 
     config.gem "bistro_car"
@@ -82,4 +85,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -12,8 +12,7 @@ Hoe.spec 'bistro_car' do
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [
-    ['coffee-script','>= 0.1.6'],
     ['jsmin','>= 1.0.1']
   ]
   self.version = BistroCar::VERSION
-end
+end

data/config/routes.rb

@@ -1,3 +1,9 @@
-ActionController::Routing::Routes.draw do |map|
-  map.connect 'javascripts/bundle/:bundle.js', :controller => 'bistro_car/bundle', :action => 'show'
+if Rails.respond_to?(:application) # Rails 3
+  Rails.application.routes.draw do
+    match 'javascripts/bundle/:bundle.js', :to => 'bistro_car/bundle#show'
+  end
+else # Rails 2.3
+  ActionController::Routing::Routes.draw do |map|
+    map.connect 'javascripts/bundle/:bundle.js', :controller => 'bistro_car/bundle', :action => 'show'
+  end
 end

data/lib/bistro_car/bundle.rb

@@ -10,38 +10,20 @@ module BistroCar
       Dir.glob(path.join('*.coffee')).to_a
     end
     
-    def render(mode)
-      __send__("render_#{mode}")
-    end
-    
     def to_javascript
-      minify(file_paths.map { |path| CoffeeScript.compile(File.read(path)) }.join)
+      minify(file_paths.map { |path| BistroCar.compile(File.read(path)) }.join)
     end
 
-  private
-  
-    def minify(javascript)
-      if BistroCar.minify then JSMin.minify(javascript) else javascript end
-    end
-  
     def javascript_url
       "/javascripts/bundle/#{name}.js"
     end
-    
-    def render_bundled
-      %(<script src="#{javascript_url}" type="text/javascript" charset="utf-8"></script>)
-    end
 
-    def render_inline
-      <<-HTML
-        <script type="text/javascript" charset="utf-8">
-        //<![CDATA[
-          #{to_javascript}
-        //]]>
-        </script>
-      HTML
-    end
+  private
 
+    def minify(javascript)
+      if BistroCar.minify then JSMin.minify(javascript) else javascript end
+    end
+  
     def path
       if name == :default
         Rails.root.join('app/scripts')
@@ -50,4 +32,4 @@ module BistroCar
       end
     end
   end
-end
+end

data/lib/bistro_car/helpers.rb

@@ -1,33 +1,47 @@
 module BistroCar
   module Helpers
+
     def coffee_script_bundle(*bundles)
       options = bundles.extract_options!
       options[:mode] ||= BistroCar.mode
-      [:default, *bundles].map { |name| Bundle.new(name).render(options[:mode]) }.join
+
+      bundles = [:default, *bundles].map do |name|
+        bundle = Bundle.new(name)
+        render_cs_bundle(bundle, options[:mode])
+      end.join
+      bundles = bundles.html_safe if bundles.respond_to?(:html_safe)
+      bundles
     end
     
     def coffee_script(&block)
-      input = realign_indentation(capture(&block))
-      output = CoffeeScript.compile(input)
+      output = BistroCar.compile(capture(&block))
       
-      concat <<-HTML
-        <script type="text/javascript" charset="utf-8">
+      concat content_tag(:script, <<-JAVASCRIPT, :type => 'text/javascript', :charset => 'utf-8')
         //<![CDATA[
           #{output}
         //]]>
-        </script>
-      HTML
+      JAVASCRIPT
     end
 
   private
 
-    def realign_indentation(string)
-      lines = string.split(/[\n\r]+/).select(&:present?)
-      basis = lines.first.index(/\S/) # find the first non-whitespace character
-      return lines.map { |s| s.sub(/^\s{#{basis}}/, '') }.join("\n")
+    def render_cs_bundle(bundle, mode)
+      __send__("render_cs_bundle_#{mode}", bundle)
+    end
+
+    def render_cs_bundle_bundled(bundle)
+      content_tag(:script, '', :src => bundle.javascript_url, :type => 'text/javascript', :charset => 'utf-8')
+    end
+
+    def render_cs_bundle_inline(bundle)
+      content_tag(:script, <<-JAVASCRIPT, :type => 'text/javascript', :charset => 'utf-8')
+        //<![CDATA[
+          #{bundle.to_javascript}
+        //]]>
+      JAVASCRIPT
     end
 
   end
 end
 
-ActionView::Base.send(:include, BistroCar::Helpers) if defined?(ActionView::Base)
+ActionView::Base.send(:include, BistroCar::Helpers) if defined?(ActionView::Base)

data/lib/bistro_car.rb

@@ -1,15 +1,28 @@
-require 'coffee-script'
 require 'jsmin'
+require 'tempfile'
 require 'bistro_car/bundle'
 require 'bistro_car/helpers'
 
 module BistroCar
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
+
+  if defined?(Rails::Engine)
+    class Engine < Rails::Engine
+      engine_name :bistro_car
+    end
+  end
   
   class << self
+    def compile(source)
+      file = Tempfile.new('script.coffee')
+      file.write(source)
+      file.close
+      %x(coffee -p #{file.path})
+    end
+  
     attr_accessor :mode, :minify
   end
 end
 
 BistroCar.mode = :bundled
-BistroCar.minify = true if defined?(Rails) and Rails.env.production?
+BistroCar.minify = true if defined?(Rails) and Rails.env.production?

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bistro_car
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,39 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +01:00
+date: 2010-03-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: coffee-script
+  name: jsmin
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.6
-    version: 
+        segments: 
+        - 2
+        - 0
+        - 3
+        version: 2.0.3
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jsmin
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: gemcutter
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
-    version: 
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
-    version: 
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :development
+  version_requirements: *id004
 description: |-
   BistroCar serves up {CoffeeScript}[http://jashkenas.github.com/coffee-script/]
   from within your Rails application.
@@ -81,18 +112,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: bistro_car
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: BistroCar serves up {CoffeeScript}[http://jashkenas.github.com/coffee-script/] from within your Rails application.