Changeset 28955

Timestamp:

01/24/09 13:34:35 (4 years ago)

Author:

isaisstillalive

Message:

• プロパティと同名のアクセッサがすでに定義されている場合の処理が甘かったので修正。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/component.rb (modified) (1 diff)
• test/ruwin/test_component.rb (modified) (1 diff)

lang/ruby/ruwin/lib/ruwin/component.rb

@@ -51 +51 @@
                 @proparty[:#{name}]
               end
+            END
+          end
+          unless method_defined? :"#{name}="
+            define_instance_methods << <<-"END"
               def #{name}= value
                 @proparty[:#{name}] = value

lang/ruby/ruwin/test/ruwin/test_component.rb

@@ -22 +22 @@
     instance.test_pro = 3
     assert_equal 3, instance.test_pro
+  end
+  
+  def test_component_property_accessor_reader_defined
+    klass = Class.new(Ruwin::Component)
+    klass.class_eval "def test_pro;:defined;end; property_accessor :test_pro => 1"
+    
+    instance = klass.new
+    assert_respond_to instance, :test_pro
+    assert_respond_to instance, :test_pro=
+    assert_equal :defined, instance.test_pro
+  end
+  
+  def test_component_property_accessor_writer_defined
+    klass = Class.new(Ruwin::Component)
+    klass.class_eval "def test_pro= v;:defined;end; property_accessor :test_pro => 1"
+    
+    instance = klass.new
+    assert_respond_to instance, :test_pro
+    assert_respond_to instance, :test_pro=
+    assert_equal :defined, instance.__send__(:test_pro=, nil)
   end