sunstone 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 567a0950650c172c56b5c8d23061ff04efe5ecc2
-  data.tar.gz: 95cd7fcc96e4aaefb0ce439548fb2e5eb9d2aff1
+  metadata.gz: 25d9399ddb2d453dfd16181b8207792c1de527a6
+  data.tar.gz: e675ed6285907dfa641237e6d0e86df12c59ce29
 SHA512:
-  metadata.gz: 82626c3c9861b180c9021eb845d2988e467a7564e0f9f5c040e202eb6ff996670d777f7f636924b8f2dc1d4738600b03381d2495c769e8a8288db534a8feccd8
-  data.tar.gz: fd7e2ec407a4f2ae055a710613c3e1ae35d486679d2299bfe29f3a661e13396f687d597e8eecec056a42b418bf8138a02f0454a7a97f0f6c7b9e93b9c8a99ad4
+  metadata.gz: de118716de30e72b4fce3b85c7267883b6daaa3a747a076d9049e64e49ca964edf105347652ecbe0830f96bd915447023cadc67799cc9b1be132215d9a24b37e
+  data.tar.gz: 54cef9aad93186f4e121331fedff26e2bb6226e25770a372343db86074ae05cf6d5ffda127d71ab637292b096466eaf60dde6827f60ac1842fc56ceb65fa6eef

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

@@ -2,7 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     module Sunstone
       module DatabaseStatements
-        
+
         # Converts an arel AST to a Sunstone API Request
         def to_sar(arel, bvs)
           if arel.respond_to?(:ast)
@@ -12,12 +12,12 @@ module ActiveRecord
             arel
           end
         end
-              
+
         # Returns an ActiveRecord::Result instance.
         def select_all(arel, name = nil, binds = [], &block)
           exec_query(arel, name, binds)
         end
-        
+
         def exec_query(arel, name = 'SAR', binds = [])
           result = exec(to_sar(arel, binds), name)
 

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -135,11 +135,11 @@ module ActiveRecord
       def update_table_definition(table_name, base) #:nodoc:
         SunstoneAPI::Table.new(table_name, base)
       end
-      
+
       def collector
         Arel::Collectors::Sunstone.new
       end
-      
+
       def server_config
         Wankel.parse(@connection.get("/configuration").body)
       end
@@ -174,4 +174,4 @@ module ActiveRecord
         end
     end
   end
-end
+end

data/lib/arel/collectors/sunstone.rb

@@ -1,9 +1,9 @@
 module Arel
   module Collectors
     class Sunstone < Arel::Collectors::Bind
-      
-      attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates
-      
+
+      attr_accessor :request_type, :table, :where, :limit, :offset, :order, :operation, :columns, :updates, :eager_loads
+
       def substitute_binds hash, bvs
         if hash.is_a?(Array)
           hash.map { |w| substitute_binds(w, bvs) }
@@ -21,11 +21,11 @@ module Arel
           newhash
         end
       end
-      
+
       def value
         flatten_nested(where).flatten
       end
-      
+
       def flatten_nested(obj)
         if obj.is_a?(Array)
           obj.map { |w| flatten_nested(w) }
@@ -35,17 +35,17 @@ module Arel
           obj
         end
       end
-      
+
       def compile bvs, conn = nil
         path = "/#{table}"
-        
+
         case operation
         when :count, :average, :min, :max
           path += "/#{operation}"
         end
-        
+
         get_params = {}
-        
+
         if where
           get_params[:where] = substitute_binds(where.clone, bvs)
           if get_params[:where].size == 1
@@ -53,23 +53,28 @@ module Arel
           end
         end
         
+        if eager_loads
+          get_params[:include] = eager_loads.clone
+        end
+
         get_params[:limit] = limit if limit
         get_params[:offset] = offset if offset
         get_params[:order] = order if order
         get_params[:columns] = columns if columns
-        
+
         if get_params.size > 0
           path += '?' + get_params.to_param
         end
-          
+
         request = request_type.new(path)
+
         if updates
           request.body = {table.singularize => substitute_binds(updates.clone, bvs)}.to_json
         end
-        
+
         request
       end
-      
+
     end
   end
 end

data/lib/arel/visitors/sunstone.rb

@@ -24,34 +24,40 @@ module Arel
       def compile node, &block
         accept(node, Arel::Collectors::SQLString.new, &block).value
       end
-      
+
       private
-      
+
       def visit_Arel_Nodes_SelectStatement o, collector
         collector = o.cores.inject(collector) { |c,x|
           visit_Arel_Nodes_SelectCore(x, c)
         }
-        
+
         if !o.orders.empty?
           collector.order = o.orders.map { |x| visit(x, collector) }
         end
-
+        
         collector = maybe_visit o.limit, collector
         collector = maybe_visit o.offset, collector
+        collector = maybe_visit o.eager_load, collector
         # collector = maybe_visit o.lock, collector
 
         collector
       end
-      
+
+      def visit_Arel_Nodes_EagerLoad o, collector
+        collector.eager_loads = o.expr
+        collector
+      end
+
       def visit_Arel_Nodes_SelectCore o, collector
         collector.request_type = Net::HTTP::Get
-        
+
         unless o.projections.empty?
           visit(o.projections.first, collector)
         else
           collector.operation = :select
         end
-        
+
         if o.source && !o.source.empty?
           collector.table = o.source.left.name
         end
@@ -78,8 +84,6 @@ module Arel
       end
 
 
-      
-      #
       # private
       #
       # def visit_Arel_Nodes_DeleteStatement o, collector
@@ -625,13 +629,14 @@ module Arel
       #     visit right, collector
       #   end
       # end
-      #
-      # def visit_Arel_Nodes_As o, collector
-      #   collector = visit o.left, collector
-      #   collector << " AS "
-      #   visit o.right, collector
-      # end
-      #
+
+      def visit_Arel_Nodes_As o, collector
+        # collector = visit o.left, collector
+        # collector << " AS "
+        # visit o.right, collector
+        collector
+      end
+
       # def visit_Arel_Nodes_UnqualifiedColumn o, collector
       #   collector << "#{quote_column_name o.name}"
       #   collector
@@ -756,4 +761,4 @@ module Arel
       end
     end
   end
-end
+end

data/lib/ext/active_record/finder_methods.rb

@@ -0,0 +1,96 @@
+module ActiveRecord
+  module FinderMethods
+    
+    def find_with_associations
+      arel.eager_load = Arel::Nodes::EagerLoad.new(eager_load_values)
+
+      if block_given?
+        yield self
+      else
+        if ActiveRecord::NullRelation === self
+          []
+        else
+          rows = connection.select_all(arel, 'SQL', arel.bind_values + bind_values)
+          instantiate_with_associations(rows, self)
+          # join_dependency.instantiate(rows, aliases)
+        end
+      end
+    end
+    
+    def instantiate_with_associations(result_set, klass)
+      seen = Hash.new { |h, parent_klass|
+        h[parent_klass] = Hash.new { |i, parent_id|
+          i[parent_id] = Hash.new { |j, child_klass| j[child_klass] = {} }
+        }
+      }
+
+      model_cache = Hash.new { |h,klass| h[klass] = {} }
+      parents = model_cache[self.base_class]
+      
+      result_set.each { |row_hash|
+        parent = parents[row_hash[primary_key]] ||= instantiate(row_hash.select{|k,v| column_names.include?(k.to_s) })
+        construct(parent, row_hash.select{|k,v| !column_names.include?(k.to_s) }, seen, model_cache)
+      }
+      
+      parents.values
+    end
+    
+    def construct(parent, relations, seen, model_cache)
+      relations.each do |key, attributes|
+        reflection = parent.class.reflect_on_association(key)
+        next unless reflection
+        
+        if reflection.collection?
+          other = parent.association(reflection.name)
+          other.loaded!
+        else
+          if parent.association_cache.key?(reflection.name)
+            model = parent.association(reflection.name).target
+            construct(model, attributes.select{|k,v| !reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+          end
+        end
+        
+        if !reflection.collection?
+          construct_association(parent, reflection, attributes, seen, model_cache)
+        else
+          attributes.each do |row|
+            construct_association(parent, reflection, row, seen, model_cache)
+          end
+        end
+          
+      end
+    end
+    
+    def construct_association(parent, reflection, attributes, seen, model_cache)
+      return if attributes.nil?
+      id = attributes[reflection.klass.primary_key]
+    
+      model = seen[parent.class.base_class][parent.id][reflection.klass][id]
+    
+      if model
+        construct(model, attributes.select{|k,v| !reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+      else
+        model = construct_model(parent, reflection, id, attributes.select{|k,v| reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+        seen[parent.class.base_class][parent.id][model.class.base_class][id] = model
+        construct(model, attributes.select{|k,v| !reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+      end
+    end
+    
+
+    def construct_model(record, reflection, id, attributes, seen, model_cache)
+      model = model_cache[reflection.klass][id] ||= reflection.klass.instantiate(attributes)
+      other = record.association(reflection.name)
+
+      if reflection.collection?
+        other.target.push(model)
+      else
+        other.target = model
+      end
+
+      other.set_inverse_instance(model)
+      model
+    end
+    
+  end
+
+end

data/lib/ext/arel/nodes/eager_load.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class EagerLoad < Arel::Nodes::Unary
+
+    end
+  end
+end

data/lib/ext/arel/nodes/select_statement.rb

@@ -0,0 +1,28 @@
+module Arel
+  module Nodes
+    class SelectStatement < Arel::Nodes::Node
+
+      attr_accessor :eager_load
+
+      def initialize_with_eager_load cores = [SelectCore.new]
+        initialize_without_eager_load
+        @eager_load = nil
+      end
+
+      alias_method :initialize_without_eager_load, :initialize
+      alias_method :initialize, :initialize_with_eager_load
+
+      def hash
+        [@cores, @orders, @limit, @lock, @offset, @with, @eager_load].hash
+      end
+
+      def eql_with_eager_load? other
+        eql_without_eager_load?(other) && self.eager_load == other.eager_load
+      end
+      alias_method :eql_without_eager_load?, :eql?
+      alias_method :eql?, :eql_with_eager_load?
+      alias_method :==, :eql?
+
+    end
+  end
+end

data/lib/ext/arel/select_manager.rb

@@ -0,0 +1,18 @@
+module Arel
+  class SelectManager < Arel::TreeManager
+
+    def eager_load
+      @ast.eager_load
+    end
+
+    def eager_load=(eager_load)
+      if eager_load.nil? || eager_load.expr.empty?
+        @ast.eager_load = nil
+      else
+        @ast.eager_load = eager_load
+      end
+      self
+    end
+
+  end
+end

data/lib/sunstone.rb

@@ -14,6 +14,11 @@ require 'ext/active_record/statement_cache'
 require 'ext/active_record/relation'
 require 'ext/active_record/associations/builder/has_and_belongs_to_many'
 
+require 'ext/arel/select_manager'
+require 'ext/arel/nodes/eager_load'
+require 'ext/arel/nodes/select_statement'
+require 'ext/active_record/finder_methods'
+
 # require 'sunstone/parser'
 
 module Sunstone
@@ -48,4 +53,4 @@ module Sunstone
 #     headers
 #   end
 #
-end
+end

data/lib/sunstone/connection.rb

@@ -2,9 +2,9 @@ require 'uri'
 require 'net/http'
 require 'net/https'
 
-# # _Sunstone_ is a low-level API. It provides basic HTTP #get, #post, #put, and
-# # #delete calls to the Sunstone Server. It can also provides basic error
-# # checking of responses.
+# _Sunstone_ is a low-level API. It provides basic HTTP #get, #post, #put, and
+# #delete calls to the Sunstone Server. It can also provides basic error
+# checking of responses.
 module Sunstone
   class Connection
     
@@ -99,7 +99,7 @@ module Sunstone
     #  end
     def send_request(request, body=nil, &block)
       request_headers.each { |k, v| request[k] = v }
-    
+
       if body.is_a?(IO)
         request['Transfer-Encoding'] = 'chunked'
         request.body_stream =  body
@@ -108,23 +108,23 @@ module Sunstone
       elsif body
         request.body = Wankel.encode(body)
       end
-    
+
       return_value = nil
       @connection.request(request) do |response|
-      
+
         if response['X-42Floors-API-Version-Deprecated']
           logger.warn("DEPRECATION WARNING: API v#{API_VERSION} is being phased out")
         end
 
         validate_response_code(response)
-      
+
         # Get the cookies
         response.each_header do |key, value|
           if key.downcase == 'set-cookie' && Thread.current[:sunstone_cookie_store]
             Thread.current[:sunstone_cookie_store].set_cookie("#{site}#{request.path}", value)
           end
         end
-      
+
         if block_given?
           return_value =yield(response)
         else
@@ -132,11 +132,9 @@ module Sunstone
         end
       end
 
-
-    
       return_value
     end
-    
+
     # Send a GET request to +path+ on the Sunstone Server via +Sunstone#send_request+.
     # See +Sunstone#send_request+ for more details on how the response is handled.
     #
@@ -335,4 +333,4 @@ module Sunstone
     end
     
   end
-end
+end

data/sunstone.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sunstone"
-  s.version     = '1.1.0'
+  s.version     = '1.2.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.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -269,8 +269,12 @@ files:
 - lib/arel/collectors/sunstone.rb
 - lib/arel/visitors/sunstone.rb
 - lib/ext/active_record/associations/builder/has_and_belongs_to_many.rb
+- lib/ext/active_record/finder_methods.rb
 - lib/ext/active_record/relation.rb
 - lib/ext/active_record/statement_cache.rb
+- lib/ext/arel/nodes/eager_load.rb
+- lib/ext/arel/nodes/select_statement.rb
+- lib/ext/arel/select_manager.rb
 - lib/sunstone.rb
 - lib/sunstone/connection.rb
 - lib/sunstone/exception.rb