edge_rider 0.3.1 → 0.3.2

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+$: << File.join(File.dirname(__FILE__), "/../lib" )
+
+require 'edge_rider'
+require 'edge_rider/development'
+require 'database_cleaner'
+require 'gemika'
+
+# Requires supporting files with custom matchers and macros, etc in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f}
+
+Gemika::RSpec.configure_clean_database_before_example
+Gemika::RSpec.configure_should_syntax

data/spec/support/database.rb

@@ -0,0 +1,34 @@
+Gemika::Database.new.rewrite_schema! do
+
+  create_table :forums do |t|
+    t.string :name
+    t.boolean :trashed
+  end
+
+  create_table :topics do |t|
+    t.string :subject
+    t.references :forum
+    t.references :author
+    t.boolean :trashed
+  end
+
+  create_table :posts do |t|
+    t.text :body
+    t.references :topic
+    t.references :author
+    t.boolean :trashed
+    t.timestamps
+  end
+
+  create_table :users do |t|
+    t.string :email
+    t.boolean :trashed
+  end
+
+  create_table :profiles do |t|
+    t.references :user
+    t.text :hobbies
+    t.boolean :trashed
+  end
+
+end

data/spec/{shared/app_root/config → support}/database.sample.yml

@@ -1,6 +1,10 @@
-test:
-  adapter: mysql2
+mysql:
+  database: edge_rider_test
   host: localhost
   username: root
   password: secret
+
+postgresql:
   database: edge_rider_test
+  user:
+  password:

data/spec/support/database.travis.yml

@@ -0,0 +1,9 @@
+mysql:
+  database: edge_rider_test
+  username: travis
+  password:
+
+postgresql:
+  database: edge_rider_test
+  user: postgres
+  password:

data/spec/support/models.rb

@@ -0,0 +1,92 @@
+require 'has_defaults'
+
+# Since our specs are mostly about working with IDs, this module can be
+# included in an ActiveRecord model class to allow setting the :id attribute
+# on create. This is forbidden by default.
+# http://stackoverflow.com/questions/431617/overriding-id-on-create-in-activerecord
+module AllowSettingIdOnCreate
+
+  module RemoveIdFromProtectedAttributes
+    def attributes_protected_by_default
+      super - ['id']
+    end
+  end
+
+  def self.included(base)
+    if ActiveRecord::VERSION::MAJOR < 3 # Rails 2 has this as an instance method
+      base.send(:include, RemoveIdFromProtectedAttributes)
+    else # Rails 3 has this as a class method
+      base.send(:extend, RemoveIdFromProtectedAttributes)
+    end
+  end
+
+end
+
+
+
+
+class Forum < ActiveRecord::Base
+  include AllowSettingIdOnCreate
+
+  has_many :topics
+  has_many :posts, :through => :topics
+  EdgeRider::Util.define_association self, :has_many, :active_topics,
+    :conditions => { :trashed => false }, :class_name => 'Topic'
+
+  has_defaults :trashed => false
+
+end
+
+
+class Post < ActiveRecord::Base
+  include AllowSettingIdOnCreate
+
+  belongs_to :topic
+  belongs_to :author, :class_name => 'User'
+
+  has_defaults :trashed => false
+
+  EdgeRider::Util.define_scope self, :these, lambda { |array| { :conditions => { :id => array } } }
+
+end
+
+
+class Profile < ActiveRecord::Base
+  include AllowSettingIdOnCreate
+
+  belongs_to :user
+
+  has_defaults :trashed => false
+
+end
+
+
+class Topic < ActiveRecord::Base
+  include AllowSettingIdOnCreate
+
+  belongs_to :forum
+  EdgeRider::Util.define_association self, :belongs_to, :active_forum,
+    :conditions => { :trashed => false }, :class_name => 'Forum'
+
+  has_many :posts
+  belongs_to :author, :class_name => 'User'
+  has_many :post_authors, :through => :posts
+
+  has_defaults :trashed => false
+
+end
+
+
+class User < ActiveRecord::Base
+  include AllowSettingIdOnCreate
+
+  has_many :posts
+  has_many :topics
+
+  has_one :profile
+  EdgeRider::Util.define_association self, :has_one, :active_profile,
+    :conditions => { :trashed => false }, :class_name => 'Profile'
+
+  has_defaults :trashed => false
+
+end

metadata

@@ -1,52 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: edge_rider
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-06-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-05-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Power tools for ActiveRecord relations (scopes)
 email: henning.koch@makandra.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .ruby-version
-- .travis.yml
+files:
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - LICENSE
 - README.md
 - Rakefile
 - edge_rider.gemspec
+- gemfiles/Gemfile.2.3.mysql2
+- gemfiles/Gemfile.2.3.mysql2.lock
+- gemfiles/Gemfile.3.2.mysql2
+- gemfiles/Gemfile.3.2.mysql2.lock
+- gemfiles/Gemfile.4.2.mysql2
+- gemfiles/Gemfile.4.2.mysql2.lock
+- gemfiles/Gemfile.4.2.pg
+- gemfiles/Gemfile.4.2.pg.lock
+- gemfiles/Gemfile.5.1.mysql2
+- gemfiles/Gemfile.5.1.mysql2.lock
+- gemfiles/Gemfile.5.1.pg
+- gemfiles/Gemfile.5.1.pg.lock
 - lib/edge_rider.rb
 - lib/edge_rider/collect_column.rb
 - lib/edge_rider/collect_ids.rb
@@ -59,139 +61,42 @@ files:
 - lib/edge_rider/traverse_association.rb
 - lib/edge_rider/util.rb
 - lib/edge_rider/version.rb
-- spec/rails-2.3/.ruby-version
-- spec/rails-2.3/Gemfile
-- spec/rails-2.3/Gemfile.lock
-- spec/rails-2.3/Rakefile
-- spec/rails-2.3/app_root/config/boot.rb
-- spec/rails-2.3/app_root/config/environment.rb
-- spec/rails-2.3/app_root/config/environments/test.rb
-- spec/rails-2.3/app_root/config/initializers/fix_missing_source_file.rb
-- spec/rails-2.3/app_root/config/preinitializer.rb
-- spec/rails-2.3/app_root/config/routes.rb
-- spec/rails-2.3/app_root/log/.gitignore
-- spec/rails-2.3/rcov.opts
-- spec/rails-2.3/spec.opts
-- spec/rails-2.3/spec/spec_helper.rb
-- spec/rails-3.0/.rspec
-- spec/rails-3.0/.ruby-version
-- spec/rails-3.0/Gemfile
-- spec/rails-3.0/Gemfile.lock
-- spec/rails-3.0/Rakefile
-- spec/rails-3.0/app_root/.gitignore
-- spec/rails-3.0/app_root/config/application.rb
-- spec/rails-3.0/app_root/config/boot.rb
-- spec/rails-3.0/app_root/config/environment.rb
-- spec/rails-3.0/app_root/config/environments/test.rb
-- spec/rails-3.0/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.0/app_root/config/initializers/inflections.rb
-- spec/rails-3.0/app_root/config/initializers/mime_types.rb
-- spec/rails-3.0/app_root/config/initializers/secret_token.rb
-- spec/rails-3.0/app_root/config/initializers/session_store.rb
-- spec/rails-3.0/app_root/config/routes.rb
-- spec/rails-3.0/app_root/lib/tasks/.gitkeep
-- spec/rails-3.0/app_root/log/.gitkeep
-- spec/rails-3.0/app_root/script/rails
-- spec/rails-3.0/rcov.opts
-- spec/rails-3.0/spec/spec_helper.rb
-- spec/rails-3.2/.rspec
-- spec/rails-3.2/.ruby-version
-- spec/rails-3.2/Gemfile
-- spec/rails-3.2/Gemfile.lock
-- spec/rails-3.2/Rakefile
-- spec/rails-3.2/app_root/.gitignore
-- spec/rails-3.2/app_root/config/application.rb
-- spec/rails-3.2/app_root/config/boot.rb
-- spec/rails-3.2/app_root/config/environment.rb
-- spec/rails-3.2/app_root/config/environments/test.rb
-- spec/rails-3.2/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.2/app_root/config/initializers/inflections.rb
-- spec/rails-3.2/app_root/config/initializers/mime_types.rb
-- spec/rails-3.2/app_root/config/initializers/secret_token.rb
-- spec/rails-3.2/app_root/config/initializers/session_store.rb
-- spec/rails-3.2/app_root/config/routes.rb
-- spec/rails-3.2/app_root/log/.gitignore
-- spec/rails-3.2/rcov.opts
-- spec/rails-3.2/spec/spec_helper.rb
-- spec/rails-4.1/.rspec
-- spec/rails-4.1/.ruby-version
-- spec/rails-4.1/Gemfile
-- spec/rails-4.1/Gemfile.lock
-- spec/rails-4.1/Rakefile
-- spec/rails-4.1/app_root/.gitignore
-- spec/rails-4.1/app_root/bin/bundle
-- spec/rails-4.1/app_root/bin/rails
-- spec/rails-4.1/app_root/bin/rake
-- spec/rails-4.1/app_root/bin/spring
-- spec/rails-4.1/app_root/config/application.rb
-- spec/rails-4.1/app_root/config/boot.rb
-- spec/rails-4.1/app_root/config/environment.rb
-- spec/rails-4.1/app_root/config/environments/development.rb
-- spec/rails-4.1/app_root/config/environments/production.rb
-- spec/rails-4.1/app_root/config/environments/test.rb
-- spec/rails-4.1/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-4.1/app_root/config/initializers/cookies_serializer.rb
-- spec/rails-4.1/app_root/config/initializers/filter_parameter_logging.rb
-- spec/rails-4.1/app_root/config/initializers/inflections.rb
-- spec/rails-4.1/app_root/config/initializers/mime_types.rb
-- spec/rails-4.1/app_root/config/initializers/session_store.rb
-- spec/rails-4.1/app_root/config/initializers/wrap_parameters.rb
-- spec/rails-4.1/app_root/config/routes.rb
-- spec/rails-4.1/app_root/config/secrets.yml
-- spec/rails-4.1/rcov.opts
-- spec/rails-4.1/spec/spec_helper.rb
-- spec/shared/app_root/app/controllers/application_controller.rb
-- spec/shared/app_root/app/models/allow_setting_id_on_create.rb
-- spec/shared/app_root/app/models/forum.rb
-- spec/shared/app_root/app/models/post.rb
-- spec/shared/app_root/app/models/profile.rb
-- spec/shared/app_root/app/models/topic.rb
-- spec/shared/app_root/app/models/user.rb
-- spec/shared/app_root/config/database.sample.yml
-- spec/shared/app_root/config/database.travis_ci.yml
-- spec/shared/app_root/db/migrate/001_create_test_tables.rb
-- spec/shared/spec/edge_rider/collect_column_spec.rb
-- spec/shared/spec/edge_rider/collect_ids_spec.rb
-- spec/shared/spec/edge_rider/origin_class_spec.rb
-- spec/shared/spec/edge_rider/preload_associations_spec.rb
-- spec/shared/spec/edge_rider/scoped_spec.rb
-- spec/shared/spec/edge_rider/to_id_query_spec.rb
-- spec/shared/spec/edge_rider/to_sql_spec.rb
-- spec/shared/spec/edge_rider/traverse_association_spec.rb
-- spec/shared/spec/edge_rider/util_spec.rb
+- spec/edge_rider/collect_column_spec.rb
+- spec/edge_rider/collect_ids_spec.rb
+- spec/edge_rider/origin_class_spec.rb
+- spec/edge_rider/preload_associations_spec.rb
+- spec/edge_rider/scoped_spec.rb
+- spec/edge_rider/to_id_query_spec.rb
+- spec/edge_rider/to_sql_spec.rb
+- spec/edge_rider/traverse_association_spec.rb
+- spec/edge_rider/util_spec.rb
+- spec/spec_helper.rb
+- spec/support/database.rb
+- spec/support/database.sample.yml
+- spec/support/database.travis.yml
+- spec/support/models.rb
 homepage: https://github.com/makandra/edge_rider
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Power tools for ActiveRecord relations (scopes)
 test_files: []
-
-has_rdoc: 

data/spec/rails-2.3/.ruby-version

@@ -1 +0,0 @@
-1.8.7

data/spec/rails-2.3/Gemfile

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-
-Deprecate.skip = true if defined?(Deprecate.skip)
-Gem::Deprecate.skip = true if defined?(Gem::Deprecate.skip)
-
-gem 'rails', '~>2.3'
-gem 'rspec', '~>1.3'
-gem 'rspec-rails', '~>1.3'
-gem 'mysql2', '~>0.2.0'
-gem 'ruby-debug', :platforms => :ruby_18
-gem 'test-unit', '~>1.2', :platforms => :ruby_19
-gem 'hoe', '=2.8.0', :platforms => :ruby_19
-gem 'database_cleaner', '=1.0.1'
-gem 'andand'
-gem 'has_defaults'
-
-gem 'edge_rider', :path => '../..'

data/spec/rails-2.3/Gemfile.lock

@@ -1,66 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    edge_rider (0.3.0)
-      activerecord
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (2.3.18)
-      actionpack (= 2.3.18)
-    actionpack (2.3.18)
-      activesupport (= 2.3.18)
-      rack (~> 1.1.0)
-    activerecord (2.3.18)
-      activesupport (= 2.3.18)
-    activeresource (2.3.18)
-      activesupport (= 2.3.18)
-    activesupport (2.3.18)
-    andand (1.3.3)
-    columnize (0.3.6)
-    database_cleaner (1.0.1)
-    has_defaults (0.4.1)
-      activerecord
-    hoe (2.8.0)
-      rake (>= 0.8.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mysql2 (0.2.20)
-    rack (1.1.6)
-    rails (2.3.18)
-      actionmailer (= 2.3.18)
-      actionpack (= 2.3.18)
-      activerecord (= 2.3.18)
-      activeresource (= 2.3.18)
-      activesupport (= 2.3.18)
-      rake (>= 0.8.3)
-    rake (10.1.0)
-    rbx-require-relative (0.0.9)
-    rspec (1.3.2)
-    rspec-rails (1.3.4)
-      rack (>= 1.0.0)
-      rspec (~> 1.3.1)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    test-unit (1.2.3)
-      hoe (>= 1.5.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  andand
-  database_cleaner (= 1.0.1)
-  edge_rider!
-  has_defaults
-  hoe (= 2.8.0)
-  mysql2 (~> 0.2.0)
-  rails (~> 2.3)
-  rspec (~> 1.3)
-  rspec-rails (~> 1.3)
-  ruby-debug
-  test-unit (~> 1.2)