infopark_reactor 1.14.0.beta1 → 1.14.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aded46ad784b7ded5b0ec6749781ebfce0489c4
-  data.tar.gz: ffc35216cfef893bb3787951e204f80ba47d0b9b
+  metadata.gz: 0d31c45363fc66e4fa2e33a596a28f961273a77f
+  data.tar.gz: 6d6bf3a3de71313b9e2b23f7431e528f2f88f3c0
 SHA512:
-  metadata.gz: 85e8e9fb655e0c45256f63f49cf39c547f99e9f955cf9a25d224339a0f808255b2bbe0b03e133203ddbca27d34ff5d5c8394a4cb5c6f9352248d640ed649470d
-  data.tar.gz: a854315cd9355f1fd1c4e0c848d22eec08f978ce9d9f8dd22e9531fe8f8f072a57724c9ca903741eef8bf54a12730ff48b445e77dab42529c84f51d6807eadb7
+  metadata.gz: 3fd880bf792f8a5677169c4bb1864fd29411d92756ff1c833eddf1ce43268f921ce6f30c0d35293d70412497a0d6b93fd223cd7ac0e88c124e6880e5008c6936
+  data.tar.gz: 8ada3be23e66e43a73f0f2d3075553b15787cd34112826cf702203c918e585a9d2d88ff84671dff83fe516210e8693eb82097f160aba9a803cdbd07f07691a97

data/app/models/rails_connector/obj_class.rb

@@ -9,8 +9,13 @@ module RailsConnector
 
     self.primary_key = :obj_class_id
 
-    has_and_belongs_to_many :custom_attributes_raw, :class_name => '::RailsConnector::Attribute',
-        :join_table => "#{table_name_prefix}obj_class_attrs"
+    if Reactor.rails4_x?
+      has_many :custom_attributes_jt, :class_name => '::RailsConnector::ObjClassAttr', :foreign_key => 'obj_class_id', :primary_key => 'obj_class_id'
+      has_many :custom_attributes_raw, :through => :custom_attributes_jt, :source => :custom_attributes_raw
+    else
+      has_and_belongs_to_many :custom_attributes_raw, :class_name => '::RailsConnector::Attribute',
+        :join_table => "reactor.#{table_name_prefix}obj_class_attrs"
+    end
 
     alias_attribute :name, :obj_class_name
 

data/app/models/rails_connector/obj_class_attr.rb

@@ -0,0 +1,5 @@
+module RailsConnector
+  class ObjClassAttr < RailsConnector::AbstractModel
+    has_many :custom_attributes_raw, :class_name => '::RailsConnector::Attribute', :foreign_key => 'attribute_id', :primary_key => 'attribute_id'
+  end
+end

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.14.0.beta1"
+  VERSION = "1.14.0.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.14.0.beta1
+  version: 1.14.0.beta2
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,7 @@ files:
 - app/models/rails_connector/content.rb
 - app/models/rails_connector/meta/eager_loader.rb
 - app/models/rails_connector/obj_class.rb
+- app/models/rails_connector/obj_class_attr.rb
 - app/models/rails_connector/object_with_meta_data.rb
 - config/routes.rb
 - infopark_reactor.gemspec