pluck_map 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b3bad6e2e72b21e54b69aa8fcfe417ad05c6461
-  data.tar.gz: 637341da36aecba00cc754f48384475921f663c7
+SHA256:
+  metadata.gz: baee1fa797afc235f781a0b9d2492a8796ff54b3e90fd795bda2fd772c70a146
+  data.tar.gz: a90a51ca0fb57d382f00228f31ace8e2157153aa4bf8f29f75589a6b6b6812f9
 SHA512:
-  metadata.gz: 9be09ab2988c556b85a383f60e166c5628065b0bc061ceeab3e4c125e0499b22b91be8cbdcee9724d02db97c4fb3ba5986c143e42c9df74f0003a271372cc39a
-  data.tar.gz: 6a03d1b833c76b944a6c6d0271222839bc1a483da2c89f90e39f2fe9eb62833e08d162ffe7e06d32afb01bf478c30cd13476c29da8f2ebffb24c4e39b16ad4a0
+  metadata.gz: 8ca7ae6a27609c8e26edfe2f33d9929773b2fc1bba4ee193633def8f4f5637d6914654c36cfc67812fb1debae1d0095fa04636c4734e9b31f98f6582e16cbff2
+  data.tar.gz: cb720743428655889f2ea30e7e4de92f27a07564faf8190b18d6b44dc7165e971cbd7e027c252aedcb39ae85e1de8c16346f147142424c521ddeb71c2096c8dc

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -1,4 +1,22 @@
 language: ruby
-rvm:
-  - 2.1.2
-before_install: gem install bundler -v 1.10.6
+rvm: 2.5.5
+
+# Rails 6 requires Postgres 9.3+
+addons:
+  postgresql: "9.3"
+
+services:
+  - postgresql
+  - mysql
+
+# Test on supported versions of Rails + Edge Rails
+# (When Rails 6.0 is released, drop Rails 4.2)
+matrix:
+  include:
+  - gemfile: gemfiles/rails_4.2.gemfile
+  - gemfile: gemfiles/rails_5.0.gemfile
+  - gemfile: gemfiles/rails_5.1.gemfile
+  - gemfile: gemfiles/rails_5.2.gemfile
+  - gemfile: gemfiles/rails_edge.gemfile
+  allow_failures:
+  - gemfile: gemfiles/rails_edge.gemfile

data/Appraisals

@@ -0,0 +1,25 @@
+appraise "rails-4.2" do
+  gem "activerecord", "~> 4.2.0"
+  gem "sqlite3", "~> 1.3.6"
+  gem "pg", "~> 0.20"
+end
+
+appraise "rails-5.0" do
+  gem "activerecord", "~> 5.0.0"
+  gem "sqlite3", "~> 1.3.6"
+end
+
+appraise "rails-5.1" do
+  gem "activerecord", "~> 5.1.0"
+  gem "sqlite3", "~> 1.3.6"
+end
+
+appraise "rails-5.2" do
+  gem "activerecord", "~> 5.2.0"
+  gem "sqlite3", "~> 1.3.6"
+end
+
+appraise "rails-edge" do
+  gem "rails", git: "https://github.com/rails/rails.git", branch: "master", require: "activerecord"
+  gem "sqlite3", "~> 1.4.0"
+end

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+## v0.3.0 (2019 Apr 7)
+
+* IMPROVEMENT: Add support for MySQL (@boblail)
+
+## v0.2.1 (2018 Mar 29)
+
+* FIX: Allow static values to be falsey (@kobsy)
+
+## v0.2.0 (2018 Mar 28)
+
+* FIX: Allow static values to be falsey (@kobsy)
+
+## v0.1.0 (2015 Nov 7)
+
+* Initial version (@boblail)

data/README.md

@@ -1,5 +1,8 @@
 # PluckMap::Presenter
 
+[![Gem Version](https://badge.fury.io/rb/pluck_map.svg)](https://rubygems.org/gems/pluck_map)
+[![Build Status](https://travis-ci.org/boblail/pluck_map.svg)](https://travis-ci.org/boblail/pluck_map)
+
 The PluckMap presenter provides a DSL for creating performant presenters. It is useful when a Rails controller action does little more than fetch several records from the database and present them in some other data format (like JSON or CSV).
 
 Let's take an example. Suppose you have an action like this:
@@ -108,4 +111,3 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/boblail/pluck_map.
-

data/Rakefile

@@ -1 +1,61 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+namespace :db do
+  namespace :mysql do
+    task :env do
+      system "mysql -e 'drop database if exists pluck_map_test'"
+      system "mysql -e 'create database pluck_map_test'"
+      ENV["ACTIVE_RECORD_ADAPTER"] = "mysql2"
+    end
+  end
+
+  namespace :postgres do
+    task :env do
+      system "psql -c 'drop database if exists pluck_map_test'"
+      system "psql -c 'create database pluck_map_test'"
+      ENV["ACTIVE_RECORD_ADAPTER"] = "postgresql"
+    end
+  end
+
+  namespace :sqlite do
+    task :env do
+      ENV["ACTIVE_RECORD_ADAPTER"] = "sqlite3"
+    end
+  end
+end
+
+ADAPTERS = Rake.application.tasks.each_with_object([]) do |task, adapters|
+  match = task.name.match(/db:(.*):env/)
+  adapters.push(match[1]) if match
+end.freeze
+
+namespace :test do
+  ADAPTERS.each do |adapter|
+    Rake::TestTask.new(adapter => "db:#{adapter}:env") do |t|
+      t.libs << "test"
+      t.libs << "lib"
+      t.test_files = FileList["test/**/*_test.rb"]
+    end  end
+end
+
+def run_without_aborting(*tasks)
+  errors = []
+
+  tasks.each do |task|
+    Rake::Task[task].invoke
+  rescue Exception
+    errors << task
+  end
+
+  abort "Errors running #{errors.join(', ')}" if errors.any?
+end
+
+desc "Run #{ADAPTERS.join(', ')} tests"
+task :test do
+  tasks = ADAPTERS.map { |adapter| "test:#{adapter}" }
+  run_without_aborting(*tasks)
+end
+
+desc "Run #{ADAPTERS.join(', ')} tests by default"
+task default: :test

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.0"
+gem "sqlite3", "~> 1.3.6"
+gem "pg", "~> 0.20"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.6"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.6"
+
+gemspec path: "../"

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", git: "https://github.com/rails/rails.git", branch: "master", require: "activerecord"
+gem "sqlite3", "~> 1.4.0"
+
+gemspec path: "../"

data/lib/pluck_map/null_logger.rb

@@ -0,0 +1,6 @@
+module PluckMap
+  class NullLogger
+    def info(*)
+    end
+  end
+end

data/lib/pluck_map/presenter.rb

@@ -1,10 +1,16 @@
 require "pluck_map/version"
 require "pluck_map/attribute"
+require "pluck_map/null_logger"
 
 module PluckMap
   class Presenter
     attr_reader :attributes
 
+    @logger = defined?(Rails) ? Rails.logger : PluckMap::NullLogger.new
+    class << self
+      attr_accessor :logger
+    end
+
     def initialize(&block)
       @attributes = []
       if block.arity == 1
@@ -44,7 +50,7 @@ module PluckMap
 
     def pluck(query)
       # puts "\e[95m#{query.select(*selects(query.table_name)).to_sql}\e[0m"
-      results = benchmark("pluck(#{query.table_name})") { query.pluck(*selects(query.table_name)) }
+      results = benchmark("pluck(#{query.table_name})") { query.pluck(*selects(query.model)) }
       return results unless block_given?
       benchmark("map(#{query.table_name})") { yield results }
     end
@@ -52,21 +58,21 @@ module PluckMap
     def benchmark(title)
       result = nil
       ms = Benchmark.ms { result = yield }
-      Rails.logger.info "\e[33m#{title}: \e[1m%.1fms\e[0m" % ms
+      self.class.logger.info "\e[33m#{title}: \e[1m%.1fms\e[0m" % ms
       result
     end
 
   private
     attr_reader :attributes_by_id, :keys
 
-    def selects(table_name)
+    def selects(model)
       attributes.flat_map do |attribute|
         if attribute.selects.length != 1
           attribute.selects
         else
           select = attribute.selects[0]
-          select = "\"#{table_name}\".\"#{select}\"" if select.is_a?(Symbol)
-          "#{select} AS \"#{attribute.alias}\""
+          select = "#{model.quoted_table_name}.#{model.connection.quote_column_name(select)}" if select.is_a?(Symbol)
+          Arel.sql("#{select} AS \"#{attribute.alias}\"")
         end
       end.uniq
     end

data/lib/pluck_map/version.rb

@@ -1,3 +1,3 @@
 module PluckMapPresenter
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/pluck_map.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "pluck_map"
   spec.version       = PluckMapPresenter::VERSION
   spec.authors       = ["Bob Lail"]
-  spec.email         = ["bob.lail@cph.org"]
+  spec.email         = ["bob.lailfamily@gmail.com"]
 
   spec.summary       = "A DSL for presenting ActiveRecord::Relations without instantiating ActiveRecord models"
   spec.homepage      = "https://github.com/boblail/pluck_map"
@@ -17,6 +17,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_dependency "activerecord"
+
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "minitest-reporters-turn_reporter"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "shoulda-context"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pluck_map
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,22 +66,143 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters-turn_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
-- bob.lail@cph.org
+- bob.lailfamily@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/pluck_map.rb
 - lib/pluck_map/attribute.rb
+- lib/pluck_map/null_logger.rb
 - lib/pluck_map/presenter.rb
 - lib/pluck_map/version.rb
 - pluck_map.gemspec
@@ -76,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A DSL for presenting ActiveRecord::Relations without instantiating ActiveRecord