sunstone 5.0.0.2 → 5.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 251b8b254f40eac45d625f004fe405db180eefe0
-  data.tar.gz: e06aa5cf5ce843ccfe6c495fd5e0e7d7ec3d5685
+  metadata.gz: ca2db5a6c3ea14865f367dbb2e47581ac78dcf5d
+  data.tar.gz: 8c7c0ea51ded30b1b39fb09eee852989f588574f
 SHA512:
-  metadata.gz: 1ad88a3734db407224aa3addb478b5eaabfd9b5ad1ae0e3effe18c67e783a6131c652b58cbb55508f300a630f0c3aea259904743418cc711af0f8ab356bfc546
-  data.tar.gz: 628039ec1b81d9f4630a85dca9decd0e455e47d45d2386721cb96765628c86f19a5372275e52e1d6bdd0ac42082da8ee3ba2e4104969731a524448e10caabdbb
+  metadata.gz: 7fc4a0e6209543012c12f674a33b10c3a1a27a21e3bb6cc0a7f647f28a83490caddfe619546df1b86caf759504616588978ab42e7d1e65623f3c9d5a690089f5
+  data.tar.gz: 33421456a4d97c91a606f250914a4b4c15ae889fee4ae33a6f08e13409b28fd10128edc9ca00cf482735169f28809587e7bc227b274f6f7874553260f7de73e6

data/.gitignore

@@ -28,3 +28,4 @@ Gemfile.lock
 
 # Text Editor scraps
 *~
+.byebug_history

data/ext/active_record/relation.rb

@@ -3,30 +3,47 @@ module ActiveRecord
 
     def to_sql
       @to_sql ||= begin
-                    relation   = self
-                    connection = klass.connection
-                    visitor    = if connection.visitor.is_a?(Arel::Visitors::Sunstone)
-                        Arel::Visitors::ToSql.new(connection)
-                      else
-                        connection.visitor
-                      end
+        relation   = self
+        connection = klass.connection
+        visitor = if connection.visitor.is_a?(Arel::Visitors::Sunstone)
+          Arel::Visitors::ToSql.new(connection)
+        else
+          connection.visitor
+        end
 
-                    if eager_loading?
-                      find_with_associations { |rel| relation = rel }
-                    end
+        if eager_loading?
+          find_with_associations { |rel| relation = rel }
+        end
 
-                    binds = if connection.visitor.is_a?(Arel::Visitors::Sunstone)
-                      relation.arel.bind_values + relation.bound_attributes
-                    else
-                      relation.bound_attributes
-                    end
-                    binds = connection.prepare_binds_for_database(binds)
-                    binds.map! { |value| connection.quote(value) }
-                    collect = visitor.accept(relation.arel.ast, Arel::Collectors::Bind.new)
-                    collect.substitute_binds(binds).join
-                  end
+        binds = relation.bound_attributes
+        binds = connection.prepare_binds_for_database(binds)
+        binds.map! { |value| connection.quote(value) }
+        collect = visitor.accept(relation.arel.ast, Arel::Collectors::Bind.new)
+        collect.substitute_binds(binds).join
+      end
+    end
+
+    def to_sar
+      @to_sar ||= begin
+        relation   = self
+        connection = klass.connection
+        visitor = if connection.visitor.is_a?(Arel::Visitors::ToSql)
+          Arel::Visitors::Sunstone.new(connection)
+        else
+          connection.visitor
+        end
+
+        if eager_loading?
+          find_with_associations { |rel| relation = rel }
+        end
+
+        binds = relation.bound_attributes
+        binds = connection.prepare_binds_for_database(binds)
+        binds.map! { |value| connection.quote(value) }
+        collect = visitor.accept(relation.arel.ast, Arel::Collectors::Sunstone.new)
+        collect.compile binds
+      end
     end
-    
 
   end
-end
+end

data/lib/arel/collectors/sunstone.rb

@@ -6,6 +6,9 @@ module Arel
 
       attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates, :eager_loads, :id, :distinct, :distinct_on
 
+      # This is used to removed an bind values. It is not used in the request
+      attr_accessor :join_source
+
       def cast_attribute(v)
         if (v.is_a?(ActiveRecord::Attribute))
           v.value_for_database
@@ -70,6 +73,10 @@ module Arel
           }
         end
 
+        if join_source
+          substitute_binds(join_source.clone, bvs)
+        end
+
         params = {}
         if where
           params[:where] = substitute_binds(where.clone, bvs)
