sunstone 2.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7571ad32bf7197a480c1f59c5a5158ce0f1d492
-  data.tar.gz: d10ec4207fc78c2e6ec8d3dee815469a7b4b868a
+  metadata.gz: 9d7b7cb926a0045ee4a771a87ce5f3f3096fb035
+  data.tar.gz: 0edf0869c5ac58e901579d47b8979ed4ecf98c39
 SHA512:
-  metadata.gz: 121532495ba520b5e66de7cc054e9fc1958076c6953c2dc10e710816d9944fc76e940a4dd6018cea3a5599aa43faecdee9c81259fd7d569ea659abcbc6ccb4d9
-  data.tar.gz: 815d5f4f6a5c89a1552b8dc8cde45ac8cf508608b5403c75f4516569fd834f2f3becf1fa3af3cf25c622cba2d3ade471dca215029d4aa2230a9b46fc916e730b
+  metadata.gz: 2bf1d1921cf1cad5967be3398b0a49de76cac94b65bc268952c549b994b1e48487913b062a29e33f4968c84fecb90aec0691f24cce06261c61f0a7cf2bce5ddb
+  data.tar.gz: 8bce1e614955c036c7d46df1c109b2650dec40ad5d0b3168d9c33963005c94f91a80a6737d1b00b045ffafea006efc43faaef28f66053f811975e0efa33e2f46

data/ext/active_record/associations/builder/has_and_belongs_to_many.rb

@@ -1,52 +1,48 @@
-# module ActiveRecord::Associations::Builder
-#   class HasAndBelongsToMany # :nodoc:
-#
-#     def through_model
-#       habtm = JoinTableResolver.build lhs_model, association_name, options
-#
-#       join_model = Class.new(lhs_model.base_class.superclass) { # Don't use ActiveRecord::Base here because that might not be the abstract class that we need and the connection may be different
-#         class << self;
-#           attr_accessor :left_model
-#           attr_accessor :name
-#           attr_accessor :table_name_resolver
-#           attr_accessor :left_reflection
-#           attr_accessor :right_reflection
-#         end
-#
-#         def self.table_name
-#           table_name_resolver.join_table
-#         end
-#
-#         def self.compute_type(class_name)
-#           left_model.compute_type class_name
-#         end
-#
-#         def self.add_left_association(name, options)
-#           belongs_to name, options
-#           self.left_reflection = _reflect_on_association(name)
-#         end
-#
-#         def self.add_right_association(name, options)
-#           rhs_name = name.to_s.singularize.to_sym
-#           belongs_to rhs_name, options
-#           self.right_reflection = _reflect_on_association(rhs_name)
-#         end
-#
-#         def self.retrieve_connection
-#           left_model.retrieve_connection
-#         end
-#
-#       }
-#
-#       join_model.name                = "HABTM_#{association_name.to_s.camelize}"
-#       join_model.table_name_resolver = habtm
-#       join_model.class_resolver      = lhs_model
-#       join_model.primary_key         = nil
-#
-#       join_model.add_left_association :left_side, anonymous_class: lhs_model
-#       join_model.add_right_association association_name, belongs_to_options(options)
-#       join_model
-#     end
-#
-#   end
-# end
+module ActiveRecord::Associations::Builder
+  class HasAndBelongsToMany # :nodoc:
+
+    def through_model
+      habtm = JoinTableResolver.build lhs_model, association_name, options
+      
+      join_model = Class.new(lhs_model.base_class.superclass) {
+        class << self;
+          attr_accessor :class_resolver
+          attr_accessor :name
+          attr_accessor :table_name_resolver
+          attr_accessor :left_reflection
+          attr_accessor :right_reflection
+        end
+
+        def self.table_name
+          table_name_resolver.join_table
+        end
+
+        def self.compute_type(class_name)
+          class_resolver.compute_type class_name
+        end
+
+        def self.add_left_association(name, options)
+          belongs_to name, options
+          self.left_reflection = _reflect_on_association(name)
+        end
+
+        def self.add_right_association(name, options)
+          rhs_name = name.to_s.singularize.to_sym
+          belongs_to rhs_name, options
+          self.right_reflection = _reflect_on_association(rhs_name)
+        end
+
+      }
+
+      join_model.name                = "HABTM_#{association_name.to_s.camelize}"
+      join_model.table_name_resolver = habtm
+      join_model.class_resolver      = lhs_model
+      join_model.primary_key         = nil
+
+      join_model.add_left_association :left_side, anonymous_class: lhs_model
+      join_model.add_right_association association_name, belongs_to_options(options)
+      join_model
+    end
+
+  end
+end

data/ext/active_record/calculations.rb

@@ -1,28 +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
-#
+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/ext/active_record/relation/predicate_builder.rb

@@ -1,29 +1,23 @@
-# module ActiveRecord
-#   class PredicateBuilder # :nodoc:
-#
-#     def self.expand(klass, table, column, value)
-#       queries = []
-#
-#       # In standard Rails where takes :table => { columns }, but in sunstone we
-#       # can can do nested tables eg: where(:properties => { :regions => {:id => 1}})
-#       if klass && reflection = klass._reflect_on_association(column)
-#         base_class = polymorphic_base_class_from_value(value)
-#
-#         if reflection.polymorphic? && base_class
-#           queries << build(table[reflection.foreign_type], base_class)
-#         end
-#
-#         column = reflection.foreign_key
-#
-#         if base_class
-#           primary_key = reflection.association_primary_key(base_class)
-#           value = convert_value_to_association_ids(value, primary_key)
-#         end
-#       end
-#
-#       queries << build(table[column], value)
-#       queries
-#     end
-#
-#   end
-# end
+module ActiveRecord
+  class PredicateBuilder # :nodoc:
+
+    def self.expand(klass, table, column, value)
+      queries = []
+
+      # In standard Rails where takes :table => { columns }, but in sunstone we
+      # can can do nested tables eg: where(:properties => { :regions => {:id => 1}})
+      if klass && reflection = klass._reflect_on_association(column)
+        if reflection.polymorphic? && base_class = polymorphic_base_class_from_value(value)
+          queries << build(table[reflection.foreign_type], base_class)
+        end
+
+        # column = reflection.foreign_key
+        column # Don't need Rails to assume we are referencing a table
+      end
+
+      queries << build(table[column], value)
+      queries
+    end
+
+  end
+end

data/ext/active_support/core_ext/object/to_query.rb

@@ -0,0 +1,7 @@
+class NilClass
+  
+  def to_query(namespace)
+    namespace
+  end
+  
+end

data/lib/active_record/connection_adapters/sunstone/type/ewkb.rb

@@ -0,0 +1,31 @@
+require 'rgeo'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Sunstone
+      module Type
+        class EWKB < ActiveRecord::Type::Value
+          
+          def type
+            :ewkb
+          end
+          
+          def type_cast_for_database(value)
+            if value
+              ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(value)
+            end
+          end
+
+          private
+          
+          def cast_value(string)
+            return string unless string.is_a?(::String)
+
+            ::RGeo::WKRep::WKBParser.new(RGeo::Geos.factory_generator, support_ewkb: true).parse(string)
+          end
+         
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -8,11 +8,12 @@ require 'active_record/connection_adapters/sunstone/column'
 
 require 'active_record/connection_adapters/sunstone/type/date_time'
 require 'active_record/connection_adapters/sunstone/type/array'
+require 'active_record/connection_adapters/sunstone/type/ewkb'
 
 module ActiveRecord
   module ConnectionHandling # :nodoc:
 
-    VALID_SUNSTONE_CONN_PARAMS = [:site, :host, :port, :api_key, :use_ssl, :user_agent]
+    VALID_SUNSTONE_CONN_PARAMS = [:site, :host, :port, :api_key, :use_ssl, :user_agent, :ca_cert]
 
     # Establishes a connection to the database that's used by all Active Record
     # objects
@@ -158,6 +159,7 @@ module ActiveRecord
           m.register_type 'decimal',    Type::Decimal.new
           m.register_type 'datetime',   Sunstone::Type::DateTime.new
           m.register_type 'hash',       Type::Value.new
+          m.register_type 'ewkb',       Sunstone::Type::EWKB.new
         end
 
         def exec(arel, name='SAR', binds=[])

data/lib/sunstone.rb

@@ -18,6 +18,8 @@ require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation')
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/query_methods'))
 # 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/active_support/core_ext/object/to_query'))
+
 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'))

data/lib/sunstone/connection.rb

@@ -36,6 +36,12 @@ module Sunstone
 
       @connection = Net::HTTP.new(host, port)
       @connection.use_ssl = use_ssl
+      if use_ssl && config[:ca_cert]
+        @connection.cert_store = OpenSSL::X509::Store.new
+        @connection.cert_store.add_cert(OpenSSL::X509::Certificate.new(File.read(config[:ca_cert])))
+      end
+
+      true
     end
 
     # Ping the Sunstone. If everything is configured and operating correctly

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '2.0.1'
+  VERSION = '2.0.4'
 end

data/test/query_test.rb

@@ -58,6 +58,12 @@ class QueryTest < Minitest::Test
     assert_equal [], Ship.where(:id => 10).to_a
   end
   
+  test '::where column is nil' do
+    stub_request(:get, URI::escape('malomalo.io/ships?where[leased_at]')).to_return(body: [].to_json)
+
+    assert_equal [], Ship.where(:leased_at => nil).to_a
+  end
+  
   test '::where on belongs_to relation' do
     stub_request(:get, URI::escape('malomalo.io/ships?where[fleet][id]=1')).to_return(body: [].to_json)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -269,6 +269,7 @@ files:
 - ext/active_record/relation.rb
 - ext/active_record/relation/predicate_builder.rb
 - ext/active_record/statement_cache.rb
+- ext/active_support/core_ext/object/to_query.rb
 - ext/arel/nodes/eager_load.rb
 - ext/arel/nodes/select_statement.rb
 - ext/arel/select_manager.rb
@@ -277,6 +278,7 @@ files:
 - lib/active_record/connection_adapters/sunstone/schema_statements.rb
 - lib/active_record/connection_adapters/sunstone/type/array.rb
 - lib/active_record/connection_adapters/sunstone/type/date_time.rb
+- lib/active_record/connection_adapters/sunstone/type/ewkb.rb
 - lib/active_record/connection_adapters/sunstone_adapter.rb
 - lib/arel/collectors/sunstone.rb
 - lib/arel/visitors/sunstone.rb