philter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28df2d4a59af11ab48898f5a79ae0af51fcb6433
-  data.tar.gz: d1637407fca0282aaae477558c3070a82277a7b6
+  metadata.gz: a82097224d3bcea151e212c83dcd4736f0ed43bd
+  data.tar.gz: 54f2e0976d20d9367f954ea333c2649b83517426
 SHA512:
-  metadata.gz: c0ae3a03853aeb05c68b16003e8c348284f28d5efee717ce344d0e5b19eafc6973a258d07671cd6e8a62dc82a87f20611d5dcdce0fd631ca7b41df1e475c96ea
-  data.tar.gz: 4eb0a010060ee387efaa84f8afc12d277b7870429ff10700d0abfb0b5f97baf6ace5b60c21d0460932ff5b5f3a65bf09c9792c62d4c91ea5bf93c8886ddf20fb
+  metadata.gz: 5321992c7fe69306f65960b8cac88f4506e1eba6cc1a91a82653305c8e4d3172f6c3b81b465f0a5516e3e4087c2050fc13f414e0501bbfe6e1a2bbd362bfa3c5
+  data.tar.gz: 1935bc23a2fbdb11b77b18f4d31a97b935304b48238d54e73e5df161970f3c6f982037a174ae36edca67ad40cffc09fdcf186d0ce8dfb6550af3c04507003ace

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.3.0 [☰](https://github.com/marcomd/Philter/compare/v0.2.0...v0.3.0) May 19th, 2016
+------------------------------
+* Added operators to work with fixnum: id: '<3' or any other operator
+* Improved documentation
+
 v0.2.0 [☰](https://github.com/marcomd/Philter/compare/v0.1.0...v0.2.0) May 19th, 2016
 ------------------------------
 * Added options `:get` to select attributes from hashes and objects

data/README.md

@@ -41,6 +41,13 @@ require 'philter'
 ].philter id: [1,3]
 => [{:id=>1, :name=>"Mark"}, {:id=>3, :name=>"Bill"}]
 
+[
+{id: 1, name: 'Mark'    },
+{id: 2, name: 'Larry'   },
+{id: 3, name: 'Bill'    }
+].philter id: '>2'
+=> [{:id=>3, :name=>"Bill"}]
+
 # Regular expression
 [
 {id: 1, name: 'Mark',   email: 'mark@gmail.com'  },

data/lib/array.rb

@@ -1,4 +1,5 @@
 class Array
+  include Philter::Base
   def philter search=nil, options={}
     options = {
         get:          nil,
@@ -24,7 +25,7 @@ class Array
        puts help if options[:debug]
        raise "Specify search parameter!"
     end
-
+    default_operator = '=='
     results = []
     self.each do |item|
        puts "item #{item.class.name} #{item}"                               if options[:debug]
@@ -47,9 +48,14 @@ class Array
                    print "| #{item.send(label)} =~ #{value}"                if options[:debug]
                    selected = item.send(label) =~ value
                  else
-                   print " .2 #{item.class.name}.#{label} == value "        if options[:debug]
-                   print "| #{item.send(label)} == #{value}"                if options[:debug]
-                   selected = item.send(label) == value
+                   # search: {id: 2}
+                   # search: {id: '<3'} or any other operator
+                   operator   = get_operator value
+                   tmp_value  = operator ? value.gsub(operator,'').to_i : value
+                   operator ||= default_operator
+                   print " .2 #{item.class.name}.#{label} #{operator} value " if options[:debug]
+                   print "| #{item.send(label)} #{operator} #{tmp_value}"     if options[:debug]
+                   selected = eval("item.send(label) #{operator} tmp_value")
                  end
                elsif item.respond_to? '[]'
                  print "  1.y label: #{label.class.name}"                   if options[:debug]
@@ -60,9 +66,13 @@ class Array
                    selected = value === item[label].to_s
                  elsif item.is_a?(Hash) && !label.is_a?(Fixnum)
                    # search: {id: 1} or {'name' => 'Mark'}
-                   print " .2 #{item.class.name}[:#{label}] == value "      if options[:debug]
-                   print "| #{item[label]} == #{value}"                     if options[:debug]
-                   selected = item[label] == value
+                   # search: {id: '<3'} or any other operator
+                   operator   = get_operator value
+                   tmp_value  = operator ? value.gsub(operator,'').to_i : value
+                   operator ||= default_operator
+                   print " .2 #{item.class.name}[:#{label}] #{operator} value " if options[:debug]
+                   print "| #{item[label]} #{operator} #{tmp_value}"            if options[:debug]
+                   selected = eval("item[label] #{operator} tmp_value")
                  else
                    print " .3 no action for #{value} !!!"                   if options[:debug]
                  end
@@ -99,9 +109,13 @@ class Array
        else
          # Search has one item
          # search: 3 or search: 'a'
-         print " c. item == search "                                        if options[:debug]
-         print "| #{item} == #{search}"                                     if options[:debug]
-         selected = item == search
+         # search: '<3' or any other operator
+         operator   = get_operator search
+         tmp_search = operator ? search.gsub(operator,'').to_i : search
+         operator ||= default_operator
+         print " c. item #{operator} search "                               if options[:debug]
+         print "| #{item} #{operator} #{tmp_search}"                        if options[:debug]
+         selected = eval("item #{operator} tmp_search")
          puts "  #{'=> X' if selected}"                                     if options[:debug]
          condition[:at_least_one] ||= selected
        end

data/lib/base.rb

@@ -0,0 +1,13 @@
+module Philter
+  module Base
+    private
+    def get_operator exp
+      regexp = "(?:<=?|>=?|!=|==|===|=~)"
+      if exp =~ /#{regexp}/
+        exp.match(/#{regexp}/).to_s
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/philter.rb

@@ -1,4 +1,5 @@
 require_relative 'version'
+require_relative 'base'
 require_relative 'array'
 
 module Philter

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Philter
   def self.version
-    "0.2.0"
+    "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Marco Mastrodonato
@@ -36,6 +36,7 @@ files:
 - LICENSE
 - README.md
 - lib/array.rb
+- lib/base.rb
 - lib/philter.rb
 - lib/version.rb
 homepage: https://github.com/marcomd/philter