Merge branch 'alpha1.5' into edge

Author: catmando

ruby/hyper-model/lib/reactive_record/active_record/class_methods.rb

@@ -339,18 +339,34 @@ def server_method(name, default: nil)
       end
     end
 
+    # def define_attribute_methods
+    #   columns_hash.each do |name, column_hash|
+    #     next if name == primary_key
+    #     column_hash[:serialized?] = true if ReactiveRecord::Base.serialized?[self][name]
+    #
+    #     define_method(name) { @backing_record.get_attr_value(name, nil) } unless method_defined?(name)
+    #     define_method("#{name}!") { @backing_record.get_attr_value(name, true) } unless method_defined?("#{name}!")
+    #     define_method("#{name}=") { |val| @backing_record.set_attr_value(name, val) } unless method_defined?("#{name}=")
+    #     define_method("#{name}_changed?") { @backing_record.changed?(name) } unless method_defined?("#{name}_changed?")
+    #     define_method("#{name}?") { @backing_record.get_attr_value(name, nil).present? } unless method_defined?("#{name}?")
+    #   end
+    #   self.inheritance_column = nil if inheritance_column && !columns_hash.key?(inheritance_column)
+    # end
+
+
     def define_attribute_methods
       columns_hash.each do |name, column_hash|
         next if name == primary_key
         # only add serialized key if its serialized.  This just makes testing a bit
         # easier by keeping the columns_hash the same if there are no seralized strings
         # see rspec ./spec/batch1/column_types/column_type_spec.rb:100
         column_hash[:serialized?] = true if ReactiveRecord::Base.serialized?[self][name]
-        define_method(name) { @backing_record.get_attr_value(name, nil) }
-        define_method("#{name}!") { @backing_record.get_attr_value(name, true) }
-        define_method("#{name}=") { |val| @backing_record.set_attr_value(name, val) }
-        define_method("#{name}_changed?") { @backing_record.changed?(name) }
-        define_method("#{name}?") { @backing_record.get_attr_value(name, nil).present? }
+        
+        define_method(name) { @backing_record.get_attr_value(name, nil) } unless method_defined?(name)
+        define_method("#{name}!") { @backing_record.get_attr_value(name, true) } unless method_defined?("#{name}!")
+        define_method("#{name}=") { |val| @backing_record.set_attr_value(name, val) } unless method_defined?("#{name}=")
+        define_method("#{name}_changed?") { @backing_record.changed?(name) } unless method_defined?("#{name}_changed?")
+        define_method("#{name}?") { @backing_record.get_attr_value(name, nil).present? } unless method_defined?("#{name}?")
       end
       self.inheritance_column = nil if inheritance_column && !columns_hash.key?(inheritance_column)
     end

ruby/hyper-model/spec/batch1/column_types/column_type_spec.rb

@@ -342,19 +342,4 @@ class TypeTest < ActiveRecord::Base
     end.to eq(r.text)
   end
 
-  it 'allows for attribute methods to be overwritten and use super' do
-    isomorphic do
-      class TypeTest < ActiveRecord::Base
-        def string
-          super.reverse
-        end
-      end
-    end
-    r = TypeTest.create(string: 'reverse')
-    expect_promise do
-      ReactiveRecord.load { TypeTest.find(1).string }
-    end.to eq(r.string)
-    expect(r.string).to eq(r[:string].reverse)
-  end
-
 end

ruby/hyper-model/spec/batch1/misc/method_override_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'test_components'
+require 'rspec-steps'
+
+RSpec::Steps.steps  "overriding attribute methods", js: true do
+
+  it 'can override the getter' do
+    expect_evaluate_ruby do
+      TypeTest.class_eval do
+        def string
+          super.reverse
+        end
+      end
+      TypeTest.new(string: 'hello').string
+    end.to eq('hello'.reverse)
+  end
+
+  it 'can override the forced getter' do
+    expect_evaluate_ruby do
+      TypeTest.class_eval do
+        def string!
+          !super
+        end
+      end
+      TypeTest.new(string: 'hello').string!
+    end.to eq(true)
+  end
+
+  it 'can override the setter' do
+    expect_evaluate_ruby do
+      TypeTest.class_eval do
+        def integer=(x)
+          super(-x)
+        end
+      end
+      test = TypeTest.new
+      test.integer = 12
+      test.integer
+    end.to eq(-12)
+  end
+
+  it 'can override the _changed method' do
+    expect_evaluate_ruby do
+      TypeTest.class_eval do
+        def integer_changed?
+          integer.even? ? super : false
+        end
+      end
+      [TypeTest.new(integer: 6).integer_changed?, TypeTest.new(integer: 7).integer_changed?]
+    end.to eq([true, false])
+  end
+
+  it 'can override the boolean ? method' do
+    expect_evaluate_ruby do
+      TypeTest.class_eval do
+        def boolean?
+          !super
+        end
+      end
+      TypeTest.new(boolean: true).boolean?
+    end.to eq(false)
+  end
+
+end

ruby/hyper-model/spec/support/component_helpers.rb

@@ -306,7 +306,7 @@ def isomorphic(&block)
   def evaluate_ruby(str="", opts={}, &block)
     insure_mount
     str = "#{str}\n#{Unparser.unparse Parser::CurrentRuby.parse(block.source).children.last}" if block
-    js = Opal.compile(str).gsub("\n","").gsub("(Opal);","(Opal)")
+    js = Opal.compile(str).gsub("// Prepare super implicit arguments\n", "").gsub("\n","").gsub("(Opal);","(Opal)")
     JSON.parse(evaluate_script("[#{js}].$to_json()"), opts).first
   end
 

ruby/hyper-spec/lib/hyper-spec/component_test_helpers.rb

@@ -111,7 +111,8 @@ def evaluate_ruby(str = '', opts = {}, &block)
       if block
         str = "#{str}\n#{Unparser.unparse Parser::CurrentRuby.parse(block.source).children.last}"
       end
-      js = Opal.compile(str).delete("\n").gsub('(Opal);', '(Opal)')
+      js = Opal.compile(str).gsub("// Prepare super implicit arguments\n", "")
+               .delete("\n").gsub('(Opal);', '(Opal)')
       # workaround for firefox 58 and geckodriver 0.19.1, because firefox is unable to find .$to_json:
       # JSON.parse(evaluate_script("(function(){var a=Opal.Array.$new(); a[0]=#{js}; return a.$to_json();})();"), opts).first
       JSON.parse(evaluate_script("[#{js}].$to_json()"), opts).first