pluck_to_hash 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a3229df2da1185b057f0e9044706edf65e95c40
-  data.tar.gz: 6747bf279dc92fb4b16fb4e42a84186ee1b5e63b
+  metadata.gz: d8a7cad98ab4502a9b3836f0a5d769d334fa99b0
+  data.tar.gz: 5eb006f187a81d71311c3a019154fb9b21fbf2ad
 SHA512:
-  metadata.gz: 9b8c27695035f0ff794a34d5fd153728eb872aa693fef0cb078bc0326c00523c9f9d912a473a41925c14dfe6f2e0a662f7c8c1de4992e0029a786be44e6bb936
-  data.tar.gz: b3f5d9d7e24ffea05bf52c579cc381cf88b51f8280d41f805efb567dceb4b94866bb99f09ab795a31450d2a17e06b6d720b0949d012409817518a917d93e4aac
+  metadata.gz: 760b2cb5d06226b6e8def38a999452471b53b9a1fda35e7aec89c6c8d20cbfb3d3410ad43442e4f6da2e6b9d32363f428f40dee807d95384025c5c9e12d70c84
+  data.tar.gz: 778887f19c45dd8b929b2979ba0566730faf38fa0655d9dcef07cca08f7fde3b22a1ce36024e9a3076157fe0ca95f4731c459896e2d6c786d0f6d6db562abf3b

data/README.md

@@ -65,6 +65,14 @@ User.pluck_to_hash(:id, :title) do |user_hash|
 end
 ```
 
+Allows specifying the type of hash. Defaults to HashWithIndifferentAccess
+
+```ruby
+User.pluck_to_hash(:id, :title, hash_type: CustomHash) do |custom_hash|
+  ...
+end
+```
+
 ### Using `pluck_to_struct`
 
 ```ruby
