active_record_query_fixer 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f597eb38ae0d02fa5d48e4fd50fcf1268a15cd
-  data.tar.gz: e019a708e58d4d1de136902141d2a26a64cf93a8
+  metadata.gz: 857a123c7746b0ebd13d93156ced020958521e5c
+  data.tar.gz: 77645290416e092257151a2ecc2420f4e7405fa6
 SHA512:
-  metadata.gz: a88ce9067351caf82731cc975ac28b2dcc0ad6bf5608a41bc2b83f5dfa43be28b292463e7900f5c5a9779bf1071fe3b1c3dfa9f6cc7804cccc96ff5550abf203
-  data.tar.gz: 45acd0bd43c74e21e240be4754b1bb54efb092ae21cbeb7121a6fb9569ace17774e4b05c8489aa4419e2ff8c1603e37d2c3e00c65a5d2d9f869ec1e2133af47a
+  metadata.gz: 2c362a8eda27b6c42bfeefef6af4a201800985823e7efaa08efecde260d2c08c7c1da55b41c46fcba7a05e25e7f2bcff1098a031fbc663ae47a5b91acae4f769
+  data.tar.gz: 1eb23a9207d260b706637e22b5ccbd9f47df50e8c4a48c5596204d163d27f9b63c78882a624aaa79b9629cdf4c72ecd8b6a07811e22bb76b19876f6fe24dcc33

data/{LICENSE.txt → MIT-LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2017 kaspernj
+Copyright 2017 kaspernj
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,54 +1,32 @@
-# encoding: utf-8
-
-require "rubygems"
-require "bundler"
 begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require "rake"
-
-require "jeweler"
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "active_record_query_fixer"
-  gem.homepage = "http://github.com/kaspernj/active_record_query_fixer"
-  gem.license = "MIT"
-  gem.summary = %(A library for automatically added `.select` on a column used for `.distinct` or automatically adding `.group` for a column used for order.)
-  gem.description =
-    %(A library for automatically added `.select` on a column used for `.distinct` or automatically adding `.group` for a column used for order.)
-  gem.email = "kaspernj@gmail.com"
-  gem.authors = ["kaspernj"]
-  # dependencies defined in Gemfile
+  require "bundler/setup"
+rescue LoadError
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
-Jeweler::RubygemsDotOrgTasks.new
 
-require "rspec/core"
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList["spec/**/*_spec.rb"]
-end
+require "rdoc/task"
 
-desc "Code coverage detail"
-task :simplecov do
-  ENV["COVERAGE"] = "true"
-  Rake::Task["spec"].execute
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "ActiveRecordQueryFixer"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-task default: :spec
+require "bundler/gem_tasks"
 
-require "rdoc/task"
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?("VERSION") ? File.read("VERSION") : ""
+require "rake/testtask"
 
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "active_record_query_fixer #{version}"
-  rdoc.rdoc_files.include("README*")
-  rdoc.rdoc_files.include("lib/**/*.rb")
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = false
 end
 
+
+task default: :test
+
 require "best_practice_project"
 BestPracticeProject.load_tasks

data/lib/active_record_query_fixer.rb

@@ -16,15 +16,11 @@ class ActiveRecordQueryFixer
   end
 
   def fix_order_group
-    return if @query.values[:group].empty?
+    return if @query.values[:joins].blank?
+    @query = @query.group("#{@query.model.table_name}.#{@query.model.primary_key}")
 
-    changed = false
     @query.values[:order].each do |order|
-      next if !order.is_a?(Arel::Nodes::Ascending) &&
-          !order.is_a?(Arel::Nodes::Descending)
-
-      @query = @query.group("#{order.expr.relation.right}.#{order.expr.name}")
-      changed = true
+      @query = @query.group(extract_table_and_column_from_expression(order))
     end
 
     self
@@ -35,14 +31,27 @@ class ActiveRecordQueryFixer
 
     changed = false
     @query.values[:order].each do |order|
-      next if !order.is_a?(Arel::Nodes::Ascending) &&
-          !order.is_a?(Arel::Nodes::Descending)
-
-      @query = @query.select("#{order.expr.relation.right}.#{order.expr.name}")
+      @query = @query.select(extract_table_and_column_from_expression(order))
       changed = true
     end
 
     @query = @query.select("#{@query.table_name}.*") if changed
     self
   end
+
+private
+
+  def extract_table_and_column_from_expression(order)
+    if order.is_a?(Arel::Nodes::Ascending) || order.is_a?(Arel::Nodes::Descending)
+      if order.expr.relation.respond_to?(:right)
+        "#{order.expr.relation.right}.#{order.expr.name}"
+      else
+        "#{order.expr.relation.table_name}.#{order.expr.name}"
+      end
+    elsif order.is_a?(String)
+      order
+    else
+      raise "Couldn't extract table and column from: #{order}"
+    end
+  end
 end

data/lib/active_record_query_fixer/version.rb

@@ -0,0 +1,3 @@
+class ActiveRecordQueryFixer
+  VERSION = "0.0.1".freeze
+end

data/lib/tasks/active_record_query_fixer_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :active_record_query_fixer do
+#   # Task goes here
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - kaspernj
@@ -9,128 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-04-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: best_practice_project
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.10
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.3
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.48.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.48.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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'
+dependencies: []
 description: A library for automatically added `.select` on a column used for `.distinct`
   or automatically adding `.group` for a column used for order.
-email: kaspernj@gmail.com
+email:
+- kaspernj@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- ".document"
-- ".rspec"
-- ".rubocop.yml"
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
+- MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
-- active_record_query_fixer.gemspec
 - lib/active_record_query_fixer.rb
-- spec/active_record_query_fixer_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/kaspernj/active_record_query_fixer
+- lib/active_record_query_fixer/version.rb
+- lib/tasks/active_record_query_fixer_tasks.rake
+homepage: https://www.github.com/kaspernj/active_record_query_fixer
 licenses:
 - MIT
 metadata: {}

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/.rubocop.yml

@@ -1,83 +0,0 @@
-AllCops:
-  DisplayCopNames: true
-  DisplayStyleGuide: true
-  Exclude:
-    - db/schema.rb
-    - spec/dummy/db/schema.rb
-
-# https://github.com/AtomLinter/linter-rubocop/issues/2
-Style/FileName:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Max: 10
-
-Metrics/LineLength:
-  Max: 160
-
-Metrics/MethodLength:
-  Max: 50
-
-Metrics/AbcSize:
-  Max: 25
-
-Metrics/ClassLength:
-  Max: 250
-
-# .find_each is not the same as .each
-Rails/FindEach:
-  Enabled: false
-
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Style/ClassAndModuleChildren:
-  EnforcedStyle: compact
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/EmptyLines:
-  Enabled: false
-
-# Will report offences for many places that are much more readable without using a guard clause
-Style/GuardClause:
-  Enabled: false
-
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: false
-
-Style/NilComparison:
-  Enabled: false
-
-Style/SignalException:
-  EnforcedStyle: only_raise
-
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Style/TrivialAccessors:
-  ExactNameMatch: true
-  Enabled: true
-
-# Disabled on purpose: https://github.com/bbatsov/rubocop/issues/1758
-Style/ClosingParenthesisIndentation:
-  Enabled: false

data/Gemfile

@@ -1,16 +0,0 @@
-source "https://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development, :test do
-  gem "best_practice_project", "0.0.10", require: false
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "2.3.3"
-  gem "rdoc", "~> 3.12"
-  gem "rspec", "~> 3.5.0"
-  gem "rubocop", "0.48.1"
-  gem "simplecov", ">= 0"
-end

data/Gemfile.lock

@@ -1,107 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    ast (2.3.0)
-    auto_autoloader (0.0.5)
-      string-cases
-    best_practice_project (0.0.10)
-      auto_autoloader (>= 0.0.5)
-    builder (3.2.3)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    git (1.3.0)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.5.5)
-    highline (1.7.8)
-    jeweler (2.3.3)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api (~> 0.11.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      psych (~> 2.2)
-      rake
-      rdoc
-      semver2
-    json (1.8.6)
-    jwt (1.5.6)
-    mini_portile2 (2.1.0)
-    multi_json (1.12.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    oauth2 (1.3.1)
-      faraday (>= 0.8, < 0.12)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    psych (2.2.2)
-    public_suffix (2.0.5)
-    rack (2.0.1)
-    rainbow (2.2.1)
-    rake (12.0.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    semver2 (3.4.2)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    string-cases (0.0.4)
-    thread_safe (0.3.6)
-    unicode-display_width (1.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  best_practice_project (= 0.0.10)
-  bundler (~> 1.0)
-  jeweler (= 2.3.3)
-  rdoc (~> 3.12)
-  rspec (~> 3.5.0)
-  rubocop (= 0.48.1)
-  simplecov
-
-BUNDLED WITH
-   1.13.7

data/VERSION

@@ -1 +0,0 @@
-0.0.0

data/active_record_query_fixer.gemspec

@@ -1,71 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: active_record_query_fixer 0.0.0 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "active_record_query_fixer".freeze
-  s.version = "0.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["kaspernj".freeze]
-  s.date = "2017-04-15"
-  s.description = "A library for automatically added `.select` on a column used for `.distinct` or automatically adding `.group` for a column used for order.".freeze
-  s.email = "kaspernj@gmail.com".freeze
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".rubocop.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "active_record_query_fixer.gemspec",
-    "lib/active_record_query_fixer.rb",
-    "spec/active_record_query_fixer_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/kaspernj/active_record_query_fixer".freeze
-  s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.8".freeze
-  s.summary = "A library for automatically added `.select` on a column used for `.distinct` or automatically adding `.group` for a column used for order.".freeze
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<best_practice_project>.freeze, ["= 0.0.10"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.3"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_development_dependency(%q<rubocop>.freeze, ["= 0.48.1"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<best_practice_project>.freeze, ["= 0.0.10"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>.freeze, ["= 2.3.3"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_dependency(%q<rubocop>.freeze, ["= 0.48.1"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<best_practice_project>.freeze, ["= 0.0.10"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>.freeze, ["= 2.3.3"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_dependency(%q<rubocop>.freeze, ["= 0.48.1"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-  end
-end
-

data/spec/active_record_query_fixer_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
-
-describe "ActiveRecordQueryFixer" do
-  it "fails" do
-    raise "hey buddy, you should probably rename this file and start specing for real"
-  end
-end

data/spec/spec_helper.rb

@@ -1,28 +0,0 @@
-require "simplecov"
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter "test_frameworks"
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require "rspec"
-require "active_record_query_fixer"
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-RSpec.configure do |config|
-end