merged_default_scopes 0.0.2

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitconfig

@@ -0,0 +1,2 @@
+[user]
+  name = David Chelimsky and Brian Tatnall

data/.gitignore

@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+.bundle

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

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

data/History.markdown

@@ -0,0 +1,10 @@
+# Version 0.0.2 / 2010-05-11
+
+* Now it actually works!
+
+# Version 0.0.1 / 2010-05-10
+
+* Initial cut
+* Supports active_record-2.3.5 only
+
+

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 David Chelimsky
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -0,0 +1,30 @@
+# merged\_default\_scopes
+
+    module SomeSoftDeletablePlugin
+      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
+
+      default_scope :order => :name
+    end
+
+    # default_scope => {:find => {:order => :name, :conditions => {:deleted_at => nil}}}
+    #
+    # ... and all is right with the world
+
+## Note on Patches/Pull Requests
+ 
+* 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.
+
+## Copyright
+
+Copyright (c) 2010 David Chelimsky and Brain Tatnall. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  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.email = "dchelimsky@gmail.com,btatnall@gmail.com"
+    gem.homepage = "http://github.com/dchelimsky/merged_default_scopes"
+    gem.authors = ["David Chelimsky", "Brian Tatnall"]
+    gem.add_development_dependency "rspec", ">= 2.0.0.beta.8"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rspec/core/rake_task'
+Rspec::Core::RakeTask.new(:spec)
+
+Rspec::Core::RakeTask.new(:rcov) do |spec|
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "merged_default_scopes #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.2

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/lib/merged_default_scopes.rb

@@ -0,0 +1,29 @@
+require "active_record"
+require "active_record/base"
+
+module MergedDefaultScopes
+  module ClassMethods
+    def default_scope(options = {})
+      if default_scoping.empty?
+        super(options)
+      else
+        with_scope(:find => options, :create => options[:conditions].is_a?(Hash) ? options[:conditions] : {}) do
+          scoped_methods << scoped_methods.last
+        end
+      end
+    end
+  end
+
+  def self.included(mod)
+    mod.class_eval do
+      class << self
+        define_method :inherited do |sub|
+          sub.extend ClassMethods
+          super(sub)
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, MergedDefaultScopes

data/merged_default_scopes.gemspec

@@ -0,0 +1,59 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{merged_default_scopes}
+  s.version = "0.0.2"
+
+  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.email = %q{dchelimsky@gmail.com,btatnall@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    ".document",
+     ".gitconfig",
+     ".gitignore",
+     ".rspec",
+     "Gemfile",
+     "History.markdown",
+     "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "autotest/discover.rb",
+     "lib/merged_default_scopes.rb",
+     "merged_default_scopes.gemspec",
+     "spec/merged_default_scopes_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/dchelimsky/merged_default_scopes}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  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/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+  end
+end
+

data/spec/merged_default_scopes_spec.rb

@@ -0,0 +1,33 @@
+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
+
+describe MergedDefaultScopes do
+  describe "#default_scope" do
+    before(:each) 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
+

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'merged_default_scopes'
+require 'rspec'
+

metadata

@@ -0,0 +1,94 @@
+--- !ruby/object:Gem::Specification 
+name: merged_default_scopes
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
+platform: ruby
+authors: 
+- David Chelimsky
+- Brian Tatnall
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-05-12 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 8
+        version: 2.0.0.beta.8
+  type: :development
+  version_requirements: *id001
+description: modify behavior of default_scope method to merge rather than override
+email: dchelimsky@gmail.com,btatnall@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.markdown
+files: 
+- .document
+- .gitconfig
+- .gitignore
+- .rspec
+- Gemfile
+- History.markdown
+- LICENSE
+- README.markdown
+- Rakefile
+- VERSION
+- autotest/discover.rb
+- lib/merged_default_scopes.rb
+- merged_default_scopes.gemspec
+- spec/merged_default_scopes_spec.rb
+- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://github.com/dchelimsky/merged_default_scopes
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.6
+signing_key: 
+specification_version: 3
+summary: the name says it all
+test_files: 
+- spec/merged_default_scopes_spec.rb
+- spec/spec_helper.rb