@@ -98,6 +106,12 @@ Post.limit(2).pluck_to_struct(:id, :title) do |post_struct|
 end
 ```
 
+Allows specifying the type of struct. Defaults to statndard Struct.
+```ruby
+Post.limit(2).pluck_to_struct(:id, :title,struct_type: OtherStructType) do |post_struct|
+  puts post_struct.title
+end
+```
 
 ## Using with Sinatra or other non-rails frameworks without ActiveSupport
 

data/lib/pluck_to_hash.rb

@@ -5,39 +5,45 @@ module PluckToHash
 
   module ClassMethods
     def pluck_to_hash(*keys)
+      hash_type = keys[-1].is_a?(Hash) ? keys.pop.fetch(:hash_type,HashWithIndifferentAccess) : HashWithIndifferentAccess
       block_given = block_given?
-      keys = column_names if keys.blank?
-      formatted_keys = format_keys(keys)
+      keys, formatted_keys = format_keys(keys)
+      keys_one = keys.size == 1
+
       pluck(*keys).map do |row|
-        row = [row] if keys.size == 1
-        value = HashWithIndifferentAccess[formatted_keys.zip(row)]
-        yield(value) if block_given
-        value
+        value = hash_type[formatted_keys.zip(keys_one ? [row] : row)]
+        block_given ? yield(value) : value
       end
     end
 
     def pluck_to_struct(*keys)
+      struct_type = keys[-1].is_a?(Hash) ? keys.pop.fetch(:struct_type,Struct) : Struct
       block_given = block_given?
-      keys = column_names if keys.blank?
-      formatted_keys = format_keys(keys)
+      keys, formatted_keys = format_keys(keys)
+      keys_one = keys.size == 1
 
-      struct = Struct.new(*formatted_keys)
+      struct = struct_type.new(*formatted_keys)
       pluck(*keys).map do |row|
-        row = [row] if keys.size == 1
-        value = struct.new(*row)
-        yield(value) if block_given
-        value
+        value = keys_one ? struct.new(*[row]) : struct.new(*row)
+        block_given ? yield(value) : value
       end
     end
 
     def format_keys(keys)
-      keys.map do |k|
-        case k
-        when String
-          k.split(/ as /i)[-1].to_sym
-        when Symbol
-          k
-        end
+      if keys.blank?
+        [column_names, column_names]
+      else
+        [
+          keys,
+          keys.map do |k|
+            case k
+            when String
+              k.split(/\bas\b/i)[-1].strip.to_sym
+            when Symbol
+              k
+            end
+          end
+        ]
       end
     end
 

data/lib/pluck_to_hash/version.rb

@@ -1,3 +1,3 @@
 module PluckToHash
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

data/pluck_to_hash.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "values", "~> 1.8"
 
   spec.add_dependency "activerecord", ">= 4.0.2"
   spec.add_dependency "activesupport", ">= 4.0.2"

data/spec/pluck_to_hash_spec.rb

@@ -35,21 +35,18 @@ describe 'PluckToHash' do
       end
     end
 
-
     context 'the model does not have the attribute specified' do
       it 'raises an error' do
         expect do
           TestModel.all.pluck_to_hash(:foo)
-        end.to raise_error
+        end.to raise_error(ActiveRecord::StatementInvalid)
       end
     end
 
     context 'no models exist for the given criteria' do
       it 'returns an empty relation' do
-        expect do
-          result = TestModel.where(id: -1).pluck_to_hash(:id)
-          expect(result).to be_empty
-        end.to_not raise_error
+        result = TestModel.where(id: -1).pluck_to_hash(:id)
+        expect(result).to be_empty
       end
     end
 
@@ -62,6 +59,16 @@ describe 'PluckToHash' do
         end
       end
     end
+
+    context 'when using a different hash type' do
+      it 'returns a hash of the correct type with all attributes' do
+        TestModel.all.pluck_to_hash(:id, :test_attribute,hash_type: Hash).each do |hash|
+          expect(hash.class).to eq(Hash)
+          expect(hash).to have_key(:id)
+          expect(hash).to have_key(:test_attribute)
+        end
+      end
+    end
   end
 
   context 'when serialize attributes used' do
@@ -111,16 +118,14 @@ describe 'PluckToHash' do
         it 'raises an error' do
           expect do
             TestModel.all.pluck_h(:foo)
-          end.to raise_error
+          end.to raise_error(ActiveRecord::StatementInvalid)
         end
       end
 
       context 'no models exist for the given criteria' do
         it 'returns an empty relation' do
-          expect do
-            result = TestModel.where(id: -1).pluck_h(:id)
-            expect(result).to be_empty
-          end.to_not raise_error
+          result = TestModel.where(id: -1).pluck_h(:id)
+          expect(result).to be_empty
         end
       end
 

data/spec/pluck_to_struct_spec.rb

@@ -1,4 +1,5 @@
 require_relative './spec_helper'
+require 'values'
 
 describe 'PluckToStruct' do
   before { TestModel.delete_all }
@@ -12,7 +13,7 @@ describe 'PluckToStruct' do
 
     it 'plucks the ids, test_attributes of the objects to a struct correctly' do
       TestModel.all.pluck_to_struct(:test_attribute, :id).each_with_index do |model, ix|
-        id = ix+1
+        id = ix + 1
         expect(model).to be_a(Struct)
         expect(model.test_attribute).to eq("test#{id}")
         expect(model.id).to eq(id)
@@ -29,17 +30,23 @@ describe 'PluckToStruct' do
     context 'the model does not have the attribute specified' do
       it 'raises an error' do
         expect do
-          TestModel.all.pluck_h(:foo)
-        end.to raise_error
+          TestModel.all.pluck_s(:foo)
+        end.to raise_error(ActiveRecord::StatementInvalid)
       end
     end
 
     context 'no models exist for the given criteria' do
       it 'returns an empty relation' do
-        expect do
-          result = TestModel.where(id: -1).pluck_h(:id)
-          expect(result).to be_empty
-        end.to_not raise_error
+        result = TestModel.where(id: -1).pluck_s(:id)
+        expect(result).to be_empty
+      end
+    end
+
+    context 'when a different struct type is specified' do
+      it 'returns an object with all attributes' do
+        TestModel.all.pluck_to_struct(:test_attribute, :id, struct_type: Value).each do |model|
+          expect(model).to respond_to(:id, :test_attribute)
+        end
       end
     end
 
@@ -77,4 +84,4 @@ describe 'PluckToStruct' do
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -17,4 +17,4 @@ end
 
 class TestModel < ActiveRecord::Base
   serialize :serialized_attribute, Array
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluck_to_hash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Girish S
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: values
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement