criterion 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade5ee002558a00db5f98d1a9e51b05064b62d44
-  data.tar.gz: 3bc4315dc5e20579e89949d5093ac199f41e5abd
+  metadata.gz: 09e4b81b186b62dd90281e0988e3edb48d11cbb8
+  data.tar.gz: 3b326f2c8b3a3c334cc1ec8805d78bc0655121ce
 SHA512:
-  metadata.gz: 8b9275a695341df769badc8d29a2ac91c54e3bd776a366c143412854efebee09713ffdd9867dedb287f931aed53ce692800a1dcd64e609d2902a1a577656bdf3
-  data.tar.gz: 3470d335585769075043a947ed574f7e456d4b68a6b301c8401106db1fdd1f086590ba2f6f23279877c578439af4eaa02536ade239c543f4d84af4a40d491d37
+  metadata.gz: 81cfcc14175b0582c735defe870f3a87e72d375779927b4f6b2aee992b77e31bee6034631818dec8ca872de232278d0c360f710a88777c7e5a30d83427a0dfdd
+  data.tar.gz: cf85cc29b54130eb54445010137d20f9d880540946829cf8a6503c26489f0dc721884de924a36138c8f6f5b01dc5fe582c6457b19395f9b5d9231cc6ec88b90f

data/README.md

@@ -1,5 +1,8 @@
 # Criterion
 
+[![Build Status](https://secure.travis-ci.org/activefx/criterion.png)](http://travis-ci.org/activefx/criterion)
+[![Code Climate](https://codeclimate.com/github/activefx/criterion/badges/gpa.svg)](https://codeclimate.com/github/activefx/criterion)
+
 Criterion is a small, simple library for searching Ruby arrays and collections with a chainable, Active Record style query interface.
 
 ## Installation
@@ -96,6 +99,17 @@ collection.where(name: 'Matt', age: 40).empty?
 #=> true
 ````
 
+### Or 
+
+As #where calls must match all query values, calling #or allows for an alternative query that will return results if either the #where or #or arguments match. 
+
+````ruby 
+collection.where(name: 'Matt').or(name: 'John').to_a
+#=> [{"name"=>"Matt", "age"=>30}, {"name"=>"John", "age"=>50}]
+````
+
+For #or to work, a #where query must also be performed. 
+
 ### Not 
 
 The #not method negates the query, returning matches that do not match all of the specified values. Like #where, #not can search by exact value, regular expression, class, proc, and range. 

data/criterion.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Matthew Solt"]
   spec.email         = ["mattsolt@gmail.com"]
 
-  spec.summary       = %q{Criterion is a small, simple library for searching Ruby arrays and collections with a chainable, Active Record style query interface.}
+  spec.summary       = %q{Search Ruby arrays and collections with a chainable, Active Record style query interface.}
   spec.description   = %q{Criterion is a small, simple library for searching Ruby arrays and collections with a chainable, Active Record style query interface.}
   spec.homepage      = "https://github.com/activefx/criterion"
   spec.license       = "MIT"

data/lib/criterion.rb

@@ -5,7 +5,7 @@ module Criterion
   extend Forwardable
 
   def_delegators :criteria,
-    :where, :not, :order, :limit, :offset, :skip,
+    :where, :or, :not, :order, :limit, :offset, :skip,
     :sum, :maximum, :minimum, :average
 
   def criteria
@@ -16,17 +16,19 @@ module Criterion
     extend Forwardable
     include Enumerable
 
-    MULTI_VALUE_METHODS   = [ :where, :not, :order ]
+    MULTI_VALUE_METHODS   = [ :where, :or, :not, :order ]
     SINGLE_VALUE_METHODS  = [ :limit, :offset ]
+    RESULT_METHODS = [
+      :[], :at, :count, :empty?, :fetch, :first, :include?, :index,
+      :last, :length, :reverse, :rindex, :sample, :size, :sort,
+      :sort_by, :take, :take_while, :values_at
+    ]
 
     attr_accessor \
-      :where_values, :not_values, :order_values,
+      :where_values, :or_values, :not_values, :order_values,
       :limit_value, :offset_value
 
-    def_delegators :to_a,
-      :[], :at, :count, :empty?, :fetch, :first, :include?, :index,
-      :last, :length, :reverse, :rindex, :sample, :size, :sort,
-      :sort_by, :take, :take_while, :values_at
+    def_delegators :to_a, *RESULT_METHODS
 
     def initialize(records)
       @records = records
@@ -40,6 +42,12 @@ module Criterion
       end
     end
 
+    def or(query = {})
+      clone.tap do |r|
+        r.or_values.merge!(query) unless query.empty?
+      end
+    end
+
     def not(query = {})
       clone.tap do |r|
         r.not_values.merge!(query) unless query.empty?
@@ -83,19 +91,35 @@ module Criterion
       to_a.collect { |x| x.send(field) }.max
     end
 
+    def where?
+      !where_values.empty?
+    end
+
+    def or?
+      !or_values.empty?
+    end
+
+    def not?
+      !not_values.empty?
+    end
+
+    def order?
+      !order_values.empty?
+    end
+
+    def offset?
+      valid_number?(offset_value)
+    end
+
+    def limit?
+      valid_number?(limit_value)
+    end
+
     def to_a
-      results = @records.select do |record|
-        keep = where_values.empty? ? true : where_values.all? do |method, value|
-          value === record.send(method)
-        end
-        exclude = not_values.empty? ? false : not_values.all? do |method, value|
-          value === record.send(method)
-        end
-        keep && !exclude
-      end
-      results = results.sort_by(&ordering_args) unless order_values.empty?
-      results = results.drop(offset_value) if offset_value.is_a?(Integer)
-      results = results.take(limit_value) if limit_value.is_a?(Integer)
+      results = @records.select{ |record| keep?(record) }
+      results = results.sort_by(&ordering_args) if order?
+      results = results.drop(offset_value) if offset?
+      results = results.take(limit_value) if limit?
       results
     end
     alias_method :all, :to_a
@@ -107,6 +131,19 @@ module Criterion
 
     private
 
+    def criteria_matches?(record, values)
+      values.all? do |method, value|
+        value === record.send(method)
+      end
+    end
+
+    def keep?(record)
+      keep = where? ? criteria_matches?(record, where_values) : true
+      alt = or? ? criteria_matches?(record, or_values) : false
+      exclude = not? ? criteria_matches?(record, not_values) : false
+      (keep || alt) && !exclude
+    end
+
     def ordering_args
       Proc.new do |item|
         order_values.map do |sort|
@@ -116,6 +153,11 @@ module Criterion
       end
     end
 
+    def valid_number?(value)
+      return false unless value.is_a?(Integer)
+      value >= 0
+    end
+
   end
 
 end

data/lib/criterion/version.rb

@@ -1,3 +1,3 @@
 module Criterion
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: criterion
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew Solt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,6 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Criterion is a small, simple library for searching Ruby arrays and collections
-  with a chainable, Active Record style query interface.
+summary: Search Ruby arrays and collections with a chainable, Active Record style
+  query interface.
 test_files: []