divine 0.0.4 → 0.0.5

data/lib/divine/dsl.rb

@@ -130,12 +130,6 @@ module Divine
   class BinaryDefinition < SimpleDefinition
   end
 
-  #
-  # Encapsulation for short binary data type
-  #
-  class ShortBinaryDefinition < SimpleDefinition # Shorted than 256 bytes
-  end
-
   #
   # Encapsulation for string data type
   #
@@ -193,7 +187,6 @@ module Divine
     int16: Integer16Definition,
     int8: Integer8Definition,
     binary: BinaryDefinition,
-    short_binary: ShortBinaryDefinition,
     string: StringDefinition,
     bool: BooleanDefinition,
     list: ListDefinition,
@@ -275,7 +268,49 @@ module Divine
       return nil
     end
 
-    def method_missing(m, *args, &block)
+    def list(*args, &block)
+      _process(:list, *args, &block)
+    end
+
+    def map(*args, &block)
+      _process(:map, *args, &block)
+    end
+    def dint63(*args, &block)
+      _process(:dint63, *args, &block)
+    end
+    def sint64(*args, &block)
+      _process(:sint64, *args, &block)
+    end
+    def sint32(*args, &block)
+      _process(:sint32, *args, &block)
+    end
+    def int32(*args, &block)
+      _process(:int32, *args, &block)
+    end
+    def int24(*args, &block)
+      _process(:int24, *args, &block)
+    end
+    def int16(*args, &block)
+      _process(:int16, *args, &block)
+    end
+    def int8(*args, &block)
+      _process(:int8, *args, &block)
+    end
+    def binary(*args, &block)
+      _process(:binary, *args, &block)
+    end
+    def string(*args, &block)
+      _process(:string, *args, &block)
+    end
+    def bool(*args, &block)
+      _process(:bool, *args, &block)
+    end
+    def ip_number(*args, &block)
+      _process(:ip_number, *args, &block)
+    end
+
+
+    def _process(m, *args, &block)
       #puts "... #{m} #{args.inspect}"
       type = $available_types[m]
       if type
@@ -296,5 +331,9 @@ module Divine
         super.send(m, args, block)
       end
     end
+
+    def method_missing(m, *args, &block)
+      _process(m, *args, &block)
+    end
   end
 end

data/lib/divine/version.rb

@@ -1,4 +1,4 @@
 module Divine
   # Divine Version
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/basic_complex_test/js_test/js_testBasic.js

@@ -35,11 +35,7 @@ function compare_list(lst_1, lst_2){
 
 function serialize(obj){
   var bBuffer = new Buffer(obj);
-  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
-    if (err) {
-      return console.log(err);
-    }
-  });
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer);
 }
 
 function deserialize(){

data/test/basic_complex_test/js_test/js_testComplex.js

@@ -44,11 +44,7 @@ function compare_map2(map_1, map_2){
 
 function serialize(obj){
   var bBuffer = new Buffer(obj);
-  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
-    if (err) {
-      return console.log(err);
-    }
-  });
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer);
 }
 
 function deserialize(){

data/test/binaryTree_test/binaryTree_test.rb

@@ -3,6 +3,7 @@ require 'divine'
 
 struct 'Node' do
   int32 :i32
+  bool  :b
   list  :next_node, :Node  # List of nodes with size equals to 2, just to refer to the next left and right nodes in the tree
 end
 

data/test/binaryTree_test/csharp_test/csharp_test.cs

@@ -27,24 +27,31 @@ namespace test_signed_int
         public static BinaryTree buildObj() {
 		Node root = new Node();
 		root.i32 = 0;
+		root.b = false;
 
 		Node n1_L = new Node();
 		n1_L.i32 = 1;
+		n1_L.b = true;
 
 		Node n1_R = new Node();
 		n1_R.i32 = 2;
+		n1_R.b = false;
 
 		Node n2_L_L = new Node();
 		n2_L_L.i32 = 3;
+		n2_L_L.b = true;
 
 		Node n2_L_R = new Node();
 		n2_L_R.i32 = 4;
+		n2_L_R.b = false;
 
 		Node n2_R_L = new Node();
 		n2_R_L.i32 = 5;
+		n2_R_L.b = true;
 
 		Node n2_R_R = new Node();
 		n2_R_R.i32 = 6;
+		n2_R_R.b = false;
 
 		root.next_node.Add(n1_L);
 		root.next_node.Add(n1_R);
@@ -64,6 +71,7 @@ namespace test_signed_int
         public static void compare(BinaryTree bt1, BinaryTree bt2)
         {
             Assert.AreEqual(bt1.root_node.Count, bt2.root_node.Count);
+	    Assert.AreEqual(bt1.root_node[0].b, bt2.root_node[0].b);
 	    Assert.AreEqual(bt1.root_node[0].i32, bt2.root_node[0].i32);
 	    Assert.AreEqual(bt1.root_node[0].next_node.Count, bt2.root_node[0].next_node.Count);
 	    Assert.AreEqual(bt1.root_node[0].next_node[0].next_node[0].i32,

data/test/binaryTree_test/java_test/JavaTest.java

@@ -28,24 +28,31 @@ public class JavaTest {
 	public BinaryTree buildObj() {
 		final Node root = new Node();
 		root.i32 = 0;
+		root.b = false;
 
 		final Node n1_L = new Node();
 		n1_L.i32 = 1;
+		n1_L.b = true;
 
 		final Node n1_R = new Node();
 		n1_R.i32 = 2;
+		n1_R.b = false;
 
 		final Node n2_L_L = new Node();
 		n2_L_L.i32 = 3;
+		n2_L_L.b = true;
 
 		final Node n2_L_R = new Node();
 		n2_L_R.i32 = 4;
+		n2_L_R.b = false;
 
 		final Node n2_R_L = new Node();
 		n2_R_L.i32 = 5;
+		n2_R_L.b = true;
 
 		final Node n2_R_R = new Node();
 		n2_R_R.i32 = 6;
+		n2_R_R.b = false;
 
 		root.next_node = new ArrayList<Node>() {
 			{
@@ -81,6 +88,8 @@ public class JavaTest {
 	public void compareBinaryTree(BinaryTree bt1, BinaryTree bt2) {
 		org.junit.Assert.assertEquals(bt1.root_node.size(), bt2.root_node
 				.size());
+		org.junit.Assert.assertEquals(bt1.root_node.get(0).b, bt2.root_node
+				.get(0).b);
 		org.junit.Assert.assertEquals(bt1.root_node.get(0).i32, bt2.root_node
 				.get(0).i32);
 		org.junit.Assert.assertEquals(bt1.root_node.get(0).next_node.size(),

data/test/binaryTree_test/js_test/js_test.js

@@ -15,24 +15,31 @@ compareBinaryTree(binaryTree_ser, binaryTree_deser);
 function buildTree(){
     var root = new Node();
     root.i32 = 0;
+    root.b = false;
     
     var n1_L = new Node();
     n1_L.i32 = 1;
+    n1_L.b = true;
 
     var n1_R = new Node();
     n1_R.i32 = 2;
+    n1_R.b = false;
 
     var n2_L_L = new Node();
     n2_L_L.i32 = 3;
+    n2_L_L.b = true;
 
     var n2_L_R = new Node();
     n2_L_R.i32 = 4;
+    n2_L_R.b = false;
 
     var n2_R_L = new Node();
     n2_R_L.i32 = 5;
+    n2_R_L.b = true;
 
     var n2_R_R = new Node();
     n2_R_R.i32 = 6;
+    n2_R_R.b = false;
 
     root.next_node = [n1_L, n1_R];
     n1_L.next_node = [n2_L_L, n2_L_R];
@@ -45,6 +52,7 @@ function buildTree(){
 
 function compareBinaryTree(bt1, bt2){
   assert.equal( bt1.root_node.length, bt2.root_node.length);
+  assert.equal( bt1.root_node[0].b, bt2.root_node[0].b);
   assert.equal( bt1.root_node[0].i32, bt2.root_node[0].i32);
   assert.equal( bt1.root_node[0].next_node.length, bt2.root_node[0].next_node.length);
   assert.equal( bt1.root_node[0].next_node[0].next_node[0].i32, bt2.root_node[0].next_node[0].next_node[0].i32);
@@ -52,11 +60,7 @@ function compareBinaryTree(bt1, bt2){
 
 function serialize(obj){
   var bBuffer = new Buffer(obj);
-  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
-    if (err) {
-      return console.log(err);
-    }
-  });
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer);
 }
 
 function deserialize(){

data/test/binaryTree_test/ruby_test/ruby_test.rb

@@ -29,24 +29,31 @@ class TestBinaryTree < MiniTest::Unit::TestCase
   def buildTree()
     root = BabelTest::Node.new
     root.i32 = 0
+    root.b = false
     
     n1_L = BabelTest::Node.new
     n1_L.i32 = 1
-
+    n1_L.b = true
+    
     n1_R = BabelTest::Node.new
     n1_R.i32 = 2
+    n1_R.b = false
 
     n2_L_L = BabelTest::Node.new
     n2_L_L.i32 = 3
-
+    n2_L_L.b = true
+    
     n2_L_R = BabelTest::Node.new
     n2_L_R.i32 = 4
+    n2_L_R.b = false
 
     n2_R_L = BabelTest::Node.new
     n2_R_L.i32 = 5
+    n2_R_L.b = true
 
     n2_R_R = BabelTest::Node.new
     n2_R_R.i32 = 6
+    n2_R_R.b = false
 
     root.next_node = [n1_L, n1_R]
     n1_L.next_node = [n2_L_L, n2_L_R]
@@ -65,6 +72,7 @@ class TestBinaryTree < MiniTest::Unit::TestCase
   #
   def compare(bt1, bt2)
     assert_equal bt1.root_node.length, bt2.root_node.length
+    assert_equal bt1.root_node[0].b, bt2.root_node[0].b
     assert_equal bt1.root_node[0].i32, bt2.root_node[0].i32
     assert_equal bt1.root_node[0].next_node.length, bt2.root_node[0].next_node.length
     assert_equal bt1.root_node[0].next_node[0].next_node[0].i32, bt2.root_node[0].next_node[0].next_node[0].i32

data/test/complex_test/js_test/js_test.js

@@ -46,11 +46,7 @@ function compare(obj1, obj2){
 
 function serialize(obj){
   var bBuffer = new Buffer(obj);
-  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
-    if (err) {
-      return console.log(err);
-    }
-  });
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer);
 }
 
 function deserialize(){

data/test/dynamic_int_test/js_test/js_test.js

@@ -31,11 +31,7 @@ function compare_list(lst_1, lst_2){
 
 function serialize(obj){
   var bBuffer = new Buffer(obj);
-  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
-    if (err) {
-      return console.log(err);
-    }
-  });
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer);
 }
 
 function deserialize(){

data/test/ipv6_test/js_test/js_test.js

@@ -37,11 +37,7 @@ function compare_list(lst_1, lst_2){
 
 function serialize(obj){
   var bBuffer = new Buffer(obj);
-  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
-    if (err) {
-      return console.log(err);
-    }
-  });
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer);
 }
 
 function deserialize(){

data/test/signed_int_test/js_test/js_test.js

@@ -32,11 +32,7 @@ function compare_list(lst_1, lst_2){
 
 function serialize(obj){
   var bBuffer = new Buffer(obj);
-  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer, function (err) {
-    if (err) {
-      return console.log(err);
-    }
-  });
+  fs.writeFileSync(__dirname +  '/bin.babel.js', bBuffer);
 }
 
 function deserialize(){

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: divine
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Nils Franzen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.2.0
 description: A simple data serialization generator for java, ruby and javascript
 email:
 - nils@franzens.org
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,7 +75,6 @@ files:
 - lib/divine/graph_generator/graph_generator.rb
 - lib/divine/version.rb
 - test/basic_complex_test/basic_complex_test.rb
-- test/basic_complex_test/graph.jpg
 - test/basic_complex_test/java_test/JavaTest.java
 - test/basic_complex_test/js_test/js_testBasic.js
 - test/basic_complex_test/js_test/js_testComplex.js
@@ -101,12 +93,10 @@ files:
 - test/complex_test/ruby_test/ruby_test.rb
 - test/dynamic_int_test/csharp_test/csharp_test.cs
 - test/dynamic_int_test/dynamic_int_test.rb
-- test/dynamic_int_test/graph.jpg
 - test/dynamic_int_test/java_test/JavaTest.java
 - test/dynamic_int_test/js_test/js_test.js
 - test/dynamic_int_test/ruby_test/ruby_test.rb
 - test/ipv6_test/csharp_test/csharp_test.cs
-- test/ipv6_test/graph.jpg
 - test/ipv6_test/ipv6_test.rb
 - test/ipv6_test/java_test/JavaTest.java
 - test/ipv6_test/js_test/js_test.js
@@ -114,7 +104,6 @@ files:
 - test/lib/csharp/nunit.framework.dll
 - test/lib/java/junit.jar
 - test/signed_int_test/csharp_test/csharp_test.cs
-- test/signed_int_test/graph.jpg
 - test/signed_int_test/java_test/JavaTest.java
 - test/signed_int_test/js_test/js_test.js
 - test/signed_int_test/ruby_test/ruby_test.rb
@@ -122,31 +111,29 @@ files:
 - test/unify_test/unify_test.rb
 homepage: https://github.com/franzen/babelphish
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple data serialization generator for java, ruby and javascript
 test_files:
 - test/basic_complex_test/basic_complex_test.rb
-- test/basic_complex_test/graph.jpg
 - test/basic_complex_test/java_test/JavaTest.java
 - test/basic_complex_test/js_test/js_testBasic.js
 - test/basic_complex_test/js_test/js_testComplex.js
@@ -165,12 +152,10 @@ test_files:
 - test/complex_test/ruby_test/ruby_test.rb
 - test/dynamic_int_test/csharp_test/csharp_test.cs
 - test/dynamic_int_test/dynamic_int_test.rb
-- test/dynamic_int_test/graph.jpg
 - test/dynamic_int_test/java_test/JavaTest.java
 - test/dynamic_int_test/js_test/js_test.js
 - test/dynamic_int_test/ruby_test/ruby_test.rb
 - test/ipv6_test/csharp_test/csharp_test.cs
-- test/ipv6_test/graph.jpg
 - test/ipv6_test/ipv6_test.rb
 - test/ipv6_test/java_test/JavaTest.java
 - test/ipv6_test/js_test/js_test.js
@@ -178,7 +163,6 @@ test_files:
 - test/lib/csharp/nunit.framework.dll
 - test/lib/java/junit.jar
 - test/signed_int_test/csharp_test/csharp_test.cs
-- test/signed_int_test/graph.jpg
 - test/signed_int_test/java_test/JavaTest.java
 - test/signed_int_test/js_test/js_test.js
 - test/signed_int_test/ruby_test/ruby_test.rb