fake_arel 1.0.0 → 1.1.0

data/Gemfile

@@ -7,10 +7,11 @@ gem 'activerecord', '~> 2.3.11'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 
+  gem 'debugger', :platform => :ruby_19
   gem 'rspec', '1.3.1'
   gem "sqlite3-ruby"
 end

data/Gemfile.lock

@@ -4,6 +4,14 @@ GEM
     activerecord (2.3.11)
       activesupport (= 2.3.11)
     activesupport (2.3.11)
+    columnize (0.3.6)
+    debugger (1.3.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.2.0)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -21,7 +29,8 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 2.3.11)
-  bundler (~> 1.0.0)
+  bundler
+  debugger
   jeweler (~> 1.6.4)
   rcov
   rspec (= 1.3.1)

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/fake_arel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fake_arel}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Ammons"]
-  s.date = %q{2012-04-03}
+  s.date = %q{2013-03-08}
   s.description = %q{fake_arel will simulate rails 3 arel syntax for Rails 2.}
   s.email = %q{grant@pipelinedealsco.com}
   s.extra_rdoc_files = [
@@ -59,24 +59,27 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.11"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.1"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<rspec>, ["= 1.3.1"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<rspec>, ["= 1.3.1"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end

data/lib/fake_arel/extensions.rb

@@ -37,7 +37,7 @@ module ActiveRecord
           ret[:select] = local_scope.proxy_options[:select] unless local_scope.proxy_options[:select].nil?
           local_conditions = merge_conditions(local_scope.proxy_options[:conditions])
           if local_conditions && ret[:conditions]
-            if !ret[:conditions].index(local_conditions)
+            if (ret[:conditions].class == Hash and !ret[:conditions].keys.include?(local_conditions)) or (ret[:conditions].class != Hash and !ret[:conditions].index(local_conditions))
               ret[:conditions] = merge_conditions(ret[:conditions], local_scope.proxy_options[:conditions])
             end
           elsif local_conditions

data/lib/fake_arel/rails_3_finders.rb

@@ -7,11 +7,11 @@ module Rails3Finders
       named_scope :offset, lambda {|offset| {:offset => offset}}
       named_scope :limit, lambda {|limit| {:limit => limit}}
       named_scope :includes, lambda { |*includes| { :include => includes }}
-      named_scope :order, lambda {|*order| {:order => order.join(',') }}
+      named_scope :order, lambda {|*order| {:order => order.flatten.join(',') }}
       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.join(',') }}
+      named_scope :group, lambda {|*group| {:group => group.flatten.join(',') }}
       named_scope :readonly, lambda {|readonly| {:readonly => readonly }}
       named_scope :lock, lambda {|lock| {:lock => lock }}
 

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.to_s(:db) %>
   
 another:
   id: 2
   topic_id: 2
   content: Nuh uh!
-  created_at: <%= 1.hour.ago.to_s(:db) %>
+  created_at: <%= 1.hour.ago.utc.to_s(:db) %>
   
 spam:
   id: 3
   topic_id: 1
   content: Nice site!
-  created_at: <%= 1.hour.ago.to_s(:db) %>
+  created_at: <%= 1.hour.ago.utc.to_s(:db) %>
 
 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.utc.to_s(:db) %>
 
 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.to_s(:db) %>
 
 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.to_s(:db) %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 -04:00
+date: 2013-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,25 +30,23 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  prerelease: false
-  name: activerecord
   version_requirements: *id001
+  name: activerecord
+  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
-  prerelease: false
-  name: bundler
+        version: "0"
   version_requirements: *id002
+  name: bundler
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
@@ -62,9 +60,9 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  prerelease: false
-  name: jeweler
   version_requirements: *id003
+  name: jeweler
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -76,12 +74,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: rcov
   version_requirements: *id004
+  name: rcov
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id005
+  name: debugger
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -92,12 +104,12 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  prerelease: false
+  version_requirements: *id006
   name: rspec
-  version_requirements: *id005
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,9 +118,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  version_requirements: *id007
   name: sqlite3-ruby
-  version_requirements: *id006
+  prerelease: false
   type: :development
 description: fake_arel will simulate rails 3 arel syntax for Rails 2.
 email: grant@pipelinedealsco.com