ransack 0.5.4 → 0.5.5

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

@@ -135,7 +135,7 @@ module Ransack
           found_association = @join_dependency.join_associations.detect do |assoc|
             assoc.reflection.name == name &&
             assoc.parent == parent &&
-            (!klass || assoc.klass == klass)
+            (!klass || assoc.reflection.klass == klass)
           end
           unless found_association
             @join_dependency.send(:build_polymorphic, name.to_sym, parent, Arel::Nodes::OuterJoin, klass)

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

@@ -140,7 +140,7 @@ module Ransack
           found_association = @join_dependency.join_associations.detect do |assoc|
             assoc.reflection.name == name &&
             assoc.parent == parent &&
-            (!klass || assoc.klass == klass)
+            (!klass || assoc.reflection.klass == klass)
           end
           unless found_association
             @join_dependency.send(:build_polymorphic, name.to_sym, parent, Arel::Nodes::OuterJoin, klass)

data/lib/ransack/context.rb

@@ -95,7 +95,7 @@ module Ransack
     end
 
     def unpolymorphize_association(str)
-      if (match = str.match(/_of_(.+?)_type$/))
+      if (match = str.match(/_of_([^_]+?)_type$/))
         [match.pre_match, Kernel.const_get(match.captures.first)]
       else
         [str, nil]

data/lib/ransack/helpers/form_builder.rb

@@ -73,6 +73,10 @@ module Ransack
         search_fields(:s, args, block)
       end
 
+      def sort_link(attribute, *args)
+        @template.sort_link @object, attribute, *args
+      end
+
       def condition_fields(*args, &block)
         search_fields(:c, args, block)
       end

data/lib/ransack/helpers/form_helper.rb

@@ -1,6 +1,7 @@
 module Ransack
   module Helpers
     module FormHelper
+
       def search_form_for(record, options = {}, &proc)
         if record.is_a?(Ransack::Search)
           search = record
@@ -23,6 +24,52 @@ module Ransack
         form_for(record, options, &proc)
       end
 
+      def sort_link(search, attribute, *args)
+        raise TypeError, "First argument must be a Ransack::Search!" unless Search === search
+
+        search_params = params[:q] || {}.with_indifferent_access
+
+        attr_name = attribute.to_s
+
+        name = (args.size > 0 && !args.first.is_a?(Hash)) ? args.shift.to_s : Translate.attribute(attr_name, :context => search.context)
+
+        if existing_sort = search.sorts.detect {|s| s.name == attr_name}
+          prev_attr, prev_dir = existing_sort.name, existing_sort.dir
+        end
+
+        options = args.first.is_a?(Hash) ? args.shift.dup : {}
+        default_order = options.delete :default_order
+        current_dir = prev_attr == attr_name ? prev_dir : nil
+
+        if current_dir
+          new_dir = current_dir == 'desc' ? 'asc' : 'desc'
+        else
+          new_dir = default_order || 'asc'
+        end
+
+        html_options = args.first.is_a?(Hash) ? args.shift.dup : {}
+        css = ['sort_link', current_dir].compact.join(' ')
+        html_options[:class] = [css, html_options[:class]].compact.join(' ')
+        options.merge!(
+          :q => search_params.merge(:s => "#{attr_name} #{new_dir}")
+        )
+        link_to [ERB::Util.h(name), order_indicator_for(current_dir)].compact.join(' ').html_safe,
+                url_for(options),
+                html_options
+      end
+
+      private
+
+      def order_indicator_for(order)
+        if order == 'asc'
+          '▲'
+        elsif order == 'desc'
+          '▼'
+        else
+          nil
+        end
+      end
+
     end
   end
 end

data/lib/ransack/search.rb

@@ -49,8 +49,10 @@ module Ransack
           sort = Nodes::Sort.new(@context).build(attrs)
           self.sorts << sort
         end
-      else
+      when String
         self.sorts = [args]
+      else
+        raise ArgumentError, "Invalid argument (#{args.class}) supplied to sorts="
       end
     end
     alias :s= :sorts=

data/lib/ransack/translate.rb

@@ -12,7 +12,7 @@ module Ransack
 
     def self.attribute(key, options = {})
       unless context = options.delete(:context)
-        raise ArgumentError, "A context is required to translate associations"
+        raise ArgumentError, "A context is required to translate attributes"
       end
 
       original_name = key.to_s

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/ransack/helpers/form_builder_spec.rb

@@ -47,6 +47,14 @@ module Ransack
 
       end
 
+      describe '#sort_link' do
+        subject { @f.sort_link :name, :controller => 'people' }
+
+        it { should match /people\?q%5Bs%5D=name\+asc/}
+        it { should match /sort_link/}
+        it { should match /Full Name<\/a>/}
+      end
+
       describe '#submit' do
 
         it 'localizes :search when no default value given' do

data/spec/ransack/helpers/form_helper_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Ransack
+  module Helpers
+    describe FormHelper do
+
+      router = ActionDispatch::Routing::RouteSet.new
+      router.draw do
+        resources :people
+        match ':controller(/:action(/:id(.:format)))'
+      end
+
+      include router.url_helpers
+
+      # FIXME: figure out a cleaner way to get this behavior
+      before do
+        @controller = ActionView::TestCase::TestController.new
+        @controller.instance_variable_set(:@_routes, router)
+        @controller.class_eval do
+          include router.url_helpers
+        end
+
+        @controller.view_context_class.class_eval do
+          include router.url_helpers
+        end
+      end
+
+      describe '#sort_link' do
+        subject { @controller.view_context.sort_link(Person.search(:sorts => ['name desc']), :name, :controller => 'people') }
+
+        it { should match /people\?q%5Bs%5D=name\+asc/}
+        it { should match /sort_link desc/}
+        it { should match /Full Name ▼/}
+      end
+
+    end
+  end
+end

data/spec/ransack/search_spec.rb

@@ -31,6 +31,16 @@ module Ransack
         condition.value.should eq 'Ernie'
       end
 
+      it 'creates Conditions for multiple polymorphic belongs_to association attributes' do
+        search = Search.new(Note, :notable_of_Person_type_name_or_notable_of_Article_type_title_eq => 'Ernie')
+        condition = search.base[:notable_of_Person_type_name_or_notable_of_Article_type_title_eq]
+        condition.should be_a Nodes::Condition
+        condition.predicate.name.should eq 'eq'
+        condition.attributes.first.name.should eq 'notable_of_Person_type_name'
+        condition.attributes.last.name.should eq 'notable_of_Article_type_title'
+        condition.value.should eq 'Ernie'
+      end
+
       it 'discards empty conditions' do
         search = Search.new(Person, :children_name_eq => '')
         condition = search.base[:children_name_eq]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-24 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70355886036760 !ruby/object:Gem::Requirement
+  requirement: &70121926259000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355886036760
+  version_requirements: *70121926259000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70355886036220 !ruby/object:Gem::Requirement
+  requirement: &70121926257860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355886036220
+  version_requirements: *70121926257860
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70355886035700 !ruby/object:Gem::Requirement
+  requirement: &70121926257080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355886035700
+  version_requirements: *70121926257080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70355886035200 !ruby/object:Gem::Requirement
+  requirement: &70121926256140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70355886035200
+  version_requirements: *70121926256140
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70355886034700 !ruby/object:Gem::Requirement
+  requirement: &70121926255080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70355886034700
+  version_requirements: *70121926255080
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70355886034140 !ruby/object:Gem::Requirement
+  requirement: &70121926254280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70355886034140
+  version_requirements: *70121926254280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70355886033680 !ruby/object:Gem::Requirement
+  requirement: &70121926253160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70355886033680
+  version_requirements: *70121926253160
 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:
@@ -147,6 +146,7 @@ files:
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
+- spec/ransack/helpers/form_helper_spec.rb
 - spec/ransack/nodes/compound_condition_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb
@@ -155,7 +155,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/en.yml
 - spec/support/schema.rb
-has_rdoc: true
 homepage: http://metautonomo.us/projects/ransack
 licenses: []
 post_install_message: 
@@ -176,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Object-based searching for ActiveRecord (currently).
@@ -192,6 +191,7 @@ test_files:
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
+- spec/ransack/helpers/form_helper_spec.rb
 - spec/ransack/nodes/compound_condition_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb