sunstone 5.0.0.4 → 5.0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca2db5a6c3ea14865f367dbb2e47581ac78dcf5d
-  data.tar.gz: 8c7c0ea51ded30b1b39fb09eee852989f588574f
+  metadata.gz: d651f0df180f9f4f42426026895a492473e6ebf4
+  data.tar.gz: f2c0d18b398b1b19d1cbaed650f77b3b9a57e47e
 SHA512:
-  metadata.gz: 7fc4a0e6209543012c12f674a33b10c3a1a27a21e3bb6cc0a7f647f28a83490caddfe619546df1b86caf759504616588978ab42e7d1e65623f3c9d5a690089f5
-  data.tar.gz: 33421456a4d97c91a606f250914a4b4c15ae889fee4ae33a6f08e13409b28fd10128edc9ca00cf482735169f28809587e7bc227b274f6f7874553260f7de73e6
+  metadata.gz: 3d4d17453a231b1547ba803d0f7728eeca34dffc567cbebc681ebba6fdcb2b23eb9e9a8a955e7b41531a0c45c414baacef543d7a8f450a1400a30a1207051aec
+  data.tar.gz: 64ab99ad6da7cceee959d694d3c4ba510c1f34303e03af5969f9c38d9edafc9ac5fd305c60150c3405d2f18aeee4e45e78434495fce9532bdcf77ca0499223ea

data/lib/arel/visitors/sunstone.rb

@@ -194,7 +194,7 @@ module Arel
           raise 'Upsupported'
         end
         if !collector.where.first['id']
-          collector.table = collector.where.first.keys.first
+          collector.table = collector.where.first.keys.first if collector.is_a?(Arel::Collectors::Sunstone)
           collector.where[0] = {'id' => collector.where.first.values.first.values.first}
         end
         
@@ -628,7 +628,7 @@ module Arel
       #
       def visit_Arel_Nodes_JoinSource o, collector
         if o.left
-          collector.table = o.left.name
+          collector.table = o.left.name if collector.is_a?(Arel::Collectors::Sunstone)
         end
         if o.right.any?
           # We need to visit the right to get remove bind values, but we don't
@@ -636,6 +636,7 @@ module Arel
           # collector << " " if o.left
           # collector = inject_join o.right, collector, ' '
           collector.join_source = inject_join(o.right, Arel::Collectors::Sunstone.new, ' ')
+          # collector.join_source = Arel::Visitors::PostgreSQL.new(Arel::Collectors::SQLString.new).send(:inject_join, o.right, Arel::Collectors::SQLString.new, ' ')
         end
         collector
       end
@@ -655,14 +656,12 @@ module Arel
       # def visit_Arel_Nodes_FullOuterJoin o
       #   "FULL OUTER JOIN #{visit o.left} #{visit o.right}"
       # end
-      #
-      # def visit_Arel_Nodes_OuterJoin o, collector
-      #   collector << "LEFT OUTER JOIN "
-      #   collector = visit o.left, collector
-      #   collector << " "
-      #   visit o.right, collector
-      # end
-      #
+
+      def visit_Arel_Nodes_OuterJoin o, collector
+        collector = visit o.left, collector
+        visit o.right, collector
+      end
+
       # def visit_Arel_Nodes_RightOuterJoin o
       #   "RIGHT OUTER JOIN #{visit o.left} #{visit o.right}"
       # end
@@ -687,10 +686,11 @@ module Arel
       #
       def visit_Arel_Table o, collector
         if o.table_alias
-          collector << "#{o.name} #{o.table_alias}"
+          collector.table = o.table_alias if collector.is_a?(Arel::Collectors::Sunstone)
         else
-          collector << o.name
+          collector.table = o.name if collector.is_a?(Arel::Collectors::Sunstone)
         end
+        collector
       end
 
       def visit_Arel_Nodes_In o, collector
@@ -898,7 +898,7 @@ module Arel
       
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name
-        collector.table == join_name ? o.name : "#{join_name}.#{o.name}"
+        collector.table == join_name ? o.name : "#{join_name}.#{o.name}" if collector.is_a?(Arel::Collectors::Sunstone)
       end
       alias :visit_Arel_Attributes_Integer :visit_Arel_Attributes_Attribute
       alias :visit_Arel_Attributes_Float :visit_Arel_Attributes_Attribute
@@ -975,18 +975,14 @@ module Arel
       #   collector << " "
       #   visit thing, collector
       # end
-      #
+
       def inject_join list, collector, join_str
         len = list.length - 1
         list.each_with_index.inject(collector) { |c, (x,i)|
-          if i == len
-            visit x, c
-          else
-            visit(x, c) << join_str
-          end
+          visit x, c
         }
       end
-      #
+
       # def infix_value o, collector, value
       #   collector = visit o.left, collector
       #   collector << value
@@ -998,7 +994,7 @@ module Arel
         if o.distinct
           collector << "DISTINCT "
         end
-        collector = inject_join(o.expressions, collector, ", ") << ")"
+        collector = inject_join(o.expressions, Arel::Collectors::Sunstone.new, ", ")# << ")"
         if o.alias
           collector << " AS "
           visit o.alias, collector

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.0.0.4'
+  VERSION = '5.0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.0.0.4
+  version: 5.0.0.5
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs