fake_arel 1.4.0 → 1.5.0

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/fake_arel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fake_arel"
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Ammons"]
-  s.date = "2013-11-27"
+  s.date = "2014-02-04"
   s.description = "fake_arel will simulate rails 3 arel syntax for Rails 2."
   s.email = "grant@pipelinedealsco.com"
   s.extra_rdoc_files = [

data/lib/fake_arel/extensions.rb

@@ -17,6 +17,11 @@ module ActiveRecord
           scopes[name].call(self, *args)
         end
       end
+
+      # make all arguments optional, like Rails 3
+      def scoped(scope = {}, &block)
+        ActiveRecord::NamedScope::Scope.new(self, scope, &block)
+      end
     end
 
     class Scope

data/lib/fake_arel/rails_3_finders.rb

@@ -60,6 +60,32 @@ module Rails3Finders
       end
       named_scope :or, __or_fn
 
+      # returns a new scope, having removed the options mentioned
+      # does *not* support extended scopes
+      def self.except(*options)
+        # include is renamed to includes in Rails 3
+        includes = options.delete(:includes)
+        options << :include if includes
+  
+        new_options = (scope(:find) || {}).reject { |k, v| options.include?(k) }
+        with_exclusive_scope(:find => new_options) { scoped }
+      end
+  
+      # returns a new scope, with just the order replaced
+      # does *not* support extended scopes
+      def self.reorder(*order)
+        new_options = (scope(:find) || {}).dup
+        new_options[:order] = order.flatten.join(',')
+        with_exclusive_scope(:find =>new_options) { scoped }
+      end
+    
+      def self.pluck(column)
+        new_options = (scope(:find) || {}).dup
+        new_options[:select] = "#{quoted_table_name}.#{column}"
+        new_options.delete(:include)
+        with_exclusive_scope(:find => new_options) { all.map(&column) }
+      end
+
       def self.fakearel_find_each(options = {:batch_size => 1000}, &block)
         count = self.scoped({}).count
         offset = 0

data/lib/fake_arel/with_scope_replacement.rb

@@ -63,7 +63,7 @@ module WithScopeReplacement
                         hash[method][key] = merge_joins(params[key], hash[method][key])
                       # see https://rails.lighthouseapp.com/projects/8994/tickets/2810-with_scope-should-accept-and-use-order-option
                       # it works now in reverse order to comply with ActiveRecord 3
-                      elsif key == :order && merge && !default_scoping.any?{ |s| s[method].keys.include?(key) }
+                      elsif [:group, :order].include?(key) && merge && !default_scoping.any?{ |s| s[method].keys.include?(key) }
                         hash[method][key] = [hash[method][key], params[key]].select{|o| !o.blank?}.join(', ')
                       else
                         hash[method][key] = hash[method][key] || params[key]

data/spec/fake_arel_spec.rb

@@ -95,6 +95,18 @@ describe "Fake Arel" do
     Reply.group(:topic_id).map(&:topic_id).sort.should == [1, 2, 4].sort
   end
 
+  it "should support pluck" do
+    Reply.where(:id => 5).pluck(:id).should == [5]
+  end
+
+  it "should support reorder" do
+    Reply.where(:id => [4, 5]).order("id DESC").reorder("id").pluck(:id).should == [4, 5]
+  end
+
+  it "should support except" do
+    Reply.select(:id).except(:select).first.created_at.should_not == nil
+  end
+
   it "should properly chain order scope in definitions" do
     Reply.topic_4_id_asc.all.should == Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id asc')
     Reply.topic_4_id_desc.all.should == Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id desc')
@@ -156,6 +168,10 @@ describe "Fake Arel" do
     }
   end
 
+  it "should properly chain with group" do
+    Topic.group(:john).group(:doe).scope(:find, :group).should == 'john, doe'
+  end
+
   it "should respond to scoped" do
     Reply.scoped({}).class.should == ActiveRecord::NamedScope::Scope
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fake_arel
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3633317675981731964
+      hash: -1479168766933848698
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: