Fixed bugs in protocol and with call_property function. Added tests for call_property

bryanjos · bryanjos · commit 07b791c493f3 · 2016-02-20T13:45:38.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v0.15.2-dev
+* Bug fixes
+  * Fixed protocol implementations for Integer and Float which where not recognized
+  * Fixed calling properties on non-objects
+
 # v0.15.1
 * Bug fixes
   * Fixed View module so that an element can have multiple elements within
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do
   def project do
     [
       app: :elixir_script,
-      version: "0.15.1",
+      version: "0.15.2-dev",
       elixir: "~> 1.0",
       escript: escript_config,
       deps: deps,
diff --git a/priv/Elixir.js b/priv/Elixir.js
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -6,12 +6,22 @@ import Protocol from './protocol';
 function call_property(item, property){
   let prop = null;
 
-  if(property in item){
+  if(typeof item === "number" || typeof item === "symbol" || typeof item === "boolean" || typeof item === "string"){
+    if(item[property] !== undefined){
       prop = property;
-  }else if(Symbol.for(property) in item){
-    prop = Symbol.for(property);
-  }else{
-    throw new Error(`Property ${property} not found in ${item}`);
+    }else if(item[Symbol.for(property)] !== undefined){
+      prop = Symbol.for(property);
+    }
+  } else {
+    if(property in item){
+      prop = property;
+    }else if(Symbol.for(property) in item){
+      prop = Symbol.for(property);
+    }
+  }
+
+  if(prop === null){
+    throw new Error(`Property ${ property } not found in ${ item }`); 
   }
 
   if(item[prop] instanceof Function){
diff --git a/src/javascript/lib/core/protocol.js b/src/javascript/lib/core/protocol.js
@@ -45,6 +45,10 @@ class Protocol{
   }
 
   hasImplementation(thing) {
+    if (thing === Integer || thing === Float){
+      return this.registry.has(thing);
+    }
+
     return this.registry.has(thing.constructor);
   }
 }
diff --git a/src/javascript/tests/core/functions.spec.js b/src/javascript/tests/core/functions.spec.js
@@ -0,0 +1,17 @@
+var Functions = require('../../lib/core').Functions;
+var expect = require('chai').expect;
+
+describe('Functions', function(){
+
+  it('call_property', function(){
+    expect(Functions.call_property(1, "toString")).to.equal("1");
+    expect(Functions.call_property([], "toString")).to.equal("");
+    expect(Functions.call_property([], "length")).to.equal(0);
+    expect(Functions.call_property("", "toString")).to.equal("");
+    expect(Functions.call_property("", "length")).to.equal(0);
+    expect(Functions.call_property(Symbol("test"), "toString")).to.equal("Symbol(test)");
+    expect(Functions.call_property({completed: false}, "completed")).to.equal(false);
+    expect(Functions.call_property({id: 0}, "id")).to.equal(0);
+  });
+
+});

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do`
`4`	`4`	`def project do`
`5`	`5`	`[`
`6`	`6`	`app: :elixir_script,`
`7`		`- version: "0.15.1",`
	`7`	`+ version: "0.15.2-dev",`
`8`	`8`	`elixir: "~> 1.0",`
`9`	`9`	`escript: escript_config,`
`10`	`10`	`deps: deps,`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ class Protocol{`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`hasImplementation(thing) {`
	`48`	`+ if (thing === Integer \|\| thing === Float){`
	`49`	`+ return this.registry.has(thing);`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`return this.registry.has(thing.constructor);`
`49`	`53`	`}`
`50`	`54`	`}`