baby_squeel 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea748a7c86d1947f7fe48e799eb2ced9f7741a63
-  data.tar.gz: f9196d9756b6cb9b461d654112cfc0818ced9b62
+  metadata.gz: 3f4792b9f869cd23c5910a52a2d95188ee75c806
+  data.tar.gz: c2d75c755301787ac04d5aa8220396be848f9f28
 SHA512:
-  metadata.gz: 040230635cc12c89d661c622b6e3b43f84d0fb37fd320a0ab570560d605fa170287d594ef810d27d7cd33278c15aeba609bdb1d71cdc28cc00bd0f6b0743dff5
-  data.tar.gz: db3975104c6c290c712fd3833e1bf469ae93e4ec262d861f1504b1f6fe9f15bada5ccebac0e43871fa61583688bf758d0d352af3bff4b7dc5e5cc9092d8c7979
+  metadata.gz: 6a91030415fc3afd7017e92f89440207bf7069b8f3681a549d3abba3629847e9dd589aabe6398104ff6c89d780660a7f600ddccecd3d69a07decb10fabcbc8f6
+  data.tar.gz: 4b1d040212307df0175af66a8e5ce59b7f398abcfae50387a857434d16b06da9b4598ffc3078a42f852272ad2981164f2fde42f3729435a44953d86b1dc17e10

data/lib/baby_squeel/dsl.rb

@@ -97,12 +97,8 @@ module BabySqueel
 
     private
 
-    def method_missing(meth, *args, &block)
-      if !args.empty? && !block_given?
-        func(meth, args)
-      else
-        super
-      end
+    def resolver
+      @resolver ||= Resolver.new(self, [:function, :column, :association])
     end
   end
 end

data/lib/baby_squeel/errors.rb

@@ -1,7 +1,18 @@
 module BabySqueel
   class NotFoundError < StandardError # :nodoc:
-    def initialize(model_name, name)
-      super "There is no column or association named '#{name}' for #{model_name}."
+    def initialize(model_name, name, strategies)
+      super "There is no #{sentence(strategies)} " \
+            "named '#{name}' for #{model_name}."
+    end
+
+    private
+
+    def sentence(*words)
+      if words.length < 3
+        words.join ' or '
+      else
+        sentence words[0..-2].join(', '), words.last
+      end
     end
   end
 

data/lib/baby_squeel/join_dependency/builder.rb

@@ -28,7 +28,10 @@ module BabySqueel
       def find_join_association(associations)
         associations.inject(join_root) do |parent, assoc|
           parent.children.find do |join_association|
-            join_association.reflection == assoc._reflection
+            reflections_equal?(
+              assoc._reflection,
+              join_association.reflection
+            )
           end
         end
       end
@@ -43,6 +46,18 @@ module BabySqueel
 
       private
 
+      # Compare two reflections and see if they're the same.
+      def reflections_equal?(a, b)
+        comparable_reflection(a) == comparable_reflection(b)
+      end
+
+      # Get the parent of the reflection if it has one.
+      # In AR4, #parent_reflection returns [name, reflection]
+      # In AR5, #parent_reflection returns just a reflection
+      def comparable_reflection(reflection)
+        [*reflection.parent_reflection].last || reflection
+      end
+
       # Active Record 5's AliasTracker initializes Arel tables
       # with the type_caster belonging to the wrong model.
       #

data/lib/baby_squeel/relation.rb

@@ -15,7 +15,7 @@ module BabySqueel
       if reflection = _scope.reflect_on_association(name)
         Association.new(self, reflection)
       else
-        not_found_error! name, type: AssociationNotFoundError
+        raise AssociationNotFoundError.new(_scope.model_name, name)
       end
     end
 
@@ -30,18 +30,8 @@ module BabySqueel
 
     private
 
-    # @override BabySqueel::Table#not_found_error!
-    def not_found_error!(name, type: NotFoundError)
-      raise type.new(_scope.model_name, name)
-    end
-
-    # @override BabySqueel::Table#resolve
-    def resolve(name)
-      if _scope.column_names.include?(name.to_s)
-        self[name]
-      elsif _scope.reflect_on_association(name)
-        association(name)
-      end
+    def resolver
+      @resolver ||= Resolver.new(self, [:column, :association])
     end
   end
 end

data/lib/baby_squeel/resolver.rb

@@ -0,0 +1,96 @@
+module BabySqueel
+  class Resolver
+    def initialize(table, strategies)
+      @table       = table
+      @strategies  = strategies
+    end
+
+    # Attempt to determine the intent of the method_missing. If this method
+    # returns nil, that means one of two things:
+    #
+    # 1. The argument signature is invalid.
+    # 2. The name of the method called is not valid (ex. invalid column name)
+    def resolve(name, *args, &block)
+      strategy = @strategies.find do |strategy|
+        valid?(strategy, name, *args, &block)
+      end
+
+      build(strategy, name, *args, &block)
+    end
+
+    # Try to resolve the method_missing. If we fail to resolve, there are
+    # two outcomes:
+    #
+    # If any of the configured strategies accept argument signature provided,
+    # raise an error. This means we failed to resolve the name. (ex. invalid
+    # column name)
+    #
+    # Otherwise, a nil return valid indicates that argument signature was not
+    # valid for any of the configured strategies. This case should be treated
+    # as a NoMethodError.
+    def resolve!(name, *args, &block)
+      if resolution = resolve(name, *args, &block)
+        return resolution
+      end
+
+      if compatible_arguments?(*args, &block)
+        raise NotFoundError.new(@table._scope.model_name, name, @strategies)
+      end
+
+      return nil
+    end
+
+    # Used to determine if a table can respond_to? a method.
+    def resolves?(name)
+      @strategies.any? do |strategy|
+        valid_name? strategy, name
+      end
+    end
+
+    private
+
+    def build(strategy, name, *args)
+      case strategy
+      when :function
+        @table.func(name, *args)
+      when :association
+        @table.association(name)
+      when :column, :attribute
+        @table[name]
+      end
+    end
+
+    def valid?(strategy, name, *args, &block)
+      valid_arguments?(strategy, *args, &block) &&
+        valid_name?(strategy, name)
+    end
+
+    def valid_name?(strategy, name)
+      case strategy
+      when :column
+        @table._scope.column_names.include?(name.to_s)
+      when :association
+        !@table._scope.reflect_on_association(name).nil?
+      when :function, :attribute
+        true
+      end
+    end
+
+    def valid_arguments?(strategy, *args)
+      return false if block_given?
+
+      case strategy
+      when :function
+        !args.empty?
+      when :column, :attribute, :association
+        args.empty?
+      end
+    end
+
+    def compatible_arguments?(*args, &block)
+      @strategies.any? do |strategy|
+        valid_arguments?(strategy, *args, &block)
+      end
+    end
+  end
+end

data/lib/baby_squeel/table.rb

@@ -1,3 +1,4 @@
+require 'baby_squeel/resolver'
 require 'baby_squeel/join_expression'
 require 'baby_squeel/join_dependency/builder'
 
@@ -93,21 +94,16 @@ module BabySqueel
 
     private
 
-    def not_found_error!
-      raise NotImplementedError, 'BabySqueel::Table will never raise a NotFoundError'
-    end
-
-    def resolve(name)
-      self[name]
+    def resolver
+      @resolver ||= Resolver.new(self, [:attribute])
     end
 
     def respond_to_missing?(name, *)
-      resolve(name).present? || super
+      resolver.resolves?(name) || super
     end
 
-    def method_missing(name, *args, &block)
-      return super if !args.empty? || block_given?
-      resolve(name) || not_found_error!(name)
+    def method_missing(*args, &block)
+      resolver.resolve!(*args, &block) || super
     end
   end
 end

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -129,6 +129,7 @@ files:
 - lib/baby_squeel/operators.rb
 - lib/baby_squeel/pluck.rb
 - lib/baby_squeel/relation.rb
+- lib/baby_squeel/resolver.rb
 - lib/baby_squeel/table.rb
 - lib/baby_squeel/version.rb
 homepage: https://github.com/rzane/baby_squeel
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An expressive query DSL for Active Record 4 and 5.