active_enumerable 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db5edb0e4e9f6d7f8fd5a300614a183963166077
-  data.tar.gz: e1b94fd1c797689656ba6191fdb9de1fe8ba6bfb
+SHA256:
+  metadata.gz: cc502a24a0dd992d14b0cbd5cf430f6ea6b65923dee12b551f8647c5a3c02cd1
+  data.tar.gz: f70d7bd888c00b4b2629f984cea4ad772b42b9017f715277e170bd9c87b0933b
 SHA512:
-  metadata.gz: 6c7f661c81d3ad8bc7a1c8cef010cd9dffb22bb668f7244b089352e9415216372b8fa522bb5afc1032e25779b7873bb7835217c02d972566fb9e05c2702f54a0
-  data.tar.gz: 93a46896255357f33867972e7a6335285908ec7dd76383028db39caf80ef88741d7955388aa8d44cd68a60012ea7b5bb53bee0eda0401290ea723913851a2c72
+  metadata.gz: b020582e03b2e91502585cda638fda595e14dfde1eaf4b46fecf14e58159102ea4427f1692cdf6a9377f349765eba8bdcedd6c7b1b8128ffba3835247dc945e1
+  data.tar.gz: 6213bbf4af9acaa7ac1fc34e59ea17a8e605eb65e713deaf9f0e110fede4434020f8dc1fe9602f0c5650703f80ee2bde87a68d270e80c7a452a6255361d0d0f1

data/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

data/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+
+## 1.1.0 - 2018-08-01
+### Feature
+- `#where` can take a block that runs with instance exec for each record. Event allows for nested objects with method chaining.
+
 ## 1.0.0 - 2018-01-26
 - Remove mutation methods and ensure 100% test coverage
 

data/README.md

@@ -24,6 +24,8 @@ Or install it yourself as:
 
 ## Usage
 
+[Documentation](http://www.rubydoc.info/gems/active_enumerable/1.0.0)
+
 ### ActiveRecord Like Querying
 
 ```ruby
@@ -48,6 +50,9 @@ customers.sum(:credit)
 
 customers << { paid: true, credit: 1500 } # accepts Hashes
 
+customers.where{ paid && credit == 1000 }
+# => <#Customers [{paid: true, credit: 1000}]
+
 class Customer
   attr_reader :paid, :credit
   def initialize(paid:, credit:)

data/lib/active_enumerable/english_dsl.rb

@@ -26,11 +26,12 @@ module ActiveEnumerable
 
     # @param [Hash, Object] matches is list of sub conditions or associations to query.
     #   Or this can by any value to compare the result from attr.
-    def of(matches)
+    def of(matches=nil, &block)
+      raise ArgumentError if matches.nil? && block.nil?
       if all_conditions.empty? || !(all_conditions.last.count == 1)
         raise UnmetCondition, ".has(attr) must be call before calling #of."
       else
-        all_conditions.last << matches
+        all_conditions.last << (matches || block)
         self
       end
     end

data/lib/active_enumerable/finder.rb

@@ -38,11 +38,14 @@ module ActiveEnumerable
     #
     # @param [Hash] conditions
     # @return [true, false]
-    def is_of(conditions={})
+    def is_of(conditions = {})
       conditions.all? do |col, match|
-        if match.is_a? Hash
+        case match
+        when Proc
+          proc_match(col, match)
+        when Hash
           hash_match(col, match)
-        elsif match.is_a? Array
+        when Array
           array_match(col, match)
         else
           compare(col, match)
@@ -52,6 +55,16 @@ module ActiveEnumerable
 
     private
 
+    def proc_match(col, match)
+      return @method_caller.instance_exec(&match) unless col
+      next_record = @method_caller.call(col)
+      if next_record.is_a? Array
+        next_record.all? { |record| Finder.new(record).is_of({nil => match}) }
+      else
+        MethodCaller.new(next_record).instance_exec(&match)
+      end
+    end
+
     def hash_match(col, match)
       next_record = @method_caller.call(col)
       if next_record.is_a? Array

data/lib/active_enumerable/method_caller.rb

@@ -1,23 +1,38 @@
 module ActiveEnumerable
   # @private
   class MethodCaller
-    attr_reader :object, :raise_no_method
+    attr_reader :__object__, :raise_no_method
 
     def initialize(object, raise_no_method: true)
-      @object          = object
+      @__object__      = object
       @raise_no_method = raise_no_method
     end
 
     def call(method)
-      if object.is_a? Hash
-        object.fetch(method)
+      if __object__.is_a? Hash
+        wrap_return __object__.fetch(method)
       else
-        object.public_send(method)
+        wrap_return __object__.public_send(method)
       end
     rescue NoMethodError => e
       raise e if raise_no_method
     rescue KeyError => e
-      raise e, "#{e.message} for #{object}" if raise_no_method
+      raise e, "#{e.message} for #{__object__}" if raise_no_method
+    end
+
+    def method_missing(method)
+      call(method)
+    end
+
+    private
+
+    def wrap_return(return_value)
+      case return_value
+      when Hash
+        self.class.new(return_value, raise_no_method: raise_no_method)
+      else
+        return_value
+      end
     end
   end
 end

data/lib/active_enumerable/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnumerable
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/active_enumerable/where.rb

@@ -1,30 +1,9 @@
 require "active_enumerable/finder"
+require "active_enumerable/where/where_not_chain"
+require "active_enumerable/where/where_or_chain"
 
 module ActiveEnumerable
   module Where
-    class WhereNotChain
-      def initialize(collection, parent_class)
-        @collection   = collection
-        @parent_class = parent_class
-      end
-
-      # Returns a new relation expressing WHERE + NOT condition according to
-      # the conditions in the arguments.
-      #
-      # #not accepts conditions as a string, array, or hash. See Where#where for
-      # more details on each format.
-      #
-      #    <#ActiveEnumerable>.where.not(name: "Jon")
-      #    <#ActiveEnumerable>.where.not(name: nil)
-      #    <#ActiveEnumerable>.where.not(name: %w(Ko1 Nobu))
-      #    <#ActiveEnumerable>.where.not(name: "Jon", role: "admin")
-      def not(conditions={})
-        @parent_class.call(@collection.reject do |record|
-          Finder.new(record).is_of(conditions)
-        end)
-      end
-    end
-
     # Returns a new relation, which is the result of filtering the current relation
     # according to the conditions in the arguments.
     #
@@ -58,35 +37,17 @@ module ActiveEnumerable
     #   <#ActiveEnumerable>.where(id: 1).or(author_id: 3)
     #
     # @see ActiveEnumerable::Finder#is_of for all usages of conditions.
-    def where(conditions=nil)
-      return WhereNotChain.new(all, method(:__new_relation__)) if conditions.nil?
-      enable_or create_where_relation(conditions, to_a.select do |record|
-        Finder.new(record).is_of(conditions)
-      end)
-    end
-
-    def enable_or(relation)
-      pre_where_to_a = to_a
-      relation.define_singleton_method(:or) do |conditions_or_relation|
-        conditions = get_conditions(conditions_or_relation)
-        or_result = create_where_relation(where_conditions, pre_where_to_a).where(conditions)
-        create_where_relation(or_result.where_conditions, relation.to_a.concat(or_result.to_a).uniq)
-      end
-      relation
-    end
-
-    private :enable_or
-
-    def get_conditions(conditions_or_relation)
-      if conditions_or_relation.respond_to?(:where_conditions)
-        conditions_or_relation.where_conditions
-      else
-        conditions_or_relation
+    def where(conditions = nil, &block)
+      return WhereNotChain.new(all, method(:__new_relation__)) unless conditions || block
+      conditions = conditions || { nil => block }
+      create_where_relation(conditions, to_a.select do |record|
+        Finder.new(record).is_of(conditions || { nil => block })
+      end).tap do |where|
+        where.extend(WhereOrChain)
+        where.original_collection = to_a
       end
     end
 
-    private :get_conditions
-
     def where_conditions
       @where_conditions ||= {}
     end

data/lib/active_enumerable/where/where_not_chain.rb

@@ -0,0 +1,26 @@
+module ActiveEnumerable
+  module Where
+    class WhereNotChain
+      def initialize(collection, parent_class)
+        @collection   = collection
+        @parent_class = parent_class
+      end
+
+      # Returns a new relation expressing WHERE + NOT condition according to
+      # the conditions in the arguments.
+      #
+      # #not accepts conditions as a string, array, or hash. See Where#where for
+      # more details on each format.
+      #
+      #    <#ActiveEnumerable>.where.not(name: "Jon")
+      #    <#ActiveEnumerable>.where.not(name: nil)
+      #    <#ActiveEnumerable>.where.not(name: %w(Ko1 Nobu))
+      #    <#ActiveEnumerable>.where.not(name: "Jon", role: "admin")
+      def not(conditions = {})
+        @parent_class.call(@collection.reject do |record|
+          Finder.new(record).is_of(conditions)
+        end)
+      end
+    end
+  end
+end

data/lib/active_enumerable/where/where_or_chain.rb

@@ -0,0 +1,23 @@
+module ActiveEnumerable
+  module Where
+    module WhereOrChain
+      def or(conditions_or_relation)
+        conditions = get_conditions(conditions_or_relation)
+        or_result  = create_where_relation(where_conditions, original_collection).where(conditions)
+        create_where_relation(or_result.where_conditions, to_a.concat(or_result.to_a).uniq)
+      end
+
+      attr_accessor :original_collection
+
+      private
+
+      def get_conditions(conditions_or_relation)
+        if conditions_or_relation.respond_to?(:where_conditions)
+          conditions_or_relation.where_conditions
+        else
+          conditions_or_relation
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_enumerable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/inspectionProfiles/Project_Default.xml"
+- ".idea/vcs.xml"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
@@ -100,6 +102,8 @@ files:
 - lib/active_enumerable/scopes.rb
 - lib/active_enumerable/version.rb
 - lib/active_enumerable/where.rb
+- lib/active_enumerable/where/where_not_chain.rb
+- lib/active_enumerable/where/where_or_chain.rb
 homepage: https://github.com/zeisler/active_enumerable
 licenses:
 - MIT
@@ -120,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Provides ActiveRecord like query methods for use in Ruby Enumerable collections.