sunstone 5.1.0.2 → 5.1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f44d08dc6bb1c700f32c5271ccab0db4fe069bc4
-  data.tar.gz: a442c4792155830be5fd507b479469e89adaddb9
+  metadata.gz: 36510647bb5cb8991c4133315ef746af7f2ad49b
+  data.tar.gz: 668776a98974ad2685c9bf82f054258fb462cd55
 SHA512:
-  metadata.gz: 2221ec8ec6cb8a6b14d0d4d08b8639b611e0fefafcec97aa6ea6d0721933f124e930a8a77382de76ce9d57d31f17aa8ce9beca7175dfd5d64630fef86e030494
-  data.tar.gz: 0d588df4234c01d1a1272fc3620c592308fda785a56a0c2ac4939301be68678547eee8907e7f780f461e390cdafad84291fdbb9d16dfe429cebb750bb2ada623
+  metadata.gz: 26f5d6e7b9095a221b5c411b5b6d8f6b32a39a4629175f72750a19b23178684275385b26e76329b3b24af6e333f2566642ebb134be60be651e59ac15fa5e0811
+  data.tar.gz: 9d000ed9a6e7647edb76e846f3fee0e3d31d64fd0ced01779dee814759885328d5dcb9b0ed26909bc3471d0c29d314e61d5509bde015615a0623732930c79eca

data/lib/arel/visitors/sunstone.rb

@@ -728,7 +728,8 @@ module Arel
       def mergeable?(hash_a, hash_b)
         
         hash_a.each do |key, value_a|
-          if hash_b.has_key?(key)
+          #TODO: one day maybe just use symbols for all keys?
+          if hash_b.has_key?(key.to_sym) || hash_b.has_key?(key.to_s)
             value_b = hash_b[key]
             if value_a.is_a?(Hash) && value_b.is_a?(Hash)
               return false if !mergeable?(value_a, value_b)

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.1.0.2'
+  VERSION = '5.1.0.3'
 end

data/test/active_record/query_test.rb

@@ -47,6 +47,13 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
     assert_nil Ship.last
   end
   
+  test '::where on the same column multiple times with symbols and strings' do
+    webmock(:get, "/ships", { where: [{ id: {gt: 10} }, 'AND', {id: {gt: 11}}], limit: 100, offset: 0 }).to_return(body: [].to_json)
+
+    arel_table = Ship.arel_table
+    assert_equal [], Ship.where(arel_table[:id].gt(10)).where(arel_table['id'].gt(11)).to_a
+  end
+  
   test '::where(AND CONDITION)' do
     webmock(:get, "/ships", { where: {id: 10, name: 'name'}, limit: 1, order: [{id: :asc}] }).to_return({
       body: [{id: 42}].to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.1.0.2
+  version: 5.1.0.3
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake