fake_arel 1.0.0.a → 1.0.0

data/VERSION

@@ -1 +1 @@
-1.0.0.a
+1.0.0

data/fake_arel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fake_arel}
-  s.version = "1.0.0.a"
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Ammons"]
-  s.date = %q{2011-10-27}
+  s.date = %q{2012-04-03}
   s.description = %q{fake_arel will simulate rails 3 arel syntax for Rails 2.}
   s.email = %q{grant@pipelinedealsco.com}
   s.extra_rdoc_files = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/gammons/fake_arel}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{fake_arel: a Rails 3 query interface to Rails 2}
 
   if s.respond_to? :specification_version then

data/lib/fake_arel/extensions.rb

@@ -21,6 +21,7 @@ module ActiveRecord
 
     class Scope
       undef select
+      undef from
 
       alias initialize_without_arel initialize
       def initialize(proxy_scope, options = {}, &block)
@@ -51,7 +52,9 @@ module ActiveRecord
               ret[:joins] = merge_joins((ret[:joins] || []), (local_scope.proxy_options[:joins] || []))
             end
           end
-          ret[:order] = [local_scope.proxy_options[:order], ret[:order]].select{|o| !o.blank?}.join(',') if ret[:order] || local_scope.proxy_options[:order]
+          local_proxy_order_options = local_scope.proxy_options[:order].split(',') unless local_scope.proxy_options[:order].nil?
+          ret_order_options = ret[:order].split(',') unless ret[:order].nil?
+          ret[:order] = [local_proxy_order_options, ret_order_options].flatten.uniq.select{|o| !o.blank?}.join(',') if ret[:order] || local_scope.proxy_options[:order]
           local_scope = local_scope.proxy_scope
         end
         ret

data/lib/fake_arel/rails_3_finders.rb

@@ -11,7 +11,7 @@ module Rails3Finders
       named_scope :joins, lambda {|*join| {:joins => join } if join[0]}
       named_scope :from, lambda {|*from| {:from => from }}
       named_scope :having, lambda {|*having| {:having => having }}
-      named_scope :group, lambda {|*group| {:group => group }}
+      named_scope :group, lambda {|*group| {:group => group.join(',') }}
       named_scope :readonly, lambda {|readonly| {:readonly => readonly }}
       named_scope :lock, lambda {|lock| {:lock => lock }}
 

data/spec/fake_arel_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper'
 require 'reply'
 require 'topic'
 require 'author'
@@ -48,6 +48,12 @@ describe "Fake Arel" do
     sql.should =~ /"topic_id" = 4/
     sql.should =~ /ORDER BY id desc/i
   end
+
+  it "should generate same sql always" do
+    first_sql = Topic.first_four_sorted_by_date.to_sql
+    second_sql = Topic.first_four_sorted_by_date.to_sql
+    first_sql.should == second_sql
+  end
   it "should not dublication conditions" do
     sql = Topic.select('content').joins(:replies).limit(1).order('id desc').where(:author_id => 1).to_sql
     sql.should_not =~ /"author_id" = 1.+"author_id" = 1/
@@ -71,6 +77,10 @@ describe "Fake Arel" do
     replies[0].attributes.should == {"id" => 5}
   end
 
+  it "should be able to group properly" do
+    Reply.group(:topic_id).map(&:topic_id).sort.should == [1, 2, 4].sort
+  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')

data/spec/fixtures/topic.rb

@@ -15,4 +15,5 @@ class Topic < ActiveRecord::Base
   named_scope :join_replies_by_string_and_author, join_replies_by_string.joins(:author)
   named_scope :join_replies_by_string_and_author_lambda, join_replies_by_string.joins(:author)
   named_scope :select_only_id, select('id as super_duper_id').includes(:replies)
+  named_scope :first_four_sorted_by_date, order('id ASC').order('created_at DESC').limit(4)
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 58
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - a
-  version: 1.0.0.a
+  version: 1.0.0
 platform: ruby
 authors: 
 - Grant Ammons
@@ -16,14 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -04:00
+date: 2012-04-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: activerecord
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,12 +30,12 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,12 +46,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  name: bundler
+  version_requirements: *id002
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +62,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
+  name: jeweler
+  version_requirements: *id003
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +76,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+  name: rcov
+  version_requirements: *id004
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,12 +92,12 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: sqlite3-ruby
+  name: rspec
+  version_requirements: *id005
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,7 +106,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  prerelease: false
+  name: sqlite3-ruby
+  version_requirements: *id006
+  type: :development
 description: fake_arel will simulate rails 3 arel syntax for Rails 2.
 email: grant@pipelinedealsco.com
 executables: []
@@ -172,18 +171,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "fake_arel: a Rails 3 query interface to Rails 2"