basic_named_scopes 0.1.1 → 0.1.2

data/README.rdoc

@@ -14,6 +14,8 @@ You can now write:
 All named scopes are called the same, except for +include+, which is now
 called +with+, because +include+ is a reserved method.
 
+Also, the scope +conditions+ is aliased as +where+, just as in ActiveRecord 3.
+
 Reuse them by making class methods:
 
   class Post < ActiveRecord::Base

data/Rakefile

@@ -11,7 +11,8 @@ begin
     gem.homepage = "http://github.com/iain/basic_named_scopes"
     gem.authors = ["Iain Hecker"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "temping", ">= 1.1.0"
+    gem.add_development_dependency "temping", ">= 1.3.0"
+    gem.add_development_dependency "activerecord", "< 3.0.pre"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/basic_named_scopes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{basic_named_scopes}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Iain Hecker"]
-  s.date = %q{2009-12-19}
+  s.date = %q{2010-01-10}
   s.description = %q{Make your queries prettier and more reusable by having a named scope for every find-parameter. As easy as Post.include(:author, :comments)}
   s.email = %q{iain@iain.nl}
   s.extra_rdoc_files = [
@@ -43,14 +43,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<temping>, [">= 1.1.0"])
+      s.add_development_dependency(%q<temping>, [">= 1.3.0"])
+      s.add_development_dependency(%q<activerecord>, ["< 3.0.pre"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<temping>, [">= 1.1.0"])
+      s.add_dependency(%q<temping>, [">= 1.3.0"])
+      s.add_dependency(%q<activerecord>, ["< 3.0.pre"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<temping>, [">= 1.1.0"])
+    s.add_dependency(%q<temping>, [">= 1.3.0"])
+    s.add_dependency(%q<activerecord>, ["< 3.0.pre"])
   end
 end
 

data/lib/basic_named_scopes.rb

@@ -12,6 +12,8 @@
 # All named scopes are called the same, except for +include+, which is now
 # called +with+, because +include+ is a reserved method.
 #
+# Also, the scope +conditions+ is aliased as +where+, just as in ActiveRecord 3.
+#
 # Reuse them by making class methods:
 #
 #   class Post < ActiveRecord::Base
@@ -49,6 +51,9 @@ module BasicNamedScopes
   # These are the normal parameters that will be turned into named scopes.
   FIND_PARAMETERS       = [:conditions, :order, :group, :having, :limit, :offset, :joins, :select, :from]
 
+  # These are aliased parameters. The keys are scope names, the values are the option they represent.
+  FIND_ALIASES          = { :where => :conditions, :with => :include }
+
   # These are the parameters that want a boolean.
   FIND_BOOLEAN_SWITCHES = [:readonly, :lock]
 
@@ -62,10 +67,12 @@ module BasicNamedScopes
     end
 
     def apply_basic_named_scopes(model)
-      model.named_scope(:with, expand_into_array(:include))
       FIND_PARAMETERS.each do |parameter|
         model.named_scope(parameter, expand_into_array(parameter))
       end
+      FIND_ALIASES.each do |name, parameter|
+        model.named_scope(name, expand_into_array(parameter))
+      end
       FIND_BOOLEAN_SWITCHES.each do |parameter|
         model.named_scope(parameter, default_to_true(parameter))
       end

data/spec/basic_named_scopes_spec.rb

@@ -50,6 +50,12 @@ describe "BasicNamedScopes" do
     Post.with(:author).to_a
   end
 
+  it "should use a scope named 'where' but internally use 'conditions' as parameter" do
+    subject = Post.where("published = ?", true)
+    subject.class.should be_scope
+    subject.should == [ @published ]
+  end
+
   [:conditions, :order, :group, :having, :limit, :offset, :joins, :with, :select, :from].each do |option|
     it "should known #{option} ActiveRecord::Base.find" do
       Post.send(option).class.should be_scope

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: basic_named_scopes
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Iain Hecker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 +01:00
+date: 2010-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 3.0.pre
     version: 
 description: Make your queries prettier and more reusable by having a named scope for every find-parameter. As easy as Post.include(:author, :comments)
 email: iain@iain.nl