mix-language 1.0.2 → 1.0.3

data/bin/mix-compile

@@ -7,9 +7,11 @@ require 'mix-language'
 
 Encoding.default_external = "UTF-8"
 
-unless filename = ARGV[0]
+begin
+  absolute_mix_path = File.absolute_path(ARGV[0])
+rescue
   puts "usage: mix-compile [filename]"
   exit
 end
 
-MixCompiler.new.compile(filename)
+MixCompiler.new.compile_to_file(absolute_mix_path)

data/bin/mixup

@@ -0,0 +1,9 @@
+#! /usr/bin/env ruby
+# encoding: UTF-8
+# 
+# Copyright © 2011-2012 Jesse Sielaff
+# 
+require 'mix-rack'
+
+MixRack.root_dir = File.absolute_path('.')
+Rack::Handler::Thin.run MixRack

data/lib/includes/dom.js

@@ -0,0 +1,6 @@
+/* dom/text.js */
+/* dom/element.js */
+/* dom/div.js */
+/* dom/table.js */
+/* dom/td.js */
+/* dom/tr.js */

data/lib/includes/event.js

@@ -0,0 +1,4 @@
+/* dom/element.js */
+/* dom/event.js */
+/* dom/mouse.js */
+/* dom/drag.js */

data/lib/javascript/ie.js

@@ -0,0 +1,30 @@
+if (!String.prototype.trim)
+{
+  String.prototype.trim = function ()
+  {
+    return this.replace(/^\s+/,'').replace(/\s+$/,'');
+  }
+}
+
+if (!Array.prototype.indexOf)
+{
+  Array.prototype.indexOf = function (item)
+  {
+    var l = this.length;
+    
+    if (l === 0)
+    {
+      return -1;
+    }
+    
+    for (var i = 0; i < l; ++i)
+    {
+      if (this[i] === searchElement)
+      {
+        return i;
+      }
+    }
+    
+    return -1;
+  }
+}

data/lib/mix-rack.rb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+# 
+# Copyright © 2011-2012 Jesse Sielaff
+# 
+require 'rack'
+require_relative './rack/mix-rack'
+require_relative './mix-language'

data/lib/rack/mix-rack.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+# 
+# Copyright © 2011-2012 Jesse Sielaff
+# 
+require_relative '../mix-language.rb'
+
+class MixRack
+  COMPILER = MixCompiler.new
+  
+  def MixRack.root_dir= (dir)
+    @@root = dir
+  end
+  
+  def MixRack.call (env)
+    file_path = File.expand_path("./#{env["PATH_INFO"]}.mix", @@root)
+    js_output_string = COMPILER.compile_to_string(file_path)
+    
+    if File.exists?(file_path)
+      return 200, {"Content-Type" => "application/javascript"}, [js_output_string]
+    else
+      return 404, {"Content-Type" => "text/plain"}, []
+    end
+  end
+end

data/lib/ruby/compiler.rb

@@ -11,35 +11,36 @@ class MixCompiler
     @translator = MixTranslator.new
   end
   
-  def basename (filename)
-    filename.match(/(.*?)(\.mix$|$)/)[1]
-  end
-  
   def combine_strings (js_string, ast_string, symbol_string)
     js_string
       .sub(%%'...Replace with AST nodes...'%, ast_string)
       .sub(%%'...Replace with symbol table...'%, symbol_string)
   end
   
-  def compile (filename)
-    mix_files, js_string = precompile_js(filename)
+  def compile_to_file (absolute_mix_path)
+    js_output_string = compile_to_string(absolute_mix_path)
+    write_js_file(absolute_mix_path, js_output_string)
+  end
+  
+  def compile_to_string (absolute_mix_path)
+    mix_files, js_string = precompile_js(absolute_mix_path)
     mix_tokens = tokenize_mix_files(mix_files)
     mix_node = parse_token_stream(mix_tokens)
     ast_string, symbol_string = translate_to_js(mix_node)
     js_output_string = combine_strings(js_string, ast_string, symbol_string)
-    write_js_file(filename, js_output_string)
+    
+    return js_output_string
     
   rescue SyntaxError => e
-    write_js_file("window.onload = function () { if (console && console.log) console.log(\"SyntaxError: #{e.message}\"); };")
+    "window.onload = function () { if (console && console.log) console.log(\"SyntaxError: #{e.message}\"); };"
   end
   
   def parse_token_stream (mix_tokens)
     @parser.parse(mix_tokens)
   end
   
-  def precompile_js (filename)
-    mix_filename = basename(filename) + '.mix'
-    @precompiler.precompile(mix_filename)
+  def precompile_js (absolute_mix_path)
+    @precompiler.precompile(absolute_mix_path)
   end
   
   def tokenize_mix_files (mix_files)
@@ -52,9 +53,11 @@ class MixCompiler
     @translator.translate(node)
   end
   
-  def write_js_file (filename, js_output_string)
-    js_filename = basename(filename) + '.js'
-    File.open(js_filename,'w') {|f| f.write(js_output_string) }
-    puts "Writing to #{js_filename}"
+  def write_js_file (absolute_mix_path, js_output_string)
+    filename = File.basename(absolute_mix_path, '.mix') + '.js'
+    absolute_js_path = File.expand_path(filename, File.dirname(absolute_mix_path))
+    
+    File.open(absolute_js_path, 'w') {|f| f.write(js_output_string) }
+    puts "Writing to #{filename}"
   end
 end

data/lib/ruby/precompiler.rb

@@ -5,12 +5,14 @@
 require 'strscan'
 
 class MixPrecompiler
+  GEM_INCLUDES_DIR = File.expand_path("../../includes", __FILE__)
+  
   JS_BASE_FILES = %w{
-    env eval object array
-    false function null
-    number string true }
+    env eval ie object
+    array false function
+    null number string true }
   .each_with_object({}) do |x,h|
-    filename = File.expand_path("../../javascript/base/#{x}.js", __FILE__)
+    filename = File.expand_path("../../javascript/#{x}.js", __FILE__)
     h[filename] = File.read(filename)
   end
   
@@ -20,87 +22,77 @@ class MixPrecompiler
     NUMBER OBJECT STRING
     TEXT TRUE =
   
-  def build_js_string
-    @js_string = @js_files.map {|*,script| script }.join ?\n
+  def build_js_string (js_files)
+    native_js = js_files.map {|*,script| script }.join ?\n
     
-    replace_type_variables
-    replace_case_markers
-    minify
+    replace_type_variables!(native_js)
+    replace_case_markers!(native_js)
+    minify!(native_js)
     
