stitch-rb 0.0.5 → 0.0.6

data/examples/app/index.js

@@ -0,0 +1,3 @@
+require('models/user');
+
+// Do some stuff

data/examples/app/models/orm.js

@@ -0,0 +1 @@
+module.exports = "A ORM";

data/examples/app/models/user.js

@@ -0,0 +1,4 @@
+var ORM = require('models/orm');
+
+var User = Dove.Class.sub();
+User.extend(ORM);

data/examples/compile.rb

@@ -2,4 +2,5 @@ $: << File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require "stitch"
 
-puts Stitch::Package.new(:paths => ["app"], :dependencies => ["lib"]).compile
+# puts Stitch::Package.new(:paths => ["app"], :dependencies => ["lib"]).compile
+puts Stitch::Package.new(:files => ["./app/index.js"], :root => './app', :dependencies => ["lib"]).compile

data/lib/stitch.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "json"
 require "stitch/version"
 

data/lib/stitch/compiler.rb

@@ -4,38 +4,55 @@ module Stitch
       def compilers
         @compilers ||= []
       end
-      
+
       def inherited(child)
         Compiler.compilers.unshift(child)
       end
-      
+
+      def all
+        Compiler.compilers.select {|c| c.enabled? }
+      end
+
+      def source_extensions
+        compilers = all.select {|c| c.source? }
+        compilers.map {|c| c.extensions }.flatten
+      end
+
       def for_extension(extension)
         extension.gsub!(/^\./, "")
-        Compiler.compilers.select(&:enabled?).find do |item| 
-          item.extensions.include?(extension) 
+        all.find do |item|
+          item.extensions.include?(extension)
         end
       end
-      
+
       # Child methods
-      
+
       def extensions(*exts)
         @extensions ||= []
         @extensions |= exts.map(&:to_s)
       end
-      
+
       def enabled(value)
         @enabled = value
       end
-      
+
       def enabled?
         @enabled != false
       end
-      
+
+      def source(value)
+        @source = value
+      end
+
+      def source?
+        @source || false
+      end
+
       def compile(*args)
         self.new.compile(*args)
       end
     end
-    
+
     def compile(filename)
       raise "Re-implement"
     end
@@ -44,4 +61,6 @@ end
 
 # Require default compilers
 require "stitch/compilers/javascript"
-require "stitch/compilers/coffeescript"
+require "stitch/compilers/coffeescript"
+require "stitch/compilers/tmpl"
+require "stitch/compilers/mustache"

data/lib/stitch/compilers/coffeescript.rb

@@ -1,14 +1,16 @@
 module Stitch
   class CoffeeScriptCompiler < Compiler
     extensions :cs, :coffee
-    
+
     enabled begin
       require "coffee-script"
       true
     rescue LoadError
       false
     end
-    
+
+    source true
+
     def compile(path)
       source = File.read(path)
       CoffeeScript.compile(source, :filename => path.to_s)

data/lib/stitch/compilers/javascript.rb

@@ -1,7 +1,9 @@
 module Stitch
   class JavaScriptCompiler < Compiler
     extensions :js
-    
+
+    source true
+
     def compile(path)
       File.read(path)
     end

data/lib/stitch/compilers/mustache.rb

@@ -0,0 +1,11 @@
+module Stitch
+  class MustacheCompiler < Compiler
+    extensions :mustache
+
+    def compile(path)
+      content = File.read(path)
+      %{var template = #{content.to_json};
+        module.exports = (function(view){ return Mustache.to_html(template, view); });}
+    end
+  end
+end

data/lib/stitch/package.rb

@@ -2,23 +2,26 @@ module Stitch
   class Package
     DEFAULTS = {
       :identifier   => "require",
-      :paths        => ["lib"],
+      :paths        => [],
+      :files        => [],
       :dependencies => []
     }
-    
+
     def initialize(options = {})
       options = DEFAULTS.merge(options)
-      
+
       @identifier   = options[:identifier]
-      @paths        = options[:paths]
-      @dependencies = options[:dependencies]
+      @paths        = Array(options[:paths])
+      @files        = Array(options[:files])
+      @root         = options[:root]
+      @dependencies = Array(options[:dependencies])
     end
-    
+
     def compile
       [compile_dependencies, compile_sources].join("\n")
     end
-    
-    protected    
+
+    protected
       def compile_dependencies
         @dependencies.map {|path|
           Source.from_path(path)
@@ -26,12 +29,22 @@ module Stitch
           dep.compile
         }.join("\n")
       end
-    
+
       def compile_sources
-        sources = @paths.map {|path| 
-          Source.from_path(path) 
+        sources = @paths.map {|path|
+          Source.from_path(path)
         }.flatten
-        
+
+        sources |= @files.map {|file|
+          Source.from_file(@root, file)
+        }.flatten
+
+        if sources.any?
+          stitch(sources)
+        end
+      end
+
+      def stitch(sources)
         result = <<-EOF
 (function(/*! Stitch !*/) {
   if (!this.#{@identifier}) {
@@ -84,11 +97,10 @@ module Stitch
   return this.#{@identifier}.define;
 }).call(this)({
         EOF
-
         sources.each_with_index do |source, i|
           result += i == 0 ? "" : ", "
           result += source.name.to_json
-          result += ": function(exports, require, module) {#{source.compile}}"
+          result += ": function(exports, require, module) {\n#{source.compile}\n}"
         end
 
         result += "});\n"

data/lib/stitch/source.rb

@@ -6,9 +6,9 @@ module Stitch
       def from_path(root, path = nil, result = [])
         path ||= root
         path = Pathname.new(path)
-        
+
         if path.directory?
-          path.children.each do |child| 
+          path.children.each do |child|
             from_path(root, child, result)
           end
         else
@@ -17,36 +17,79 @@ module Stitch
         end
         result
       end
+
+      def from_file(root, path = nil, result = [])
+        unless path
+          path = root
+          root = root.dirname
+        end
+
+        source = self.new(root, path)
+        source.requires.each do |child|
+          from_file(root, child, result)
+        end
+
+        raise "Recursive" if result.include?(source)
+        result << source
+      end
+
+      def resolve(path, relative_to)
+        path        = Pathname.new(path)
+        relative_to = Pathname.new(relative_to)
+
+        unless path.absolute?
+          path = path.expand_path(relative_to)
+        end
+
+        return path if path.exist?
+
+        Compiler.source_extensions.each do |ext|
+          candidate = Pathname.new(path.to_s + "." + ext)
+          return candidate if candidate.exist?
+        end
+
+        raise "#{path} not found"
+      end
     end
-    
+
     attr_reader :root, :path
-    
+
     def initialize(root, path)
-      @root = Pathname.new(root)
-      @path = Pathname.new(path)
+      @root = Pathname.new(root).expand_path
+      @path = Pathname.new(path).expand_path
     end
-        
+
     def name
       name = path.relative_path_from(root)
       name = name.dirname + name.basename(".*")
       name.to_s
     end
-    
+
     def ext
       path.extname
     end
-    
+
     def compile
       compiler.compile(path)
     end
-    
+
     def valid?
       !!compiler
     end
-    
-    protected  
+
+    def requires
+      return [] unless source?
+      requires = path.read.scan(/require\(("|')(.+)\1\)/)
+      requires.map {|(_, pn)| self.class.resolve(pn, root) }
+    end
+
+    protected
+      def source?
+        valid? && compiler.source?
+      end
+
       def compiler
-        Compiler.for_extension(ext)
+        @compiler ||= Compiler.for_extension(ext)
       end
   end
 end

data/lib/stitch/version.rb

@@ -1,3 +1,3 @@
 module Stitch
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stitch-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-12-03 00:00:00.000000000Z
 dependencies: []
 description: A JavaScript package manager
 email:
@@ -24,7 +24,10 @@ files:
 - README.md
 - Rakefile
 - examples/.DS_Store
-- examples/app/controllers/controller.coffee
+- examples/app/controllers/users.coffee
+- examples/app/index.js
+- examples/app/models/orm.js
+- examples/app/models/user.js
 - examples/compile.rb
 - examples/lib/jquery.js
 - examples/lib/lib.coffee
@@ -33,6 +36,7 @@ files:
 - lib/stitch/compiler.rb
 - lib/stitch/compilers/coffeescript.rb
 - lib/stitch/compilers/javascript.rb
+- lib/stitch/compilers/mustache.rb
 - lib/stitch/compilers/tmpl.rb
 - lib/stitch/package.rb
 - lib/stitch/server.rb
@@ -59,7 +63,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: Stitch ported to Ruby