sunstone 1.6.8 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1787de5cb810783b227cb3f567734aa5ce0cc3
-  data.tar.gz: 8a98b6a8e435cbfe10085e25afa88ae9a8354177
+  metadata.gz: f199678115b092025dfcacc613338734a4fcd233
+  data.tar.gz: 0cf2e737fff1dd02536ceacf622f702915efc292
 SHA512:
-  metadata.gz: 6ce4c180fbede2b0bf98270636801def200595d654a42f2bc87f4ae6b41034ba58a199bd193973839e95a033335c8ca013eca340ea47417d71ae8ae9139d51d6
-  data.tar.gz: 17dc0ac2d3c7413f783a3a3162bcdfb80e61dbd6edc0392a1820324b729fb8da346279cedbb23acb245f971f43daf4218df21cc1375bdea4bbfa7578d7d08ee8
+  metadata.gz: 9b950838b5a920260ada34a8e40bcf13cf99740f0348b765458ff380105d264202993b3b0d399ea671412722dc637e5d24cb2db7279db2f4dbe844950bf83f33
+  data.tar.gz: f5413976e8d8a1bbaded1394701cf81bc854953e4a029e792b2b87825e543f258222448e9141a79cf85af42f9cf812c8a93869af80defe33011e40b9f9d4fb64

data/lib/active_record/connection_adapters/sunstone/database_statements.rb

@@ -19,16 +19,17 @@ module ActiveRecord
         end
 
         def exec_query(arel, name = 'SAR', binds = [])
-          result = exec(to_sar(arel, binds), name)
+          sar = to_sar(arel, binds)
+          result = exec(sar, name)
 
-          if result.is_a?(Array)
-            ActiveRecord::Result.new(result[0] ? result[0].keys : [], result.map{|r| r.values})
+          if sar.instance_variable_get(:@sunstone_calculation)
+            # this is a count, min, max.... yea i know..
+            ActiveRecord::Result.new(['all'], [result], {:all => type_map.lookup('integer')})
           else
-            # this is a count.. yea i know..
-            ActiveRecord::Result.new(['all'], [[result]], {:all => type_map.lookup('integer')})
+            ActiveRecord::Result.new(result[0] ? result[0].keys : [], result.map{|r| r.values})
           end
         end
-
+        
       end
     end
   end

data/lib/arel/collectors/sunstone.rb

@@ -62,9 +62,9 @@ module Arel
         case operation
         when :count
           path += "/#{operation}"
-        when :average, :min, :max
-          get_params[:column] = columns
-          path += "/#{operation}"
+        when :calculate
+          path += "/calculate"
+          get_params[:select] = columns
         when :update, :delete
           path += "/#{get_params[:where]['id']}"
           get_params.delete(:where)
@@ -75,6 +75,7 @@ module Arel
         end
 
         request = request_type.new(path)
+        request.instance_variable_set(:@sunstone_calculation, true) if operation == :calculate
 
         if updates
           request.body = body

data/lib/arel/visitors/sunstone.rb

@@ -46,7 +46,7 @@ module Arel
         collector.request_type = Net::HTTP::Get
 
         unless o.projections.empty?
-          visit(o.projections.first, collector)
+          o.projections.each { |proj| visit(proj, collector) }
         else
           collector.operation = :select
         end
@@ -391,8 +391,11 @@ module Arel
       # end
       #
       def visit_Arel_Nodes_Count o, collector
-        collector.operation = :count
-        collector.columns   = visit o.expressions.first, collector
+        collector.operation = :calculate
+        
+        collector.columns   ||= []
+        collector.columns   << {:count => (o.expressions.first.is_a?(Arel::Attributes::Attribute) ? o.expressions.first.name : o.expressions.first) }
+        # collector.columns   = visit o.expressions.first, collector
       end
       #
       # def visit_Arel_Nodes_Sum o, collector
@@ -400,35 +403,42 @@ module Arel
       # end
       #
       def visit_Arel_Nodes_Max o, collector
-        collector.operation = :max
+        collector.operation = :calculate
+        
+        collector.columns   ||= []
         if o.expressions.first.is_a?(Arel::Attributes::Attribute)
           relation = o.expressions.first.relation
           join_name = relation.table_alias || relation.name
-          collector.columns = join_name ? o.expressions.first.name : "#{join_name}.#{o.expressions.first.name}"
+          collector.columns << {:maximum => join_name ? o.expressions.first.name : "#{join_name}.#{o.expressions.first.name}"}
         else
-          collector.columns   = o.expressions.first
+          collector.columns << {:maximum => o.expressions.first}
         end
       end
 
       def visit_Arel_Nodes_Min o, collector
-        collector.operation = :min
+        collector.operation = :calculate
+
+        collector.columns   ||= []
         if o.expressions.first.is_a?(Arel::Attributes::Attribute)
           relation = o.expressions.first.relation
           join_name = relation.table_alias || relation.name
-          collector.columns = join_name ? o.expressions.first.name : "#{join_name}.#{o.expressions.first.name}"
+          collector.columns << {:minimum => join_name ? o.expressions.first.name : "#{join_name}.#{o.expressions.first.name}"}
         else
