ransack 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d33a76673ff5b03a95d1b2ea72c5fcc552fc24a3
-  data.tar.gz: 061c963998e43b654a28e0b3e7e9501feee14192
+  metadata.gz: c740816de011eb6b10728dc32b58e179304fad94
+  data.tar.gz: 07fb384c320453fe1176fc9c51261721318fe708
 SHA512:
-  metadata.gz: aa17a37043b1924961e17631865374576b78584068785c91331c06567b285ce10764b837c78f54f740570696e2ffd620e6681a391600074f2cc33d5d73956a1c
-  data.tar.gz: 7f3253f6d31f941546e0244389dcff4be6ec55e90511954c0eb0151447a27051b2c98a2d1b8e57ed89c279e98c1c608c5ee24a56115f8095aeed2038130ff7cb
+  metadata.gz: 6647e2d472b4efd1e0051bd293698011c5a89ffdd096456c75da5b44f58b8ac825d3a5292d41a174e6b01e43bfd0bfc996685ee0fd30a13af91eaabb920162e3
+  data.tar.gz: 09e01482d289cfca68527dfce6161a8cf028846da7d510d927b59e155792e1c82b2aa3fc02eec5a4667b47b0fa08a13eb0fb2d542f3e91b368917540d13ce7ed

data/CHANGELOG.md

@@ -2,6 +2,32 @@
 This change log was started in August 2014. All notable changes to this project
 henceforth should be documented here.
 
+## Version 1.5.1 - 2014-10-30
+### Added
+
+*   Add base specs for search on fields with `_start` and `_end`.
+
+    *Jon Atack*
+
+*   Add a failing spec for detecting attribute fields containing `_and_` that
+    needs to be fixed. Method names containing `_and_` and `_or_` are still not
+    parsed/detected correctly.
+
+    *Jon Atack*
+
+### Fixed
+
+*   Fix a regression caused by incorrect string constants in context.rb.
+
+    *Kazuhiro NISHIYAMA*
+
+### Changed
+
+*   Remove duplicate code in spec/support/schema.rb.
+
+    *Jon Atack*
+
+
 ## Version 1.5.0 - 2014-10-26
 ### Added
 
@@ -48,14 +74,15 @@ henceforth should be documented here.
 
     *Jon Atack*
 
-*   Improve `attribute_method?` parsing for method names containing `_and_` and
-    `_or_`. Attributes named like `foo_and_bar` or `foo_or_bar` are recognized
-    now instead of running failing checks for `foo` and `bar`.
+*   Improve `attribute_method?` parsing for attribute names containing `_and_`
+    and `_or_`. Attributes named like `foo_and_bar` or `foo_or_bar` are
+    recognized now instead of running failing checks for `foo` and `bar`.
+    CORRECTION October 28, 2014: this feature is still not working!
 
     *Joe Yates*
 
-*   Improve `attribute_method?` parsing for method names ending with a
-    predicate like `_start` and `_end`. For instance, a `life_start` attribute
+*   Improve `attribute_method?` parsing for attribute names ending with a
+    predicate like `_start` and `_end`. For instance, a `foo_start` attribute
     is now recognized instead of raising a NoMethodError.
 
     *Timo Schilling*, *Jon Atack*

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

@@ -158,7 +158,7 @@ module Ransack
         def get_association(str, parent = @base)
           klass = klassify parent
           ransackable_association?(str, klass) &&
-            klass.reflect_on_all_associations.detect { |a| a.name.to_s == str }
+          klass.reflect_on_all_associations.detect { |a| a.name.to_s == str }
         end
 
         def join_dependency(relation)
@@ -175,13 +175,13 @@ module Ransack
           buckets = relation.joins_values.group_by do |join|
             case join
             when String
-              STRING_JOIN
+              Ransack::Constants::STRING_JOIN
             when Hash, Symbol, Array
-              ASSOCIATION_JOIN
+              Ransack::Constants::ASSOCIATION_JOIN
             when JoinDependency, JoinDependency::JoinAssociation
-              STASHED_JOIN
+              Ransack::Constants::STASHED_JOIN
             when Arel::Nodes::Join
-              JOIN_NODE
+              Ransack::Constants::JOIN_NODE
             else
               raise 'unknown class: %s' % join.class.name
             end

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

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

@@ -130,15 +130,52 @@ module Ransack
           end
 
           it "should function correctly when using fields with % in them" do
-            Person.create!(:name => "110%-er")
+            p = Person.create!(:name => "110%-er")
             s = Person.search(:name_cont => "10%")
-            expect(s.result.exists?).to be true
+            expect(s.result.to_a).to eq [p]
           end
 
           it "should function correctly when using fields with backslashes in them" do
-            Person.create!(:name => "\\WINNER\\")
+            p = Person.create!(:name => "\\WINNER\\")
             s = Person.search(:name_cont => "\\WINNER\\")
-            expect(s.result.exists?).to be true
+            expect(s.result.to_a).to eq [p]
+          end
+
+          it "should function correctly when an attribute name ends with '_start'" do
+            p = Person.create!(:new_start => 'Bar and foo', :name => 'Xiang')
+
+            s = Person.search(:new_start_end => ' and foo')
+            expect(s.result.to_a).to eq [p]
+
+            s = Person.search(:name_or_new_start_start => 'Xia')
+            expect(s.result.to_a).to eq [p]
+
+            s = Person.search(:new_start_or_name_end => 'iang')
+            expect(s.result.to_a).to eq [p]
+          end
+
+          it "should function correctly when an attribute name ends with '_end'" do
+            p = Person.create!(:stop_end => 'Foo and bar', :name => 'Marianne')
+
+            s = Person.search(:stop_end_start => 'Foo and')
+            expect(s.result.to_a).to eq [p]
+
+            s = Person.search(:stop_end_or_name_end => 'anne')
+            expect(s.result.to_a).to eq [p]
+
+            s = Person.search(:name_or_stop_end_end => ' bar')
+            expect(s.result.to_a).to eq [p]
+          end
+
+          it "should function correctly when an attribute name has 'and' in it" do
+          # FIXME: this test does not pass!
+            p = Person.create!(:terms_and_conditions => true)
+            s = Person.search(:terms_and_conditions_eq => true)
+          # search is not detecting the attribute
+            puts "
+            FIXME: Search not detecting the `terms_and_conditions` attribute in
+            base_spec.rb, line 178: #{s.result.to_sql}"
+          # expect(s.result.to_a).to eq [p]
           end
 
           it 'allows sort by "only_sort" field' do

data/spec/support/schema.rb

@@ -66,21 +66,6 @@ class Person < ActiveRecord::Base
     end
   end
 
-  def self.ransackable_attributes(auth_object = nil)
-    if auth_object == :admin
-      column_names + _ransackers.keys - ['only_sort']
-    else
-      column_names + _ransackers.keys - ['only_sort', 'only_admin']
-    end
-  end
-
-  def self.ransortable_attributes(auth_object = nil)
-    if auth_object == :admin
-      column_names + _ransackers.keys - ['only_search']
-    else
-      column_names + _ransackers.keys - ['only_search', 'only_admin']
-    end
-  end
 end
 
 class Article < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack