active_record_or 1.0.0 → 1.0.1

data/README.md

@@ -18,6 +18,13 @@ This would let you write handy things like
     to_harass    = Blog.joins(:author).where('authors.name' => 'Julian')\
                                       .or.generally_disliked
 
+Also, if you call `or` on a condition-less scope, it will be ignored:
+
+    Blog.scoped.or.where(:name => 'Julian')
+
+This means you can start off the query with an `or`, in case you don't
+know the state of the scope.
+
 The end.
 
 Credits

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end
+
+task :default => [:test]

data/lib/active_record_or.rb

@@ -7,8 +7,12 @@ module ActiveRecordOr
     end
 
     def method_missing(method, *args, &block)
+      last_left_constraint = @left.constraints.last
+      return @left.send(method, *args, &block) unless last_left_constraint
+
       raw_right = @left.unscoped.send(method, *args, &block)
-      or_based_constraints = @left.constraints.last.or(raw_right.constraints.last)
+
+      or_based_constraints = last_left_constraint.or(raw_right.constraints.last)
       right = @left.send(method, *args, &block)
       right.where_values = [or_based_constraints]
       right

data/lib/active_record_or/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordOr
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/active_record_or_test.rb

@@ -48,5 +48,11 @@ describe ActiveRecord::Relation do
       to_harass.join_sql.must_equal(
        %(INNER JOIN "authors" ON "authors"."id" = "blogs"."author_id") )
     end
+
+    it "works with no conditions on the left side" do
+      sql = Blog.scoped.or.where(:name => 'Julian')
+
+      sql.to_sql.must_equal "SELECT \"blogs\".* FROM \"blogs\"  WHERE \"blogs\".\"name\" = 'Julian'"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_or
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies: []
 description: Adds OR logic to ActiveRecord
 email:
@@ -47,10 +47,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_record_or
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Chain scopes with 'or'
 test_files:
 - test/active_record_or_test.rb
 - test/test_helper.rb
+has_rdoc: