superstore 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5693d8b8ef6d996873be8b90469953d6d43da3d9
-  data.tar.gz: 3441e366eb68a131363c9d8376905bc3c4dfd68a
+  metadata.gz: efa28ad8771bdcf6a918cf33a4d81f3e6945581a
+  data.tar.gz: 732be1d35bf085bc141c1772d7beef1e1655f397
 SHA512:
-  metadata.gz: f9b800bb4f54c8e9bda088ebc7dbe97fb64eea4bc84f3e601658495b0d9afeb897a03738de445bf55c4527128f1d8a7fa2845663df1164deb68aef1d973054bf
-  data.tar.gz: 2324d4e9d7cff4f03db292828eee93973e138b38637a206eae00f9b04889e595b0656d6711abf3456586159f6550eb8a8e53cf55fbc1134b7b406df722956cf9
+  metadata.gz: c8f18bbcabe090e89e0ff5a19058689b7e2002488be9332c666e62cc556e78a58573918e27081c48f13eb9ed30c26a60cab90d6c39abe0f0e2522f6e90770786
+  data.tar.gz: bfc9b5f6637f4955ad45753f0a2996be1f5892aba8ac15646ee9deb4194237b2300c1d57ef42c22e310f8e6e261aedc7c75bcdca58fc40a5fad36395a0f2c0da

data/.travis.yml

@@ -1,9 +1,23 @@
 language: ruby
 rvm:
-- 2.0.0-p647
-- 2.1.7
-- 2.2.3
-sudo: false
+- 2.1.10
+- 2.2.5
+- 2.3.1
+sudo: required
+dist: trusty
 cache: bundler
-addons:
-  postgresql: '9.4'
+before_install:
+# https://github.com/travis-ci/travis-ci/issues/4264
+- sudo cp /etc/postgresql/9.4/main/pg_hba.conf /tmp
+- sudo add-apt-repository "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg 9.5"
+- sudo apt-key adv --keyserver keys.gnupg.net --recv-keys 7FCC7D46ACCC4CF8
+- sudo apt-get update
+- sudo service postgresql stop
+- for version in 9.1 9.2 9.3 9.4; do sudo pg_dropcluster --stop $version main; done
+- sudo apt-get remove --purge --yes postgresql-9.[1234]
+- sudo apt-get install --no-install-recommends --yes postgresql-client-9.5 postgresql-9.5
+- sudo apt-get autoremove --yes
+- sudo cp /tmp/pg_hba.conf /etc/postgresql/9.5/main/
+- sudo service postgresql restart
+- sudo -u postgres createuser -s travis
+- sudo -u postgres createdb -O travis travis

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.2.0
+
+Released 2016-06-02.
+
+## New Features
+
+* Add `geo_point` type.
+
 # 2.1.2
 
 Released 2016-05-04.

data/Rakefile

@@ -1,12 +1,9 @@
-require 'bundler/setup'
-require 'rake'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 task default: :test
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
+  t.libs = %w(lib test)
   t.pattern = 'test/unit/**/*_test.rb'
-  t.verbose = true
 end

data/lib/superstore/adapters/jsonb_adapter.rb

@@ -30,7 +30,8 @@ module Superstore
           elsif @scope.select_values == [@adapter.primary_key_column]
             @adapter.primary_key_column
           else
-            "#{@adapter.primary_key_column}, jsonb_slice(document, #{@adapter.fields_to_postgres_array(@scope.select_values)}) as document"
+            selects = @scope.select_values.map { |key| "#{@adapter.quote(key)},document->>#{@adapter.quote(key)}" }
+            "#{@adapter.primary_key_column}, json_build_object(#{selects * ','}) as document"
           end
         end
 
@@ -142,18 +143,9 @@ module Superstore
       def update(table, id, attributes)
         return if attributes.empty?
 
-        not_nil_attributes = attributes.reject { |key, value| value.nil? }
-        nil_attributes = attributes.select { |key, value| value.nil? }
-
-        if not_nil_attributes.any? && nil_attributes.any?
-          value_update = "jsonb_merge(jsonb_delete(document, #{fields_to_postgres_array(nil_attributes.keys)}), #{to_quoted_jsonb(not_nil_attributes)})"
-        elsif not_nil_attributes.any?
-          value_update = "jsonb_merge(document, #{to_quoted_jsonb(not_nil_attributes)})"
-        elsif nil_attributes.any?
-          value_update = "jsonb_delete(document, #{fields_to_postgres_array(nil_attributes.keys)})"
-        end
-
+        value_update = "jsonb_strip_nulls(document || #{to_quoted_jsonb(attributes)})"
         statement = "UPDATE #{table} SET document = #{value_update} WHERE #{primary_key_column} = #{quote(id)}"
+
         execute_batchable statement
       end
 
@@ -205,54 +197,6 @@ module Superstore
       def to_quoted_jsonb(data)
         "#{quote(Oj.dump(data, OJ_OPTIONS))}::JSONB"
       end
-
-      JSON_FUNCTIONS = {
-        # SELECT jsonb_slice('{"b": 2, "c": 3, "a": 4}', '{b, c}');
-        'jsonb_slice(data jsonb, keys text[])' => %{
-          SELECT json_object_agg(key, value)::jsonb
-          FROM (
-            SELECT * FROM jsonb_each(data)
-          ) t
-          WHERE key =ANY(keys);
-        },
-
-        # SELECT jsonb_merge('{"a": 1}', '{"b": 2, "c": 3, "a": 4}');
-        'jsonb_merge(data jsonb, merge_data jsonb)' => %{
-          SELECT json_object_agg(key, value)::jsonb
-          FROM (
-            WITH to_merge AS (
-              SELECT * FROM jsonb_each(merge_data)
-            )
-            SELECT *
-            FROM jsonb_each(data)
-            WHERE key NOT IN (SELECT key FROM to_merge)
-            UNION ALL
-            SELECT * FROM to_merge
-          ) t;
-        },
-
-        # SELECT jsonb_delete('{"b": 2, "c": 3, "a": 4}', '{b, c}');
-        'jsonb_delete(data jsonb, keys text[])' => %{
-          SELECT json_object_agg(key, value)::jsonb
-          FROM (
-            SELECT * FROM jsonb_each(data)
-            WHERE key <>ALL(keys)
-          ) t;
-        },
-      }
-      def define_jsonb_functions!
-        JSON_FUNCTIONS.each do |signature, body|
-          connection.execute %{
-            CREATE OR REPLACE FUNCTION public.#{signature}
-            RETURNS jsonb
-            IMMUTABLE
-            LANGUAGE sql
-            AS $$
-              #{body}
-            $$;
-          }
-        end
-      end
     end
   end
 end

data/superstore.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'superstore'
-  s.version = '2.2.0'
+  s.version = '2.3.0'
   s.description = 'ActiveModel for many attributes'
   s.summary = 'JSONB ActiveModel'
   s.authors = ["Michael Koziarski", "Infogroup"]

data/test/support/jsonb.rb

@@ -1,7 +1,6 @@
 class JsonbInitializer
   def self.initialize!
     Superstore::Base.adapter.create_table('issues')
-    Superstore::Base.adapter.define_jsonb_functions!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel