record_filter 0.9.16 → 0.9.17

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 16
 :major: 0
 :minor: 9
+:patch: 17

data/lib/record_filter/column_parser.rb

@@ -5,7 +5,13 @@ module RecordFilter
 
     def parse_column_in_table(column, table)
       while column.is_a?(Hash)
-        table = table.find_join!(column.keys[0]).right_table
+        join = table.find_join(column.keys[0])
+        if join
+          table = join.right_table
+        else
+          table.join_association(column.keys[0])
+          table = table.find_join(column.keys[0]).right_table
+        end
         column = column.values[0]
       end
       [column, table]

data/lib/record_filter/filter.rb

@@ -23,6 +23,10 @@ module RecordFilter
       @query = Query.new(@clazz, filter, *args, &block)
     end
 
+    def filter_class
+      @clazz
+    end
+
     def first(*args) # :nodoc:
       do_with_scope do
         @clazz.find(:first, *args)

data/lib/record_filter/join.rb

@@ -57,9 +57,9 @@ module RecordFilter
 
     def join_type_string
       @join_type_string ||= case(@join_type)
-        when :inner then 'INNER'
-        when :left then 'LEFT OUTER'
-        when :right then 'RIGHT OUTER'
+        when :inner, 'inner' then 'INNER'
+        when :left, 'left' then 'LEFT OUTER'
+        when :right, 'right' then 'RIGHT OUTER'
         else nil
       end
     end

data/lib/record_filter/order.rb

@@ -10,8 +10,8 @@ module RecordFilter
 
     def to_sql
       dir = case @direction
-        when :asc then 'ASC'
-        when :desc then 'DESC'
+        when :asc, 'asc' then 'ASC'
+        when :desc, 'desc' then 'DESC'
         else raise InvalidFilterException.new("An invalid order of #{@direction} was specified.") 
       end
 

data/lib/record_filter/query.rb

@@ -20,8 +20,6 @@ module RecordFilter
         params = {}
         conditions = @conjunction.to_conditions
         params = { :conditions => conditions } if conditions
-        joins = @table.all_joins
-        params[:joins] = joins.map { |join| join.to_sql } unless joins.empty?
         set_select(params, count_query)
         orders = @table.orders
         params[:order] = orders.map { |order| order.to_sql } * ', ' unless orders.empty?
@@ -30,6 +28,10 @@ module RecordFilter
         params[:limit] = @conjunction.limit if @conjunction.limit
         params[:offset] = @conjunction.offset if @conjunction.offset
         params[:readonly] = false
+        # this is a bit of a hack, but the joins need to go at the end because the other
+        # operations may have implicitly created joins as they were sql-ized.
+        joins = @table.all_joins
+        params[:joins] = joins.map { |join| join.to_sql } unless joins.empty?
         params
       end
     end

data/record_filter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{record_filter}
-  s.version = "0.9.16"
+  s.version = "0.9.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aubrey Holland", "Mat Brown"]
-  s.date = %q{2010-02-12}
+  s.date = %q{2010-03-04}
   s.description = %q{RecordFilter is a Pure-ruby criteria API for building complex queries in ActiveRecord. It supports queries that are built on the fly as well as named filters that can be added to objects and chained to create complex queries. It also gets rid of the nasty hard-coded SQL that shows up in most ActiveRecord code with a clean API that makes queries simple and intuitive to build.}
   s.email = %q{aubreyholland@gmail.com}
   s.extra_rdoc_files = [
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{record-filter}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{An ActiveRecord query API for replacing SQL with awesome}
   s.test_files = [
     "spec/active_record_spec.rb",

data/spec/exception_spec.rb

@@ -55,7 +55,7 @@ describe 'raising exceptions' do
         Post.filter do
           order({ :this_is_not_there => :eh }, :asc)
         end.inspect
-      }.should raise_error(RecordFilter::InvalidJoinException)
+      }.should raise_error(RecordFilter::AssociationNotFoundException)
     end
 
     it 'should raise ColumnNotFoundException for explicit joins on bad column names for the right table' do

data/spec/implicit_join_spec.rb

@@ -257,6 +257,14 @@ describe 'implicit joins' do
     end
   end
 
+  it 'should allow strings to be passed as the join type' do
+    Blog.filter do
+      having({ :posts => :comments }, :join_type => 'left') do
+        with(:offensive, true)
+      end
+    end.inspect
+  end
+
   describe 'on polymorphic associations' do
     before do
       PublicPost.filter do
@@ -293,6 +301,15 @@ describe 'implicit joins' do
     end
   end
 
+  describe 'adding joins automatically on ordering' do
+    it 'should infer the join' do
+      Post.filter do
+        order(:comments => :created_at)
+      end.inspect
+      Post.last_find.should == {:order => 'posts__comments.created_at ASC', :joins => [%q(INNER JOIN "comments" AS posts__comments ON "posts".id = posts__comments.post_id)], :readonly => false}
+    end
+  end
+
   describe 'on has_one_through associations' do
     before do
       Post.filter do

data/spec/restrictions_spec.rb

@@ -84,7 +84,7 @@ describe 'RecordFilter restrictions' do
     Post.filter do
       with(:blog_id).not_in([])
     end.inspect
-    Post.last_find.should == { :readonly => false }
+    Post.last_find.should == { :conditions => [], :readonly => false }
   end
 
   it 'should do the right thing for IN filters with single values' do
@@ -271,4 +271,9 @@ describe 'RecordFilter restrictions' do
     end.inspect
     Blog.last_find[:conditions].should == [%q(("blogs".created_at > cmts.created_at))]
   end
+
+  it 'should return the filter class from a filter' do
+    filter = Blog.filter { having(:comments) }
+    filter.filter_class.should == Blog
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.16
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 17
+  version: 0.9.17
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -10,29 +15,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -05:00
+date: 2010-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: RecordFilter is a Pure-ruby criteria API for building complex queries in ActiveRecord. It supports queries that are built on the fly as well as named filters that can be added to objects and chained to create complex queries. It also gets rid of the nasty hard-coded SQL that shows up in most ActiveRecord code with a clean API that makes queries simple and intuitive to build.
 email: aubreyholland@gmail.com
 executables: []
@@ -108,18 +117,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: record-filter
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord query API for replacing SQL with awesome