sunstone 1.8.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eae0846af813b1c0fc695244c0d5f41c596213cd
-  data.tar.gz: 8bd60e37e8b04992ea6b60abbc732a6f479f6753
+  metadata.gz: 5971616d7a67d451d0d618ed1aaa6f9de9b3daa0
+  data.tar.gz: df3a218c951f5070e2cfccdc91cfa88c0c6a895c
 SHA512:
-  metadata.gz: 1ae2591677494501e528f9c390c631de45576f47b5154f5e84eb3cce67e00a50bbc2188bfa0d84681eabb1d474055adb6bd6e1983cf0785c89044af08abd66ae
-  data.tar.gz: 76c26a37f72174c37c52feef35c2837dd298697a805232a917ac9c73a229a20fc7ba559dee2d6c4348a041396a05dd54e6ae7643419698010c1b04530d039f22
+  metadata.gz: 6c2eed7323ae88fe0200bfbe83dff412602174d0f3559d94c8bce01117768b1f11b70b95f3b016f75de4751f051db8eb5dbee9ea9efa94743d0e5f9fc49ccfa0
+  data.tar.gz: 87f7fe2cf78a6d7b0e8a4d0c10b00f606b31d4058c4a8b0fe1ed5f70ab16d39414da4d8d350e778dc389fa19408fd3c980dd9cf03fc9cf7ec8acc94c6beb91fc

data/{lib/ext → ext}/active_record/finder_methods.rb

@@ -63,11 +63,17 @@ module ActiveRecord
     
     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]
+      
+      klass = if reflection.polymorphic?
+        parent.send(reflection.foreign_type).constantize.base_class
+      else
+        reflection.klass
+      end
+      id = attributes[klass.primary_key]
+      model = seen[parent.class.base_class][parent.id][klass][id]
       
       if model
-        construct(model, attributes.select{|k,v| !reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+        construct(model, attributes.select{|k,v| !klass.column_names.include?(k.to_s) }, seen, model_cache)
 
         other = parent.association(reflection.name)
         
@@ -79,15 +85,21 @@ module ActiveRecord
 
         other.set_inverse_instance(model)
       else
-        model = construct_model(parent, reflection, id, attributes.select{|k,v| reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+        model = construct_model(parent, reflection, id, attributes.select{|k,v| 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)
+        construct(model, attributes.select{|k,v| !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)
+      klass = if reflection.polymorphic?
+        record.send(reflection.foreign_type).constantize
+      else
+        reflection.klass
+      end
+      
+      model = model_cache[klass][id] ||= klass.instantiate(attributes)
       other = record.association(reflection.name)
 
       if reflection.collection?

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

@@ -8,7 +8,7 @@ module ActiveRecord
         # If the schema is not specified as part of +name+ then it will only find tables within
         # the current schema search path (regardless of permissions to access tables in other schemas)
         def table_exists?(name)
-          schema_definition[name] != nil
+          tables.include?(name)
         end
 
         # Returns the list of all column definitions for a table.
@@ -25,18 +25,13 @@ module ActiveRecord
         #  - format_type includes the column size constraint, e.g. varchar(50)
         #  - ::regclass is a function that gives the id for a table name
         def column_definitions(table_name) # :nodoc:
-          definition = schema_definition[table_name]
-          raise ActiveRecord::StatementInvalid, "Table \"#{table_name}\" does not exist" if definition.nil?
-
-          definition
+          Wankel.parse(@connection.get("/#{table_name}/schema").body)
+        rescue ::Sunstone::Exception::NotFound
+          raise ActiveRecord::StatementInvalid, "Table \"#{table_name}\" does not exist"
         end
         
-        def schema_definition
-          exec( Arel::Table.new(:schema).project )
-        end
-    
         def tables
-          Wankel.parse(@connection.get('/schema').body, :symbolize_keys => true).keys
+          Wankel.parse(@connection.get('/tables').body)
         end
         
         def new_column(name, cast_type, options={}) # :nodoc:
@@ -54,45 +49,6 @@ module ActiveRecord
           columns(table).find{ |c| c.primary_key? }.name
         end
 
-        # TODO: do we need this?
-        # Maps logical Rails types to PostgreSQL-specific data types.
-        # def type_to_sql(type, limit = nil, precision = nil, scale = nil)
-        #   case type.to_s
-        #   when 'binary'
-        #     # PostgreSQL doesn't support limits on binary (bytea) columns.
-        #     # The hard limit is 1Gb, because of a 32-bit size field, and TOAST.
-        #     case limit
-        #     when nil, 0..0x3fffffff; super(type)
-        #     else raise(ActiveRecordError, "No binary type has byte size #{limit}.")
-        #     end
-        #   when 'text'
-        #     # PostgreSQL doesn't support limits on text columns.
-        #     # The hard limit is 1Gb, according to section 8.3 in the manual.
-        #     case limit
-        #     when nil, 0..0x3fffffff; super(type)
-        #     else raise(ActiveRecordError, "The limit on text can be at most 1GB - 1byte.")
-        #     end
-        #   when 'integer'
-        #     return 'integer' unless limit
-        #
-        #     case limit
-        #       when 1, 2; 'smallint'
-        #       when 3, 4; 'integer'
-        #       when 5..8; 'bigint'
-        #       else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
-        #     end
-        #   when 'datetime'
-        #     return super unless precision
-        #
-        #     case precision
-        #       when 0..6; "timestamp(#{precision})"
-        #       else raise(ActiveRecordError, "No timestamp type has precision of #{precision}. The allowed range of precision is from 0 to 6")
-        #     end
-        #   else
-        #     super
-        #   end
-        # end
-
       end
     end
   end

data/lib/sunstone.rb

@@ -1,51 +1,19 @@
 require 'wankel'
 require 'cookie_store'
-
-require 'active_support'
-require 'active_support/core_ext'
-
-require 'active_model'
-
 require 'active_record'
 
-require 'sunstone/connection'
-require 'sunstone/exception'
-require 'ext/active_record/statement_cache'
-require 'ext/active_record/relation'
-require 'ext/active_record/relation/predicate_builder'
-require 'ext/active_record/calculations'
-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 'ext/active_record/batches'
-
-# require 'sunstone/parser'
-
-module Sunstone
-  VERSION = '1.7.15'
-
-# TODO:
-#
-#   # Get a connection from the connection pool and perform the block with
-#   # the connection
-#   def with_connection(&block)
-#     connection_pool.with({}, &block)
-#   end
-#
-#   private
-#
-#   def request_headers
-#     headers = {
-#       'Content-Type'            => 'application/json',
-#       'User-Agent'              => user_agent
-#     }
-#
-#     headers['Api-Key'] = api_key if api_key
-#
-#     headers
-#   end
-#
-end
+require File.expand_path(File.join(__FILE__, '../sunstone/version'))
+require File.expand_path(File.join(__FILE__, '../sunstone/connection'))
+require File.expand_path(File.join(__FILE__, '../sunstone/exception'))
+
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/statement_cache'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation/predicate_builder'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/calculations'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/associations/builder/has_and_belongs_to_many'))
+
+require File.expand_path(File.join(__FILE__, '../../ext/arel/select_manager'))
+require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/eager_load'))
+require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/select_statement'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/finder_methods'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/batches'))

data/lib/sunstone/exception.rb

@@ -1,11 +1,5 @@
 module Sunstone
   
-  class RecordInvalid < ::Exception
-  end
-  
-  class RecordNotSaved < ::Exception
-  end
-  
   class Exception < ::Exception
     
     class UnexpectedResponse < Sunstone::Exception

data/lib/sunstone/version.rb

@@ -0,0 +1,3 @@
+module Sunstone
+  VERSION = '2.0.0'
+end

data/sunstone.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path("../lib/sunstone/version", __FILE__)
+
 Gem::Specification.new do |s|
   s.name        = "sunstone"
-  s.version     = '1.8.2'
+  s.version     = Sunstone::VERSION
   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.8.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -261,6 +261,16 @@ files:
 - README.md
 - Rakefile.rb
 - TODO.md
+- ext/active_record/associations/builder/has_and_belongs_to_many.rb
+- ext/active_record/batches.rb
+- ext/active_record/calculations.rb
+- ext/active_record/finder_methods.rb
+- ext/active_record/relation.rb
+- ext/active_record/relation/predicate_builder.rb
+- ext/active_record/statement_cache.rb
+- ext/arel/nodes/eager_load.rb
+- ext/arel/nodes/select_statement.rb
+- ext/arel/select_manager.rb
 - lib/active_record/connection_adapters/sunstone/column.rb
 - lib/active_record/connection_adapters/sunstone/database_statements.rb
 - lib/active_record/connection_adapters/sunstone/schema_statements.rb
@@ -269,20 +279,10 @@ files:
 - lib/active_record/connection_adapters/sunstone_adapter.rb
 - 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/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/relation/predicate_builder.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
-- lib/sunstone/parser.rb
+- lib/sunstone/version.rb
 - sunstone.gemspec
 - test/sunstone/connection_test.rb
 - test/sunstone/parser_test.rb

data/lib/sunstone/parser.rb

@@ -1,93 +0,0 @@
-module Sunstone
-  class Parser < Wankel::SaxParser
-    
-    attr_reader :object
-    
-    def self.parse(instance_or_class, response_or_body)
-      parser = self.new(instance_or_class)
-      
-      if response_or_body.is_a?(Net::HTTPResponse)
-        response_or_body.read_body do |chunk|
-          parser << chunk
-        end
-      else
-        parser << response_or_body
-      end
-      
-      parser.complete
-    end
-  
-    def initialize(klass, options=nil)
-      super(options)
-      
-      @object = klass.class == Class ? klass.new : klass
-      @stack = []
-    end
-
-    def on_map_start
-      if @stack.size == 0
-        @stack << @object
-      elsif @stack.last.is_a?(Array)
-        key = @stack[-2].to_sym
-        if @stack[-3].reflect_on_associations[key]
-          @stack << @stack[-3].reflect_on_associations[key][:klass].new
-        end
-      else
-        key = @stack.last.to_sym
-        if @stack[-2].reflect_on_associations[key]
-          @stack << @stack[-2].reflect_on_associations[key][:klass].new
-        end
-      end
-    end
-  
-    def on_map_end
-      value = @stack.pop
-      
-      on_value(value) if @stack.size > 0
-      
-      value
-    end
-  
-    def on_map_key(key)
-      @stack << key
-    end
-  
-    def on_value(value)
-      if @stack.last.is_a?(Array)
-        @stack.last << value
-      else
-        attribute = @stack.pop
-        @stack.last.send(:"#{attribute}=", value) if @stack.last.respond_to?(:"#{attribute}=")
-      end
-    end
-  
-    def on_null; on_value(nil) ;end
-    alias :on_boolean :on_value
-    alias :on_integer :on_value
-    alias :on_double  :on_value
-    alias :on_string  :on_value
-  
-    def on_array_start
-        @stack << Array.new
-    end
-  
-    def on_array_end
-      value = @stack.pop
-      attribute = @stack.pop
-      @stack.last.send(:"#{attribute}=", value) if @stack.last.respond_to?(:"#{attribute}=")
-    end
-  
-    # Override to return the account
-    def parse(*args, &block)
-      super(*args, &block)
-      @object
-    end
-  
-    # Override to return the account
-    def complete
-      super
-      @object
-    end
-    
-  end
-end