opal-native 0.0.2 → 0.0.3

data/README.md

@@ -2,10 +2,10 @@ Opal support for automagical native bridging
 ============================================
 
 This gem gives to Opal a standard API to implement bridges to native objects and glue-less native
-access and usage with the 'Object()` helper function.
+access and usage with the `Native()` helper function.
 
 ```ruby
-o = Object(`$opal`)
+o = Native(`$opal`)
 
 o.global.console            # this will access the global console object and return it
 o.global.console.log('wut') # this will call the log function on the console object

data/Rakefile

@@ -10,9 +10,9 @@ task :build => :dependencies do
 	Opal::Builder.new(files: 'lib', out: 'build/opal-native.js').build
 end
 
-desc 'Build latest opal-native ready for testing to build dir'
-task :test => :dependencies do
-	Opal::Builder.new(files: %w[lib spec], debug: true, out: 'build/opal-native.test.js').build
+desc 'Run specs in spec/'
+task :test => :build do
+  Opal::Context.runner 'spec/**/*.rb'
 end
 
 task :default => :build

data/lib/opal/native.rb

@@ -8,113 +8,21 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-class Module
-	%x{
-		function define_attr_bridge (klass, target, name, getter, setter) {
-			if (getter) {
-				$opal.defn(klass, $opal.mid_to_jsid(name), function() {
-					var real = target;
-
-					if (#{Symbol == `target`}) {
-						real = target[0] == '@' ? this[target.substr(1)] : this[$opal.mid_to_jsid(target)].apply(this);
-					}
-
-					var result = real[name];
-
-					return result == null ? nil : result;
-				});
-			}
-
-			if (setter) {
-				$opal.defn(klass, $opal.mid_to_jsid(name + '='), function (block, val) {
-					var real = target;
-
-					if (#{Symbol === `target`}) {
-						real = target[0] == '@' ? this[target.substr(1)] : this[$opal.mid_to_jsid(target)].apply(this);
-					}
-
-					return real[name] = val;
-				});
-			}
-		}
-	}
-
-	def attr_accessor_bridge (target, *attrs)
-		%x{
-			for (var i = 0, length = attrs.length; i < length; i++) {
-				define_attr_bridge(this, target, attrs[i], true, true);
-			}
-		}
-
-		self
-	end
-
-	def attr_reader_bridge (target, *attrs)
-		%x{
-			for (var i = 0, length = attrs.length; i < length; i++) {
-				define_attr_bridge(this, target, attrs[i], true, false);
-			}
-		}
-
-		self
-	end
-
-	def attr_writer_bridge (target, *attrs)
-		%x{
-			for (var i = 0, length = attrs.length; i < length; i++) {
-				define_attr_bridge(this, target, attrs[i], false, true);
-			}
-		}
-
-		self
-	end
-
-	def attr_bridge (target, name, setter = false)
-		`define_attr_bridge(this, target, name, true, setter)`
-
-		self
-	end
-
-	def define_method_bridge (object, name, ali = nil)
-		%x{
-			var self = this;
-
-			$opal.defn(self, $opal.mid_to_jsid(#{ali || name}), function () {
-				var real = object;
-
-				if (#{Symbol === object}) {
-					real = object[0] == '@' ? self[object.substr(1)] : self[$opal.mid_to_jsid(object)].apply(self);
-				}
-
-				return real[name].apply(real, arguments);
-			});
-		}
-
-		nil
+module Native
+	def self.=== (other)
+		`#{other} == null || !#{other}.o$klass`
 	end
-end
-
-module Kernel
-	def define_singleton_method_bridge (object, name, ali = nil)
-		%x{
-			var self = this;
 
-			$opal.defs(this, $opal.mid_to_jsid(#{ali || name}), function () {
-				var real = object;
-
-				if (#{Symbol === object}) {
-					real = object[0] == '@' ? self[object.substr(1)] : self[$opal.mid_to_jsid(object)].apply(self);
-				}
+	def self.send (object, name, *args, &block)
+		args << block if block
 
-				return real[name].apply(real, arguments);
-			});
+		args = args.map {|obj|
+			Native === obj ? obj : obj.to_native
 		}
 
-		nil
+		Kernel.Native(`object[name].apply(object, args)`)
 	end
-end
 
-module Native
 	def self.included (klass)
 		class << klass
 			def from_native (object)
@@ -134,10 +42,12 @@ module Native
 		@native
 	end
 
-	def native_send (name, *args)
-		return method_missing(name, *args) unless Opal.function? `#@native[name]`
+	def native_send (name, *args, &block)
+		unless Proc === `#@native[name]`
+			raise NoMethodError, "undefined method `#{name}` for #{`#@native.toString()`}"
+		end
 
-		`#@native[name].apply(#@native, args)`
+		Native.send(@native, name, *args, &block)
 	end
 
 	alias __native_send__ native_send
@@ -153,32 +63,18 @@ class Native::Object
 		update!
 	end
 
-	def update! (name = nil)
-		unless name
-			%x{
-				for (var name in #@native) {
-					#{update!(`name`)}
-				}
-			}
+	def [] (name)
+		Kernel.Native(`#@native[name]`)
+	end
 
-			return
-		end
+	def []= (name, value)
+		value = value.to_native unless Native === value
 
-		if Opal.function? `#@native[name]`
-			define_singleton_method_bridge @native, name
+		`#@native[name] = #{value}`
 
-			if respond_to? "#{name}="
-				singleton_class.undef_method "#{name}="
-			end
-		else
-			define_singleton_method name do
-				self[name]
-			end
+		update!(name)
 
-			define_singleton_method "#{name}=" do |value|
-				self[name] = value
-			end
-		end
+		value
 	end
 
 	def each
@@ -186,7 +82,7 @@ class Native::Object
 
 		%x{
 			for (var name in #@native) {
-				#{yield Kernel.Object(`name`), Kernel.Object(`#@native[name]`)}
+				#{yield Kernel.Native(`name`), Kernel.Native(`#@native[name]`)}
 			}
 		}
 
@@ -198,7 +94,7 @@ class Native::Object
 
 		%x{
 			for (var name in #@native) {
-				#{yield Kernel.Object(`name`)}
+				#{yield Kernel.Native(`name`)}
 			}
 		}
 
@@ -210,33 +106,23 @@ class Native::Object
 
 		%x{
 			for (var name in #@native) {
-				#{yield Kernel.Object(`#@native[name]`)}
+				#{yield Kernel.Native(`#@native[name]`)}
 			}
 		}
 	end
 
-	def [] (name)
-		Kernel.Object(`#@native[name] || nil`)
+	def inspect
+		"#<Native: #{`#@native.toString()`}>"
 	end
 
-	def []= (name, value)
-		value = value.to_native unless Opal.native?(value)
-
-		`#@native[name] = #{value}`
-
-		update!(name)
-
-		value
+	def keys
+		each_key.to_a
 	end
 
 	def nil?
 		`#@native === null || #@native === undefined`
 	end
 
-	def inspect
-		"#<Native: #{`#@native.toString()`}>"
-	end
-
 	def to_s
 		`#@native.toString()`
 	end
@@ -244,11 +130,47 @@ class Native::Object
 	def to_hash
 		Hash[to_a]
 	end
+
+	def values
+		each_value.to_a
+	end
+
+	def update! (name = nil)
+		unless name
+			%x{
+				for (var name in #@native) {
+					#{update!(`name`)}
+				}
+			}
+
+			return
+		end
+
+		if Proc === `#@native[name]`
+			define_singleton_method name do |*args, &block|
+				__native_send__(name, *args, &block)
+			end
+
+			if respond_to? "#{name}="
+				singleton_class.undef_method "#{name}="
+			end
+		else
+			define_singleton_method name do
+				self[name]
+			end
+
+			define_singleton_method "#{name}=" do |value|
+				self[name] = value
+			end
+		end
+	end
 end
 
 module Kernel
-	def Object (object)
-		Opal.native?(object) ? Native::Object.new(object) : object
+	def Native (object)
+		return if `object == null`
+
+		Native === object ? Native::Object.new(object) : object
 	end
 end
 
@@ -266,7 +188,7 @@ end
 
 class Array
 	def to_native
-		map { |obj| Opal.object?(obj) ? obj.to_native : obj }
+		map { |obj| Native === obj ? obj : obj.to_native }
 	end
 end
 
@@ -280,7 +202,7 @@ class Hash
 				var key   = map[assoc][0],
 						value = map[assoc][1];
 
-				result[key] = #{Opal.native?(`value`)} ? value : #{`value`.to_native};
+				result[key] = #{Native === `value` ? `value` : `value`.to_native};
 			}
 
 			return result;
