praxis 2.0.pre.3 → 2.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d869bce23150f16857b3d92fb1e4e6fe98b0b747
-  data.tar.gz: bf2e0bac5b872453a6ae142f518591a2fae67180
+  metadata.gz: fa827ff7e042719b8976def88a05ab420fa05eb5
+  data.tar.gz: a3c09e65e43ea6d5ef508ca9be649552b271b305
 SHA512:
-  metadata.gz: d2975bad774d35e3c7a98067442258fff5d7670f161ee4b5653dfe5b038f1af341b9fb21fefcff733d9f2a7c96a9ee742014919c29148d87826433b15291dcb0
-  data.tar.gz: cf8665de0a625dee430a30b23a07328bebd8d60cffb2aad9e7dc3aed9503c21afd463aa024ee97fefb7ce639db008716aa4996ee70e3361d91d102b5408c6adc
+  metadata.gz: 9055b2bb74579f7b0bfb6b2823df6b03dc863e30945314aa7d2251326ad1e4c7bf9a2213b24251ca8334e3e00bca5371b4fbc7d7199e7829ca4f625c9f1f0a97
+  data.tar.gz: e458dcf8e0d69e5df81ca9a2a1bc62250891ac788f7cfd2dbc9e08a76193bcf797d099799f83cfbdc0c2010e3fe3b23bef917efc036a80f95029f0437904f847

data/lib/praxis/mapper/selector_generator.rb

@@ -19,9 +19,10 @@ module Praxis::Mapper
     end
 
     def map_property(name, fields)
+      praxis_compat_model = resource.model && resource.model.respond_to?(:_praxis_associations)
       if resource.properties.key?(name)
         add_property(name, fields)
-      elsif resource.model._praxis_associations.key?(name)
+      elsif praxis_compat_model && resource.model._praxis_associations.key?(name)
         add_association(name, fields)
       else
         add_select(name)
@@ -68,13 +69,18 @@ module Praxis::Mapper
     def add_property(name, fields)
       dependencies = resource.properties[name][:dependencies]
       # Always add the underlying association if we're overriding the name...
-      add_association(name, fields) if resource.model._praxis_associations.key?(name)
+      praxis_compat_model = resource.model && resource.model.respond_to?(:_praxis_associations)
+      if praxis_compat_model && resource.model._praxis_associations.key?(name)
+        add_association(name, fields)
+      end
       if dependencies
         dependencies.each do |dependency|
           # To detect recursion, let's allow mapping depending fields to the same name of the property
           # but properly detecting if it's a real association...in which case we've already added it above
-          if dependency == name 
-            add_select(name) unless resource.model._praxis_associations.key?(name)
+          if dependency == name
+            unless praxis_compat_model && resource.model._praxis_associations.key?(name)
+              add_select(name)
+            end
           else
             apply_dependency(dependency)
           end
@@ -112,12 +118,11 @@ module Praxis::Mapper
           existing.add_select(col_name)
         end
         node.tracks.each do |name, n|
-          existing.merge(name, n)
+          existing.merge_track(name, n)
         end
       else
         self.tracks[track_name] = node
       end
-
     end
 
     def dump

data/lib/praxis/version.rb

@@ -1,3 +1,3 @@
 module Praxis
-  VERSION = '2.0.pre.3'
+  VERSION = '2.0.pre.4'
 end

data/spec/praxis/mapper/selector_generator_spec.rb

@@ -181,6 +181,38 @@ describe Praxis::Mapper::SelectorGenerator do
         end
         it_behaves_like 'a proper selector'
       end
+
+      context 'merging multiple tracks with the same name within a node' do
+        let(:fields) do
+          { # Both everything_from_parent and parent will track the underlying 'parent' assoc
+            # ...and the final respective fields and tracks will need to be merged together.
+            # columns will be merged by just *, and tracks will merge true with simple children
+            everything_from_parent: true,
+            parent: {
+              simple_children: true
+            }
+          }
+        end
+        let(:selectors) do
+          {
+            model: SimpleModel,
+            columns: [:parent_id, :added_column],
+            tracks: {
+              parent: {
+                model: ParentModel,
+                columns: [:*],
+                tracks: {
+                  simple_children: {
+                    model: SimpleModel,
+                    columns: [:parent_id]
+                  }
+                }
+              }
+            }
+          }
+        end
+        it_behaves_like 'a proper selector'
+      end
     end
 
     context 'string associations' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 2.0.pre.3
+  version: 2.0.pre.4
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack