sunstone 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b03328d14a617316bc09421b97d94726aa85e6
-  data.tar.gz: a46d7b00f94e8a052d6014ab391bdf153c1686fd
+  metadata.gz: 0c0406aa3472706a069b6ad96fbd734c94dbe2fa
+  data.tar.gz: 3c1d5642f1edb3c3868c2e01b4cc5408c3354ffa
 SHA512:
-  metadata.gz: d82113de48120d57a36fa5cd35b980bac4456671c81c4712547d9323fbb4d620525a76271de2cfc9f4c4eea60934032510e5cb7f902fac8124261515ac31831c
-  data.tar.gz: 788d96dfeda86bee15c0b2009a3f05ba5838791a98354567af7040c1dee24690804559c6a4c18a22443e05048738722f5cbec74b58c10af13345dd820f2a82fc
+  metadata.gz: f759b2964fb0767614828d9cc455fac9d769c2778e502131d55430c7f8c9b8a96766940eafa60d5077efccb7837b8fe6b467b6fd6f82bca597a7246267d96f72
+  data.tar.gz: ff84746a3d4dc7dcd66e4fcf0b779cee4b8d56e331fd57f97b34dcfb96c42db5ec5b18593cf5164c05d3d079ca5c336b6f77c5a42d32beb497610d16248b94ab

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -111,6 +111,12 @@ module ActiveRecord
       def reset!
         # configure_connection
       end
+      
+      # Executes the delete statement and returns the number of rows affected.
+      def delete(arel, name = nil, binds = [])
+        r = exec_delete(to_sql(arel, binds), name, binds)
+        r.rows.first.to_i
+      end
 
       # TODO: deal with connection.close
       # Disconnects from the database if already connected. Otherwise, this

data/lib/arel/collectors/sunstone.rb

@@ -39,13 +39,6 @@ module Arel
       def compile bvs, conn = nil
         path = "/#{table}"
 
-        case operation
-        when :count, :average, :min, :max
-          path += "/#{operation}"
-        when :update
-          path += "/#{id}"
-        end
-
         get_params = {}
 
         if where
@@ -64,6 +57,15 @@ module Arel
         get_params[:order] = order if order
         get_params[:columns] = columns if columns
 
+
+        case operation
+        when :count, :average, :min, :max
+          path += "/#{operation}"
+        when :update, :delete
+          path += "/#{get_params[:where]['id']}"
+          get_params.delete(:where)
+        end
+        
         if get_params.size > 0
           path += '?' + get_params.to_param
         end

data/lib/arel/visitors/sunstone.rb

@@ -84,18 +84,24 @@ module Arel
       end
 
 
-      # private
-      #
-      # def visit_Arel_Nodes_DeleteStatement o, collector
-      #   collector << "DELETE FROM "
-      #   collector = visit o.relation, collector
-      #   if o.wheres.any?
-      #     collector << " WHERE "
-      #     inject_join o.wheres, collector, AND
-      #   else
-      #     collector
-      #   end
-      # end
+      private
+
+      def visit_Arel_Nodes_DeleteStatement o, collector
+        collector.request_type  = Net::HTTP::Delete
+        collector.table         = o.relation.name
+        collector.operation     = :delete
+
+        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'
+        else
+          collector.where = wheres
+        end
+
+        collector
+      end
       #
       # # FIXME: we should probably have a 2-pass visitor for this
       # def build_subselect key, o
@@ -119,6 +125,8 @@ module Arel
         }
         if wheres.size != 1 && wheres.first.size != 1 && !wheres['id']
           raise 'Upsupported'
+        else
+          collector.where = wheres
         end
         
         collector.id = wheres.first['id']

data/sunstone.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sunstone"
-  s.version     = '1.3.0'
+  s.version     = '1.4.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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake