reflexion 0.1.10 → 0.1.11

data/src/world.cpp

@@ -250,6 +250,8 @@ namespace Reflex
 		return debug_draw;
 	}
 
+	bool is_view_active (View* view);
+
 	void
 	World::BeginContact (b2Contact* contact)
 	{
@@ -259,6 +261,9 @@ namespace Reflex
 		View* v2 = (View*) contact->GetFixtureB()->GetBody()->GetUserData();
 		if (!v2) return;
 
+		if (!is_view_active(v1) || !is_view_active(v2))
+			return;
+
 		ContactEvent e1(ContactEvent::BEGIN, v2);
 		v1->on_contact(&e1);
 
@@ -275,6 +280,9 @@ namespace Reflex
 		View* v2 = (View*) contact->GetFixtureB()->GetBody()->GetUserData();
 		if (!v2) return;
 
+		if (!is_view_active(v1) || !is_view_active(v2))
+			return;
+
 		ContactEvent e1(ContactEvent::END, v2);
 		v1->on_contact(&e1);
 

data/test/test_selector.rb

@@ -21,7 +21,7 @@ class TestSelector < Test::Unit::TestCase
 
   def test_name ()
     s = sel
-    assert_equal nil, s.name
+    assert_equal '', s.name
     s.name = 'Test'
     assert_equal 'Test', s.name
   end
@@ -46,17 +46,19 @@ class TestSelector < Test::Unit::TestCase
     assert_equal [], s.tags.to_a
   end
 
-  def test_match ()
-    assert_not sel.match(sel name: :A, tag: :T)
-    assert     sel(name: :A).match(sel name: :A)
-    assert_not sel(name: :A).match(sel name: :B)
-    assert     sel(tag: :T1).match(sel tag: :T1)
-    assert_not sel(tag: :T1).match(sel tag: :T2)
-    assert     sel(tag: :T1).match(sel tag: [:T1, :T2])
-    assert_not sel(tag: [:T1, :T2]).match(sel tag: :T1)
-    assert     sel(name: :A, tag: :T1).match(sel name: :A, tag: :T1)
-    assert_not sel(name: :A, tag: :T1).match(sel name: :A)
-    assert_not sel(name: :A, tag: :T1).match(sel tag: :T1)
+  def test_contains ()
+    assert_not sel.contains(sel name: :A, tag: :T)
+    assert     sel(name: :A).contains(sel name: :A)
+    assert_not sel(name: :A).contains(sel name: :B)
+    assert     sel(tag: :T1).contains(sel tag: :T1)
+    assert_not sel(tag: :T1).contains(sel tag: :T2)
+    assert     sel(tag: [:T1, :T2]).contains(sel tag: :T1)
+    assert_not sel(tag: :T1).contains(sel tag: [:T1, :T2])
+    assert     sel(name: :A, tag: :T1).contains(sel name: :A, tag: :T1)
+    assert     sel(name: :A, tag: :T1).contains(sel name: :A)
+    assert     sel(name: :A, tag: :T1).contains(sel tag: :T1)
+    assert_not sel(name: :A).contains(sel name: :A, tag: :T1)
+    assert_not sel(tag: :T1).contains(sel name: :A, tag: :T1)
   end
 
   def test_compare ()

data/test/test_style.rb

@@ -11,7 +11,7 @@ class TestStyle < Test::Unit::TestCase
   end
 
   def test_initialize ()
-    assert_equal nil, style.name
+    assert_equal '',  style.name
     assert_equal 'A', style(name: :A).name
     assert_equal 'A', style{self.name = :A}.name
   end
@@ -24,7 +24,7 @@ class TestStyle < Test::Unit::TestCase
   def test_flow ()
     s = style
 
-    assert_equal [:down, :none], s.flow
+    assert_equal [:right, :down], s.flow
     s.flow = :up
     assert_equal [:up, :none],   s.flow
     s.flow = [:left, :down]
@@ -39,6 +39,7 @@ class TestStyle < Test::Unit::TestCase
     s = style
 
     assert_equal [0, 0, 0, 0], s.margin.to_a.map(&:value)
+=begin
     s.margin   = [1]
     assert_equal [1, 1, 1, 1], s.margin.to_a.map(&:value)
     s.margin   = [1, 2]
@@ -47,8 +48,10 @@ class TestStyle < Test::Unit::TestCase
     assert_equal [1, 2, 3, 2], s.margin.to_a.map(&:value)
     s.margin   = [1, 2, 3, 4]
     assert_equal [1, 2, 3, 4], s.margin.to_a.map(&:value)
+=end
 
     assert_equal [0, 0, 0, 0], s.padding.to_a.map(&:value)
+=begin
     s.padding   = [1]
     assert_equal [1, 1, 1, 1], s.padding.to_a.map(&:value)
     s.padding   = [1, 2]
@@ -57,14 +60,16 @@ class TestStyle < Test::Unit::TestCase
     assert_equal [1, 2, 3, 2], s.padding.to_a.map(&:value)
     s.padding   = [1, 2, 3, 4]
     assert_equal [1, 2, 3, 4], s.padding.to_a.map(&:value)
+=end
   end
 
-  def test_background_color ()
-    assert_equal [0, 0, 0, 1], style.background_color.to_a
+  def test_fill_stroke ()
+    assert_equal [0, 0, 0, 1], style.fill.to_a
+    assert_equal [0, 0, 0, 1], style.stroke.to_a
   end
 
-  def test_background_image ()
-    assert_equal nil, style.background_image
+  def test_image ()
+    assert_equal nil, style.image
   end
 
 end# TestStyle

data/test/test_style_length.rb

@@ -17,18 +17,17 @@ class TestStyleLength < Test::Unit::TestCase
     assert_equal :px, len(100).unit
     assert_equal 100, len(100, :px).value
     assert_equal :px, len(100, :px).unit
-    #assert_equal :%,  len(100, :%).unit
+    assert_equal :%,  len(100, :%).unit
     assert_equal 100, len('100px').value
     assert_equal :px, len('100px').unit
-    #assert_equal :%,  len('100%').unit
+    assert_equal :%,  len('100%').unit
   end
 
   def test_to_s ()
     assert_equal '100px',  len(100,   :px).to_s
-    #assert_equal '100%',   len(100,   :%).to_s
-    #assert_equal '100.5%', len(100.5, :%).to_s
-    assert_raises(Rucy::NativeError) {len.to_s}
-    assert ((len.to_s rescue $!.message)) =~ /InvalidStateError/
+    assert_equal '100%',   len(100,   :%).to_s
+    assert_equal '100.5%', len(100.5, :%).to_s
+    assert_equal '',       len.to_s
   end
 
   def test_inspect ()

data/test/test_view.rb

@@ -84,13 +84,14 @@ class TestView < Test::Unit::TestCase
   def test_style ()
     v = view
     s = v.style
-    assert_equal 0,   s.margin.left.value
-    assert_equal nil, s.margin.left.unit
-    assert ((s.margin.left.to_s rescue $!.message)) =~ /InvalidStateError/
-    s.margin.left = '100px'
-    assert_equal 100,     s.margin.left.value
-    assert_equal :px,     s.margin.left.unit
-    assert_equal '100px', s.margin.left.to_s
+    assert_equal 0,   s.margin_left.value
+    assert_equal nil, s.margin_left.unit
+    assert_equal '',  s.margin_left.to_s
+
+    s.margin_left = '100px'
+    assert_equal 100,     s.margin_left.value
+    assert_equal :px,     s.margin_left.unit
+    assert_equal '100px', s.margin_left.to_s
   end
 
   def test_add_remove_style ()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,8 +108,6 @@ extra_rdoc_files:
 - ".doc/ext/reflex/shape_view.cpp"
 - ".doc/ext/reflex/style.cpp"
 - ".doc/ext/reflex/style_length.cpp"
-- ".doc/ext/reflex/style_length2.cpp"
-- ".doc/ext/reflex/style_length4.cpp"
 - ".doc/ext/reflex/update_event.cpp"
 - ".doc/ext/reflex/view.cpp"
 - ".doc/ext/reflex/wheel_event.cpp"
@@ -142,8 +140,6 @@ files:
 - ext/reflex/shape_view.cpp
 - ext/reflex/style.cpp
 - ext/reflex/style_length.cpp
-- ext/reflex/style_length2.cpp
-- ext/reflex/style_length4.cpp
 - ext/reflex/update_event.cpp
 - ext/reflex/view.cpp
 - ext/reflex/wheel_event.cpp
@@ -176,14 +172,12 @@ files:
 - include/reflex/ruby/selector.h
 - include/reflex/ruby/shape_view.h
 - include/reflex/ruby/style.h
-- include/reflex/ruby/style_length.h
 - include/reflex/ruby/view.h
 - include/reflex/ruby/window.h
 - include/reflex/selector.h
 - include/reflex/shader.h
 - include/reflex/shape_view.h
 - include/reflex/style.h
-- include/reflex/style_length.h
 - include/reflex/texture.h
 - include/reflex/view.h
 - include/reflex/window.h
@@ -224,8 +218,6 @@ files:
 - lib/reflex/shape_view.rb
 - lib/reflex/style.rb
 - lib/reflex/style_length.rb
-- lib/reflex/style_length2.rb
-- lib/reflex/style_length4.rb
 - lib/reflex/text_view.rb
 - lib/reflex/texture.rb
 - lib/reflex/update_event.rb
@@ -400,7 +392,6 @@ files:
 - src/selector.cpp
 - src/shape_view.cpp
 - src/style.cpp
-- src/style_length.cpp
 - src/view.cpp
 - src/win32/application.cpp
 - src/win32/defs.cpp
@@ -424,8 +415,6 @@ files:
 - test/test_selector.rb
 - test/test_style.rb
 - test/test_style_length.rb
-- test/test_style_length2.rb
-- test/test_style_length4.rb
 - test/test_view.rb
 - test/test_window.rb
 - ".doc/ext/reflex/application.cpp"
@@ -450,8 +439,6 @@ files:
 - ".doc/ext/reflex/shape_view.cpp"
 - ".doc/ext/reflex/style.cpp"
 - ".doc/ext/reflex/style_length.cpp"
-- ".doc/ext/reflex/style_length2.cpp"
-- ".doc/ext/reflex/style_length4.cpp"
 - ".doc/ext/reflex/update_event.cpp"
 - ".doc/ext/reflex/view.cpp"
 - ".doc/ext/reflex/wheel_event.cpp"
@@ -491,7 +478,5 @@ test_files:
 - test/test_selector.rb
 - test/test_style.rb
 - test/test_style_length.rb
-- test/test_style_length2.rb
-- test/test_style_length4.rb
 - test/test_view.rb
 - test/test_window.rb

data/.doc/ext/reflex/style_length2.cpp

@@ -1,149 +0,0 @@
-#include "reflex/ruby/style_length.h"
-
-
-#include <rucy.h>
-#include "defs.h"
-
-
-using namespace Rucy;
-
-
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::StyleLength2)
-
-#define THIS  to<Reflex::StyleLength2*>(self)
-
-#define CHECK RUCY_CHECK_OBJ(Reflex::StyleLength2, self)
-
-
-static
-VALUE alloc(VALUE klass)
-{
-	return new_type<Reflex::StyleLength2>(klass);
-}
-
-static
-VALUE initialize_copy(VALUE self, VALUE obj)
-{
-	CHECK;
-	*THIS = to<Reflex::StyleLength2&>(obj).copy();
-	return self;
-}
-
-static
-VALUE set_width(VALUE self, VALUE width)
-{
-	CHECK;
-	THIS->set_width(to<Reflex::StyleLength>(width));
-}
-
-static
-VALUE get_width(VALUE self)
-{
-	CHECK;
-	return value(THIS->width());
-}
-
-static
-VALUE set_height(VALUE self, VALUE height)
-{
-	CHECK;
-	THIS->set_height(to<Reflex::StyleLength>(height));
-}
-
-static
-VALUE get_height(VALUE self)
-{
-	CHECK;
-	return value(THIS->height());
-}
-
-static
-VALUE set_at(VALUE self, VALUE index, VALUE length)
-{
-	CHECK;
-
-	int i = index.as_i(), size = (int) THIS->size();
-	while (i < 0) i += size;
-
-	if (i >= size)
-		index_error(__FILE__, __LINE__);
-
-	(*THIS)[i] = to<Reflex::StyleLength>(length);
-}
-
-static
-VALUE get_at(VALUE self, VALUE index)
-{
-	CHECK;
-
-	int i = index.as_i(), size = (int) THIS->size();
-	while (i < 0) i += size;
-
-	if (i >= size)
-		index_error(__FILE__, __LINE__);
-
-	return value((*THIS)[i]);
-}
-
-
-static Class cStyleLength2;
-
-void
-Init_style_length2 ()
-{
-	Module mReflex = rb_define_module("Reflex");
-
-	cStyleLength2 = rb_define_class_under(mReflex, "StyleLength2", rb_cObject);
-	rb_define_alloc_func(cStyleLength2, alloc);
-	rb_define_private_method(cStyleLength2, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
-	rb_define_method(cStyleLength2, "width=", RUBY_METHOD_FUNC(set_width), 1);
-	rb_define_method(cStyleLength2, "width", RUBY_METHOD_FUNC(get_width), 0);
-	rb_define_method(cStyleLength2, "height=", RUBY_METHOD_FUNC(set_height), 1);
-	rb_define_method(cStyleLength2, "height", RUBY_METHOD_FUNC(get_height), 0);
-	cStyleLength2.define_method("[]=", set_at);
-	cStyleLength2.define_method("[]",  get_at);
-}
-
-
-namespace Rucy
-{
-
-
-	template <> Reflex::StyleLength2
-	value_to<Reflex::StyleLength2> (Value value, bool convert)
-	{
-		if (convert && value.is_array())
-		{
-			Value* a = value.as_array();
-			switch (value.size())
-			{
-				case 1: return Reflex::StyleLength2(
-					to<Reflex::StyleLength>(a[0]));
-
-				case 2: return Reflex::StyleLength2(
-					to<Reflex::StyleLength>(a[0]),
-					to<Reflex::StyleLength>(a[1]));
-
-				default: argument_error(__FILE__, __LINE__);
-			}
-		}
-
-		return value_to<Reflex::StyleLength2&>(value, convert);
-	}
-
-
-}// Rucy
-
-
-namespace Reflex
-{
-
-
-	Class
-	style_length2_class ()
-	{
-		return cStyleLength2;
-	}
-
-
-}// Reflex

data/.doc/ext/reflex/style_length4.cpp

@@ -1,192 +0,0 @@
-#include "reflex/ruby/style_length.h"
-
-
-#include <rucy.h>
-#include "defs.h"
-
-
-using namespace Rucy;
-
-
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::StyleLength4)
-
-#define THIS  to<Reflex::StyleLength4*>(self)
-
-#define CHECK RUCY_CHECK_OBJ(Reflex::StyleLength4, self)
-
-
-static
-VALUE alloc(VALUE klass)
-{
-	return new_type<Reflex::StyleLength4>(klass);
-}
-
-static
-VALUE initialize_copy(VALUE self, VALUE obj)
-{
-	CHECK;
-	*THIS = to<Reflex::StyleLength4&>(obj).copy();
-	return self;
-}
-
-static
-VALUE set_left(VALUE self, VALUE left)
-{
-	CHECK;
-	THIS->set_left(to<Reflex::StyleLength>(left));
-}
-
-static
-VALUE get_left(VALUE self)
-{
-	CHECK;
-	return value(THIS->left());
-}
-
-static
-VALUE set_top(VALUE self, VALUE top)
-{
-	CHECK;
-	THIS->set_top(to<Reflex::StyleLength>(top));
-}
-
-static
-VALUE get_top(VALUE self)
-{
-	CHECK;
-	return value(THIS->top());
-}
-
-static
-VALUE set_right(VALUE self, VALUE right)
-{
-	CHECK;
-	THIS->set_right(to<Reflex::StyleLength>(right));
-}
-
-static
-VALUE get_right(VALUE self)
-{
-	CHECK;
-	return value(THIS->right());
-}
-
-static
-VALUE set_bottom(VALUE self, VALUE bottom)
-{
-	CHECK;
-	THIS->set_bottom(to<Reflex::StyleLength>(bottom));
-}
-
-static
-VALUE get_bottom(VALUE self)
-{
-	CHECK;
-	return value(THIS->bottom());
-}
-
-static
-VALUE set_at(VALUE self, VALUE index, VALUE length)
-{
-	CHECK;
-
-	int i = index.as_i(), size = (int) THIS->size();
-	while (i < 0) i += size;
-
-	if (i >= size)
-		index_error(__FILE__, __LINE__);
-
-	(*THIS)[i] = to<Reflex::StyleLength>(length);
-}
-
-static
-VALUE get_at(VALUE self, VALUE index)
-{
-	CHECK;
-
-	int i = index.as_i(), size = (int) THIS->size();
-	while (i < 0) i += size;
-
-	if (i >= size)
-		index_error(__FILE__, __LINE__);
-
-	return value((*THIS)[i]);
-}
-
-
-static Class cStyleLength4;
-
-void
-Init_style_length4 ()
-{
-	Module mReflex = rb_define_module("Reflex");
-
-	cStyleLength4 = rb_define_class_under(mReflex, "StyleLength4", rb_cObject);
-	rb_define_alloc_func(cStyleLength4, alloc);
-	rb_define_private_method(cStyleLength4, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
-	rb_define_method(cStyleLength4, "left=", RUBY_METHOD_FUNC(set_left), 1);
-	rb_define_method(cStyleLength4, "left", RUBY_METHOD_FUNC(get_left), 0);
-	rb_define_method(cStyleLength4, "top=", RUBY_METHOD_FUNC(set_top), 1);
-	rb_define_method(cStyleLength4, "top", RUBY_METHOD_FUNC(get_top), 0);
-	rb_define_method(cStyleLength4, "right=", RUBY_METHOD_FUNC(set_right), 1);
-	rb_define_method(cStyleLength4, "right", RUBY_METHOD_FUNC(get_right), 0);
-	rb_define_method(cStyleLength4, "bottom=", RUBY_METHOD_FUNC(set_bottom), 1);
-	rb_define_method(cStyleLength4, "bottom", RUBY_METHOD_FUNC(get_bottom), 0);
-	cStyleLength4.define_method("[]=", set_at);
-	cStyleLength4.define_method("[]",  get_at);
-}
-
-
-namespace Rucy
-{
-
-
-	template <> Reflex::StyleLength4
-	value_to<Reflex::StyleLength4> (Value value, bool convert)
-	{
-		if (convert && value.is_array())
-		{
-			Value* a = value.as_array();
-			switch (value.size())
-			{
-				case 1: return Reflex::StyleLength4(
-					to<Reflex::StyleLength>(a[0]));
-
-				case 2: return Reflex::StyleLength4(
-					to<Reflex::StyleLength>(a[0]),
-					to<Reflex::StyleLength>(a[1]));
-
-				case 3: return Reflex::StyleLength4(
-					to<Reflex::StyleLength>(a[0]),
-					to<Reflex::StyleLength>(a[1]),
-					to<Reflex::StyleLength>(a[2]));
-
-				case 4: return Reflex::StyleLength4(
-					to<Reflex::StyleLength>(a[0]),
-					to<Reflex::StyleLength>(a[1]),
-					to<Reflex::StyleLength>(a[2]),
-					to<Reflex::StyleLength>(a[3]));
-
-				default: argument_error(__FILE__, __LINE__);
-			}
-		}
-
-		return value_to<Reflex::StyleLength4&>(value, convert);
-	}
-
-
-}// Rucy
-
-
-namespace Reflex
-{
-
-
-	Class
-	style_length4_class ()
-	{
-		return cStyleLength4;
-	}
-
-
-}// Reflex