Merge remote-tracking branch 'origin/attr_struct' into HEAD

#126
notEthan · Jan 15, 2021 · aaf5c03 · aaf5c03
2 parents fe4d32d + a16ed8a
commit aaf5c03
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/lib/jsi/util/attr_struct.rb b/lib/jsi/util/attr_struct.rb
@@ -30,15 +30,15 @@ def [](*attribute_keys)
 
           Class.new(AttrStruct).tap do |klass|
             klass.define_singleton_method(:attribute_keys) { attribute_keys }
-            klass.define_method(:attribute_keys) { attribute_keys }
+            klass.send(:define_method, :attribute_keys) { attribute_keys }
             attribute_keys.each do |attribute_key|
               # reader
-              klass.define_method(attribute_key) do
+              klass.send(:define_method, attribute_key) do
                 @attributes[attribute_key]
               end
 
               # writer
-              klass.define_method("#{attribute_key}=") do |value|
+              klass.send(:define_method, "#{attribute_key}=") do |value|
                 @attributes[attribute_key] = value
               end
             end

diff --git a/test/util_test.rb b/test/util_test.rb
@@ -52,4 +52,15 @@
       assert_equal(expected, actual)
     end
   end
+  describe 'AttrStruct' do
+    Foo = JSI::Util::AttrStruct[*%w(bar)]
+    it 'structs' do
+      foo = Foo.new(bar: 'bar')
+      assert_equal('bar', foo.bar)
+      foo.bar = 'baar'
+      assert_equal('baar', foo.bar)
+      assert_equal(foo, Foo.new(bar: 'baar'))
+      refute_equal(foo, Foo.new(bar: 'baaar'))
+    end
+  end
 end