bellejs 0.1.0 → 0.3.0

data/lib/bellejs/belle_transpiler.rb

@@ -2,7 +2,7 @@ require "rbelly" # javascript parser
 
 class BelleTranspiler
 
-  BELLEJS_NODE_CLASSES = [RBelly::Nodes::ImportNode, RBelly::Nodes::ClassNode]
+  BELLEJS_NODE_CLASSES = [RBelly::Nodes::ImportNode, RBelly::Nodes::ClassNode, RBelly::Nodes::ExtendsNode, RBelly::Nodes::BellejsVarStatementNode, RBelly::Nodes::BellejsFuncStatementNode]
   LINE_END = RBelly::Nodes::ExpressionStatementNode
 
   def initialize(file_contents, local_dir)
@@ -41,6 +41,10 @@ class BelleTranspiler
         process_import bellejs_statement
       when RBelly::Nodes::ClassNode
         process_class bellejs_statement
+      when RBelly::Nodes::BellejsVarStatementNode
+        process_var_statement bellejs_statement
+      when RBelly::Nodes::BellejsFuncStatementNode
+        process_function bellejs_statement
       else
         bellejs_statement
     end
@@ -53,7 +57,61 @@ class BelleTranspiler
   end
 
   def process_class(class_statement)
-    class_as_function = @parser.parse("function #{class_statement.value}() #{class_statement.class_body.to_ecma}")
+    compiled_class = "function #{class_statement.value}() #{class_statement.class_body.to_ecma}"
+    unless class_statement.parent.nil?
+       inheritance_prototype = process_extends(class_statement.value, class_statement.parent)
+       compiled_class = compiled_class + "\n" + inheritance_prototype
+    end
+    @parser.parse compiled_class
+  end
+
+  def process_extends(class_name, parent)
+     parent_name = parent.parent
+    "#{class_name}.prototype = new #{parent_name}();"
+  end
+
+  def process_var_statement(var_statement)
+    visibility = var_statement.value
+    js_decl_statement = var_statement.var_statement.value.first
+    var_name = js_decl_statement.name
+    var_value = (js_decl_statement.value == nil ? nil : js_decl_statement.value.value.value)
+    var_value = js_decl_statement.value.value.to_ecma if var_value.class == Array
+    var_value_statement = (var_value.nil? ? ";" : " = " + var_value.to_s + ";")
+    is_constant = js_decl_statement.constant?
+
+    if visibility == 'public'
+      compiled_string =  "this.#{var_name}#{var_value_statement}"
+    else
+      if visibility == 'private'
+          compiled_string = (is_constant ? "const" : "var") + " #{var_name}#{var_value_statement}"
+      else
+        raise "invalid variable declaration"
+      end
+    end
+    @parser.parse compiled_string
+  end
+
+  def process_function(function_statement)
+    visibility = function_statement.value
+    func_name = function_statement.func_statement.value
+    func_body = function_statement.func_statement.function_body.to_ecma
+    func_args = function_statement.func_statement.arguments
+    func_args_string = String.new
+    unless func_args.nil?
+      func_args.each do |arg|
+        func_args_string += arg.value.to_s + (arg != func_args.last ? ", " : "")
+      end
+    end
+    if visibility == 'public'
+      compiled_string =  "this.#{func_name} = function(#{func_args_string})#{func_body}"
+    else
+      if visibility == 'private'
+        compiled_string = "function #{func_name}(#{func_args_string})#{func_body}"
+      else
+        raise "invalid function declaration"
+      end
+    end
+    @parser.parse compiled_string
   end
 
   # debug helpers:

data/lib/bellejs/version.rb

@@ -1,3 +1,3 @@
 class Bellejs
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/bellejs.rb

@@ -45,7 +45,7 @@ class Bellejs
   end
 
   def uglify_js
-    @compiled_js = Uglifier.compile(@compiled_js, :mangle => false)
+    @compiled_js = Uglifier.compile(@compiled_js, :compress => {:unused => false, })
   end
 
   def write

data/test/test_belle_transpiler_class.rb

@@ -12,4 +12,20 @@ class TestBelleTranspilerClass < Test::Unit::TestCase
     assert_equal File.read("#{TEST_FILE_DIRECTORY}class_test.js"), File.read("#{TEST_FILE_DIRECTORY}non_complied_class_test.js")
   end
 
+  def test_extends_statement
+    file_path = TEST_FILE_DIRECTORY + 'extends_test.bellejs'
+    bellejs = Bellejs.new(file_path)
+    result = File.read("#{TEST_FILE_DIRECTORY}extends_test.js")
+    comparison = File.read("#{TEST_FILE_DIRECTORY}non_compiled_extends_test.js")
+    assert_equal result, comparison
+  end
+
+  def test_private_public_statement
+    file_path = TEST_FILE_DIRECTORY + 'private_public_test.bellejs'
+    bellejs = Bellejs.new(file_path)
+    result = File.read("#{TEST_FILE_DIRECTORY}private_public_test.js")
+    comparison = File.read("#{TEST_FILE_DIRECTORY}noncompiled_private_public_test.js")
+    assert_equal result, comparison
+  end
+
 end

data/test/test_files/extends_test.bellejs

@@ -0,0 +1,15 @@
+class Animal {
+    this.makeNoise = function () {
+        alert("-rustle-");
+    }
+}
+
+class Wolf extends Animal {
+    this.howl = function () {
+        alert("Hooooooowlllllll!");
+    }
+
+    this.makeNoise = function () {
+        this.howl();
+    }
+}

data/test/test_files/non_compiled_extends_test.js

@@ -0,0 +1,14 @@
+function Animal(){
+  this.makeNoise = function() {
+    alert("-rustle-");
+  };
+}
+function Wolf(){
+  this.howl = function() {
+    alert("Hooooooowlllllll!");
+  };
+  this.makeNoise = function() {
+    this.howl();
+  };
+}
+Wolf.prototype = new Animal();

data/test/test_files/noncompiled_private_public_test.js

@@ -0,0 +1,12 @@
+function Alligator(){
+    var tooth;
+    var genitals = "thing";
+    this.face = 2345;
+    this.tail = ['scaly', 'green', 'long'];
+      function pickNose(){
+    alert("adsf");
+  }
+    this.walk = function(arg1, arg2) {
+    alert(this.face);
+  };
+}

data/test/test_files/private_public_test.bellejs

@@ -0,0 +1,16 @@
+class Alligator {
+
+    private var tooth;
+    private var genitals = "thing";
+    public var face = 2345;
+    public var tail = ['scaly','green','long']
+
+    private function pickNose() {
+        alert("adsf");
+    }
+
+    public function walk(arg1, arg2) {
+       alert(this.face);
+    }
+
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellejs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbelly
@@ -97,29 +97,19 @@ files:
 - test/test_belle_transpiler_import.rb
 - test/test_bellejs.rb
 - test/test_files/class_test.bellejs
+- test/test_files/extends_test.bellejs
 - test/test_files/import_test.bellejs
 - test/test_files/import_test.js
+- test/test_files/non_compiled_extends_test.js
 - test/test_files/non_complied_class_test.js
+- test/test_files/noncompiled_private_public_test.js
+- test/test_files/private_public_test.bellejs
 - test/test_files/recursive_double_import.bellejs
 - test/test_files/recursive_double_import.js
 - test/test_files/recursive_import_test.bellejs
 - test/test_files/recursive_import_test.js
 - test/test_files/simple_javascript.bellejs
 - test/test_files/simple_javascript.js
-- test/test_files/subdir/13617/output_test2.js
-- test/test_files/subdir/17210/output_test2.js
-- test/test_files/subdir/31452/output_test2.js
-- test/test_files/subdir/327/output_test2.js
-- test/test_files/subdir/3631/output_test2.js
-- test/test_files/subdir/51024/output_test2.js
-- test/test_files/subdir/57182/output_test2.js
-- test/test_files/subdir/60145/output_test2.js
-- test/test_files/subdir/72175/output_test2.js
-- test/test_files/subdir/73350/output_test2.js
-- test/test_files/subdir/81401/output_test2.js
-- test/test_files/subdir/84914/output_test2.js
-- test/test_files/subdir/91780/output_test2.js
-- test/test_files/subdir/99826/output_test2.js
 - test/test_files/subdir/output_test.js
 - test/test_files/subdir/test_file_NaME.js
 - test/test_files/subdir_import_test.bellejs
@@ -156,29 +146,19 @@ test_files:
 - test/test_belle_transpiler_import.rb
 - test/test_bellejs.rb
 - test/test_files/class_test.bellejs
+- test/test_files/extends_test.bellejs
 - test/test_files/import_test.bellejs
 - test/test_files/import_test.js
+- test/test_files/non_compiled_extends_test.js
 - test/test_files/non_complied_class_test.js
+- test/test_files/noncompiled_private_public_test.js
+- test/test_files/private_public_test.bellejs
 - test/test_files/recursive_double_import.bellejs
 - test/test_files/recursive_double_import.js
 - test/test_files/recursive_import_test.bellejs
 - test/test_files/recursive_import_test.js
 - test/test_files/simple_javascript.bellejs
 - test/test_files/simple_javascript.js
-- test/test_files/subdir/13617/output_test2.js
-- test/test_files/subdir/17210/output_test2.js
-- test/test_files/subdir/31452/output_test2.js
-- test/test_files/subdir/327/output_test2.js
-- test/test_files/subdir/3631/output_test2.js
-- test/test_files/subdir/51024/output_test2.js
-- test/test_files/subdir/57182/output_test2.js
-- test/test_files/subdir/60145/output_test2.js
-- test/test_files/subdir/72175/output_test2.js
-- test/test_files/subdir/73350/output_test2.js
-- test/test_files/subdir/81401/output_test2.js
-- test/test_files/subdir/84914/output_test2.js
-- test/test_files/subdir/91780/output_test2.js
-- test/test_files/subdir/99826/output_test2.js
 - test/test_files/subdir/output_test.js
 - test/test_files/subdir/test_file_NaME.js
 - test/test_files/subdir_import_test.bellejs

data/test/test_files/subdir/13617/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/17210/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/31452/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/327/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/3631/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/51024/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/57182/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/60145/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/72175/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/73350/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/81401/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/84914/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/91780/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}

data/test/test_files/subdir/99826/output_test2.js

@@ -1,15 +0,0 @@
-alert("Hey this is an alert");
-$(document).ready(doStuff);
-$('a.important_tag').click(function() {
-  if(doStuff()) {
-    $(this).attr("href", "www.google.com/");
-  }
-});
-function doStuff(){
-  var number = 9 * 12 - 19 + 2;
-  if(number == 200) {
-    return true;
-  } else {
-    return false;
-  }
-}