@@ -310,7 +232,9 @@ class Proc
 			var self = this;
 
 			return (function () {
-				return self.apply(self.$S, arguments);
+				return self.apply(self.$S, [null].concat(#{
+					`$slice.call(arguments)`.map { |o| Kernel.Native(o) }
+				}));
 			});
 		}
 	end
@@ -327,3 +251,5 @@ class String
 		`this.valueOf()`
 	end
 end
+
+require 'native/bridge'

data/lib/opal/native/bridge.rb

@@ -0,0 +1,123 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Module
+	def define_attr_bridge (target, name, getter, setter)
+		if getter
+			if Symbol === target
+				if target.start_with? '@'
+					define_method name do
+						object = instance_variable_get(target)
+
+						Kernel.Native(`#{Native === object ? object : object.to_native}[name]`)
+					end
+				else
+					define_method name do
+						object = __send__(target)
+
+						Kernel.Native(`#{Native === object ? object : object.to_native}[name]`)
+					end
+				end
+			else
+				define_method name do |*args, &block|
+					Kernel.Native(`target[name]`)
+				end
+			end
+		end
+
+		if setter
+			if Symbol === target
+				if target.start_with? '@'
+					define_method "#{name}=" do |value|
+						object = instance_variable_get(target)
+						value  = value.to_native unless Native === value
+
+						Kernel.Native(`#{Native === object ? object : object.to_native}[name] = value`)
+					end
+				else
+					define_method "#{name}=" do |value|
+						object = __send__(target)
+						value  = value.to_native unless Native === value
+
+						Kernel.Native(`#{Native === object ? object : object.to_native}[name] = value`)
+					end
+				end
+			else
+				define_method "#{name}=" do |value|
+					value = value.to_native unless Native === value
+
+					Kernel.Native(`target[name] = value`)
+				end
+			end
+		end
+	end
+
+	def attr_accessor_bridge (target, *attrs)
+		attrs.each {|attr|
+			define_attr_bridge(target, attr, true, true)
+		}
+
+		self
+	end
+
+	def attr_reader_bridge (target, *attrs)
+		attrs.each {|attr|
+			define_attr_bridge(target, attr, true, false)
+		}
+
+		self
+	end
+
+	def attr_writer_bridge (target, *attrs)
+		attrs.each { |attr|
+			define_attr_bridge(target, attr, false, true)
+		}
+
+		self
+	end
+
+	def attr_bridge (target, name, setter = false)
+		define_attr_bridge(target, name, true, setter)
+
+		self
+	end
+
+	def define_method_bridge (target, name, ali = nil)
+		if Symbol === target
+			if target.start_with? '@'
+				define_method ali || name do |*args, &block|
+					object = instance_variable_get(target)
+
+					Native.send(Native === object ? object : object.to_native, name, *args, &block)
+				end
+			else
+				define_method ali || name do |*args, &block|
+					object = __send__(target)
+
+					Native.send(Native === object ? object : object.to_native, name, *args, &block)
+				end
+			end
+		else
+			define_method ali || name do |*args, &block|
+				Native.send(target, name, *args, &block)
+			end
+		end
+
+		nil
+	end
+end
+
+module Kernel
+	def define_singleton_method_bridge (target, name, ali = nil)
+		define_singleton_method ali || name do |*args, &block|
+			Native.send(target, name, *args, &block)
+		end
+	end
+end

data/opal-native.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name         = 'opal-native'
-	s.version      = '0.0.2'
+	s.version      = '0.0.3'
 	s.author       = 'meh.'
 	s.email        = 'meh@paranoici.org'
 	s.homepage     = 'http://github.com/opal/opal-native'
@@ -12,5 +12,5 @@ Gem::Specification.new {|s|
 	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 	s.require_paths = ['lib']
 
-	s.add_development_dependency 'opal-spec'
+	# s.add_dependency 'opal-spec'
 }

data/spec/bridge_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Native do
+	before do
+		@object = object = `{
+			a: 23,
+
+			b: function () {
+				return 1337;
+			}
+		}`
+
+		@test = Class.new {
+			attr_accessor_bridge object, :a
+
+			define_method_bridge object, :b
+
+			define_singleton_method_bridge object, :b, :c
+		}
+	end
+
+	it 'bridges correctly accessors' do
+		test = @test.new
+
+		`#@object.a`.should == 23
+		`#@object.a = 42`
+		`#@object.a`.should == 42
+
+		test.a.should == 42
+
+		test.a = 23
+		test.a.should == 23
+		`#@object.a`.should == 23
+	end
+
+	it 'bridges correctly methods' do
+		@test.new.b.should == 1337
+	end
+
+	it 'bridges correctly singleton methods' do
+		@test.c.should == 1337
+	end
+end

data/spec/native_spec.rb

@@ -1,11 +1,17 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-class Test
-	include Native
-end
-
 describe Native do
+	before do
+		@test = Class.new {
+			include Native
+		}
+	end
+
 	it 'creates a working object' do
-		Test.new(42).to_native.should == 42
+		@test.new(42).to_native.should == 42
+	end
+
+	it 'sends calls properly' do
+		@test.new(42).native_send(:toString, 16).should == '2a'
 	end
 end

data/spec/object_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Native::Object do
+	before do
+		@object = `{
+			a: 42,
+
+			b: function () {
+				return 42;
+			},
+
+			c: function () {
+				return { a: 23 };
+			},
+
+			d: function (a, h) {
+				return h({a: a});
+			}
+		}`
+
+		@test = Kernel.Native(@object)
+	end
+
+	it 'wraps an object properly' do
+		`#{@test.to_native} == #{@object}`.should be_true
+	end
+
+	it 'makes an accessor properly' do
+		@test.a.should == 42
+		@test.a = 23
+		@test.a.should == 23
+		`#@object.a`.should == 23
+	end
+
+	it 'calls a function as a method when present' do
+		@test.b.should == 42
+	end
+
+	it 'calls a function as a method when present and returns a Native' do
+		@test.c.a.should == 23
+	end
+
+	it 'calls handlers with proper wrapping' do
+		@test.d(23) { |o| o.a }.should == 23
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-native
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: opal-spec
-  requirement: &15880980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *15880980
+date: 2012-01-21 00:00:00.000000000 Z
+dependencies: []
 description: 
 email: meh@paranoici.org
 executables: []
@@ -32,8 +21,11 @@ files:
 - README.md
 - Rakefile
 - lib/opal/native.rb
+- lib/opal/native/bridge.rb
 - opal-native.gemspec
+- spec/bridge_spec.rb
 - spec/native_spec.rb
+- spec/object_spec.rb
 - spec/spec_helper.rb
 - spec/spec_runner.html
 homepage: http://github.com/opal/opal-native
@@ -61,6 +53,8 @@ signing_key:
 specification_version: 3
 summary: Easy support for native objects in Opal
 test_files:
+- spec/bridge_spec.rb
 - spec/native_spec.rb
+- spec/object_spec.rb
 - spec/spec_helper.rb
 - spec/spec_runner.html