dependence 0.0.93 → 0.0.94

data/bin/dependence

@@ -8,10 +8,9 @@ require 'optparse'
 class DependenceCompiler
   def initialize(config)
     @config = config
-    @src_glob = "**/*.#{@config[:type]}"
+    @src_glob = "**/*"
     @concatenator = Dependence::Concatenator.new(
-      :load_path => @config[:src_dir],
-      :source_type => @src_glob
+      :load_path => @config[:src_dir]
     )
   end
 
@@ -42,9 +41,11 @@ class DependenceCompiler
     @concatenator.concat do |module_name, module_content|
       stdout_compile_msg(module_name)
       FileUtils::mkdir_p @config[:output]
+
+      compiled = module_content
+      compiled = ModuleInjector.modularize(module_name, module_content) unless @config[:bare]
+
       output = File.join(@config[:output], "#{module_name}.js")
-      compiled = compile_code(module_content)
-      compiled = ModuleInjector.modularize(module_name, compiled) unless @config[:bare]
       File.open(output, 'w') { |f| f.syswrite compiled }
 
       stdout_compile_complete_msg(module_name, output)
@@ -60,11 +61,6 @@ class DependenceCompiler
     puts Colors.green("Compiled #{module_name} to #{output}")
   end
 
-  def compile_code(raw_code)
-    return CoffeeScript.compile(raw_code, :bare => true) if @config[:type] == "coffee"
-    raw_code
-  end
-
   def compress_code(source_file)
     JsCompiler.new(source_file).compile
   end
@@ -73,7 +69,6 @@ end
 
 options = {
   :output   => ".",
-  :type     => "js",
   :watch    => false,
   :bare     => false,
   :compress => false
@@ -87,7 +82,6 @@ OptionParser.new do |opts|
   end
 
   opts.on("-t", "--type TYPE", "Source file extension [js, coffee]") do |type|
-    options[:type] = type
   end
 
   opts.on("-w", "--watch", "Watch src_dir for changes and recompile") do |bool|

data/lib/dependence/compiler.rb

@@ -0,0 +1,54 @@
+module Dependence
+  class Compiler
+    class << self
+      @@compilers ||= []
+
+      def inherited(compiler)
+        @@compilers << compiler
+      end
+
+      def get_compiler_for(extension)
+        extension.gsub!(/^\./, "")
+        @@compilers.find do |compiler|
+          compiler.extensions.include?(extension.to_sym)
+        end
+      end
+
+      def supported_extensions
+        @@compilers.map { |c| c.extensions }.flatten.map {|e| ".#{e.to_s}" }
+      end
+
+      def compile(*args)
+        self.new.compile(*args)
+      end
+    end
+
+    def compile
+      raise "abstract method"
+    end
+  end
+
+  class CoffeeScriptCompiler < Compiler
+    @@extensions = [:cs, :coffee]
+
+    def self.extensions
+      @@extensions
+    end
+
+    def compile(source_string, options = {})
+      CoffeeScript.compile(source_string, options)
+    end
+  end
+
+  class JavaScriptCompiler < Compiler
+    @@extensions = [:js]
+
+    def self.extensions
+      @@extensions
+    end
+
+    def compile(source_string, options = {})
+      source_string
+    end
+  end
+end 

data/lib/dependence/concatenator.rb

@@ -6,7 +6,7 @@ module Dependence
   class Concatenator
     @@defaults = {
       :load_path    => ".",
-      :source_type  => "**/*.js"
+      :source_type  => "**/*{#{Compiler.supported_extensions.join(',')}}"
     }
 
     def initialize(opts = {})
@@ -42,10 +42,18 @@ module Dependence
 
     def concat_files(file_list)
       content = ""
-      file_list.each { |f| content << File.read(f); content << "\n" }
+      file_list.each do |f| 
+        content << compile_file(f)
+        content << "\n"
+      end
       content
     end
 
+    def compile_file(file)
+      compiler = Compiler.get_compiler_for(File.extname(file))
+      compiler.new.compile(File.read(file))
+    end
+
     # Top level dirs only
     def get_dirs
       Dir.glob("#{@options[:load_path]}/*/**/")

data/lib/dependence.rb

@@ -1,5 +1,6 @@
 require "dependence/dependency_resolver.rb"
 require "dependence/module_injector.rb"
+require "dependence/compiler.rb"
 require "dependence/js_compiler.rb"
 require "dependence/file_watcher.rb"
 require "dependence/concatenator.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependence
 version: !ruby/object:Gem::Version
-  version: 0.0.93
+  version: 0.0.94
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
-  requirement: &2173365880 !ruby/object:Gem::Requirement
+  requirement: &15461820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173365880
+  version_requirements: *15461820
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &2173365440 !ruby/object:Gem::Requirement
+  requirement: &15461380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173365440
+  version_requirements: *15461380
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2173365020 !ruby/object:Gem::Requirement
+  requirement: &15460960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173365020
+  version_requirements: *15460960
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2173364600 !ruby/object:Gem::Requirement
+  requirement: &15460540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173364600
+  version_requirements: *15460540
 description: 
 email: jcarver989@gmail.com
 executables:
@@ -64,12 +64,13 @@ extra_rdoc_files: []
 files:
 - bin/dependence
 - compiler/compiler.jar
+- lib/dependence/compiler.rb
+- lib/dependence/js_compiler.rb
 - lib/dependence/colors.rb
 - lib/dependence/concatenator.rb
-- lib/dependence/dependency_resolver.rb
-- lib/dependence/file_watcher.rb
-- lib/dependence/js_compiler.rb
 - lib/dependence/module_injector.rb
+- lib/dependence/file_watcher.rb
+- lib/dependence/dependency_resolver.rb
 - lib/dependence.rb
 homepage: 
 licenses: []
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An easy way to handle your client side javascript dependencies