@@ -77,7 +84,7 @@ module Arel
             params[:where] = params[:where].pop
           end
         end
-        
+
         if eager_loads
           params[:include] = eager_loads.clone
         end
@@ -94,14 +101,14 @@ module Arel
           params[:limit] = limit
         end
 
+        params[:order] = substitute_binds(order, bvs) if order
+
         if offset.is_a?(Arel::Nodes::BindParam)
           params[:offset] = substitute_binds(offset, bvs)
         elsif offset
           params[:offset] = offset
         end
 
-        params[:order] = substitute_binds(order, bvs) if order
-
         case operation
         when :count
           path += "/#{operation}"
@@ -143,6 +150,3 @@ module Arel
     end
   end
 end
-
-
-

data/lib/arel/visitors/sunstone.rb

@@ -58,7 +58,7 @@ module Arel
         collector = maybe_visit o.set_quantifier, collector
 
         if o.source && !o.source.empty?
-          collector.table = o.source.left.name
+          collector = visit o.source, collector
         end
 
         if !o.wheres.empty?
@@ -628,11 +628,14 @@ module Arel
       #
       def visit_Arel_Nodes_JoinSource o, collector
         if o.left
-          collector = visit o.left, collector
+          collector.table = o.left.name
         end
         if o.right.any?
-          collector << " " if o.left
-          collector = inject_join o.right, collector, ' '
+          # We need to visit the right to get remove bind values, but we don't
+          # add it to the collector
+          # collector << " " if o.left
+          # collector = inject_join o.right, collector, ' '
+          collector.join_source = inject_join(o.right, Arel::Collectors::Sunstone.new, ' ')
         end
         collector
       end
@@ -663,23 +666,20 @@ module Arel
       # def visit_Arel_Nodes_RightOuterJoin o
       #   "RIGHT OUTER JOIN #{visit o.left} #{visit o.right}"
       # end
-      #
-      # def visit_Arel_Nodes_InnerJoin o, collector
-      #   collector << "INNER JOIN "
-      #   collector = visit o.left, collector
-      #   if o.right
-      #     collector << SPACE
-      #     visit(o.right, collector)
-      #   else
-      #     collector
-      #   end
-      # end
-      #
-      # def visit_Arel_Nodes_On o, collector
-      #   collector << "ON "
-      #   visit o.expr, collector
-      # end
-      #
+
+      def visit_Arel_Nodes_InnerJoin o, collector
+        collector = visit o.left, collector
+        if o.right
+          visit(o.right, collector)
+        else
+          collector
+        end
+      end
+
+      def visit_Arel_Nodes_On o, collector
+        visit o.expr, collector
+      end
+
       # def visit_Arel_Nodes_Not o, collector
       #   collector << "NOT ("
       #   visit(o.expr, collector) << ")"

data/lib/sunstone/version.rb

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

data/test/active_record/query_test.rb

@@ -35,7 +35,7 @@ class ActiveRecord::QueryTest < Minitest::Test
     
     assert_nil Ship.first
   end
-  
+
   test '::last' do
     webmock(:get, "/ships", { limit: 1, order: [{id: :desc}] }).to_return(body: [].to_json)
     
@@ -134,5 +134,19 @@ class ActiveRecord::QueryTest < Minitest::Test
   test '#to_sql' do
     assert_equal "SELECT ships.* FROM ships WHERE ships.id = 10", Ship.where(:id => 10).to_sql
   end
-  
+
+  test '#to_sql binds correctly when joining' do
+    assert_equal 'SELECT ships.* FROM ships INNER JOIN ownerships ON ownerships.asset_id = ships.id AND ownerships.asset_type = \'Ship\' WHERE ownerships.id = 1', Ship.joins(:ownerships).where({ ownerships: { id: 1 } }).to_sql
+  end
+
+  test '#to_sar' do
+    assert_equal "/ships?%81%A5where%81%A2id%A210", Ship.where(:id => 10).to_sar.path
+  end
+
+  test 'bind params get eaten when joining' do
+    uri = URI(Ship.joins(:ownerships).where({ ownerships: { id: 1 } }).to_sar.path)
+    query = MessagePack.unpack(CGI.unescape(uri.query))
+    assert_equal({"where"=>{"ownerships"=>{"id"=>{"eq"=>"1"}}}}, query)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.0.0.2
+  version: 5.0.0.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-11-30 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.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs