barista 0.1.5 → 0.2.0

data/barista.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-04-27}
+  s.date = %q{2010-05-02}
   s.description = %q{Automatically compiles app/scripts/*.coffee to javascript for rails awesomesauce.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/barista.rb",
      "lib/barista/compiler.rb",
      "lib/barista/filter.rb",
+     "lib/barista/framework.rb",
      "lib/barista/tasks/barista.rake",
      "lib/barista/version.rb",
      "lib/generators/barista_install/USAGE",
@@ -37,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.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Transparent coffeescript support for rails 3}
 
   if s.respond_to? :specification_version then

data/lib/barista.rb

@@ -3,8 +3,9 @@ require 'pathname'
 
 module Barista
   
-  autoload :Compiler, 'barista/compiler'
-  autoload :Filter,   'barista/filter' 
+  autoload :Compiler,  'barista/compiler'
+  autoload :Filter,    'barista/filter'
+  autoload :Framework, 'barista/framework'
   
   class << self
     
@@ -18,6 +19,7 @@ module Barista
     
     def root=(value)
       @root = Pathname(value.to_s)
+      Framework.default_framework = nil
     end
     
     def output_root
@@ -28,38 +30,37 @@ module Barista
       @output_root = Pathname(value.to_s)
     end
     
-    def render_path(path)
-      full_path = root.join("#{path.gsub(/(\A\/|\/\Z)/, '')}.coffee")
-      return unless full_path.exist? && full_path.readable?
-      Compiler.compile(full_path.read)
-    rescue SystemCallError
-      nil
-    end
-    
     def compile_file!(file, force = false)
-      file = file.to_s
-      file = root.join(file).to_s unless file.include?(root.to_s)
-      destination_path = file.gsub(/\.(coffee|js)\Z/, '').gsub(root.to_s, output_root.to_s) + ".js"
-      return unless force || should_compile_file?(file, destination_path)
-      Rails.logger.debug "[Barista] Compiling #{file} to #{destination_path}"
+      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)
       File.open(destination_path, "w+") do |f|
-        f.write Compiler.compile(File.read(file))
+        f.write Compiler.compile(File.read(origin_path))
       end
       true
     rescue SystemCallError
       false
     end
     
-    def should_compile_file?(from, to)
-      File.exist?(from) && (!File.exist?(to) || File.mtime(to) < File.mtime(from))
-    end
-    
     def compile_all!(force = false)
-      Dir[root.join("**", "*.coffee")].each {|file| compile_file! file, force }
+      debug "Compiling all coffeescripts"
+      Framework.exposed_coffeescripts.each do |coffeescript|
+        compile_file! coffeescript, force
+      end
       true
     end
     
+    def output_path_for(file)
+      output_root.join(file.to_s.gsub(/^\/+/, '')).to_s.gsub(/\.coffee$/, '.js')
+    end
+    
+    def debug(message)
+      Rails.logger.debug "[Barista] #{message}" if defined?(Rails.logger) && Rails.logger
+    end
+    
     # By default, only add it in dev / test
     def add_filter?
       Rails.env.test? || Rails.env.development?

data/lib/barista/compiler.rb

@@ -29,6 +29,10 @@ module Barista
       @compiled_content.to_s
     end
     
+    def self.dirty?(from, to)
+      File.exist?(from) && (!File.exist?(to) || File.mtime(to) < File.mtime(from))
+    end
+    
     protected
     
     def coffee_options

data/lib/barista/framework.rb

@@ -0,0 +1,60 @@
+module Barista
+  class Framework
+    
+    def self.default_framework
+      @default_framework ||= self.new("default", Barista.root)
+    end
+    
+    def self.default_framework=(value)
+      @default_framework = value
+    end
+    
+    def self.all
+      [default_framework] + (@all ||= [])
+    end
+    
+    def self.exposed_coffeescripts
+      all.inject([]) do |collection, fw|
+        collection + fw.exposed_coffeescripts
+      end.uniq
+    end
+    
+    def self.full_path_for(script)
+      script = script.to_s.gsub(/\.js$/, '.coffee').gsub(/^\/+/, '')
+      all.each do |fw|
+        full_path = fw.full_path_for(script)
+        return full_path, fw if full_path
+      end
+      nil
+    end
+    
+    def self.register(name, root)
+      (@all ||= []) << self.new(name, root)
+    end
+    
+    attr_reader :name, :framework_root
+    
+    def initialize(name, root)
+      @name           = name
+      @framework_root = File.expand_path(root)
+    end
+    
+    def coffeescripts
+      Dir[File.join(@framework_root, "**", "*.coffee")]
+    end
+    
+    def short_name(script)
+      File.expand_path(script).gsub /^#{Regexp.escape(@framework_root)}\/?/, ''
+    end
+    
+    def exposed_coffeescripts
+      coffeescripts.map { |script| short_name(script) }
+    end
+    
+    def full_path_for(name)
+      full_path = File.join(@framework_root, name)
+      File.exist?(full_path) ? full_path : nil
+    end
+    
+  end
+end

data/lib/barista/version.rb

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

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +08:00
+date: 2010-05-02 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +34,7 @@ files:
 - lib/barista.rb
 - lib/barista/compiler.rb
 - lib/barista/filter.rb
+- lib/barista/framework.rb
 - lib/barista/tasks/barista.rake
 - lib/barista/version.rb
 - lib/generators/barista_install/USAGE
@@ -57,20 +53,18 @@ 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.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Transparent coffeescript support for rails 3