model_view 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d309f17a7cace28365d69fd6a09a9fbea7834459
-  data.tar.gz: 12dc29109bc78c788c26aaf4983abf1ee5bc68d1
+  metadata.gz: 7f452a7c8518cd7317744d92c073b69ecda1a8ea
+  data.tar.gz: d2f23452702e9503b9d6528318d3c3633626e67d
 SHA512:
-  metadata.gz: 737cf93c2fb26e0d8f57765cedbe584bdee8407e17f9dc3242094b195288025afd1b9f846f292faae49ca1259bc11352ee90aee4c75ccc1d9550f27472d81266
-  data.tar.gz: 71d927e979f1975b9d9aa813b8136f8457fd4e713bb1732a20c94de88e84d37123c9d96cd3fae6b790fbf73bcb001eab00b938347e84ee5de45eebe40932f228
+  metadata.gz: fb18484060aa0268040989d9442fa181bea59161c6eb1bccce476cdb6b31a1e168b6a37a0302155615b4d1371fbbfc16facc26e4d96132c3478d193159382d49
+  data.tar.gz: e4f1038e682911d1a77a7576f262ff845ae0d343851ccd2162cd7dcc3e24324b62dc3fbb0399392401ce961ea731a537569e96ec442315edc4f318d4181690d5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 0.6.0
+* One level of inheritance from the parent class
+
 # 0.5.0
 * Transfer field args to setters
 

data/lib/model_view/updater.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash'
+
 module ModelView
   class Updater
 

data/lib/model_view/version.rb

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

data/lib/model_view.rb

@@ -74,18 +74,18 @@ module ModelView
   end
 
   def add_after_update(scope, block)
-    @scopes ||= {ROOT =>  new_opts}
+    create_scopes
     @scopes[scope] ||= new_opts
     @scopes[scope][:after_update] = block
   end
 
   def add_scope(scope_name)
-    @scopes ||= {ROOT => new_opts}
-    @scopes[scope_name] = new_opts
+    create_scopes
+    @scopes[scope_name] = new_opts unless @scopes.key?(scope_name)
   end
 
   def add_field(scope, field_name, args, block)
-    @scopes ||= {ROOT =>  new_opts}
+    create_scopes
     @scopes[scope] ||= new_opts
     cleaned_args = args.select{ |k| k != :setter}
     if args[:setter]
@@ -95,9 +95,17 @@ module ModelView
   end
 
   def add_setter(scope, field_name, args, block)
-    @scopes ||= {ROOT =>  new_opts}
+    create_scopes
     @scopes[scope] ||= new_opts
     @scopes[scope][:setters][field_name] = {args: args, block: block}
   end
 
+  def create_scopes
+    if self.superclass.respond_to?(:scopes) && @scopes.nil?
+      @scopes = self.superclass.scopes
+    elsif @scopes.nil?
+      @scopes = { ROOT =>  new_opts }
+    end
+  end
+
 end

data/model_view.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake",    "~> 10.0"
   spec.add_development_dependency "rspec",   "~> 3.0"
   spec.add_development_dependency "pry",     "~> 0.10"
+  spec.add_development_dependency "rails",     "~> 5.1.4"
 end

data/spec/model_view/model_view_spec.rb

@@ -39,7 +39,7 @@ describe ModelView do
 
       context "with a block" do
         it "adds the field to the root scope" do
-          dummy_class.field :a_field { 1 + 1 }
+          dummy_class.field(:a_field) { 1 + 1 }
 
           scope_fields = dummy_class.scopes[root_scope][:fields]
 
@@ -47,6 +47,30 @@ describe ModelView do
           expect(scope_fields[:a_field][:block].call).to eq(2)
         end
       end
+
+      context "when a parent class has been defined" do
+        it "shares parent class fields" do
+          dummy_class.field(:a_field) { 1 + 1 }
+
+          child_class = Class.new(dummy_class)
+          child_class.field(:b_field) { 1 + 2 }
+
+          scope_fields = child_class.scopes[root_scope][:fields]
+          expect(scope_fields[:a_field][:block].call).to eq(2)
+          expect(scope_fields[:b_field][:block].call).to eq(3)
+        end
+
+        it "overwrites parent class field with child field correctly" do
+          dummy_class.field(:a_field) { 1 + 1 }
+
+          child_class = Class.new(dummy_class)
+          child_class.field(:a_field) { 1 + 2 }
+
+          scope_fields = child_class.scopes[root_scope][:fields]
+          expect(scope_fields[:a_field][:args]).to eq({})
+          expect(scope_fields[:a_field][:block].call).to eq(3)
+        end
+      end
     end
 
     describe :fields do
@@ -82,7 +106,7 @@ describe ModelView do
 
       context "with a block" do
         it "adds the seter to the root scope" do
-          dummy_class.setter :a_field { 1 + 1 }
+          dummy_class.setter(:a_field) { 1 + 1 }
 
           scope_setters = dummy_class.scopes[root_scope][:setters]
 
@@ -90,6 +114,32 @@ describe ModelView do
           expect(scope_setters[:a_field][:block].call).to eq(2)
         end
       end
+
+      context "when a parent class has been defined" do
+        it "shares parent class setter" do
+          dummy_class.field :a_field, {setter: true, arg1: "foo1"}
+
+          child_class = Class.new(dummy_class)
+          child_class.field :b_field, {setter: true, arg1: "foo2"}
+
+          scope_setters = dummy_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
+
+        it "overwrites parent class setter correctly" do
+          dummy_class.field :a_field, {setter: true, arg1: "foo"}
+
+          child_class = Class.new(dummy_class)
+          child_class.field :a_field, {setter: true, arg1: "foo2"}
+
+          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]
+          expect(scope_setters[:a_field]).to eq({args: {arg1: "foo2"}, block: nil})
+        end
+      end
     end
 
     describe :after_update do
@@ -99,13 +149,35 @@ describe ModelView do
         after_update = dummy_class.scopes[root_scope][:after_update]
         expect(after_update).to be_a(Proc)
       end
+
+      context "when a parent class has been defined" do
+        it "child shares the parent after_update block" do
+          dummy_class.after_update { |obj| obj.save }
+
+          child_class = Class.new(dummy_class)
+          child_class.field(:a_field) { 1 + 2 }
+
+          after_update = child_class.scopes[root_scope][:after_update]
+          expect(after_update).to be_a(Proc)
+        end
+
+        it "overwrites the parent class after_update block correctly" do
+          dummy_class.after_update { |obj| obj.save }
+
+          child_class = Class.new(dummy_class)
+          child_class.after_update { 1 + 1 }
+
+          after_update = child_class.scopes[root_scope][:after_update]
+          expect(after_update.call('test')).to eq(2)
+        end
+      end
     end
   end
 
   context "within a scope" do
     describe :scope do
       it "creates a scope" do
-        dummy_class.scope :a_scope {  }
+        dummy_class.scope(:a_scope) {  }
 
         expect(dummy_class.scopes.keys).to include(:a_scope)
       end
@@ -113,14 +185,14 @@ describe ModelView do
 
     describe :field do
       it "adds a field inside the scope" do
-        dummy_class.scope :a_scope { field :foo }
+        dummy_class.scope(:a_scope) { field :foo }
 
         scope_fields = dummy_class.scopes[:a_scope][:fields]
         expect(scope_fields.keys).to include(:foo)
       end
 
       it "changes the current scope back to root" do
-        dummy_class.scope :a_scope { field :foo }
+        dummy_class.scope(:a_scope) { field :foo }
         dummy_class.field :bar
 
         scope_fields = dummy_class.scopes[:a_scope][:fields]
@@ -133,31 +205,43 @@ describe ModelView do
 
     describe :fields do
       it "adds all the fields to the current scope" do
-        dummy_class.scope :foo_scope { fields :field_1, :field_2, :field_3 }
+        dummy_class.scope(:foo_scope) { fields :field_1, :field_2, :field_3 }
 
         scope_fields = dummy_class.scopes[:foo_scope][:fields]
         expect(scope_fields.keys).to eq([:field_1, :field_2, :field_3])
       end
+
+      context "when a parent class has been defined" do
+        it "merges parent class fields and child fields to the current scope" do
+          dummy_class.scope(:foo_scope) { fields :field_1, :field_2, :field_3 }
+
+          child_class = Class.new(dummy_class)
+          child_class.scope(:foo_scope) { fields :field_4 }
+
+          scope_fields = child_class.scopes[:foo_scope][:fields]
+          expect(scope_fields.keys).to eq([:field_1, :field_2, :field_3, :field_4])
+        end
+      end
     end
 
     describe :include_scope do
       context "given a single scope" do
         it "adds the scope to the current scope's includes" do
-          dummy_class.scope :my_scope { include_scope :foo }
+          dummy_class.scope(:my_scope) { include_scope :foo }
           expect(dummy_class.scopes[:my_scope][:includes]).to eq([:foo])
         end
       end
 
       context "given an array" do
         it "adds all the scopes to the current scope's includes" do
-          dummy_class.scope :my_scope { include_scope [:foo, :bar] }
+          dummy_class.scope(:my_scope) { include_scope [:foo, :bar] }
           expect(dummy_class.scopes[:my_scope][:includes]).to eq([:foo, :bar])
         end
       end
 
       context "given more than one scope" do
         it "adds all the scopes to the current scope's includes" do
-          dummy_class.scope :my_scope { include_scope :foo, :bar }
+          dummy_class.scope(:my_scope) { include_scope :foo, :bar }
           expect(dummy_class.scopes[:my_scope][:includes]).to eq([:foo, :bar])
         end
       end
@@ -166,21 +250,21 @@ describe ModelView do
     describe :extend_scope do
       context "given a single scope" do
         it "adds the scope to the current scope's extends" do
-          dummy_class.scope :my_scope { extend_scope :foo }
+          dummy_class.scope(:my_scope) { extend_scope :foo }
           expect(dummy_class.scopes[:my_scope][:extends]).to eq([:foo])
         end
       end
 
       context "given an array" do
         it "adds all the scopes to the current scope's extends" do
-          dummy_class.scope :my_scope { extend_scope [:foo, :bar] }
+          dummy_class.scope(:my_scope) { extend_scope [:foo, :bar] }
           expect(dummy_class.scopes[:my_scope][:extends]).to eq([:foo, :bar])
         end
       end
 
       context "given more than one scope" do
         it "adds all the scopes to the current scope's extends" do
-          dummy_class.scope :my_scope { extend_scope :foo, :bar }
+          dummy_class.scope(:my_scope) { extend_scope :foo, :bar }
           expect(dummy_class.scopes[:my_scope][:extends]).to eq([:foo, :bar])
         end
       end
@@ -189,7 +273,7 @@ describe ModelView do
     describe :setter do
       context "without a block" do
         it "adds the setter to the root scope" do
-          dummy_class.scope :my_scope { setter :a_field }
+          dummy_class.scope(:my_scope) { setter :a_field }
 
           scope_setters = dummy_class.scopes[:my_scope][:setters]
           expect(scope_setters[:a_field]).to eq({args: {}, block: nil})
@@ -198,7 +282,7 @@ describe ModelView do
 
       context "with a block" do
         it "adds the seter to the root scope" do
-          dummy_class.scope :my_scope { setter :a_field { 1 + 1 } }
+          dummy_class.scope(:my_scope) { setter(:a_field) { 1 + 1 } }
 
           scope_setters = dummy_class.scopes[:my_scope][:setters]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_view
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Martin Pretorius
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.4
 description: Composable serialisation for models
 email:
 - martin@offerzen.com
@@ -123,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Composable serialisation for models