ransack 0.2.1 → 0.3.0

data/Gemfile

@@ -1,11 +1,15 @@
 source "http://rubygems.org"
 gemspec
 
-gem 'arel', :git => 'git://github.com/rails/arel.git'
-gem 'rack', :git => 'git://github.com/rack/rack.git'
-
-git 'git://github.com/rails/rails.git' do
+if ENV['RAILS_VERSION'] == 'release'
   gem 'activesupport'
   gem 'activerecord'
   gem 'actionpack'
-end
+else
+  gem 'arel',  :git => 'git://github.com/rails/arel.git'
+  git 'git://github.com/rails/rails.git' do
+    gem 'activesupport'
+    gem 'activerecord'
+    gem 'actionpack'
+  end
+end

data/lib/ransack.rb

@@ -2,6 +2,8 @@ require 'ransack/configuration'
 
 module Ransack
   extend Configuration
+
+  class UntraversableAssociationError < StandardError; end;
 end
 
 Ransack.configure do |config|

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

@@ -19,7 +19,6 @@ module Ransack
           Ransacker.new(self, name, opts, &block)
         end
 
-        # TODO: Let's actually do some authorization. Whitelist-only.
         def ransackable_attributes(auth_object)
           column_names + _ransackers.keys
         end

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

@@ -69,8 +69,7 @@ module Ransack
             found_assoc = nil
             while remainder.unshift(segments.pop) && segments.size > 0 && !found_assoc do
               assoc, klass = unpolymorphize_association(segments.join('_'))
-              if ransackable_association?(assoc, klassify(parent))
-                found_assoc = get_association(assoc, parent)
+              if found_assoc = get_association(assoc, parent)
                 join = build_or_find_association(found_assoc.name, parent, klass)
                 parent, attr_name = get_parent_and_attribute_name(remainder.join('_'), join)
               end
@@ -80,16 +79,10 @@ module Ransack
           [parent, attr_name]
         end
 
-        def ransackable_attribute?(str, klass)
-          klass.ransackable_attributes(auth_object).include? str
-        end
-
-        def ransackable_association?(str, klass)
-          klass.ransackable_associations(auth_object).include? str
-        end
-
         def get_association(str, parent = @base)
-          klassify(parent).reflect_on_all_associations.detect {|a| a.name.to_s == str}
+          klass = klassify parent
+          ransackable_association?(str, klass) &&
+          klass.reflect_on_all_associations.detect {|a| a.name.to_s == str}
         end
 
         def join_dependency(relation)

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

@@ -74,8 +74,7 @@ module Ransack
             found_assoc = nil
             while remainder.unshift(segments.pop) && segments.size > 0 && !found_assoc do
               assoc, klass = unpolymorphize_association(segments.join('_'))
-              if ransackable_association?(assoc, klassify(parent))
-                found_assoc = get_association(assoc, parent)
+              if found_assoc = get_association(assoc, parent)
                 join = build_or_find_association(found_assoc.name, parent, klass)
                 parent, attr_name = get_parent_and_attribute_name(remainder.join('_'), join)
               end
@@ -85,16 +84,10 @@ module Ransack
           [parent, attr_name]
         end
 
-        def ransackable_attribute?(str, klass)
-          klass.ransackable_attributes(auth_object).include? str
-        end
-
-        def ransackable_association?(str, klass)
-          klass.ransackable_associations(auth_object).include? str
-        end
-
         def get_association(str, parent = @base)
-          klassify(parent).reflect_on_all_associations.detect {|a| a.name.to_s == str}
+          klass = klassify parent
+          ransackable_association?(str, klass) &&
+          klass.reflect_on_all_associations.detect {|a| a.name.to_s == str}
         end
 
         def join_dependency(relation)

data/lib/ransack/context.rb

@@ -65,12 +65,14 @@ module Ransack
         association_parts = []
         found_assoc = nil
         while !found_assoc && segments.size > 0 && association_parts << segments.shift do
+          # Strip the _of_Model_type text from the association name, but hold
+          # onto it in klass, for use as the next base
           assoc, klass = unpolymorphize_association(association_parts.join('_'))
           if found_assoc = get_association(assoc, base)
             base = traverse(segments.join('_'), klass || found_assoc.klass)
           end
         end
-        raise ArgumentError, "No association matches #{str}" unless found_assoc
+        raise UntraversableAssociationError, "No association matches #{str}" unless found_assoc
       end
 
       klassify(base)
@@ -104,9 +106,21 @@ module Ransack
       end
     end
 
+    def ransackable_attribute?(str, klass)
+      klass.ransackable_attributes(auth_object).include? str
+    end
+
+    def ransackable_association?(str, klass)
+      klass.ransackable_associations(auth_object).include? str
+    end
+
     def searchable_attributes(str = '')
       traverse(str).ransackable_attributes(auth_object)
     end
 
+    def searchable_associations(str = '')
+      traverse(str).ransackable_associations(auth_object)
+    end
+
   end
 end

data/lib/ransack/helpers/form_builder.rb

@@ -22,19 +22,8 @@ module Ransack
         options[:include_blank] = true unless options.has_key?(:include_blank)
         bases = [''] + association_array(options[:associations])
         if bases.size > 1
-          collection = bases.map do |base|
-            [
-              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
-            ]
-          end
           @template.grouped_collection_select(
-            @object_name, :name, collection, :last, :first, :first, :last,
+            @object_name, :name, attribute_collection_for_bases(bases), :last, :first, :first, :last,
             objectify_options(options), @default_options.merge(html_options)
           )
         else
@@ -55,20 +44,9 @@ module Ransack
         raise ArgumentError, "sort_select must be called inside a search FormBuilder!" unless object.respond_to?(:context)
         options[:include_blank] = true unless options.has_key?(:include_blank)
         bases = [''] + association_array(options[:associations])
-        if bases.any?
-          collection = bases.map do |base|
-            [
-              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
-            ]
-          end
+        if bases.size > 1
           @template.grouped_collection_select(
-            @object_name, :name, collection, :last, :first, :first, :last,
+            @object_name, :name, 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,
@@ -159,7 +137,7 @@ module Ransack
           obj.map do |key, value|
             case value
             when Array, Hash
-              bases_array(value, key.to_s)
+              association_array(value, key.to_s)
             else
               [key.to_s, [key, value].join('_')]
             end
@@ -173,6 +151,24 @@ module Ransack
         [base, column].reject {|v| v.blank?}.join('_')
       end
 
+      def 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
+          ]
+          rescue UntraversableAssociationError => e
+            nil
+          end
+        end.compact
+      end
+
     end
   end
 end

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: ransack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -147,7 +147,6 @@ files:
 - spec/blueprints/tags.rb
 - spec/console.rb
 - spec/helpers/ransack_helper.rb
-- spec/playground.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
@@ -194,7 +193,6 @@ test_files:
 - spec/blueprints/tags.rb
 - spec/console.rb
 - spec/helpers/ransack_helper.rb
-- spec/playground.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb

data/spec/playground.rb

@@ -1,37 +0,0 @@
-$VERBOSE = false
-require 'bundler'
-Bundler.setup
-require 'machinist/active_record'
-require 'sham'
-require 'faker'
-
-Dir[File.expand_path('../../spec/{helpers,support,blueprints}/*.rb', __FILE__)].each do |f|
-  require f
-end
-
-Sham.define do
-  name     { Faker::Name.name }
-  title    { Faker::Lorem.sentence }
-  body     { Faker::Lorem.paragraph }
-  salary   {|index| 30000 + (index * 1000)}
-  tag_name { Faker::Lorem.words(3).join(' ') }
-  note     { Faker::Lorem.words(7).join(' ') }
-end
-
-Schema.create
-
-require 'ransack'
-
-Article.joins{person.comments}.where{person.comments.body =~ '%hello%'}.to_sql
-# => "SELECT \"articles\".* FROM \"articles\" INNER JOIN \"people\" ON \"people\".\"id\" = \"articles\".\"person_id\" INNER JOIN \"comments\" ON \"comments\".\"person_id\" = \"people\".\"id\" WHERE \"comments\".\"body\" LIKE '%hello%'"
-
-Person.where{(id + 1) == 2}.first
-# => #<Person id: 1, parent_id: nil, name: "Aric Smith", salary: 31000>
-
-Person.where{(salary - 40000) < 0}.to_sql
-# => "SELECT \"people\".* FROM \"people\"  WHERE \"people\".\"salary\" - 40000 < 0"
-
-p = Person.select{[id, name, salary, (salary + 1000).as('salary_after_increase')]}.first
-# => #<Person id: 1, name: "Aric Smith", salary: 31000>
-
-p.salary_after_increase # =>