-    @js_string = <<-JAVASCRIPT
-mix_result_should_be_undefined=function(){var SYMBOLS='...Replace with symbol table...';#{@js_string};
+<<-JAVASCRIPT
+mix_result_should_be_undefined=function(){var SYMBOLS='...Replace with symbol table...';#{native_js};
 window.onload=function(){startup();evaluate('...Replace with AST nodes...');}}();
 JAVASCRIPT
   end
   
-  def collect_scripts
-    @mix_files = {}
-    @js_files = JS_BASE_FILES.dup
+  def locate_file (path)
+    absolute_path_local = File.expand_path(path, @local_mix_dir)
+    absolute_path_gem = File.expand_path(path, GEM_INCLUDES_DIR)
+    
+    return absolute_path_local if File.exists?(absolute_path_local)
+    return absolute_path_gem if File.exists?(absolute_path_gem)
     
-    scan_mix_file(@primary_filename)
+    puts "could not locate file #{path} in local directory or in gem includes"
+    exit
+  end
+  
+  def minify! (string)
+    string.gsub!(/\s*\/\*.*?\*\/\s*/m, ?\n)
+    string.gsub!(/\s*\n\s*/, ?\n)
+    string.gsub!(/\s*([{;:,=])\s*/, '\1')
+    string.gsub!("\n}", ?})
   end
   
-  def minify
-    @js_string.gsub!(/\s*\/\*.*?\*\/\s*/m, ?\n)
-    @js_string.gsub!(/\s*\n\s*/, ?\n)
-    @js_string.gsub!(/\s*([{;:,=])\s*/, '\1')
-    @js_string.gsub!("\n}", ?})
+  def precompile (absolute_mix_path)
+    @local_mix_dir = File.dirname(absolute_mix_path)
+    @paths_seen = []
+    @files = {"mix" => {}, "js" => {}.merge(JS_BASE_FILES)}
+    
+    @files["mix"][absolute_mix_path] = read_file(absolute_mix_path)
+    js_string = build_js_string(@files["js"])
+    
+    return @files["mix"], js_string
   end
   
-  def precompile (filename)
-    @primary_filename = filename
-    collect_scripts
-    build_js_string
+  def read_file (absolute_path)
+    script = File.read(absolute_path) + ?\n
+    scan_includes(script)
     
-    return @mix_files, @js_string
+    return script
   end
   
-  def replace_case_markers
+  def replace_case_markers! (string)
     MixTranslator::NODE_TYPES.each do |k,v|
-      @js_string.gsub!("case #{k}:","case #{v}:")
+      string.gsub!("case #{k}:","case #{v}:")
     end
   end
   
-  def replace_type_variables
+  def replace_type_variables! (string)
     JS_OBJECT_TYPES.each_with_index do |t,i|
-      @js_string.gsub!("#{t}_TYPE", i.to_s)
+      string.gsub!("#{t}_TYPE", i.to_s)
     end
   end
   
   def scan_includes (script)
     ss = StringScanner.new(script)
-    js_filenames = []
     
-    while ss.scan(/~~\s*(.*)\.(js|mix)\s*\n/)
-      basename = ss[1]
-      type = ss[2]
-      filename = "#{basename}.#{type}"
+    while ss.scan(/^\/\*\s*(.*)\.(js)\s*\*\/\s*\n/) || ss.scan(/^~~\s*(.*)\.(js|mix)\s*\n/)
+      path, ext = ss[1], ss[2]
+      absolute_path = locate_file("#{path}.#{ext}")
       
-      if type == 'mix'
-        unless [@primary_filename, *@mix_files.keys].include?(filename)
-          scan_mix_file(filename)
-        end
-      else
-        js_filenames << filename
-      end
-    end
-    
-    js_filenames.each do |name|
-      filename = File.expand_path("../../javascript/#{name}", __FILE__)
-      next if @js_files.has_key?(filename)
-      @js_files[filename] = File.read(filename)
-    end
-  end
-  
-  def scan_mix_file (filename)
-    unless File.exists? filename
-      puts "no such file #{filename}"
-      exit
+      @paths_seen.include?(absolute_path) ? next : (@paths_seen << absolute_path)
+      
+      @files[ext][absolute_path] = read_file(absolute_path)
     end
-    
-    script = File.read(filename) + ?\n
-    scan_includes(script)
-    
-    @mix_files[filename] = script
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: mix-language
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -11,40 +11,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-07 00:00:00 Z
+date: 2012-01-16 00:00:00 Z
 dependencies: []
 
 description: .
 email: jesse.sielaff@gmail.com
 executables: 
 - mix-compile
+- mixup
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - ./bin/mix-compile
-- ./lib/javascript/base/array.js
-- ./lib/javascript/base/env.js
-- ./lib/javascript/base/eval.js
-- ./lib/javascript/base/false.js
-- ./lib/javascript/base/function.js
-- ./lib/javascript/base/null.js
-- ./lib/javascript/base/number.js
-- ./lib/javascript/base/object.js
-- ./lib/javascript/base/string.js
-- ./lib/javascript/base/true.js
-- ./lib/javascript/dom/div.js
-- ./lib/javascript/dom/drag.js
-- ./lib/javascript/dom/element.js
-- ./lib/javascript/dom/event.js
-- ./lib/javascript/dom/mouse.js
-- ./lib/javascript/dom/table.js
-- ./lib/javascript/dom/td.js
-- ./lib/javascript/dom/text.js
-- ./lib/javascript/dom/tr.js
+- ./bin/mixup
+- ./lib/includes/dom/div.js
+- ./lib/includes/dom/drag.js
+- ./lib/includes/dom/element.js
+- ./lib/includes/dom/event.js
+- ./lib/includes/dom/mouse.js
+- ./lib/includes/dom/table.js
+- ./lib/includes/dom/td.js
+- ./lib/includes/dom/text.js
+- ./lib/includes/dom/tr.js
+- ./lib/includes/dom.js
+- ./lib/includes/event.js
+- ./lib/javascript/array.js
+- ./lib/javascript/env.js
+- ./lib/javascript/eval.js
+- ./lib/javascript/false.js
+- ./lib/javascript/function.js
+- ./lib/javascript/ie.js
+- ./lib/javascript/null.js
+- ./lib/javascript/number.js
+- ./lib/javascript/object.js
+- ./lib/javascript/string.js
+- ./lib/javascript/true.js
 - ./lib/mix-language.rb
+- ./lib/mix-rack.rb
 - ./lib/mix.rb
+- ./lib/rack/mix-rack.rb
 - ./lib/ruby/compiler.rb
 - ./lib/ruby/mix.grammar
 - ./lib/ruby/mix.tab.rb
@@ -54,6 +61,7 @@ files:
 - ./lib/ruby/tokenizer.rb
 - ./lib/ruby/translator.rb
 - bin/mix-compile
+- bin/mixup
 homepage: 
 licenses: []