edge_rider 0.3.1 → 0.3.2

data/gemfiles/Gemfile.4.2.pg

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>4.2.0'
+gem 'pg'
+
+# Development dependencies
+gem 'rake'
+gem 'database_cleaner'
+gem 'rspec'
+gem 'has_defaults' # used by test models
+gem 'gemika'
+
+# Gem under test
+gem 'edge_rider', :path => '..'

data/gemfiles/Gemfile.4.2.pg.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: ..
+  specs:
+    edge_rider (0.3.2)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
+    database_cleaner (1.5.3)
+    diff-lcs (1.2.5)
+    gemika (0.3.2)
+    has_defaults (0.4.4)
+      activerecord
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.9.1)
+    pg (0.19.0)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2.0)
+  database_cleaner
+  edge_rider!
+  gemika
+  has_defaults
+  pg
+  rake
+  rspec
+
+BUNDLED WITH
+   1.12.5

data/gemfiles/Gemfile.5.1.mysql2

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>5.1.1'
+gem 'mysql2'
+
+# Development dependencies
+gem 'rake'
+gem 'database_cleaner'
+gem 'rspec'
+gem 'has_defaults' # used by test models
+gem 'gemika'
+
+# Gem under test
+gem 'edge_rider', :path => '..'

data/gemfiles/Gemfile.5.1.mysql2.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: ..
+  specs:
+    edge_rider (0.3.2)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.6.1)
+    diff-lcs (1.3)
+    gemika (0.3.2)
+    has_defaults (0.4.4)
+      activerecord
+    i18n (0.8.1)
+    minitest (5.10.2)
+    mysql2 (0.4.6)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.1.1)
+  database_cleaner
+  edge_rider!
+  gemika
+  has_defaults
+  mysql2
+  rake
+  rspec
+
+BUNDLED WITH
+   1.15.0

data/gemfiles/Gemfile.5.1.pg

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>5.1.1'
+gem 'pg'
+
+# Development dependencies
+gem 'rake'
+gem 'database_cleaner'
+gem 'has_defaults' # used by test models
+gem 'rspec'
+gem 'gemika'
+
+# Gem under test
+gem 'edge_rider', :path => '..'

data/gemfiles/Gemfile.5.1.pg.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: ..
+  specs:
+    edge_rider (0.3.2)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.6.1)
+    diff-lcs (1.3)
+    gemika (0.3.2)
+    has_defaults (0.4.4)
+      activerecord
+    i18n (0.8.1)
+    minitest (5.10.2)
+    pg (0.20.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.1.1)
+  database_cleaner
+  edge_rider!
+  gemika
+  has_defaults
+  pg
+  rake
+  rspec
+
+BUNDLED WITH
+   1.15.0

data/lib/edge_rider.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'active_record'
+
 require 'edge_rider/version'
 require 'edge_rider/util'
 

data/lib/edge_rider/collect_column.rb

@@ -6,7 +6,13 @@ module EdgeRider
       qualified_column_name = EdgeRider::Util.qualify_column_name(self, column_name)
       if respond_to?(:pluck) # Rails 3.2+
         scope = scoped({})
-        scope = scope.uniq if distinct
+        if distinct
+          if ActiveRecord::VERSION::MAJOR < 5
+            scope = scope.uniq
+          else
+            scope = scope.distinct
+          end
+        end
         scope.pluck(qualified_column_name)
       else # Rails 2
         select = distinct ? "DISTINCT #{qualified_column_name}" : qualified_column_name

data/lib/edge_rider/collect_ids.rb

@@ -8,7 +8,7 @@ module EdgeRider
       def collect_ids
         collect do |obj|
           case obj
-            when Fixnum then obj
+            when Integer then obj
             when ActiveRecord::Base then obj.id
             else raise Uncollectable, "Cannot collect an id from #{obj.inspect}"
           end
@@ -41,7 +41,7 @@ module EdgeRider
     ::ActiveRecord::Associations::HasManyAssociation.send(:include, ActiveRecordScope)
     ::ActiveRecord::Associations::HasManyThroughAssociation.send(:include, ActiveRecordScope)
 
-    module Fixnum
+    module Integer
 
       def collect_ids
         [self]
@@ -49,7 +49,7 @@ module EdgeRider
 
     end
 
-    ::Fixnum.send(:include, Fixnum)
+    ::Integer.send(:include, Integer)
 
   end
 end

data/lib/edge_rider/development.rb

@@ -2,24 +2,11 @@ module EdgeRider
   module Development
     extend self
 
-    def drop_all_tables
-      connection = ::ActiveRecord::Base.connection
-      connection.tables.each do |table|
-        connection.drop_table table
-      end
-    end
-
-    def migrate_test_database
-      print "\033[30m" # dark gray text
-      drop_all_tables
-      ::ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
-      print "\033[0m"
-    end
-
     def selects_star_with_conditions_pattern(table, conditions)
       table = Regexp.quote(table)
       conditions = Regexp.quote(conditions) unless conditions.is_a?(Regexp)
-      /\ASELECT (`#{table}`\.)?\* FROM `#{table}`\s+WHERE \(?#{conditions}\)?\s*\z/
+      quote = '[`"]?'
+      /\ASELECT (#{quote}#{table}#{quote}\.)?\* FROM #{quote}#{table}#{quote}\s+WHERE \(?#{conditions}\)?\s*\z/
     end
 
   end

data/lib/edge_rider/util.rb

@@ -41,7 +41,7 @@ module EdgeRider
     end
     
     def define_association(owner, association, target, options)
-      if Rails.version.to_i < 4
+      if active_record_version < 4
         owner.send association, target, options
       else
         # Reduce the options hash to the given keys and store the remainder in
@@ -53,8 +53,37 @@ module EdgeRider
       end
     end
 
+    def active_record_version
+      ActiveRecord::VERSION::MAJOR
+    end
+
     def activerecord2?
-      ActiveRecord::VERSION::MAJOR < 3
+      active_record_version < 3
+    end
+
+    def rspec_version
+      if defined?(Spec)
+        1
+      else
+        require 'rspec/version'
+        RSpec::Version::STRING.to_i
+      end
+    end
+
+    def rspec_root
+      if rspec_version == 1
+        Spec
+      else
+        RSpec
+      end
+    end
+
+    def rspec_path
+      if rspec_version == 1
+        'spec'
+      else
+        'rspec'
+      end
     end
 
   end

data/lib/edge_rider/version.rb

@@ -1,3 +1,3 @@
 module EdgeRider
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/{shared/spec/edge_rider → edge_rider}/collect_ids_spec.rb

@@ -26,7 +26,7 @@ describe EdgeRider::CollectIds do
 
     end
 
-    context 'when called on a Fixnum' do
+    context 'when called on an Integer' do
 
       it 'should return the number as an array with a single element' do
         5.collect_ids.should == [5]
@@ -42,7 +42,7 @@ describe EdgeRider::CollectIds do
 
     end
 
-    context 'when called on an array of Fixnums' do
+    context 'when called on an array of Integers' do
 
       it 'should return the list itself' do
         [1, 3].collect_ids.should == [1, 3]

data/spec/{shared/spec/edge_rider → edge_rider}/scoped_spec.rb

@@ -41,13 +41,14 @@ describe EdgeRider::Scoped do
     it 'can be used to add conditions to a has_many association' do
       forum = Forum.create!
       thema = Topic.create! :subject => 'Thema', :trashed => false, :forum => forum
+      other_topic = Topic.create! :subject => 'Other', :trashed => false, :forum => forum
       trashed_thema = Topic.create! :subject => 'Thema', :trashed => true, :forum => forum
       
       has_many_scope = forum.active_topics
       # In Rails 3, #scoped on associations does not take parameters but turns
       # an association into a real scope.
       has_many_scope = has_many_scope.scoped if ActiveRecord::VERSION::MAJOR == 3
-      has_many_scope.scoped(:conditions => { :subject => 'Thema' }).should =~ [ thema ]
+      has_many_scope.scoped(:conditions => { :subject => 'Thema' }).to_a.should =~ [ thema ]
     end
     
   end

data/spec/{shared/spec/edge_rider → edge_rider}/to_id_query_spec.rb

@@ -9,7 +9,7 @@ describe EdgeRider::ToIdQuery do
       Forum.create!(:id => 2, :name => 'Name 2')
       Forum.create!(:id => 3, :name => 'Name 2')
       scope = Forum.scoped(:conditions => { :name => 'Name 2' })
-      scope.to_id_query.to_sql.should =~ EdgeRider::Development.selects_star_with_conditions_pattern('forums', /`forums`\.`id` IN \(2,\s*3\)/)
+      scope.to_id_query.to_sql.should =~ EdgeRider::Development.selects_star_with_conditions_pattern('forums', /["`]?forums["`]?\.["`]?id["`]? IN \(2,\s*3\)/)
     end
 
     it 'should resolve and lose any JOINs' do
@@ -20,8 +20,8 @@ describe EdgeRider::ToIdQuery do
       Topic.create!(:id => 101, :forum_id => 1)
       Topic.create!(:id => 102, :forum_id => 2)
       Topic.create!(:id => 103, :forum_id => 3)
-      scope = Topic.scoped(:joins => :forum, :conditions => 'forums.name = "A"')
-      scope.to_id_query.to_sql.should =~ EdgeRider::Development.selects_star_with_conditions_pattern('topics', /`topics`\.`id` IN \(100,\s*101,\s*103\)/)
+      scope = Topic.scoped(:joins => :forum, :conditions => "forums.name = 'A'")
+      scope.to_id_query.to_sql.should =~ EdgeRider::Development.selects_star_with_conditions_pattern('topics', /["`]?topics["`]?\.["`]?id["`]? IN \(100,\s*101,\s*103\)/)
     end
 
   end

data/spec/{shared/spec/edge_rider → edge_rider}/to_sql_spec.rb

@@ -6,7 +6,7 @@ describe EdgeRider::ToSql do
 
     it "should return the SQL the scope would produce" do
       scope = Forum.scoped(:conditions => { :name => 'Name' })
-      scope.to_sql.should =~ EdgeRider::Development.selects_star_with_conditions_pattern('forums', "`forums`.`name` = 'Name'")
+      scope.to_sql.should =~ EdgeRider::Development.selects_star_with_conditions_pattern('forums', /["`]?forums["`]?\.["`]?name["`]? = 'Name'/)
     end
 
   end