superstore 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcfb4894f1b5070e7d844c0e4c24e64d8616b6b2
-  data.tar.gz: 09a982cfedfcb5fc0998296fed5c4143530abec2
+  metadata.gz: cb66e1d1f8009402327ad30ba1342e21ea80bc7a
+  data.tar.gz: f9bc8954b6b27db5ee99d2a81243dd51d28751ae
 SHA512:
-  metadata.gz: 4385589c6b5e8904dfb4a38d0de81017d5d3c34cffb21e0ef36a8248616e76d1fe26a6ede7ef95b4b9b04a25301c1dd1ac053415c0da6a4a7adc22d251624fed
-  data.tar.gz: 0a3b380939669676eb9a9a6bc5e5440b806379efc5363f36c86857743547d8c24884f5db8c68bbc0834f734e938b326c380cb701fc0c4ed3e76e9132df5da7a1
+  metadata.gz: 57efc766e9cfd09a53827243b748f0121e5e829580372318fefecf3dfebca43befc44546f0fe2b5479e4a6b27a15c57391bdf4168bc9055ee966dc62f739c4de
+  data.tar.gz: 158b2901c8ea1208067d593eda2134a6cde16e8b1a19e3e1c43eb2898b2df20b50cd1df8fcaaeba99e1382e298cbb2aefa513fc2b1692886c05f8774f96604db

data/lib/superstore/adapters/jsonb_adapter.rb

@@ -12,18 +12,25 @@ module Superstore
 
         def to_query
           [
-            "SELECT #{select_string} FROM #{@scope.klass.table_name}",
+            "SELECT #{select_string}",
+            from_string,
             where_string,
             order_string,
             limit_string
           ].delete_if(&:blank?) * ' '
         end
 
+        def from_string
+          "FROM #{@scope.klass.table_name}"
+        end
+
         def select_string
-          if @scope.select_values.any?
-            "id, jsonb_slice(document, #{@adapter.fields_to_postgres_array(@scope.select_values)}) as document"
-          else
+          if @scope.select_values.empty?
             '*'
+          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"
           end
         end
 
@@ -76,8 +83,9 @@ module Superstore
         end
       end
 
+      PRIMARY_KEY_COLUMN = 'id'.freeze
       def primary_key_column
-        'id'
+        PRIMARY_KEY_COLUMN
       end
 
       def connection
@@ -96,6 +104,11 @@ module Superstore
         connection.execute statement
       end
 
+      def to_ids(scope)
+        statement = QueryBuilder.new(self, scope.select('id')).to_query
+        connection.select_values(statement)
+      end
+
       def select(scope)
         statement = QueryBuilder.new(self, scope).to_query
 

data/lib/superstore/scope/finder_methods.rb

@@ -22,6 +22,10 @@ module Superstore
       limit(1).to_a.first
     end
 
+    def to_ids
+      klass.adapter.to_ids self
+    end
+
     private
 
       def find_one(id)

data/lib/superstore/scope.rb

@@ -67,7 +67,6 @@ module Superstore
         klass.adapter.select(self) do |key, attributes|
           results << klass.instantiate(key, attributes)
         end
-        results.compact!
         results
       end
   end

data/lib/superstore/scoping.rb

@@ -4,7 +4,7 @@ module Superstore
 
     included do
       singleton_class.class_eval do
-        delegate :find, :find_by_id, :first, :all, to: :scope
+        delegate :find, :find_by_id, :first, :all, :to_ids, to: :scope
         delegate :find_each, :find_in_batches, to: :scope
         delegate :select, :where, :where_ids, to: :scope
       end

data/superstore.gemspec

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

data/test/unit/scope/finder_methods_test.rb

@@ -48,4 +48,10 @@ class Superstore::FinderMethodsTest < Superstore::TestCase
 
     assert [first_issue, second_issue].include?(Issue.first)
   end
+
+  test 'to_ids' do
+    first_issue = Issue.create title: 'Sup!'
+
+    assert_equal [first_issue.id], Issue.to_ids
+  end
 end

metadata

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