RubyGems - mongomodel - Versions diffs - 0.2.0 → 0.2.1 - Mend

mongomodel 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

data/lib/mongomodel/document/scopes.rb +2 -1
data/lib/mongomodel/version.rb +1 -1
data/mongomodel.gemspec +1 -1
metadata +2 -2

data/lib/mongomodel/document/scopes.rb CHANGED

@@ -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 CHANGED

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

data/mongomodel.gemspec CHANGED

@@ -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 CHANGED

@@ -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