fake_arel 1.3.4 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.4.0

data/fake_arel.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fake_arel}
-  s.version = "1.3.4"
+  s.name = "fake_arel"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Ammons"]
-  s.date = %q{2013-09-16}
-  s.description = %q{fake_arel will simulate rails 3 arel syntax for Rails 2.}
-  s.email = %q{grant@pipelinedealsco.com}
+  s.date = "2013-11-27"
+  s.description = "fake_arel will simulate rails 3 arel syntax for Rails 2."
+  s.email = "grant@pipelinedealsco.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -48,11 +48,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "tasks/rspec.rake"
   ]
-  s.homepage = %q{http://github.com/gammons/fake_arel}
+  s.homepage = "http://github.com/gammons/fake_arel"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{fake_arel: a Rails 3 query interface to Rails 2}
+  s.rubygems_version = "1.8.25"
+  s.summary = "fake_arel: a Rails 3 query interface to Rails 2"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fake_arel/rails_3_finders.rb

@@ -13,7 +13,7 @@ module Rails3Finders
       named_scope :having, lambda {|*having| {:having => having }}
       named_scope :group, lambda {|*group| {:group => group.flatten.join(',') }}
       named_scope :readonly, lambda {|readonly| {:readonly => readonly }}
-      named_scope :lock, lambda {|lock| {:lock => lock }}
+      named_scope :lock, lambda {|*lock| lock = [true] if lock.empty?; {:lock => lock.first }}
 
       def self.select(value = Proc.new)
         if block_given?
@@ -41,9 +41,10 @@ module Rails3Finders
         # for some reason, flatten is actually executing the scope
         scopes = scopes[0] if scopes.size == 1
         scopes.each do |s|
+          scope = s.proxy_scope
           s = s.proxy_options
           begin
-            where << merge_conditions(s[:conditions])
+            where << scope.merge_conditions(s[:conditions])
           rescue NoMethodError
             # I am ActiveRecord::Base. Only my subclasses define merge_conditions:
             where << subclasses.first.merge_conditions(s[:conditions])
@@ -71,6 +72,25 @@ module Rails3Finders
       def self.fakearel_destroy
         self.destroy_all(:id => self.scoped({}).select(:id).map(&:id))
       end
+
+      # allow defining scopes Rails 3 style (scope, not named_scope)
+      # scope is still a Rails 2 method, so we have to call the correct method
+      # depending on the argument types
+      def self.scope_with_named_scope(*args, &block)
+        if args.length == 2
+          case args[1]
+            when String, Symbol
+              scope_without_named_scope(*args)
+            else
+              named_scope *args, &block
+          end
+        else
+          scope_without_named_scope(*args)
+        end
+      end
+      class << self
+        alias_method_chain :scope, :named_scope
+      end
     end
   end
 end

data/spec/fake_arel_spec.rb

@@ -205,6 +205,12 @@ describe "Fake Arel" do
     Reply.or(q1,q2).all.map(&:id).should == [2]
   end
 
+  it 'should be able to combine with "or" a different class' do
+    q1 = Author.where(:id => 0)
+    q2 = Author.where(:id => 1)
+    Author.or(q1,q2).all.map(&:id).should == [1]
+  end
+
   it "should use select like rails 3 uses select" do
     lambda { Reply.all.select {|r| r.id == 1 }}.should_not raise_error
     Reply.all.select {|r| r.id == 1 }.size.should == 1

data/spec/fixtures/author.rb

@@ -1,9 +1,9 @@
 class Author < ActiveRecord::Base
   has_many :topics
 
-  named_scope :mentions_activerecord, :conditions => ['topics.title LIKE ?', '%ActiveRecord%']
+  scope :mentions_activerecord, :conditions => ['topics.title LIKE ?', '%ActiveRecord%']
   
-  named_scope :with_replies_starting_with, lambda { |text|
+  scope :with_replies_starting_with, lambda { |text|
     { :conditions => "replies.content LIKE '#{text}%' ", :include  => :replies }
   }
 end

data/spec/fixtures/authors.yml

@@ -1,5 +1,5 @@
 john:
   id: 1
   name: John
-  created_at: <%= 1.day.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.utc.iso8601 %>
   updated_at:

data/spec/fixtures/replies.yml

@@ -2,34 +2,34 @@ witty_retort:
   id: 1
   topic_id: 1
   content: Birdman is better!
-  created_at: <%= 6.hours.ago.to_s(:db) %>
+  created_at: <%= 6.hours.ago.utc.iso8601 %>
   
 another:
   id: 2
   topic_id: 2
   content: Nuh uh!
-  created_at: <%= 1.hour.ago.to_s(:db) %>
+  created_at: <%= 1.hour.ago.utc.iso8601 %>
   
 spam:
   id: 3
   topic_id: 1
   content: Nice site!
-  created_at: <%= 1.hour.ago.to_s(:db) %>
+  created_at: <%= 1.hour.ago.utc.iso8601 %>
 
 decisive:
   id: 4
   topic_id: 4
   content: "I'm getting to the bottom of this"
-  created_at: <%= 30.minutes.ago.to_s(:db) %>
+  created_at: <%= 30.minutes.ago.localtime.iso8601 %>
 
 brave:
   id: 5
   topic_id: 4
   content: "AR doesn't scare me a bit"
-  created_at: <%= 10.minutes.ago.to_s(:db) %>
+  created_at: <%= 10.minutes.ago.utc.iso8601 %>
 
 thang:
   id: 6
   topic_id: 4
   content: "AR This is some more content"
-  created_at: <%= 10.hours.ago.to_s(:db) %>
+  created_at: <%= 10.hours.ago.utc.iso8601 %>

data/spec/fixtures/reply.rb

@@ -3,35 +3,35 @@ class Reply < ActiveRecord::Base
 
   belongs_to :topic, :include => [:replies]
 
-  named_scope :recent, where('replies.created_at > ?', 15.minutes.ago)
-  named_scope :recent_two_wheres, where('replies.created_at > ?', 15.minutes.ago).where(:id => 5)
-  named_scope :recent_limit_1, where('replies.created_at > ?', 15.minutes.ago).limit(1)
-  named_scope :recent_with_content_like_ar, recent.where('lower(replies.content) like ?', "AR%")
-  named_scope :recent_with_content_like_ar_and_id_4, recent.where('lower(replies.content) like ?', "AR%").where("id = 4")
-  named_scope :recent_joins_topic, recent.joins(:topic)
-  named_scope :topic_title_is, lambda {|topic_title| joins(:topic).where("topics.title like ?", topic_title + "%") }
-
-  named_scope :join_topic_and_author, joins(:topic => [:author])
-  named_scope :filter_join_topic_and_author, joins(:topic => [:author]).where('lower(replies.content) like ?','AR%')
-
-  named_scope :arel_id, :conditions => "id = 1"
-  named_scope :arel_id_with_lambda, lambda {|aid| arel_id}
-  named_scope :arel_id_with_nested_lambda, lambda {|aid| arel_id_with_lambda(aid)}
-
-  named_scope :id_asc, order('id asc')
-  named_scope :id_desc, order('id desc')
-  named_scope :topic_4_id_asc, id_asc.where(:topic_id => 4)
-  named_scope :topic_4_id_desc, id_desc.where(:topic_id => 4)
-  named_scope :topic_id, lambda{|topic_id| where(:topic_id => topic_id)}
-  named_scope :recent_topic_id, lambda{|topic_id| recent.where(:topic_id => topic_id)}
-  named_scope :topic__id_asc, lambda{|topic_id| id_asc.where(:topic_id => topic_id)}
-  named_scope :topic__id_desc, lambda{|topic_id| id_desc.where(:topic_id => topic_id)}
-  named_scope :topic__id_desc1, lambda{|topic_id| where(:topic_id => topic_id).id_desc}
-  named_scope :topic__id_desc2, lambda{|topic_id| order('id desc').where(:topic_id => topic_id)}
-  named_scope :topic__id_desc3, lambda{|topic_id| where(:topic_id => topic_id).order('id desc')}
-  named_scope :topic_id_asc, order('topic_id asc')
-  named_scope :topic_id_asc_id_desc, order('topic_id asc').id_desc
-  named_scope :lam_topic_id_asc_id_desc, lambda{ topic_id_asc.id_desc }
+  scope :recent, where('replies.created_at > ?', 15.minutes.ago.utc.to_s(:db))
+  scope :recent_two_wheres, where('replies.created_at > ?', 15.minutes.ago.utc.to_s(:db)).where(:id => 5)
+  scope :recent_limit_1, where('replies.created_at > ?', 15.minutes.ago.utc.to_s(:db)).limit(1)
+  scope :recent_with_content_like_ar, recent.where('lower(replies.content) like ?', "AR%")
+  scope :recent_with_content_like_ar_and_id_4, recent.where('lower(replies.content) like ?', "AR%").where("id = 4")
+  scope :recent_joins_topic, recent.joins(:topic)
+  scope :topic_title_is, lambda {|topic_title| joins(:topic).where("topics.title like ?", topic_title + "%") }
+
+  scope :join_topic_and_author, joins(:topic => [:author])
+  scope :filter_join_topic_and_author, joins(:topic => [:author]).where('lower(replies.content) like ?','AR%')
+
+  scope :arel_id, :conditions => "id = 1"
+  scope :arel_id_with_lambda, lambda {|aid| arel_id}
+  scope :arel_id_with_nested_lambda, lambda {|aid| arel_id_with_lambda(aid)}
+
+  scope :id_asc, order('id asc')
+  scope :id_desc, order('id desc')
+  scope :topic_4_id_asc, id_asc.where(:topic_id => 4)
+  scope :topic_4_id_desc, id_desc.where(:topic_id => 4)
+  scope :topic_id, lambda{|topic_id| where(:topic_id => topic_id)}
+  scope :recent_topic_id, lambda{|topic_id| recent.where(:topic_id => topic_id)}
+  scope :topic__id_asc, lambda{|topic_id| id_asc.where(:topic_id => topic_id)}
+  scope :topic__id_desc, lambda{|topic_id| id_desc.where(:topic_id => topic_id)}
+  scope :topic__id_desc1, lambda{|topic_id| where(:topic_id => topic_id).id_desc}
+  scope :topic__id_desc2, lambda{|topic_id| order('id desc').where(:topic_id => topic_id)}
+  scope :topic__id_desc3, lambda{|topic_id| where(:topic_id => topic_id).order('id desc')}
+  scope :topic_id_asc, order('topic_id asc')
+  scope :topic_id_asc_id_desc, order('topic_id asc').id_desc
+  scope :lam_topic_id_asc_id_desc, lambda{ topic_id_asc.id_desc }
 
   validates_presence_of :content
 

data/spec/fixtures/topic.rb

@@ -2,18 +2,18 @@ class Topic < ActiveRecord::Base
   has_many :replies, :dependent => :destroy, :order => 'replies.created_at DESC'
   belongs_to :author
 
-  named_scope :mentions_activerecord, :conditions => ['topics.title LIKE ?', '%ActiveRecord%']
+  scope :mentions_activerecord, :conditions => ['topics.title LIKE ?', '%ActiveRecord%']
 
-  named_scope :with_replies_starting_with, lambda { |text|
+  scope :with_replies_starting_with, lambda { |text|
     { :conditions => "replies.content LIKE '#{text}%' ", :include  => :replies }
   }
 
-  named_scope :mentions_activerecord_with_replies, includes(:replies).mentions_activerecord
-  named_scope :by_title_with_replies, lambda {|title| includes(:replies).where('topics.title like ?', title) }
+  scope :mentions_activerecord_with_replies, includes(:replies).mentions_activerecord
+  scope :by_title_with_replies, lambda {|title| includes(:replies).where('topics.title like ?', title) }
 
-  named_scope :join_replies_by_string, joins('inner join replies on topics.id = replies.topic_id')
-  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)
+  scope :join_replies_by_string, joins('inner join replies on topics.id = replies.topic_id')
+  scope :join_replies_by_string_and_author, join_replies_by_string.joins(:author)
+  scope :join_replies_by_string_and_author_lambda, join_replies_by_string.joins(:author)
+  scope :select_only_id, select('id as super_duper_id').includes(:replies)
+  scope :first_four_sorted_by_date, order('id ASC').order('created_at DESC').limit(4)
 end

data/spec/fixtures/topics.yml

@@ -4,7 +4,7 @@ futurama:
   title: Isnt futurama awesome?
   subtitle: It really is, isnt it.
   content: I like futurama
-  created_at: <%= 1.day.ago.to_s(:db) %>
+  created_at: <%= 1.day.ago.utc.iso8601 %>
   updated_at:
   
 harvey_birdman:
@@ -13,7 +13,7 @@ harvey_birdman:
   title: Harvey Birdman is the king of all men
   subtitle: yup
   content: He really is
-  created_at: <%= 2.hours.ago.to_s(:db) %>
+  created_at: <%= 2.hours.ago.utc.iso8601 %>
   updated_at:
 
 rails:
@@ -22,11 +22,11 @@ rails:
   title: Rails is nice
   subtitle: It makes me happy
   content: except when I have to hack internals to fix pagination. even then really.
-  created_at: <%= 20.minutes.ago.to_s(:db) %>
+  created_at: <%= 20.minutes.ago.utc.iso8601 %>
 
 ar:
   id: 4
   author_id: 1
   title: ActiveRecord sometimes freaks me out
   content: "I mean, what's the deal with eager loading?"
-  created_at: <%= 15.minutes.ago.to_s(:db) %>
+  created_at: <%= 15.minutes.ago.utc.iso8601 %>

metadata

@@ -1,151 +1,152 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fake_arel
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.4.0
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 4
-  version: 1.3.4
 platform: ruby
-authors: 
+authors:
 - Grant Ammons
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-16 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2013-11-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 3
-        - 11
+      - !ruby/object:Gem::Version
         version: 2.3.11
   type: :runtime
-  name: activerecord
-  version_requirements: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.11
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: *id002
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  name: jeweler
-  version_requirements: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: ruby-debug
-  version_requirements: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-  version_requirements: *id006
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
-  name: rspec
-  version_requirements: *id007
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  version_requirements: *id008
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: fake_arel will simulate rails 3 arel syntax for Rails 2.
 email: grant@pipelinedealsco.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -176,39 +177,32 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/rspec.rake
-has_rdoc: true
 homepage: http://github.com/gammons/fake_arel
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3633317675981731964
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: "fake_arel: a Rails 3 query interface to Rails 2"
+summary: ! 'fake_arel: a Rails 3 query interface to Rails 2'
 test_files: []
-