-          collector.columns   = o.expressions.first
+          collector.columns << {:minimum => o.expressions.first}
         end
       end
 
       def visit_Arel_Nodes_Avg o, collector
-        collector.operation = :average
+        collector.operation = :calculate
+
+        collector.columns   ||= []
         if o.expressions.first.is_a?(Arel::Attributes::Attribute)
           relation = o.expressions.first.relation
           join_name = relation.table_alias || relation.name
-          collector.columns = join_name ? o.expressions.first.name : "#{join_name}.#{o.expressions.first.name}"
+          collector.columns << {:average => join_name ? o.expressions.first.name : "#{join_name}.#{o.expressions.first.name}"}
         else
-          collector.columns   = o.expressions.first
+
+          collector.columns << {:average => o.expressions.first}
         end
       end
       #

data/lib/ext/active_record/calculations.rb

@@ -0,0 +1,28 @@
+module ActiveRecord
+  module Calculations
+    def pluck(*column_names)
+      
+      # column_names.map! do |column_name|
+      #   if column_name.is_a?(Symbol) && attribute_alias?(column_name)
+      #     attribute_alias(column_name)
+      #   else
+      #     column_name.to_s
+      #   end
+      # end
+
+      if has_include?(column_names.first)
+        construct_relation_for_association_calculations.pluck(*column_names)
+      else
+        relation = spawn
+        relation.select_values = column_names.map { |cn|
+          columns_hash.key?(cn) ? arel_table[cn] : cn
+        }
+        
+        result = klass.connection.exec_query(relation.arel, nil, relation.arel.bind_values + bind_values)
+        result.cast_values(klass.column_types)
+      end
+    end
+    
+  end
+end
+

data/lib/sunstone.rb

@@ -12,6 +12,7 @@ require 'sunstone/connection'
 require 'sunstone/exception'
 require 'ext/active_record/statement_cache'
 require 'ext/active_record/relation'
+require 'ext/active_record/calculations'
 require 'ext/active_record/associations/builder/has_and_belongs_to_many'
 
 require 'ext/arel/select_manager'

data/sunstone.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sunstone"
-  s.version     = '1.6.8'
+  s.version     = '1.7.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.6.8
+  version: 1.7.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -270,6 +270,7 @@ files:
 - lib/arel/visitors/sunstone.rb
 - lib/ext/active_record/associations/builder/has_and_belongs_to_many.rb
 - lib/ext/active_record/batches.rb
+- lib/ext/active_record/calculations.rb
 - lib/ext/active_record/finder_methods.rb
 - lib/ext/active_record/relation.rb
 - lib/ext/active_record/statement_cache.rb
@@ -279,7 +280,6 @@ files:
 - lib/sunstone.rb
 - lib/sunstone/connection.rb
 - lib/sunstone/exception.rb
-- lib/sunstone/model/associations.rb
 - lib/sunstone/parser.rb
 - sunstone.gemspec
 - test/sunstone/connection_test.rb
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs

data/lib/sunstone/model/associations.rb

@@ -1,89 +0,0 @@
-module Sunstone
-  class Model
-    
-    module Associations
-      
-      extend ActiveSupport::Concern
-      
-      attr_accessor :assoications
-      
-      def initialize(*)
-        super
-        @associations = {}
-      end
-      
-      def reflect_on_associations
-        self.class.reflect_on_associations
-      end
-      
-      module ClassMethods
-        
-        def inherited(subclass)
-          super
-          subclass.initialize_associations
-        end
-  
-        def initialize_associations
-          @associations = {}
-        end
-  
-        def reflect_on_associations
-          @associations
-        end
-        
-        def belongs_to(name, options = {})
-          @associations[name] = {
-            :name => name,
-            :macro => :belongs_to,
-            :klass => (options[:class_name] || name).to_s.camelize.constantize,
-            :foreign_key => (options[:foreign_key] || :"#{name}_id")
-          }
-          
-          attribute(@associations[name][:foreign_key], :integer)
-          define_association_reader(@associations[name])
-          define_association_writer(@associations[name])
-        end
-        
-        def has_many(name, options = {})
-          @associations[name] = {
-            :name => name,
-            :macro => :has_many,
-            :klass => (options[:class_name] || name.to_s.singularize).to_s.camelize.constantize
-          }
-          
-          define_association_reader(@associations[name])
-          define_association_writer(@associations[name])
-        end
-  
-        def define_association_reader(association)
-          # if association[:macro] == :belongs_to
-            class_eval <<-EOV, __FILE__, __LINE__ + 1
-              def #{association[:name]}
-                @associations[:#{association[:name]}]
-              end
-            EOV
-          # end
-        end
-  
-        def define_association_writer(association)
-          if association[:macro] == :belongs_to
-            class_eval <<-EOV, __FILE__, __LINE__ + 1
-              def #{association[:name]}=(value)
-                self.#{association[:foreign_key]} = value.id if !value.nil?
-                @associations[:#{association[:name]}] = value
-              end
-            EOV
-          elsif association[:macro] == :has_many
-            class_eval <<-EOV, __FILE__, __LINE__ + 1
-              def #{association[:name]}=(value)
-                @associations[:#{association[:name]}] = value
-              end
-            EOV
-          end
-        end
-
-      end
-      
-    end
-  end
-end