model_view 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f452a7c8518cd7317744d92c073b69ecda1a8ea
-  data.tar.gz: d2f23452702e9503b9d6528318d3c3633626e67d
+  metadata.gz: '0885b745771d5534eb267626b8d700db8960179f'
+  data.tar.gz: f5b24180e59c055bd63657362e6fd28c13047149
 SHA512:
-  metadata.gz: fb18484060aa0268040989d9442fa181bea59161c6eb1bccce476cdb6b31a1e168b6a37a0302155615b4d1371fbbfc16facc26e4d96132c3478d193159382d49
-  data.tar.gz: e4f1038e682911d1a77a7576f262ff845ae0d343851ccd2162cd7dcc3e24324b62dc3fbb0399392401ce961ea731a537569e96ec442315edc4f318d4181690d5
+  metadata.gz: 01fdace93124435a1d22af99009656c8de9cde716319dbe8881b5d62aa14adf893b4b217663ced28f9c864e4ef5cc156542eecc8b0eed7e40a768b17b43c077a
+  data.tar.gz: ab43776039f08301579a2e607a06e1cc7aecc6627bd5dbdbd7783942ffced536a4c468bbd617f8c7155b8e788b180b9e0d3c4fc0476bf2e2a51ae9987f50f72f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 0.6.1
+* Fix inheritance bug overwriting parent scope
+
 # 0.6.0
 * One level of inheritance from the parent class
 

data/lib/model_view.rb

@@ -1,5 +1,6 @@
 require 'model_view/resolver'
 require 'model_view/updater'
+require 'active_support/core_ext/object'
 
 module ModelView
 
@@ -102,7 +103,7 @@ module ModelView
 
   def create_scopes
     if self.superclass.respond_to?(:scopes) && @scopes.nil?
-      @scopes = self.superclass.scopes
+      @scopes = self.superclass.scopes.deep_dup
     elsif @scopes.nil?
       @scopes = { ROOT =>  new_opts }
     end

data/lib/model_view/version.rb

@@ -1,3 +1,3 @@
 module ModelView
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/model_view/model_view_spec.rb

@@ -122,7 +122,7 @@ describe ModelView do
           child_class = Class.new(dummy_class)
           child_class.field :b_field, {setter: true, arg1: "foo2"}
 
-          scope_setters = dummy_class.scopes[root_scope][:setters]
+          scope_setters = child_class.scopes[root_scope][:setters]
           expect(scope_setters[:a_field]).to eq({args: {arg1: "foo1"}, block: nil})
           expect(scope_setters[:b_field]).to eq({args: {arg1: "foo2"}, block: nil})
         end
@@ -136,7 +136,7 @@ describe ModelView do
           scope_fields = child_class.scopes[root_scope][:fields]
           expect(scope_fields[:a_field]).to eq({args: {arg1: "foo2"}, block: nil})
 
-          scope_setters = dummy_class.scopes[root_scope][:setters]
+          scope_setters = child_class.scopes[root_scope][:setters]
           expect(scope_setters[:a_field]).to eq({args: {arg1: "foo2"}, block: nil})
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_view
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Martin Pretorius