multipluck 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d4f255600fa5cb8f4336cc17650b0c0682f3f4fd
+  data.tar.gz: e5edfd4e8d679b64a8b00868ce72518b9befdc8e
+SHA512:
+  metadata.gz: 70e1b4e04ffb1363313d9e8e8f216a52e421a32f23f5a195e80776e379425cef397a0c5f76cef8a14df9c2468f3e7ebc79839e31aa329fb2452ce4a666103a95
+  data.tar.gz: 3bcbd55e0b332cdbf28c54f5225aa50557780ba667e891e8ddcbabc435a0057c8af85daca3df53492042fd4e6219aee3c72d6254113aa389e31e1118e78268bb

data/.gitignore

@@ -0,0 +1,11 @@
+.bundle/
+log/*.log
+pkg/
+test/dummy/db/*.sqlite3
+test/dummy/log/*.log
+test/dummy/tmp/
+test/dummy/.sass-cache
+.idea
+Gemfile.lock
+.ruby-gemset
+.ruby-version

data/.travis.yml

@@ -0,0 +1,23 @@
+language: ruby
+
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: rbx-2
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2
+  - 2.1.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-2
+
+script:
+  - (cd test/dummy && RAILS_ENV=test bundle exec rake --trace db:migrate test)

data/Gemfile

@@ -0,0 +1,14 @@
+source 'http://rubygems.org'
+
+gemspec
+
+group :development do
+  platform :ruby do
+    gem 'sqlite3', '~> 1.3'
+  end
+
+  platform :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
+    gem 'jdbc-sqlite3', '~> 3.8'
+  end
+end

data/README.md

@@ -1,27 +1,26 @@
-## Multipluck  [![Build Status](https://secure.travis-ci.org/hanzq/multipluck.png)](http://travis-ci.org/hanzq/multipluck)
+## Multipluck
 
-Multipluck is a Ruby gem for Rails that enhances the .pluck function to select multiple columns.  
+[![Build Status](https://travis-ci.org/jzaleski/multipluck.svg)](https://travis-ci.org/jzaleski/multipluck)
+[![Dependency Status](https://gemnasium.com/jzaleski/multipluck.png)](https://gemnasium.com/jzaleski/multipluck)
 
-Currently limited to Rails 3.2.3+, but I plan to change that.
+A Ruby gem for Rails that enhances the `pluck` function to select multiple columns
 
-### Usage
+## Usage
 
 ```ruby
-# Fetch all user ids and names
+# Fetch all user ids and names using var-args
+User.pluck(:id, :name)
+# => [[1, "Bob"], [2, "Simone"], ...]
 
+# Fetch all user ids and names using an `Array` (legacy)
 User.pluck([:id, :name])
-# => [ [1, "Bob"], [2, "Simone"], ...  ]
+# => [[1, "Bob"], [2, "Simone"], ...]
 ```
 
-### Installation
+## Contributing
 
- 1. Add the gem to your Gemfile
-
- ```ruby
- gem 'multipluck'
- ```
-
- 2. Pluck forth!
-
-
-This project rocks and uses MIT-LICENSE. Yes it does.
+1. Fork it ( http://github.com/jzaleski/multipluck/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,9 +1,11 @@
 #!/usr/bin/env rake
+
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
 begin
   require 'rdoc/task'
 rescue LoadError
@@ -14,25 +16,26 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Multipluck'
+  rdoc.title = 'Multipluck'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
+  t.libs += %w[lib test]
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
+def run_rake_task_in_dummy(task)
+  abort unless system("cd test/dummy && bundle exec rake #{task}")
+end
+
+Dir.glob(File.expand_path('../lib/tasks/*.rake', __FILE__)).each { |f| load f }
 
 task :default => :test

data/lib/multipluck/pluck.rb

@@ -1,21 +1,31 @@
-
 module Multipluck
   module Pluck
     extend ActiveSupport::Concern
 
     included do
-    # Preserve the original pluck functionality
+      # Preserve the original `pluck` functionality
       alias_method :single_column_pluck, :pluck
 
-      def pluck(column_name_or_array)
-        return single_column_pluck(column_name_or_array) unless  column_name_or_array.instance_of?(Array)
+      def pluck(*args)
+        # Extract `opts` (defaults could be merged here in the future)
+        opts = args.last.is_a?(Hash) ? args.pop : {}
+
+        # Maintains legacy support, the previous interface expected an `Array`
+        # as the first argument
+        column_names = args.flatten
 
-        column_names = column_name_or_array.map(&:to_s)
+        # If no `opts` is empty and there was only one `column_name` specified
+        # fall back to the default `pluck` implementation
+        return single_column_pluck(column_names.first) \
+          if column_names.size == 1 && opts.empty?
 
-        # Array of rows
+        # Since `column_names` can be symbols `stringify` them here
+        column_names.map!(&:to_s)
+
+        # Yields an `Array` of `Hash(es)`
         rows = klass.connection.select_all(select(column_names).arel)
 
-        # Row is a hash of of 'column_name' => value
+        # Row is a `Hash` of: 'column_name' => value
         rows.map! do |row|
           attrs = klass.initialize_attributes(row)
           column_names.map do |col_name|
@@ -23,7 +33,6 @@ module Multipluck
           end
         end
       end
-
     end
   end
 end

data/lib/multipluck/version.rb

@@ -1,3 +1,3 @@
 module Multipluck
-  VERSION = "0.0.4"
+  VERSION = '0.0.5'
 end

data/lib/tasks/db.rake

@@ -0,0 +1,22 @@
+namespace :db do
+  %w[create drop migrate rollback version].each do |task_name|
+    desc "Run db:#{task_name} in the dummy application"
+    task task_name.to_sym do
+      run_rake_task_in_dummy("db:#{task_name}")
+    end
+  end
+
+  namespace :schema do
+    desc 'Run db:schema:load in the dummy application'
+    task :load do
+      run_rake_task_in_dummy('db:schema:load')
+    end
+  end
+
+  namespace :test do
+    desc 'Run db:test:prepare in the dummy-app'
+    task :prepare do
+      run_rake_task_in_dummy('db:test:prepare')
+    end
+  end
+end

data/multipluck.gemspec

@@ -0,0 +1,19 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'multipluck/version'
+
+Gem::Specification.new do |gem|
+  gem.name = 'multipluck'
+  gem.version = Multipluck::VERSION
+  gem.authors = ['Jonathan W. Zaleski', 'David Wright']
+  gem.email = ['JonathanZaleski@gmail.com']
+  gem.homepage = 'https://github.com/jzaleski/multipluck'
+  gem.summary = 'A Ruby gem for Rails that enhances the `pluck` function to select multiple columns'
+
+  gem.files = `git ls-files`.split($/)
+  gem.executables = gem.files.grep(%r{^bin/}) { |file| File.basename(file) }
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
+
+  gem.add_dependency 'rails', '>= 3.2.0', '< 4.0'
+end

data/test/dummy/app/assets/javascripts/application.js

@@ -10,6 +10,4 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/test/dummy/config/database.yml

@@ -1,25 +1,16 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+shared: &shared
   adapter: sqlite3
-  database: db/development.sqlite3
   pool: 5
   timeout: 5000
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
+development:
+  <<: *shared
+  database: db/development.sqlite3
+
 test:
-  adapter: sqlite3
+  <<: *shared
   database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
 
 production:
-  adapter: sqlite3
+  <<: *shared
   database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

data/test/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/test/multipluck_test.rb

@@ -1,33 +1,41 @@
-require_relative 'test_helper'
+require 'test_helper'
 
 class MultipluckTest < ActiveSupport::TestCase
-
-  test "make sure normal pluck functionality still works" do
-    Widget.create!(an_int: 5)
+  test 'make sure original pluck functionality still works' do
+    Widget.create!(:an_int => 5)
     assert_equal [5], Widget.pluck(:an_int)
   end
 
-  test "normal pluck, multiple rows" do
-    Widget.create!(an_int: 5)
-    Widget.create!(an_int: 12)
+  test 'normal pluck, multiple rows' do
+    Widget.create!(:an_int => 5)
+    Widget.create!(:an_int => 12)
     assert_equal [5, 12], Widget.pluck(:an_int)
   end
 
-  test "same parameter twice" do
-    Widget.create!(an_int: 5)
-    assert_equal [[5, 5]], Widget.pluck([:an_int, :an_int])
+  test 'multiple parameters in an Array' do
+    Widget.create!(:a_string => 'cow', :an_int => 5)
+    assert_equal [[5, 'cow']], Widget.pluck([:an_int, :a_string])
+  end
+
+  test 'multiple parameters as Varargs' do
+    Widget.create!(:a_string => 'cow', :an_int => 5)
+    assert_equal [[5, 'cow']], Widget.pluck(:an_int, :a_string)
   end
 
-  test "multiple parameters" do
-    Widget.create!(a_string: "cow", an_int: 5)
-    assert_equal [[5, "cow"]], Widget.pluck([:an_int, :a_string])
-    assert_equal [["cow", 5]], Widget.pluck([:a_string, :an_int])
+  test 'same parameter twice' do
+    Widget.create!(:an_int => 5)
+    assert_equal [[5, 5]], Widget.pluck(:an_int, :an_int)
   end
 
-  test "multiple parameters / multiple rows" do
-    Widget.create!(a_string: "cow", an_int: 5)
-    Widget.create!(a_string: "dog", an_int: 12)
-    assert_equal [[5,"cow"], [12, "dog"]], Widget.pluck([:an_int, :a_string])
+  test 'multiple parameters' do
+    Widget.create!(:a_string => 'cow', :an_int => 5)
+    assert_equal [[5, 'cow']], Widget.pluck(:an_int, :a_string)
+    assert_equal [['cow', 5]], Widget.pluck(:a_string, :an_int)
   end
 
+  test 'multiple parameters / multiple rows' do
+    Widget.create!(:a_string => 'cow', :an_int => 5)
+    Widget.create!(:a_string => 'dog', :an_int => 12)
+    assert_equal [[5, 'cow'], [12, 'dog']], Widget.pluck(:an_int, :a_string)
+  end
 end

metadata

@@ -1,58 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: multipluck
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
+- Jonathan W. Zaleski
 - David Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70163287847220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163287847220
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70163287846800 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70163287846800
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: 
 email:
-- davidwright@gmail.com
+- JonathanZaleski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/multipluck/pluck.rb
-- lib/multipluck/version.rb
-- lib/multipluck.rb
-- lib/tasks/multipluck_tasks.rake
+- .gitignore
+- .travis.yml
+- Gemfile
 - MIT-LICENSE
-- Rakefile
 - README.md
+- Rakefile
+- lib/multipluck.rb
+- lib/multipluck/pluck.rb
+- lib/multipluck/version.rb
+- lib/tasks/db.rake
+- multipluck.gemspec
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/mailers/.gitkeep
+- test/dummy/app/models/.gitkeep
 - test/dummy/app/models/widget.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -68,54 +75,54 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20120422025545_create_widgets.rb
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/log/test.log
+- test/dummy/lib/assets/.gitkeep
+- test/dummy/log/.gitkeep
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/dummy/test/fixtures/widgets.yml
 - test/multipluck_test.rb
 - test/test_helper.rb
-homepage: https://github.com/hanzq/multipluck
+homepage: https://github.com/jzaleski/multipluck
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Use the ActiveRecord pluck to pluck multiple columns instead of just one
+specification_version: 4
+summary: A Ruby gem for Rails that enhances the `pluck` function to select multiple
+  columns
 test_files:
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/mailers/.gitkeep
+- test/dummy/app/models/.gitkeep
 - test/dummy/app/models/widget.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -131,19 +138,14 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20120422025545_create_widgets.rb
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/log/test.log
+- test/dummy/lib/assets/.gitkeep
+- test/dummy/log/.gitkeep
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/dummy/test/fixtures/widgets.yml
 - test/multipluck_test.rb