ransack 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae3f27c548f10f431a0d5c13b3a9863d7e707e73
-  data.tar.gz: 83840f65158cb74f04e8bd5e0b63d1251bcd3272
+  metadata.gz: aa2e8ee70ef82d95b0bc2c83e0005505252e2b13
+  data.tar.gz: ae83094fdd4be127ba5471b48442a6c1f2922680
 SHA512:
-  metadata.gz: 1883d781609fbae07044a265169f8960c4416e2836d3c332ad66ffb2ec8a4427bd8f3114d7539bb62f7ed0d132478004751763bb51d96e782b6ca904f0d82f88
-  data.tar.gz: 8a817a0a03b09622c527a63c24502d3c9da37c46096ccf376a2577cf05d54c6302c9ba13e866dc2789f79e588c2b262a5e799760a15dfeae0c9339da6d016f8a
+  metadata.gz: f2d9b0b0be3432472e801b0fdbfc19075a71461bba475c64f0cafa7cc32f9b8606b9136488fd7e1f1ef0dc34b7f2877815d32fc30a626ad74c3c75d21422e1b8
+  data.tar.gz: dbb0b40594df15a6e7321d97e9ba134402168facc2de41b9a07cdf58683bb172f61aa01a6f5a61c5f73d6ff7053c597e2ce13b3b942cba2aea1b79f67de614cd

data/.travis.yml

@@ -1,16 +1,21 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
 
 env:
-  - RAILS=4-0-stable
-  - RAILS=3-2-stable
-  - RAILS=3-1-stable
-  - RAILS=3-0-stable
+-   RAILS=4-0-stable DB=sqlite
+  - RAILS=4-0-stable DB=mysql
+  - RAILS=4-0-stable DB=postgres
+  - RAILS=3-2-stable DB=sqlite
+  - RAILS=3-2-stable DB=mysql
+  - RAILS=3-2-stable DB=postgres
+  - RAILS=3-1-stable DB=sqlite
+  - RAILS=3-1-stable DB=mysql
+  - RAILS=3-1-stable DB=postgres
+  - RAILS=3-0-stable DB=sqlite
+  - RAILS=3-0-stable DB=mysql
+  - RAILS=3-0-stable DB=postgres
 
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      env: RAILS=4-0-stable
+before_script:
+  - mysql -e 'create database ransack;'
+  - psql -c 'create database ransack;' -U postgres

data/README.md

@@ -173,6 +173,11 @@ end
 <% end %>
 ```
 
+## I18n
+
+Take a look at our locale file on ``lib/ransack/locale/en.yml`` to check all available messages. You may also be interested in one of the many translations that are available on:
+
+http://www.localeapp.com/projects/2999
 
 ## Contributions
 

data/lib/ransack.rb

@@ -19,7 +19,7 @@ end
 require 'ransack/translate'
 require 'ransack/search'
 require 'ransack/ransacker'
-require 'ransack/adapters/active_record'
+require 'ransack/adapters/active_record' if defined?(::ActiveRecord::Base)
 require 'ransack/helpers'
 require 'action_controller'
 

data/lib/ransack/adapters/active_record.rb

@@ -1,4 +1,3 @@
-require 'active_record'
 require 'ransack/adapters/active_record/base'
 ActiveRecord::Base.extend Ransack::Adapters::ActiveRecord::Base
 

data/lib/ransack/adapters/active_record/base.rb

@@ -23,6 +23,11 @@ module Ransack
           column_names + _ransackers.keys
         end
 
+        def ransortable_attributes(auth_object = nil)
+          # Here so users can overwrite the attributes that show up in the sort_select
+          ransackable_attributes(auth_object)
+        end
+
         def ransackable_associations(auth_object = nil)
           reflect_on_all_associations.map {|a| a.name.to_s}
         end

data/lib/ransack/constants.rb

@@ -23,10 +23,12 @@ module Ransack
     module_function
     # replace % \ to \% \\
     def escape_wildcards(unescaped)
-      if ActiveRecord::VERSION::MAJOR == 3
-        unescaped.to_s.gsub(/([\\|\%|.])/, '\\\\\\1')
-      else
-        unescaped.to_s.gsub(/\\/){ "\\\\" }.gsub(/%/, "\\%")
+      case ActiveRecord::Base.connection.adapter_name
+        when "SQLite"
+          unescaped
+        else
+          # Necessary for PostgreSQL and MySQL
+          unescaped.to_s.gsub(/([\\|\%|.])/, '\\\\\\1')
       end
     end
 

data/lib/ransack/context.rb

@@ -131,6 +131,10 @@ module Ransack
       traverse(str).ransackable_attributes(auth_object)
     end
 
+    def sortable_attributes(str = '')
+      traverse(str).ransortable_attributes(auth_object)
+    end
+
     def searchable_associations(str = '')
       traverse(str).ransackable_associations(auth_object)
     end

data/lib/ransack/helpers/form_builder.rb

@@ -23,16 +23,11 @@ module Ransack
         bases = [''] + association_array(options[:associations])
         if bases.size > 1
           @template.grouped_collection_select(
-            @object_name, :name, attribute_collection_for_bases(bases), :last, :first, :first, :last,
+            @object_name, :name, searchable_attribute_collection_for_bases(bases), :last, :first, :first, :last,
             objectify_options(options), @default_options.merge(html_options)
           )
         else
-          collection = object.context.searchable_attributes(bases.first).map do |c|
-            [
-              attr_from_base_and_column(bases.first, c),
-              Translate.attribute(attr_from_base_and_column(bases.first, c), :context => object.context)
-            ]
-          end
+          collection = searchable_attribute_collection_for_base(bases.first)
           @template.collection_select(
             @object_name, :name, collection, :first, :last,
             objectify_options(options), @default_options.merge(html_options)
@@ -46,19 +41,14 @@ module Ransack
         bases = [''] + association_array(options[:associations])
         if bases.size > 1
           @template.grouped_collection_select(
-            @object_name, :name, attribute_collection_for_bases(bases), :last, :first, :first, :last,
+            @object_name, :name, sortable_attribute_collection_for_bases(bases), :last, :first, :first, :last,
             objectify_options(options), @default_options.merge(html_options)
           ) + @template.collection_select(
             @object_name, :dir, [['asc', object.translate('asc')], ['desc', object.translate('desc')]], :first, :last,
             objectify_options(options), @default_options.merge(html_options)
           )
         else
-          collection = object.context.searchable_attributes(bases.first).map do |c|
-            [
-              attr_from_base_and_column(bases.first, c),
-              Translate.attribute(attr_from_base_and_column(bases.first, c), :context => object.context)
-            ]
-          end
+          collection = sortable_attribute_collection_for_base(bases.first)
           @template.collection_select(
             @object_name, :name, collection, :first, :last,
             objectify_options(options), @default_options.merge(html_options)
@@ -171,17 +161,29 @@ module Ransack
         [base, column].reject {|v| v.blank?}.join('_')
       end
 
-      def attribute_collection_for_bases(bases)
+      def attribute_collection_for_base(attributes, base=nil)
+        attributes.map do |c|
+          [
+            attr_from_base_and_column(base, c),
+            Translate.attribute(attr_from_base_and_column(base, c), :context => object.context)
+          ]
+        end
+      end
+
+      def sortable_attribute_collection_for_base(base=nil)
+        attribute_collection_for_base(object.context.sortable_attributes(base), base)
+      end
+
+      def searchable_attribute_collection_for_base(base=nil)
+        attribute_collection_for_base(object.context.searchable_attributes(base), base)
+      end
+
+      def sortable_attribute_collection_for_bases(bases)
         bases.map do |base|
           begin
           [
             Translate.association(base, :context => object.context),
-            object.context.searchable_attributes(base).map do |c|
-              [
-                attr_from_base_and_column(base, c),
-                Translate.attribute(attr_from_base_and_column(base, c), :context => object.context)
-              ]
-            end
+            sortable_attribute_collection_for_base(base)
           ]
           rescue UntraversableAssociationError => e
             nil
@@ -189,6 +191,18 @@ module Ransack
         end.compact
       end
 
+      def searchable_attribute_collection_for_bases(bases)
+        bases.map do |base|
+          begin
+          [
+            Translate.association(base, :context => object.context),
+            searchable_attribute_collection_for_base(base)
+          ]
+          rescue UntraversableAssociationError => e
+            nil
+          end
+        end.compact
+      end
     end
   end
 end

data/lib/ransack/nodes/sort.rb

@@ -33,6 +33,7 @@ module Ransack
       end
 
       def dir=(dir)
+        dir = dir.try(:downcase)
         @dir = %w(asc desc).include?(dir) ? dir : 'asc'
       end
 

data/lib/ransack/search.rb

@@ -14,7 +14,7 @@ module Ransack
              :translate, :to => :base
 
     def initialize(object, params = {}, options = {})
-      params ||= {}
+      (params ||= {}).delete_if { |k, v| v.blank? && v != false }
       @context = Context.for(object, options)
       @context.auth_object = options[:auth_object]
       @base = Nodes::Grouping.new(@context, 'and')

data/lib/ransack/version.rb

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

data/ransack.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'
   s.add_development_dependency 'sqlite3', '~> 1.3.3'
+  s.add_development_dependency 'pg', '0.17.0'
+  s.add_development_dependency 'mysql2', '0.3.13'
+  s.add_development_dependency 'pry', '0.9.12.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/blueprints/people.rb

@@ -1,4 +1,5 @@
 Person.blueprint do
   name
+  email { "test@example.com" }
   salary
 end

data/spec/helpers/ransack_helper.rb

@@ -1,2 +1,9 @@
 module RansackHelper
+  def quote_table_name(table)
+    ActiveRecord::Base.connection.quote_table_name(table)
+  end
+
+  def quote_column_name(column)
+    ActiveRecord::Base.connection.quote_column_name(column)
+  end
 end

data/spec/ransack/adapters/active_record/base_spec.rb

@@ -20,6 +20,15 @@ module Ransack
         end
 
         describe '#ransacker' do
+          # For infix tests
+          def self.sane_adapter?
+            case ::ActiveRecord::Base.connection.adapter_name
+              when "SQLite3" || "PostgreSQL"
+                true
+              else
+                false
+            end
+          end
           # in schema.rb, class Person:
           # ransacker :reversed_name, :formatter => proc {|v| v.reverse} do |parent|
           #   parent.table[:name]
@@ -36,18 +45,36 @@ module Ransack
 
           it 'can be accessed through associations' do
             s = Person.search(:children_reversed_name_eq => 'htimS cirA')
-            s.result.to_sql.should match /"children_people"."name" = 'Aric Smith'/
+
+            s.result.to_sql.should match /#{quote_table_name("children_people")}.#{quote_column_name("name")} = 'Aric Smith'/
           end
 
           it 'allows an "attribute" to be an InfixOperation' do
             s = Person.search(:doubled_name_eq => 'Aric SmithAric Smith')
             s.result.first.should eq Person.find_by_name('Aric Smith')
-          end if defined?(Arel::Nodes::InfixOperation)
+          end if defined?(Arel::Nodes::InfixOperation) && sane_adapter?
 
           it "doesn't break #count if using InfixOperations" do
             s = Person.search(:doubled_name_eq => 'Aric SmithAric Smith')
             s.result.count.should eq 1
-          end if defined?(Arel::Nodes::InfixOperation)
+          end if defined?(Arel::Nodes::InfixOperation) && sane_adapter?
+
+          it "should function correctly when using fields with dots in them" do
+            s = Person.search(email_cont: "example.com")
+            s.result.exists?.should be_true
+          end
+
+          it "should function correctly when using fields with % in them" do
+            Person.create!(name: "110%-er")
+            s = Person.search(name_cont: "10%")
+            s.result.exists?.should be_true
+          end
+
+          it "should function correctly when using fields with backslashes in them" do
+            Person.create!(name: "\\WINNER\\")
+            s = Person.search(name_cont: "\\WINNER\\")
+            s.result.exists?.should be_true
+          end
         end
 
         describe '#ransackable_attributes' do
@@ -58,6 +85,14 @@ module Ransack
           it { should include 'doubled_name' }
         end
 
+        describe '#ransortable_attributes' do
+          subject { Person.ransortable_attributes }
+
+          it { should include 'name' }
+          it { should include 'reversed_name' }
+          it { should include 'doubled_name' }
+        end
+
         describe '#ransackable_associations' do
           subject { Person.ransackable_associations }
 

data/spec/ransack/adapters/active_record/context_spec.rb

@@ -13,12 +13,12 @@ module Ransack
         end
 
         describe '#evaluate' do
-          it 'evaluates search obects' do
+          it 'evaluates search objects' do
             search = Search.new(Person, :name_eq => 'Joe Blow')
             result = subject.evaluate(search)
 
             result.should be_an ::ActiveRecord::Relation
-            result.to_sql.should match /"name" = 'Joe Blow'/
+            result.to_sql.should match /#{quote_column_name("name")} = 'Joe Blow'/
           end
 
           it 'SELECTs DISTINCT when :distinct => true' do

data/spec/ransack/predicate_spec.rb

@@ -13,13 +13,7 @@ module Ransack
         expect { subject.result }.to_not raise_error
       end
 
-      it (
-        if ActiveRecord::VERSION::MAJOR == 3
-          "escapes '%', '.' and '\\\\' in value"
-        else
-          "escapes % and \\ in value"
-        end
-      ) do
+      it "escapes '%', '.' and '\\\\' in value" do
         subject.send(:"#{method}=", '%._\\')
         subject.result.to_sql.should match(regexp)
       end
@@ -28,12 +22,14 @@ module Ransack
     describe 'eq' do
       it 'generates an equality condition for boolean true' do
         @s.awesome_eq = true
-        @s.result.to_sql.should match /"people"."awesome" = 't'/
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        @s.result.to_sql.should match /#{field} = #{ActiveRecord::Base.connection.quoted_true}/
       end
 
       it 'generates an equality condition for boolean false' do
         @s.awesome_eq = false
-        @s.result.to_sql.should match /"people"."awesome" = 'f'/
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
+        @s.result.to_sql.should match /#{field} = #{ActiveRecord::Base.connection.quoted_false}/
       end
 
       it 'does not generate a condition for nil' do
@@ -44,48 +40,56 @@ module Ransack
 
     describe 'cont' do
   
-      it_has_behavior 'wildcard escaping', :name_cont, (
-        if ActiveRecord::VERSION::MAJOR == 3
-          /"people"."name" LIKE '%\\%\\._\\\\%'/
+      it_has_behavior 'wildcard escaping', :name_cont,
+        (if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+          /"people"."name" ILIKE '%\\%\\._\\\\%'/
+        elsif ActiveRecord::Base.connection.adapter_name == "Mysql2"
+          /`people`.`name` LIKE '%\\\\%\\\\._\\\\\\\\%'/
         else
-          /"people"."name" LIKE '%\\%._\\\\%'/ 
+         /"people"."name" LIKE '%%._\\%'/
         end) do
         subject { @s }
       end
 
       it 'generates a LIKE query with value surrounded by %' do
         @s.name_cont = 'ric'
-        @s.result.to_sql.should match /"people"."name" LIKE '%ric%'/
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        @s.result.to_sql.should match /#{field} I?LIKE '%ric%'/
       end
     end
 
     describe 'not_cont' do
-      it_has_behavior 'wildcard escaping', :name_not_cont, (
-        if ActiveRecord::VERSION::MAJOR == 3
-          /"people"."name" NOT LIKE '%\\%\\._\\\\%'/
+      it_has_behavior 'wildcard escaping', :name_not_cont,
+        (if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+          /"people"."name" NOT ILIKE '%\\%\\._\\\\%'/
+        elsif ActiveRecord::Base.connection.adapter_name == "Mysql2"
+          /`people`.`name` NOT LIKE '%\\\\%\\\\._\\\\\\\\%'/
         else
-          /"people"."name" NOT LIKE '%\\%._\\\\%'/
+         /"people"."name" NOT LIKE '%%._\\%'/
         end) do
         subject { @s }
       end
 
       it 'generates a NOT LIKE query with value surrounded by %' do
         @s.name_not_cont = 'ric'
-        @s.result.to_sql.should match /"people"."name" NOT LIKE '%ric%'/
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        @s.result.to_sql.should match /#{field} NOT I?LIKE '%ric%'/
       end
     end
 
     describe 'null' do
       it 'generates a value IS NULL query' do
         @s.name_null = true
-        @s.result.to_sql.should match /"people"."name" IS NULL/
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        @s.result.to_sql.should match /#{field} IS NULL/
       end
     end
 
     describe 'not_null' do
       it 'generates a value IS NOT NULL query' do
         @s.name_not_null = true
-        @s.result.to_sql.should match /"people"."name" IS NOT NULL/
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        @s.result.to_sql.should match /#{field} IS NOT NULL/
       end
     end
   end

data/spec/ransack/search_spec.rb

@@ -113,25 +113,27 @@ module Ransack
     end
 
     describe '#result' do
+      let(:people_name_field) { "#{quote_table_name("people")}.#{quote_column_name("name")}" }
+      let(:children_people_name_field) { "#{quote_table_name("children_people")}.#{quote_column_name("name")}" }
       it 'evaluates conditions contextually' do
         search = Search.new(Person, :children_name_eq => 'Ernie')
         search.result.should be_an ActiveRecord::Relation
         where = search.result.where_values.first
-        where.to_sql.should match /"children_people"\."name" = 'Ernie'/
+        where.to_sql.should match /#{children_people_name_field} = 'Ernie'/
       end
 
       it 'evaluates compound conditions contextually' do
         search = Search.new(Person, :children_name_or_name_eq => 'Ernie')
         search.result.should be_an ActiveRecord::Relation
         where = search.result.where_values.first
-        where.to_sql.should match /"children_people"\."name" = 'Ernie' OR "people"\."name" = 'Ernie'/
+        where.to_sql.should match /#{children_people_name_field} = 'Ernie' OR #{people_name_field} = 'Ernie'/
       end
 
       it 'evaluates polymorphic belongs_to association conditions contextually' do
         search = Search.new(Note, :notable_of_Person_type_name_eq => 'Ernie')
         search.result.should be_an ActiveRecord::Relation
         where = search.result.where_values.first
-        where.to_sql.should match /"people"."name" = 'Ernie'/
+        where.to_sql.should match /#{people_name_field} = 'Ernie'/
       end
 
       it 'evaluates nested conditions' do
@@ -145,9 +147,9 @@ module Ransack
         )
         search.result.should be_an ActiveRecord::Relation
         where = search.result.where_values.first
-        where.to_sql.should match /"children_people"."name" = 'Ernie'/
-        where.to_sql.should match /"people"."name" = 'Ernie'/
-        where.to_sql.should match /"children_people_2"."name" = 'Ernie'/
+        where.to_sql.should match /#{children_people_name_field} = 'Ernie'/
+        where.to_sql.should match /#{people_name_field} = 'Ernie'/
+        where.to_sql.should match /#{quote_table_name("children_people_2")}.#{quote_column_name("name")} = 'Ernie'/
       end
 
       it 'evaluates arrays of groupings' do
@@ -161,10 +163,10 @@ module Ransack
         where = search.result.where_values.first
         sql = where.to_sql
         first, second = sql.split(/ AND /)
-        first.should match /"people"."name" = 'Ernie'/
-        first.should match /"children_people"."name" = 'Ernie'/
-        second.should match /"people"."name" = 'Bert'/
-        second.should match /"children_people"."name" = 'Bert'/
+        first.should match /#{people_name_field} = 'Ernie'/
+        first.should match /#{children_people_name_field} = 'Ernie'/
+        second.should match /#{people_name_field} = 'Bert'/
+        second.should match /#{children_people_name_field} = 'Bert'/
       end
 
       it 'returns distinct records when passed :distinct => true' do
@@ -204,6 +206,24 @@ module Ransack
         sort.dir.should eq 'desc'
       end
 
+      it 'creates sorts based on a single attribute and uppercase direction' do
+        @s.sorts = 'id DESC'
+        @s.sorts.should have(1).item
+        sort = @s.sorts.first
+        sort.should be_a Nodes::Sort
+        sort.name.should eq 'id'
+        sort.dir.should eq 'desc'
+      end
+
+      it 'creates sorts based on a single attribute and without direction' do
+        @s.sorts = 'id'
+        @s.sorts.should have(1).item
+        sort = @s.sorts.first
+        sort.should be_a Nodes::Sort
+        sort.name.should eq 'id'
+        sort.dir.should eq 'asc'
+      end
+
       it 'creates sorts based on multiple attributes/directions in array format' do
         @s.sorts = ['id desc', 'name asc']
         @s.sorts.should have(2).items
@@ -216,6 +236,30 @@ module Ransack
         sort2.dir.should eq 'asc'
       end
 
+      it 'creates sorts based on multiple attributes and uppercase directions in array format' do
+        @s.sorts = ['id DESC', 'name ASC']
+        @s.sorts.should have(2).items
+        sort1, sort2 = @s.sorts
+        sort1.should be_a Nodes::Sort
+        sort1.name.should eq 'id'
+        sort1.dir.should eq 'desc'
+        sort2.should be_a Nodes::Sort
+        sort2.name.should eq 'name'
+        sort2.dir.should eq 'asc'
+      end
+
+      it 'creates sorts based on multiple attributes and different directions in array format' do
+        @s.sorts = ['id DESC', 'name']
+        @s.sorts.should have(2).items
+        sort1, sort2 = @s.sorts
+        sort1.should be_a Nodes::Sort
+        sort1.name.should eq 'id'
+        sort1.dir.should eq 'desc'
+        sort2.should be_a Nodes::Sort
+        sort2.name.should eq 'name'
+        sort2.dir.should eq 'asc'
+      end
+
       it 'creates sorts based on multiple attributes/directions in hash format' do
         @s.sorts = {
           '0' => { :name => 'id', :dir => 'desc' },
@@ -229,6 +273,32 @@ module Ransack
         name_sort.dir.should eq 'asc'
       end
 
+      it 'creates sorts based on multiple attributes and uppercase directions in hash format' do
+        @s.sorts = {
+            '0' => { :name => 'id', :dir => 'DESC' },
+            '1' => { :name => 'name', :dir => 'ASC' }
+        }
+        @s.sorts.should have(2).items
+        @s.sorts.should be_all { |s| Nodes::Sort === s }
+        id_sort = @s.sorts.detect { |s| s.name == 'id' }
+        name_sort = @s.sorts.detect { |s| s.name == 'name' }
+        id_sort.dir.should eq 'desc'
+        name_sort.dir.should eq 'asc'
+      end
+
+      it 'creates sorts based on multiple attributes and different directions in hash format' do
+        @s.sorts = {
+            '0' => { :name => 'id', :dir => 'DESC' },
+            '1' => { :name => 'name', :dir => nil }
+        }
+        @s.sorts.should have(2).items
+        @s.sorts.should be_all { |s| Nodes::Sort === s }
+        id_sort = @s.sorts.detect { |s| s.name == 'id' }
+        name_sort = @s.sorts.detect { |s| s.name == 'name' }
+        id_sort.dir.should eq 'desc'
+        name_sort.dir.should eq 'asc'
+      end
+
       it 'overrides existing sort' do
         @s.sorts = 'id asc'
         @s.result.first.id.should eq 1

data/spec/spec_helper.rb

@@ -24,7 +24,8 @@ RSpec.configure do |config|
 
   config.before(:suite) do
     puts '=' * 80
-    puts "Running specs against ActiveRecord #{ActiveRecord::VERSION::STRING} and ARel #{Arel::VERSION}..."
+    connection_name = ActiveRecord::Base.connection.adapter_name
+    puts "Running specs against #{connection_name}, ActiveRecord #{ActiveRecord::VERSION::STRING} and ARel #{Arel::VERSION}..."
     puts '=' * 80
     Schema.create
   end

data/spec/support/schema.rb

@@ -1,9 +1,26 @@
 require 'active_record'
 
-ActiveRecord::Base.establish_connection(
-  :adapter  => 'sqlite3',
-  :database => ':memory:'
-)
+case ENV['DB']
+when "mysql"
+  ActiveRecord::Base.establish_connection(
+    adapter:  'mysql2',
+    database: 'ransack',
+    encoding: 'utf8'
+  )
+when "postgres"
+  ActiveRecord::Base.establish_connection(
+    adapter: 'postgresql',
+    database: 'ransack',
+    username: 'postgres',
+    min_messages: 'warning'
+  )
+else
+  # Assume SQLite3
+  ActiveRecord::Base.establish_connection(
+    adapter: 'sqlite3',
+    database: ':memory:'
+  )
+end
 
 class Person < ActiveRecord::Base
   if ActiveRecord::VERSION::MAJOR == 3
@@ -58,6 +75,7 @@ module Schema
       create_table :people, :force => true do |t|
         t.integer  :parent_id
         t.string   :name
+        t.string   :email
         t.integer  :salary
         t.boolean  :awesome, :default => false
         t.timestamps

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,6 +109,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.12.2
 description: Ransack is the successor to the MetaSearch gem. It improves and expands
   upon MetaSearch's functionality, but does not have a 100%-compatible API.
 email:
@@ -140,10 +182,7 @@ files:
 - lib/ransack/helpers.rb
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
-- lib/ransack/locale/cs.yml
 - lib/ransack/locale/en.yml
-- lib/ransack/locale/es.yml
-- lib/ransack/locale/fr.yml
 - lib/ransack/naming.rb
 - lib/ransack/nodes.rb
 - lib/ransack/nodes/attribute.rb
@@ -198,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.0.0
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Object-based searching for ActiveRecord (currently).
@@ -222,4 +261,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/en.yml
 - spec/support/schema.rb
-has_rdoc: 

data/lib/ransack/locale/cs.yml

@@ -1,70 +0,0 @@
-cs:
-  ransack:
-    search: "vyhledávání"
-    predicate: "predikát"
-    and: "a"
-    or: "nebo"
-    any: "kteroukoliv"
-    all: "každou"
-    combinator: "kombinátor"
-    attribute: "atribut"
-    value: "hodnota"
-    condition: "podmínka"
-    sort: "řazení"
-    asc: "vzestupné"
-    desc: "sestupné"
-    predicates:
-      eq: "rovno"
-      eq_any: "rovno kterékoliv"
-      eq_all: "rovno všem"
-      not_eq: "nerovno"
-      not_eq_any: "nerovno kterékoliv"
-      not_eq_all: "nerovno všem"
-      matches: "odpovídá"
-      matches_any: "odpovídá kterékoliv"
-      matches_all: "odpovídá všem"
-      does_not_match: "neodpovídá"
-      does_not_match_any: "neodpovídá kterékoliv"
-      does_not_match_all: "neodpovídá všem"
-      lt: "menší než"
-      lt_any: "menší než kterákoliv"
-      lt_all: "menší než všechny"
-      lteq: "menší nebo rovno než"
-      lteq_any: "menší nebo rovno než kterákoliv"
-      lteq_all: "menší nebo rovno než všechny"
-      gt: "větší než"
-      gt_any: "větší než kterákoliv"
-      gt_all: "větší než všechny"
-      gteq: "větší nebo rovno než"
-      gteq_any: "větší nebo rovno než kterákoliv"
-      gteq_all: "větší nebo rovno než všechny"
-      in: "v"
-      in_any: "v kterékoliv"
-      in_all: "ve všech"
-      not_in: "není v"
-      not_in_any: "není v kterékoliv"
-      not_in_all: "není ve všech"
-      cont: "obsahuje"
-      cont_any: "obsahuje kterékoliv"
-      cont_all: "obsahuje všechny"
-      not_cont: "neobsahuje"
-      not_cont_any: "neobsahuje kteroukoliv"
-      not_cont_all: "neobsahuje všechny"
-      start: "začíná s"
-      start_any: "začíná s kteroukoliv"
-      start_all: "začíná se všemi"
-      not_start: "nezačíná s"
-      not_start_any: "nezačíná s kteroukoliv"
-      not_start_all: "nezačíná se všemi"
-      end: "končí s"
-      end_any: "končí s kteroukoliv"
-      end_all: "končí se všemi"
-      not_end: "nekončí s"
-      not_end_any: "nekončí s kteroukoliv"
-      not_end_all: "nekončí se všemi"
-      'true': "je pravdivé"
-      'false': "není pravdivé"
-      present: "je vyplněné"
-      blank: "je prázdné"
-      'null': "je null"
-      not_null: "není null"

data/lib/ransack/locale/es.yml

@@ -1,70 +0,0 @@
-es:
-  ransack:
-    search: "buscar"
-    predicate: "predicado"
-    and: "y"
-    or: "o"
-    any: "cualquier"
-    all: "todos"
-    combinator: "combinado"
-    attribute: "atributo"
-    value: "valor"
-    condition: "condición"
-    sort: "ordernar"
-    asc: "ascendente"
-    desc: "descendente"
-    predicates:
-      eq: "es igual a"
-      eq_any: "es igual a cualquier"
-      eq_all: "es igual a todos"
-      not_eq: "no es igual a"
-      not_eq_any: "no es igual a cualquier"
-      not_eq_all: "no es iguala todos"
-      matches: "coincidir"
-      matches_any: "coincidir a cualquier"
-      matches_all: "coincidir a todos"
-      does_not_match: "no coincide"
-      does_not_match_any: "no coincide con ninguna"
-      does_not_match_all: "no coincide con todos"
-      lt: "menor que"
-      lt_any: "menor que cualquier"
-      lt_all: "menor o igual a"
-      lteq: "menor que o igual a"
-      lteq_any: "menor o igual a cualquier"
-      lteq_all: "menor o igual a todos"
-      gt: "mayor que"
-      gt_any: "mayor que cualquier"
-      gt_all: "mayor que todos"
-      gteq: "mayor que o igual a"
-      gteq_any: "mayor que o igual a cualquier"
-      gteq_all: "mayor que o igual a todos"
-      in: "en"
-      in_any: "en cualquier"
-      in_all: "en todos"
-      not_in: "no en"
-      not_in_any: "no en cualquier"
-      not_in_all: "no en todos"
-      cont: "contiene"
-      cont_any: "contiene cualquier"
-      cont_all: "contiene todos"
-      not_cont: "no contiene"
-      not_cont_any: "no contiene ninguna"
-      not_cont_all: "no contiene toda"
-      start: "comienza con"
-      start_any: "comienza con cualquier"
-      start_all: "comienza con toda"
-      not_start: "no inicia con"
-      not_start_any: "no comienza con cualquier"
-      not_start_all: "no inicia con toda"
-      end: "termina con"
-      end_any: "termina con cualquier"
-      end_all: "termina con todo"
-      not_end: "no termina con"
-      not_end_any: "no termina con cualquier"
-      not_end_all: "no termina con todo"
-      'true': "es verdadero"
-      'false': "es falso"
-      present: "es presente"
-      blank: "está en blanco"
-      'null': "es nula"
-      not_null: "no es nula"

data/lib/ransack/locale/fr.yml

@@ -1,70 +0,0 @@
-fr:
-  ransack:
-    search: "recherche"
-    predicate: "prédicat"
-    and: "et"
-    or: "ou"
-    any: "au moins un"
-    all: "tous"
-    combinator: "combinateur"
-    attribute: "attribut"
-    value: "valeur"
-    condition: "condition"
-    sort: "tri"
-    asc: "ascendant"
-    desc: "descendant"
-    predicates:
-      eq: "égal à"
-      eq_any: "égal à au moins un"
-      eq_all: "égal à tous"
-      not_eq: "différent de"
-      not_eq_any: "différent d'au moins un"
-      not_eq_all: "différent de tous"
-      matches: "correspond à"
-      matches_any: "correspond à au moins un"
-      matches_all: "correspond à tous"
-      does_not_match: "ne correspond pas à"
-      does_not_match_any: "ne correspond pas à au moins un"
-      does_not_match_all: "ne correspond à aucun"
-      lt: "inférieur à"
-      lt_any: "inférieur à au moins un"
-      lt_all: "inférieur à tous"
-      lteq: "inférieur ou égal à"
-      lteq_any: "inférieur ou égal à au moins un"
-      lteq_all: "inférieur ou égal à tous"
-      gt: "supérieur à"
-      gt_any: "supérieur à au moins un"
-      gt_all: "supérieur à tous"
-      gteq: "supérieur ou égal à"
-      gteq_any: "supérieur ou égal à au moins un"
-      gteq_all: "supérieur ou égal à tous"
-      in: "inclus dans"
-      in_any: "inclus dans au moins un"
-      in_all: "inclus dans tous"
-      not_in: "non inclus dans"
-      not_in_any: "non inclus dans au moins un"
-      not_in_all: "non inclus dans tous"
-      cont: "contient"
-      cont_any: "contient au moins un"
-      cont_all: "contient tous"
-      not_cont: "ne contient pas"
-      not_cont_any: "ne contient pas au moins un"
-      not_cont_all: "ne contient pas tous"
-      start: "commence par"
-      start_any: "commence par au moins un"
-      start_all: "commence par tous"
-      not_start: "ne commence pas par"
-      not_start_any: "ne commence pas par au moins un"
-      not_start_all: "ne commence pas par tous"
-      end: "finit par"
-      end_any: "finit par au moins un"
-      end_all: "finit par tous"
-      not_end: "ne finit pas par"
-      not_end_any: "ne finit pas par au moins un"
-      not_end_all: "ne finit pas par tous"
-      'true': "est vrai"
-      'false': "est faux"
-      present: "est présent"
-      blank: "est blanc"
-      'null': "est null"
-      not_null: "n'est pas null"