merged_default_scopes 0.0.2 → 0.0.3

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 .bundle
+debug.log

data/Gemfile

@@ -1,5 +1,8 @@
+source :gemcutter
+
 gem "activerecord", "~> 2.3.5"
 
 group :test do
   gem "rspec", ">= 2.0.0.beta.8"
+  gem "jeweler"
 end

data/History.markdown

@@ -1,8 +1,12 @@
-# Version 0.0.2 / 2010-05-11
+# Version 0.0.3 / 2010-05-16
+
+* add clear_default_scope
+
+# Version 0.0.2 / 2010-05-12
 
 * Now it actually works!
 
-# Version 0.0.1 / 2010-05-10
+# Version 0.0.1 / 2010-05-11
 
 * Initial cut
 * Supports active_record-2.3.5 only

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 David Chelimsky
+Copyright (c) 2010 David Chelimsky and Brian Tatnall
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,30 +1,68 @@
 # merged\_default\_scopes
 
-    module SomeSoftDeletablePlugin
+    require 'merged_default_scopes' 
+    
+    module SomePlugin
       def self.included(mod)
         mod.default_scope :conditions => {:deleted_at => nil}
       end
     end
     
     class SomeModel < ActiveRecord::Base
-      include SomeSoftDeletablePlugin # that may or may not be setting a default_scope
+      include SomePlugin
 
       default_scope :order => :name
     end
-
-    # default_scope => {:find => {:order => :name, :conditions => {:deleted_at => nil}}}
+    
+    SomeModel.__send__(:scope, :find)
+    # => {:order => :name, :conditions => {:deleted_at => nil}}
     #
     # ... and all is right with the world
 
-## Note on Patches/Pull Requests
+# clear\_default\_scope
+
+    require 'merged_default_scopes' 
+    
+    class SomeModel < ActiveRecord::Base
+      include SomePluginThatMightSetDefaultScope
+      include AnotherPluginThatMightSetDefaultScope
+
+      clear_default_scope
+      default_scope :order => :name
+    end
+    
+    SomeModel.__send__(:scope, :find)
+    # => {:order => :name}
+    #
+    # ... and all is right with the world, assuming you want the old
+    # behaviour of default_scope, which is to overwrite previously set
+    # default scopes
+
+## Motivation
+
+Sometimes plugins use `default_scope` to do what they do. We need a means of adding to
+the default scope without blowing it away.
+
+This is going to be the behaviour of default_scope and clear_default_scope in
+rails-3 (as of http://github.com/rails/rails/commit/35a114a8941cb22d29a536f1215a23a8cf7c4756),
+so this gem serves as a back-port to rails-2.
+
+## Install
+
+    $ gem install merged_default_scopes
+
+## Contribute
  
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+* [Fork the project](http://github.com/dchelimsky/merged_default_scopes)
+* Make the code better with a new feature, bug fix, or refactoring.
+  * New features and bug fixes should have specs.
+* Send us a pull request.
+
+## Learn more
+
+* [code/docs](http://github.com/dchelimsky/merged_default_scopes)
+* [issues](http://github.com/dchelimsky/merged_default_scopes/issues)
 
 ## Copyright
 
-Copyright (c) 2010 David Chelimsky and Brain Tatnall. See LICENSE for details.
+Copyright (c) 2010 David Chelimsky and Brian Tatnall. See LICENSE for details.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "merged_default_scopes"
     gem.summary = %Q{the name says it all}
-    gem.description = %Q{modify behavior of default_scope method to merge rather than override}
+    gem.description = %Q{modify behavior of ActiveRecord::Base::default_scope to merge rather than overwrite}
     gem.email = "dchelimsky@gmail.com,btatnall@gmail.com"
     gem.homepage = "http://github.com/dchelimsky/merged_default_scopes"
     gem.authors = ["David Chelimsky", "Brian Tatnall"]

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/merged_default_scopes.rb

@@ -12,6 +12,10 @@ module MergedDefaultScopes
         end
       end
     end
+
+    def clear_default_scope
+      scoped_methods.clear
+    end
   end
 
   def self.included(mod)

data/merged_default_scopes.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{merged_default_scopes}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Brian Tatnall"]
-  s.date = %q{2010-05-12}
-  s.description = %q{modify behavior of default_scope method to merge rather than override}
+  s.date = %q{2010-05-16}
+  s.description = %q{modify behavior of ActiveRecord::Base::default_scope to merge rather than overwrite}
   s.email = %q{dchelimsky@gmail.com,btatnall@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "autotest/discover.rb",
      "lib/merged_default_scopes.rb",
      "merged_default_scopes.gemspec",
+     "spec/db/schema.rb",
      "spec/merged_default_scopes_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -39,7 +40,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{the name says it all}
   s.test_files = [
-    "spec/merged_default_scopes_spec.rb",
+    "spec/db/schema.rb",
+     "spec/merged_default_scopes_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/db/schema.rb

@@ -0,0 +1,7 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :some_models do |t|
+    t.column :deleted_at, :datetime
+    t.column :name, :string
+  end
+end
+

data/spec/merged_default_scopes_spec.rb

@@ -1,33 +1,26 @@
 require "spec_helper"
 
-class SomeModel < ActiveRecord::Base
-  def initialize
-    @columns = []
-  end
-  
-  def self.columns
-    @columns ||= [];
-  end
-  
-  def self.column(name, sql_type = nil, default = nil, null = true)
-    columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
-  end
-
-  column :deleted_at, :datetime
-  column :name, :string
-end
+class SomeModel < ActiveRecord::Base; end
 
 describe MergedDefaultScopes do
+  after(:each) do
+    SomeModel.__send__ :clear_default_scope
+  end
   describe "#default_scope" do
-    before(:each) do
+    it "merges multiple calls" do
       SomeModel.__send__ :default_scope, :order => :name
       SomeModel.__send__ :default_scope, :conditions => {:deleted_at => nil}
-    end
-
-    it "merges multiple calls" do
       SomeModel.__send__(:scope, :find).
         should == {:order => :name, :conditions => {:deleted_at => nil}}
     end
   end
-end
 
+  describe "#clear_default_scope" do
+    it "clears default scopes" do
+      SomeModel.__send__ :default_scope, :order => :name
+      SomeModel.__send__ :default_scope, :conditions => {:deleted_at => nil}
+      SomeModel.__send__ :clear_default_scope
+      SomeModel.__send__(:scope, :find).should be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,16 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'merged_default_scopes'
 require 'rspec'
+require "sqlite3"
+
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.establish_connection(
+  :adapter  => "sqlite3",
+  :database => ":memory:"
+)
+ActiveRecord::Migration.verbose = false
+load(File.dirname(__FILE__) + "/db/schema.rb")
+
+class AuditableModel < ActiveRecord::Base; end
+
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -05:00
+date: 2010-05-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
         version: 2.0.0.beta.8
   type: :development
   version_requirements: *id001
-description: modify behavior of default_scope method to merge rather than override
+description: modify behavior of ActiveRecord::Base::default_scope to merge rather than overwrite
 email: dchelimsky@gmail.com,btatnall@gmail.com
 executables: []
 
@@ -57,6 +57,7 @@ files:
 - autotest/discover.rb
 - lib/merged_default_scopes.rb
 - merged_default_scopes.gemspec
+- spec/db/schema.rb
 - spec/merged_default_scopes_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -90,5 +91,6 @@ signing_key:
 specification_version: 3
 summary: the name says it all
 test_files: 
+- spec/db/schema.rb
 - spec/merged_default_scopes_spec.rb
 - spec/spec_helper.rb