baby_squeel 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e25c11d1ea3b43b1911854cc0966350877f7d62
-  data.tar.gz: a203af4f8f653617a5a64930e43501daf314489a
+  metadata.gz: 2c05b66383b8b74c1c6ba92af1164da82a4290a2
+  data.tar.gz: 19d23ae9dae15bc8f7b8acb91f18272f7101e9c7
 SHA512:
-  metadata.gz: 1a0528486cceb39952ad82687a69a9a6fb920a1ba6faf16ebdf4544bcfd5d6769d457ce10c87b4ad167f3a4a17c5234a6c36a78609fad03806d983232df4b743
-  data.tar.gz: aa45ff551f8d7c86c761749af179482011a2da522c9261ced4fab70ee1f5547f1b94eb6c93df3b5cf250e9169b72a3184bf1689c5bf614b7db20a69b476b3f88
+  metadata.gz: 4ff0c39cba1d8b76911020f7b1a66affacddfb6dbe5a4e63a6cf7752f40bcdc30180fcfb95fa5437c495146469a30dbf7e73ceeddf5ca7fbb75d5c6810ff245b
+  data.tar.gz: e765fd51a96096549e971be4a8ffd87a2ae24300475e49043eddf33b692500501f2a1ca3ca8933048aedc08ea60f18f9748dfc93d1bd69f84e5067a9cf9d2594

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## [Unreleased]
 
-*Nothing yet.*
+Nothing to see yet!
+
+## [1.1.0] - 2017-02-10
+> This version drops support for Active Record 4.1. If you're stil on 4.1, you should seriously consider upgrading to at least 4.2.
+
+### Added
+- DSLs for ActiveRecord::Relation::Calculations. You can not use `plucking`, `counting`, `summing`, `averaging`, `minimizing`, and `maximizing`.
 
 ## [1.0.3] - 2017-02-09
 ### Added
@@ -93,7 +99,8 @@
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.0.3...HEAD
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/rzane/baby_squeel/compare/v1.0.3...v1.1.0
 [1.0.3]: https://github.com/rzane/baby_squeel/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/rzane/baby_squeel/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/rzane/baby_squeel/compare/v1.0.0...v1.0.1

data/baby_squeel.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Ray Zane']
   spec.email         = ['ray@promptworks.com']
 
-  spec.summary       = 'A tiny squeel implementation without all of the evil.'
+  spec.summary       = 'An expressive query DSL for Active Record 4 and 5.'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/rzane/baby_squeel'
   spec.license       = 'MIT'
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '>= 4.1.0'
+  spec.add_dependency 'activerecord', '>= 4.2.0'
   spec.add_dependency 'polyamorous', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.11'

data/lib/baby_squeel.rb

@@ -5,6 +5,7 @@ require 'baby_squeel/version'
 require 'baby_squeel/errors'
 require 'baby_squeel/active_record/base'
 require 'baby_squeel/active_record/query_methods'
+require 'baby_squeel/active_record/calculations'
 require 'baby_squeel/active_record/where_chain'
 
 module BabySqueel
@@ -43,5 +44,6 @@ end
 ActiveSupport.on_load :active_record do
   ::ActiveRecord::Base.extend BabySqueel::ActiveRecord::Base
   ::ActiveRecord::Relation.prepend BabySqueel::ActiveRecord::QueryMethods
+  ::ActiveRecord::Relation.prepend BabySqueel::ActiveRecord::Calculations
   ::ActiveRecord::QueryMethods::WhereChain.prepend BabySqueel::ActiveRecord::WhereChain
 end

data/lib/baby_squeel/active_record/base.rb

@@ -4,7 +4,9 @@ module BabySqueel
   module ActiveRecord
     module Base
       delegate :joining, :joining!, :selecting, :ordering,
-               :grouping, :when_having, :plucking, to: :all
+               :grouping, :when_having, :plucking,
+               :averaging, :counting, :maximizing,
+               :minimizing, :summing, to: :all
 
       # Define a sifter that can be used within DSL blocks.
       #

data/lib/baby_squeel/active_record/calculations.rb

@@ -0,0 +1,52 @@
+require 'baby_squeel/calculation'
+require 'baby_squeel/pluck'
+
+module BabySqueel
+  module ActiveRecord
+    module Calculations
+      def plucking(&block)
+        pluck Pluck.wrap(DSL.evaluate(self, &block))
+      end
+
+      def counting(&block)
+        count Calculation.new(DSL.evaluate(self, &block))
+      end
+
+      def summing(&block)
+        sum Calculation.new(DSL.evaluate(self, &block))
+      end
+
+      def averaging(&block)
+        average Calculation.new(DSL.evaluate(self, &block))
+      end
+
+      def minimizing(&block)
+        minimum Calculation.new(DSL.evaluate(self, &block))
+      end
+
+      def maximizing(&block)
+        maximum Calculation.new(DSL.evaluate(self, &block))
+      end
+
+      # @override
+      def aggregate_column(column_name)
+        if column_name.kind_of? Calculation
+          column_name.node
+        else
+          super
+        end
+      end
+
+      if ::ActiveRecord::VERSION::MAJOR < 5
+        # @override
+        def type_for(field)
+          if field.kind_of? Calculation
+            field
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/baby_squeel/active_record/query_methods.rb

@@ -29,40 +29,6 @@ module BabySqueel
         having DSL.evaluate(self, &block)
       end
 
-      if ::ActiveRecord::VERSION::MAJOR >= 5
-        def plucking(&block)
-          pluck DSL.evaluate(self, &block)
-        end
-      elsif ::ActiveRecord::VERSION::STRING >= '4.2.0'
-        def plucking(&block)
-          relation = selecting(&block)
-          binds = relation.arel.bind_values + bind_values
-          result = klass.connection.select_all(relation.arel, nil, binds)
-          result.cast_values(klass.column_types)
-        end
-      else
-        def plucking(&block)
-          relation = selecting(&block)
-          binds = relation.arel.bind_values + bind_values
-          result = klass.connection.select_all(relation.arel, nil, binds)
-          columns = result.columns.map do |key|
-            klass.column_types.fetch(key) {
-              result.column_types.fetch(key) { result.identity_type }
-            }
-          end
-
-          result = result.rows.map do |values|
-            values = result.columns.zip(values).map do |column_name, value|
-              single_attr_hash = { column_name => value }
-              klass.initialize_attributes(single_attr_hash).values.first
-            end
-
-            columns.zip(values).map { |column, value| column.type_cast value }
-          end
-          columns.one? ? result.map!(&:first) : result
-        end
-      end
-
       private
 
       # This is a monkey patch, and I'm not happy about it.

data/lib/baby_squeel/association.rb

@@ -99,7 +99,7 @@ module BabySqueel
     if ActiveRecord::VERSION::MAJOR >= 5
       def build_where_clause(other)
         if valid_where_clause?(other)
-          relation = @parent._scope.where(nil)
+          relation = @parent._scope.all
           factory = relation.send(:where_clause_factory)
           factory.build({ _reflection.name => other }, [])
         else

data/lib/baby_squeel/calculation.rb

@@ -0,0 +1,35 @@
+module BabySqueel
+  class Calculation # :nodoc:
+    attr_reader :node
+
+    def initialize(node)
+      @node = node
+    end
+
+    # This is only used in 4.2. We're just pretending to be
+    # a database column to fake the casting here.
+    def type_cast_from_database(value)
+      value
+    end
+
+    # In Active Record 5, we don't *need* this class to make
+    # calculations work. They happily accept arel. However,
+    # when grouping with a calculation, there's a really,
+    # really weird alias name. It calls #to_s on the Arel.
+    #
+    # If this were not addressed, it would likely break query
+    # caching because the alias would have a unique name every
+    # time.
+    def to_s
+      names = node.map do |child|
+        if child.kind_of?(String) || child.kind_of?(Symbol)
+          child.to_s
+        elsif child.respond_to?(:name)
+          child.name.to_s
+        end
+      end
+
+      names.compact.uniq.join('_')
+    end
+  end
+end

data/lib/baby_squeel/dsl.rb

@@ -5,19 +5,11 @@ require 'baby_squeel/association'
 module BabySqueel
   class DSL < Relation
     class << self
-      # Evaluates a block and unwraps the nodes
-      def evaluate(scope, &block)
-        Nodes.unwrap evaluate!(scope, &block)
+      def evaluate(scope, &block) # :nodoc:
+        Nodes.unwrap new(scope).evaluate(&block)
       end
 
-      # Evaluates a block in the context of a DSL instance
-      def evaluate!(scope, &block)
-        new(scope).evaluate(&block)
-      end
-
-      # Evaluates a block in the context of a new DSL instance
-      # and passes all arguments to the block.
-      def evaluate_sifter(scope, *args, &block)
+      def evaluate_sifter(scope, *args, &block) # :nodoc:
         evaluate scope do |root|
           root.instance_exec(*args, &block)
         end

data/lib/baby_squeel/nodes/attribute.rb

@@ -17,6 +17,14 @@ module BabySqueel
         end
       end
 
+      def not_in(rel)
+        if rel.is_a? ::ActiveRecord::Relation
+          ::Arel::Nodes::NotIn.new(self, Arel.sql(rel.to_sql))
+        else
+          super
+        end
+      end
+
       def _arel
         if @parent.kind_of? BabySqueel::Association
           @parent.find_alias[@name]

data/lib/baby_squeel/pluck.rb

@@ -0,0 +1,25 @@
+module BabySqueel
+  class Pluck # :nodoc:
+    # In Active Record 4.2, #pluck chokes when you give it
+    # Arel. It calls #to_s on whatever you pass in. So the
+    # hacky solution is to wrap the node in a class that
+    # returns the node when you call #to_s. Then, it works!
+    #
+    # In Active Record 5, #pluck accepts Arel, so we won't
+    # bother to use this there.
+
+    if ::ActiveRecord::VERSION::MAJOR >= 5
+      def self.wrap(node); node; end
+    else
+      def self.wrap(node); new(node); end
+    end
+
+    def initialize(node)
+      @node = node
+    end
+
+    def to_s
+      @node
+    end
+  end
+end

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: polyamorous
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A tiny squeel implementation without all of the evil.
+description: An expressive query DSL for Active Record 4 and 5.
 email:
 - ray@promptworks.com
 executables: []
@@ -108,9 +108,11 @@ files:
 - baby_squeel.gemspec
 - lib/baby_squeel.rb
 - lib/baby_squeel/active_record/base.rb
+- lib/baby_squeel/active_record/calculations.rb
 - lib/baby_squeel/active_record/query_methods.rb
 - lib/baby_squeel/active_record/where_chain.rb
 - lib/baby_squeel/association.rb
+- lib/baby_squeel/calculation.rb
 - lib/baby_squeel/compat.rb
 - lib/baby_squeel/dsl.rb
 - lib/baby_squeel/errors.rb
@@ -125,6 +127,7 @@ files:
 - lib/baby_squeel/nodes/node.rb
 - lib/baby_squeel/nodes/proxy.rb
 - lib/baby_squeel/operators.rb
+- lib/baby_squeel/pluck.rb
 - lib/baby_squeel/relation.rb
 - lib/baby_squeel/table.rb
 - lib/baby_squeel/version.rb
@@ -151,5 +154,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: A tiny squeel implementation without all of the evil.
+summary: An expressive query DSL for Active Record 4 and 5.
 test_files: []