sunstone 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932214114f8eca2aa1070795e17fd2c1e2cdf129
-  data.tar.gz: 752db701091fb743681348f1b9a34e1f4bcf1e2f
+  metadata.gz: f5b03328d14a617316bc09421b97d94726aa85e6
+  data.tar.gz: a46d7b00f94e8a052d6014ab391bdf153c1686fd
 SHA512:
-  metadata.gz: 4551d1399d76ce59806fcc33ed50267142247e22d321b814fe2216b8e8398809769305af7f1689ee0f2b93cd01caa403a74d7765662d9277ba77c35b10d8ba4c
-  data.tar.gz: a93c30a197f5e0d8d8538bf80576bd84fd4422ca4a694adb3c1d6d135b33d7cf4173f4c56a333d93c0ef91bc7dc462a6ce2608e5ad8b42dd238de85484ae8a91
+  metadata.gz: d82113de48120d57a36fa5cd35b980bac4456671c81c4712547d9323fbb4d620525a76271de2cfc9f4c4eea60934032510e5cb7f902fac8124261515ac31831c
+  data.tar.gz: 788d96dfeda86bee15c0b2009a3f05ba5838791a98354567af7040c1dee24690804559c6a4c18a22443e05048738722f5cbec74b58c10af13345dd820f2a82fc

data/lib/arel/collectors/sunstone.rb

@@ -2,7 +2,7 @@ module Arel
   module Collectors
     class Sunstone < Arel::Collectors::Bind
 
-      attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates, :eager_loads
+      attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates, :eager_loads, :id
 
       def substitute_binds hash, bvs
         if hash.is_a?(Array)
@@ -42,6 +42,8 @@ module Arel
         case operation
         when :count, :average, :min, :max
           path += "/#{operation}"
+        when :update
+          path += "/#{id}"
         end
 
         get_params = {}

data/lib/arel/visitors/sunstone.rb

@@ -109,27 +109,26 @@ module Arel
       #   stmt
       # end
       #
-      # def visit_Arel_Nodes_UpdateStatement o, collector
-      #   if o.orders.empty? && o.limit.nil?
-      #     wheres = o.wheres
-      #   else
-      #     wheres = [Nodes::In.new(o.key, [build_subselect(o.key, o)])]
-      #   end
-      #
-      #   collector << "UPDATE "
-      #   collector = visit o.relation, collector
-      #   unless o.values.empty?
-      #     collector << " SET "
-      #     collector = inject_join o.values, collector, ", "
-      #   end
-      #
-      #   unless wheres.empty?
-      #     collector << " WHERE "
-      #     collector = inject_join wheres, collector, " AND "
-      #   end
-      #
-      #   collector
-      # end
+      def visit_Arel_Nodes_UpdateStatement o, collector
+        collector.request_type  = Net::HTTP::Patch
+        collector.table         = o.relation.name
+        collector.operation     = :update
+
+        wheres = o.wheres.map { |x| visit(x, collector) }.inject([]) { |c, w|
+          w.is_a?(Array) ? c += w : c << w
+        }
+        if wheres.size != 1 && wheres.first.size != 1 && !wheres['id']
+          raise 'Upsupported'
+        end
+        
+        collector.id = wheres.first['id']
+        
+        if o.values
+          collector.updates = o.values.map { |x| visit(x, collector) }.inject({}){|c,v| c.merge(v) }#.zip(o.values).to_h
+        end
+
+        collector
+      end
       #
       #
       # def visit_Arel_Nodes_Exists o, collector
@@ -392,7 +391,7 @@ module Arel
       #
       def visit_Arel_Nodes_Count o, collector
         collector.operation = :count
-        collector.columns   = o.expressions.first
+        collector.columns   = visit o.expressions.first, collector
       end
       #
       # def visit_Arel_Nodes_Sum o, collector
@@ -590,18 +589,16 @@ module Arel
         ors
       end
 
-      # def visit_Arel_Nodes_Assignment o, collector
-      #   case o.right
-      #   when Arel::Nodes::UnqualifiedColumn, Arel::Attributes::Attribute, Arel::Nodes::BindParam
-      #     collector = visit o.left, collector
-      #     collector << " = "
-      #     visit o.right, collector
-      #   else
-      #     collector = visit o.left, collector
-      #     collector << " = "
-      #     collector << quote(o.right, column_for(o.left)).to_s
-      #   end
-      # end
+      def visit_Arel_Nodes_Assignment o, collector
+        case o.right
+        when Arel::Nodes::UnqualifiedColumn, Arel::Attributes::Attribute, Arel::Nodes::BindParam
+          { visit(o.left, collector) => visit(o.right, collector) }
+        else
+          collector = visit o.left, collector
+          collector << " = "
+          collector << quote(o.right, column_for(o.left)).to_s
+        end
+      end
 
       def visit_Arel_Nodes_Equality o, collector
         key = visit(o.left, collector).to_s.split('.')
@@ -637,11 +634,10 @@ module Arel
         collector
       end
 
-      # def visit_Arel_Nodes_UnqualifiedColumn o, collector
-      #   collector << "#{quote_column_name o.name}"
-      #   collector
-      # end
-      #
+      def visit_Arel_Nodes_UnqualifiedColumn o, collector
+        o.name
+      end
+
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name
         # collector <<

data/sunstone.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sunstone"
-  s.version     = '1.2.1'
+  s.version     = '1.3.0'
   s.authors     = ["Jon Bracy"]
   s.email       = ["jonbracy@gmail.com"]
   s.homepage    = "http://sunstonerb.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake