azahara_schema 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5aef33899add853399c0c393de05ca669875cf80fe5b4ee8b4b980bc125df8
-  data.tar.gz: db7d83afd07a9dd04b1596a69b532cc280bca4795f532591d9598dbe751b5b5a
+  metadata.gz: af8c74a55165b64dd1028655871bbccd2df367faf7f8e140c2574d5e3823260c
+  data.tar.gz: 2b066a64fe4b33863562dad9d13c38dad1cd73f5460368f057851ef3dc873ab7
 SHA512:
-  metadata.gz: 8b039a53e324f96b2bfca695916952a00e7b1399f42492ebe05725255642ffac8f126585029170a5e67512b18e8a26b102a6b1d8e3a8b6ec79bd6f89757d1ef6
-  data.tar.gz: f6faf3bca1aad759a8d524c49563bd27f908f0421878306d6551ca4ca9da39929380c7ba0b4ed51dc649fdebd01d1cc4b9d26de5a96f45e7807e8cd2c96a52e1
+  metadata.gz: e68614299630ffafb7d870b3a8aea26df55ddccd8bea8ea5deaeebfcea6e1b2f76364c9b45a3b435ccaebf4b613f7ce824d52fb1e2721bc99866dab91394a784
+  data.tar.gz: 22bd14b10428e52aa5d61ccd404cc8ae892264548842c780abcecdd7bb9f19b4a72eddedfe1c34c9e0d10940d72fde20683664c4485cfde0fbc04028838e3f60

data/lib/azahara_schema/association_attribute.rb

@@ -55,12 +55,27 @@ module AzaharaSchema
       { association.name => attribute.association_hash }
     end
 
+    def arel_join(parent=nil, join_type=::Arel::Nodes::OuterJoin, a_tbl=self.arel_table)
+      parent ||= a_tbl
+      joined = parent
+      case association.macro
+      when :has_many, :has_one
+        joined = parent.join(attribute.arel_table, join_type).on( attribute.arel_table[association.foreign_key].eq( a_tbl[model.primary_key] ) )
+      when :belongs_to
+        joined = parent.join(attribute.arel_table, join_type).on( attribute.arel_table[attribute.model.primary_key].eq( a_tbl[association.foreign_key] ) )
+      else
+        raise 'Unknown macro ' + association.macro.to_s
+      end
+      attribute.arel_join( joined )
+    end
+
     def arel_statement(operator, values)
       attribute.arel_statement(operator, values)
     end
 
     def add_join(scope)
-      scope.includes(association_hash).references(association_hash)
+      # scope.left_outer_joins(association_hash)
+      scope.joins(arel_join.join_sources)
     end
 
     def add_preload(scope)

data/lib/azahara_schema/attribute.rb

@@ -2,7 +2,7 @@ require 'azahara_schema/field_format'
 
 module AzaharaSchema
   class Attribute
-    attr_accessor :name, :format, :model
+    attr_accessor :name, :format, :model, :table_alias
 
     def initialize(model, name, type)
       @name, @model = name, model
@@ -26,8 +26,12 @@ module AzaharaSchema
       format.format_name
     end
 
-    def arel_field
-      model.arel_table[filter_name]
+    def arel_table(t_alias=self.table_alias)
+      t_alias ? model.arel_table.alias(t_alias) : model.arel_table
+    end
+
+    def arel_field(t_alias=self.table_alias)
+      arel_table(t_alias)[filter_name]
     end
 
     def arel_sort_field
@@ -111,5 +115,9 @@ module AzaharaSchema
       {}
     end
 
+    def arel_join(parent=nil, join_type=::Arel::Nodes::OuterJoin, a_tbl=self.arel_table(self.table_alias))
+      parent
+    end
+
   end
 end

data/lib/azahara_schema/derived_attribute.rb

@@ -48,7 +48,8 @@ module AzaharaSchema
       end
     end
 
-    def arel_field
+    # do not alias tables - let attributes derived from handle that
+    def arel_field(t_alias=nil)
       case derivation_method
       when :concat
         arel_fields = attributes.collect{|a| a.arel_field}

data/lib/azahara_schema/schema.rb

@@ -125,6 +125,7 @@ module AzaharaSchema
     def available_attributes
       unless @available_attributes
         initialize_available_attributes
+        @available_attributes.each{|at| at.table_alias = Array(association_path[1..-1]).collect(&:to_s).join('_').presence }
       end
       @available_attributes
     end
@@ -157,7 +158,7 @@ module AzaharaSchema
     end
 
     def association_path
-      @association_path ||= parent_schema ? ( [association.name].concat(parent_schema.association_path) ) : []
+      @association_path ||= parent_schema ? ( parent_schema.association_path + [association.name] ) : [model.model_name.element.to_sym]
     end
 
     def available_associations

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Gem to support developement of rails application with schema over an entity