fixes

Author: catmando

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

@@ -50,6 +50,12 @@ def initialize(owner_class, macro, name, options = {})
         unless options[:polymorphic]
           @klass_name = options[:class_name] || (collection? && name.camelize.singularize) || name.camelize
         end
+
+        if @klass_name < ActiveRecord::Base
+          @klass = @klass_name
+          @klass_name = @klass_name.name
+        end rescue nil
+
         @association_foreign_key =
           options[:foreign_key] ||
           (macro == :belongs_to && "#{name}_id") ||
@@ -176,8 +182,10 @@ def find_inverse(model)  # private
 
       def klass(model = nil)
         @klass ||= Object.const_get(@klass_name) if @klass_name
-        raise "model is not correct class" if @klass && model && model.class != @klass
-        raise "no model supplied for polymorphic relationship" unless @klass || model
+        if @klass && model && !(model.class <= @klass)
+          raise "internal error: provided model #{model} is not subclass of #{@klass}"
+        end
+        raise 'no model supplied for polymorphic relationship' unless @klass || model
         @klass || model.class
       end
 

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

@@ -167,7 +167,7 @@ def add_new_inverse_attribute(association, orig, model)
         model.backing_record.push_onto_collection(@model, inverse_association, @ar_instance)
       else
         inverse_attr = inverse_association.attribute
-        value.attributes[inverse_attr] = @ar_instance
+        model.attributes[inverse_attr] = @ar_instance
         return if data_loading?
         Hyperstack::Internal::State::Variable.set(model.backing_record, inverse_attr, @ar_instance)
       end

ruby/hyper-model/spec/batch2/one_to_one_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+require 'test_components'
+require 'rspec-steps'
+
+describe "one to one relationships", js: true do
+
+  before(:all) do
+    require 'pusher'
+    require 'pusher-fake'
+    Pusher.app_id = "MY_TEST_ID"
+    Pusher.key =    "MY_TEST_KEY"
+    Pusher.secret = "MY_TEST_SECRET"
+    require "pusher-fake/support/base"
+
+    Hyperstack.configuration do |config|
+      config.transport = :pusher
+      config.channel_prefix = "synchromesh"
+      config.opts = {app_id: Pusher.app_id, key: Pusher.key, secret: Pusher.secret}.merge(PusherFake.configuration.web_options)
+    end
+
+    class ActiveRecord::Base
+      class << self
+        def public_columns_hash
+          @public_columns_hash ||= {}
+        end
+      end
+    end
+  end
+
+  before(:each) do
+
+    # spec_helper resets the policy system after each test so we have to setup
+    # before each test
+    stub_const 'TestApplicationPolicy', Class.new
+    TestApplicationPolicy.class_eval do
+      always_allow_connection
+      regulate_all_broadcasts { |policy| policy.send_all }
+      allow_change(to: :all, on: [:create, :update, :destroy]) { true }
+    end
+
+    size_window(:small, :large)
+
+    isomorphic do
+
+      class Parent < ActiveRecord::Base
+        def self.build_tables
+          connection.create_table :parents, force: true do |t|
+            t.string :name
+            t.timestamps
+          end
+          ActiveRecord::Base.public_columns_hash[name] = columns_hash
+        end
+
+        has_one :child
+      end
+
+      class Child < ActiveRecord::Base
+        def self.build_tables
+          connection.create_table :children, force: true do |t|
+            t.string :name
+            t.integer :parent_id
+            t.timestamps
+          end
+          ActiveRecord::Base.public_columns_hash[name] = columns_hash
+        end
+        belongs_to :parent
+      end
+    end
+
+    [Parent, Child].each { |klass| klass.build_tables }
+
+  end
+
+  def compare_to_server(model, expression, expected_result, load=true)
+    server_side = eval("#{model.class}.find(#{model.id}).#{expression}")
+    expect(server_side).to eq(expected_result)
+    be_expected_result = expected_result.is_a?(Array) ? contain_exactly(*expected_result) : eq(expected_result)
+    if load
+      expect_promise("Hyperstack::Model.load { #{model.class}.find(#{model.id}).#{expression} }")
+      .to be_expected_result
+    else
+      wait_for_ajax
+      expect_evaluate_ruby("#{model.class}.find(#{model.id}).#{expression}").to be_expected_result
+    end
+  end
+
+  before(:each) do
+    @parent1 = Parent.create(name: 'parent1')
+    @child1 = Child.create(name: 'child1', parent: @parent1)
+  end
+
+  it 'will load the parent' do
+    compare_to_server @child1, 'parent.name', 'parent1'
+  end
+
+  it 'will load the child' do
+    compare_to_server @parent1, 'child.name', 'child1'
+  end
+end

ruby/hyper-model/spec/batch7/poly_assoc_spec.rb

@@ -92,9 +92,6 @@ def self.build_tables
         has_one :picture, as: :imageable
       end
 
-      class ReactiveRecord::Collection
-      end if RUBY_ENGINE == 'opal'
-
       class Membership < ActiveRecord::Base
         def self.build_tables
           connection.create_table :memberships, force: true do |t|