mongomodel 0.2.0 → 0.2.1

data/lib/mongomodel/document/scopes.rb

@@ -36,7 +36,8 @@ module MongoModel
           end
           
           scopes[name] = lambda do |*args|
-            scope.is_a?(Proc) ? scope.call(*args) : scope
+            s = scope.is_a?(Proc) ? scope.call(*args) : scope
+            scoped.merge(s)
           end
           
           singleton_class.class_eval do

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/mongomodel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomodel}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Pohlenz"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sam Pohlenz