conditioner 0.0.3 → 0.0.4

data/Rakefile

@@ -26,9 +26,10 @@ end
 
 PKG_FILES = FileList[ '[a-zA-Z]*', 'generators/**/*', 'lib/**/*', 'rails/**/*', 'tasks/**/*', 'test/**/*' ]
 
+require 'lib/conditioner.rb'
 spec = Gem::Specification.new do |s|
   s.name = "conditioner"
-  s.version = "0.0.3"
+  s.version = Conditioner::VERSION
   s.author = "niquola"
   s.email = "niquola@gmail.com"
   s.homepage = "http://github.com/niquola/conditioner"

data/lib/conditioner.rb

@@ -2,10 +2,11 @@ $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Conditioner
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   autoload :ActiveRecordMixin, 'conditioner/active_record_mixin'
   autoload :Condition, 'conditioner/condition'
   autoload :Configurator, 'conditioner/configurator'
+  autoload :FakeModel, 'conditioner/fake_model'
 
   class << self
     def enable
@@ -23,6 +24,16 @@ module Conditioner
     def configure
       yield config
     end
+
+    def create(table_name_or_model, options = {})
+      if table_name_or_model.is_a?(String)
+        model = FakeModel.new(table_name_or_model, options)
+      else
+        model = table_name_or_model
+      end
+
+      Condition.new(model, options)
+    end
   end
 end
 

data/lib/conditioner/condition.rb

@@ -1,10 +1,10 @@
 module Conditioner
   class Condition < String
-    def initialize(model)
-      @model=model
-      @result=[]
-      @column_names=@model.column_names
-      @first_condition=true
+    def initialize(model, options = {})
+      @model = model
+      @column_names = @model.column_names
+      @result = []
+      @first_condition = true
       yield self if block_given?
     end
 
@@ -28,12 +28,12 @@ module Conditioner
       @condition_called_flag= true
       result= []
       unless @first_condition
-        result<<' '<<unit
+        result << ' ' << unit
       else
-        @first_condition=false
+        @first_condition = false
       end
-      result<<@model.send(:sanitize_sql_for_conditions, *args)
-      self<< result.join(" ")
+      result << @model.send(:sanitize_sql_for_conditions, *args)
+      self << result.join(" ")
       self
     end
 
@@ -59,3 +59,4 @@ module Conditioner
     end
   end
 end
+

data/lib/conditioner/configurator.rb

@@ -16,17 +16,33 @@ module Conditioner
 
     def activate_default_rules!
       add_rule do |field, v, cnd|
-        if cnd.is_field?(field) && v =~ /(\*$|^\*)/
-          cnd.and(["#{cnd.with_table_name(field)} ILIKE ?",v.gsub(/(\*$|^\*)/,'%')])
-        elsif cnd.is_field?(field) && v =~ /(%$|^%)/
-          cnd.and(["upper(#{cnd.with_table_name(field)}) like upper(?)",v])
-          #FIXME: add logic for ranges
-        elsif field=~ /^from_(\w*_(datetime|at))/ and cnd.is_field?($1)
-          cnd.and(["#{cnd.with_table_name($1)} >= ?","#{v} 00:00:00.000"])
-        elsif field=~ /^to_(\w*_(datetime|at))/ and cnd.is_field?($1)
-          cnd.and(["#{cnd.with_table_name($1)} <= ?","#{v} 23:59:59.999"])
-        elsif cnd.is_field?(field) && (field.include?('_datetime') || field.include?('_at'))
-          cnd.and(["(#{cnd.with_table_name(field)} BETWEEN ? AND ?)","#{v} 00:00","#{v} 23:59:59.999"])
+        unless v.nil? || (v.respond_to?(:'empty?') && v.empty?)
+          if cnd.is_field?(field) && v =~ /(\*$|^\*)/
+            cnd.and(["#{cnd.with_table_name(field)} ILIKE ?",v.gsub(/(\*$|^\*)/,'%')])
+          elsif cnd.is_field?(field) && v =~ /(%$|^%)/
+            cnd.and(["upper(#{cnd.with_table_name(field)}) like upper(?)",v])
+            #FIXME: add logic for ranges
+          elsif field=~ /^from_(\w*_(datetime|at))/ and cnd.is_field?($1)
+            cnd.and(["#{cnd.with_table_name($1)} >= ?","#{v} 00:00:00.000"])
+          elsif field=~ /^to_(\w*_(datetime|at))/ and cnd.is_field?($1)
+            cnd.and(["#{cnd.with_table_name($1)} <= ?","#{v} 23:59:59.999"])
+          elsif cnd.is_field?(field) && (field.include?('_datetime') || field.include?('_at'))
+            cnd.and(["(#{cnd.with_table_name(field)} BETWEEN ? AND ?)","#{v} 00:00","#{v} 23:59:59.999"])
+          elsif field=~ /^(\w*)_(ltoe|gtoe|lt|gt)$/ and cnd.is_field?($1)
+            operator = { 'lt' => '<', 'gt' => '>', 'ltoe' => '<=', 'gtoe' => '>=' }[$2]
+            cnd.and(["#{cnd.with_table_name($1)} #{operator} ?", v])
+          elsif field=~ /^(\w*)_(begins_with|ends_with|contains)$/ and cnd.is_field?($1)
+            if $2 == 'begins_with'
+              like_expr = "#{v}%"
+            elsif $2 == 'ends_with'
+              like_expr = "%#{v}"
+            else
+              like_expr = "%#{v}%"
+            end
+            cnd.and(["#{cnd.with_table_name($1)} ILIKE ?", like_expr])
+          elsif field=~ /^(\w*)_in$/ and cnd.is_field?($1)
+            cnd.and(["#{cnd.with_table_name($1)} IN (?)", v])
+          end
         end
       end
     end

data/lib/conditioner/fake_model.rb

@@ -0,0 +1,27 @@
+module Conditioner
+  class FakeModel
+
+    def initialize(table_name, options = {})
+      @table_name = table_name
+      @options = options
+    end
+
+    def sanitize_sql_for_conditions(*args)
+      args << ActiveRecord::Base.connection.quote_table_name(@table_name)
+      ActiveRecord::Base.send(:sanitize_sql_for_conditions, *args)
+    end
+
+    def column_names
+      if @options[:columns]
+        @options[:columns]
+      else
+        @column_names ||= ActiveRecord::Base.connection.columns(@table_name).map { |c| c.name }
+      end
+    end
+
+    def table_name
+      @table_name
+    end
+
+  end
+end

data/test/conditioner_test.rb

@@ -7,8 +7,8 @@ Conditioner.configure do |cfg|
   #cfg.clear_rules!
 
   cfg.add_rule do |key, value, cnd|
-    if /(.\w*)_gt/ =~ key.to_s && cnd.is_field?($1) 
-      cnd.and(["#{key.gsub(/_gt$/,'')} > ?",value])
+    if /(.\w*)_gt/ =~ key.to_s && cnd.is_field?($1)
+      cnd.and(["#{key.gsub(/_gt$/,'')} > ? ", value])
     end
   end
 end
@@ -25,25 +25,67 @@ class TestConditioner < Test::Unit::TestCase
 
   def test_extraction
     cnd=User.conditioner(:updated_at=>'2009-01-01', :email=>'nicola@mail.com',:unexisting=>'value')
-    assert_match(/"users"."email"\s*=\s*E'nicola@mail.com'/, cnd)
-    assert_match(/users.updated_at BETWEEN E'2009-01-01 00:00' AND E'2009-01-01 23:59:59.999'/, cnd)
+    assert_match(/"users"."email"\s*=\s*'nicola@mail.com'/, cnd)
+    assert_match(/users.updated_at BETWEEN '2009-01-01 00:00' AND '2009-01-01 23:59:59.999'/, cnd)
     assert_no_match(/unexisting/, cnd)
   end
 
   def test_extract_from_and_to_prefixed_date_fields
     cnd = User.conditioner :to_updated_at =>'2010-02-02', :from_updated_at=>'2009-01-01'
-    assert_match(/updated_at <= E'2010-02-02 23:59:59.999'/, cnd)
-    assert_match(/updated_at >= E'2009-01-01 00:00:00.000'/, cnd)
+    assert_match(/updated_at <= '2010-02-02 23:59:59.999'/, cnd)
+    assert_match(/updated_at >= '2009-01-01 00:00:00.000'/, cnd)
+  end
+
+  def test_extract_lt_and_gt_postfixed_fields
+    cnd = User.conditioner :id_lt => '5', :id_gt => 2
+    assert_match(/id < '5'/, cnd)
+    assert_match(/id > 2/, cnd)
+  end
+
+  def test_extract_ltoe_and_gtoe_postfixed_fields
+    cnd = User.conditioner :id_ltoe => '5', :id_gtoe => 2
+    assert_match(/id <= '5'/, cnd)
+    assert_match(/id >= 2/, cnd)
+  end
+
+  def test_begins_ends_contains_rules
+    cnd = User.conditioner :email_begins_with => "a", :email_ends_with => "b", :email_contains => "c"
+    assert_match(/email ILIKE 'a%'/, cnd)
+    assert_match(/email ILIKE '%b'/, cnd)
+    assert_match(/email ILIKE '%c%'/, cnd)
+    cnd = User.conditioner :email_begins_with => ""
+    assert_no_match(/email ILIKE/, cnd,'must not empty values')
+  end
+
+  def test_in_postfixed_field
+    cnd = User.conditioner :email_in => ['a', 'b', 'c']
+    assert_match(/email IN \('a','b','c'\)/, cnd)
   end
 
   def test_ilike
-    cnd = User.conditioner :name=>'*nicola*'
-    assert_match(/name ILIKE E'%nicola%'/, cnd)
-    assert_no_match(/\*nicola\*/, cnd,'Rule must work only once!')
+    cnd = User.conditioner :name=> '*nicola*'
+    assert_match(/name ILIKE '%nicola%'/, cnd)
+    assert_no_match(/\*nicola\*/, cnd, 'Rule must work only once!')
   end
 
   def test_configurator
     cnd = User.conditioner :created_at_gt => '2010-01-01'
-    assert_match(/created_at > E'2010-01-01'/, cnd)
+    assert_match(/created_at > '2010-01-01'/, cnd)
   end
+
+  def test_conditioner_without_model
+    cnd = Conditioner.create('users', :columns => ['id', 'email']).extract(:email => "nicola", :foo => "bar")
+    assert_equal(%Q["users"."email" = 'nicola'], cnd)
+  end
+
+  def test_conditioner_without_model_with_advanced_rules
+    cnd = Conditioner.create('users', :columns => ['id', 'email']).extract(:email => "*nicola*")
+    assert_match(/email ILIKE '%nicola%'/, cnd)
+  end
+
+  def test_conditioner_without_model_and_without_hardcoded_columns
+    cnd = Conditioner.create('users').extract(:email => "nicola", :foo => "bar")
+    assert_equal(%Q["users"."email" = 'nicola'], cnd)
+  end
+
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: conditioner
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - niquola
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +04:00
+date: 2010-06-18 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +37,7 @@ files:
 - lib/conditioner.rb
 - lib/conditioner/condition.rb
 - lib/conditioner/active_record_mixin.rb
+- lib/conditioner/fake_model.rb
 - lib/conditioner/configurator.rb
 - test/conditioner_test.rb
 - test/test_helper.rb
@@ -49,23 +51,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple conditions builder for active_record