edge_rider 0.2.5 → 0.3.0

data/spec/shared/app_root/app/models/user.rb

@@ -5,8 +5,9 @@ class User < ActiveRecord::Base
   has_many :topics
 
   has_one :profile
-  has_one :active_profile, :conditions => { :trashed => false }, :class_name => 'Profile'
-
+  EdgeRider::Util.define_association self, :has_one, :active_profile,
+    :conditions => { :trashed => false }, :class_name => 'Profile'
+  
   has_defaults :trashed => false
 
 end

data/spec/shared/spec/edge_rider/scoped_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe EdgeRider::Scoped do
+  describe 'scoped' do
+    
+    it 'returns a scope when called without parameters' do
+      unless EdgeRider::Util.activerecord2? # Rails 2 cannot do this
+        EdgeRider::Util.scope?( Forum.scoped ).should == true
+      end
+    end
+    
+    it 'returns a scope when called with an empty hash' do
+      EdgeRider::Util.scope?( Forum.scoped({}) ).should == true
+    end
+    
+    it 'respects conditions' do
+      trashed = Forum.create! :trashed => true
+      active = Forum.create! :trashed => false
+      
+      Forum.scoped(:conditions => { :trashed => true }).to_a.should == [ trashed ]
+    end
+    
+    it 'respects order' do
+      c = Forum.create! :name => 'Chemikalien'
+      a = Forum.create! :name => 'Allegorie'
+      b = Forum.create! :name => 'Botanisch'
+      
+      Forum.scoped(:order => 'name ASC').to_a.should == [ a, b, c ]
+    end
+    
+    it 'can be used to add conditions to an existing scope chain' do
+      bulldog = Forum.create! :name => 'bulldog', :trashed => false
+      trashed = Forum.create! :name => 'maneuver', :trashed => true
+      trashed_bulldog = Forum.create! :name => 'bulldog', :trashed => true
+      
+      Forum.
+        scoped(:conditions => { :trashed => true }).
+        scoped(:conditions => { :name => 'bulldog' }).to_a.should == [ trashed_bulldog ]
+    end
+    
+    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
+      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 Rails.version.to_i == 3
+      has_many_scope.scoped(:conditions => { :subject => 'Thema' }).should =~ [ thema ]
+    end
+    
+  end
+end

data/spec/shared/spec/edge_rider/traverse_association_spec.rb

@@ -14,7 +14,7 @@ describe EdgeRider::TraverseAssociation do
       topic_4 = Topic.create!(:forum => forum_3)
       scope = Topic.scoped(:conditions => { :id => [ topic_2.id, topic_4.id ] })
       traversed_scope = scope.traverse_association(:forum)
-      EdgeRider::Util.scope?(traversed_scope).should be_true
+      EdgeRider::Util.scope?(traversed_scope).should == true
       traversed_scope.to_a.should =~ [forum_1, forum_3]
     end
 
@@ -40,7 +40,7 @@ describe EdgeRider::TraverseAssociation do
       post_3 = Post.create!(:topic => topic_3)
       scope = Post.scoped(:conditions => { :id => [post_1.id, post_3.id] })
       traversed_scope = scope.traverse_association(:topic, :forum)
-      EdgeRider::Util.scope?(traversed_scope).should be_true
+      EdgeRider::Util.scope?(traversed_scope).should == true
       traversed_scope.to_a.should =~ [forum_1, forum_3]
     end
 
@@ -57,10 +57,11 @@ describe EdgeRider::TraverseAssociation do
       post_3b = Post.create!(:topic => topic_3)
       scope = Forum.scoped(:conditions => { :id => [forum_1.id, forum_3.id] })
       traversed_scope = scope.traverse_association(:topics, :posts)
-      EdgeRider::Util.scope?(traversed_scope).should be_true
+      EdgeRider::Util.scope?(traversed_scope).should == true
       traversed_scope.to_a.should =~ [post_1, post_3a, post_3b]
     end
 
+    # in Rails 4, conditions on a scope are expressed as a lambda parameter
     it 'should raise an error when traversing a has_many association with conditions, until this is implemented' do
       forum = Forum.create!
       topic = Topic.create(:forum => forum, :trashed => true)
@@ -84,7 +85,7 @@ describe EdgeRider::TraverseAssociation do
       post_3b = Post.create!(:topic => topic_3)
       scope = Forum.scoped(:conditions => { :id => [forum_1.id, forum_3.id] })
       traversed_scope = scope.traverse_association(:posts)
-      EdgeRider::Util.scope?(traversed_scope).should be_true
+      EdgeRider::Util.scope?(traversed_scope).should == true
       traversed_scope.to_a.should =~ [post_1, post_3a, post_3b]
     end
 
@@ -97,7 +98,7 @@ describe EdgeRider::TraverseAssociation do
       profile_3 = Profile.create!(:user => user_3)
       scope = User.scoped(:conditions => { :id => [user_2.id, user_3.id] })
       traversed_scope = scope.traverse_association(:profile)
-      EdgeRider::Util.scope?(traversed_scope).should be_true
+      EdgeRider::Util.scope?(traversed_scope).should == true
       traversed_scope.to_a.should =~ [profile_2, profile_3]
     end
 
@@ -124,7 +125,7 @@ describe EdgeRider::TraverseAssociation do
       post_3b = Post.create!(:topic => topic_3)
       scope = Post.scoped(:conditions => { :id => [post_3a.id] })
       traversed_scope = scope.traverse_association(:topic, :forum, :topics, :posts)
-      EdgeRider::Util.scope?(traversed_scope).should be_true
+      EdgeRider::Util.scope?(traversed_scope).should == true
       traversed_scope.to_a.should =~ [post_3a, post_3b]
     end
 

metadata

@@ -1,48 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: edge_rider
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-05 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-06-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !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: 
+files:
 - .gitignore
-- .rvmrc
+- .ruby-version
 - .travis.yml
 - LICENSE
 - README.md
@@ -54,11 +43,13 @@ files:
 - lib/edge_rider/development.rb
 - lib/edge_rider/origin_class.rb
 - lib/edge_rider/preload_associations.rb
+- lib/edge_rider/scoped.rb
 - lib/edge_rider/to_id_query.rb
 - lib/edge_rider/to_sql.rb
 - 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
@@ -73,6 +64,7 @@ files:
 - 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
@@ -93,6 +85,7 @@ files:
 - 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
@@ -110,6 +103,33 @@ files:
 - 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
@@ -124,43 +144,133 @@ files:
 - 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
-has_rdoc: true
 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: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Power tools for ActiveRecord relations (scopes)
-test_files: []
-
+test_files:
+- 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

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm 1.8.7
-