model_view 0.4.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6f1228c9decb1c8c548d0641e35dc935ee4473b
-  data.tar.gz: db0e1c74ad97f5ffb60de645f7407cf80f79cadc
+SHA256:
+  metadata.gz: df48774fd9e789552ad5e1bc03ef4e60a9958c81a9eb51220fbbb3746ecf7aa9
+  data.tar.gz: bd816c3e95d4c059633b07263065b1539a89a343e2968f2bbbe3e9632bf2affa
 SHA512:
-  metadata.gz: 3be2f2b46b4a7a9302716a8f917688c7b5f2d1a01d2a09c4096f62074a9f4336b34850d037623465b2fc96a6045044a9782923b4a3e901d2c544596586105cda
-  data.tar.gz: 0ba01965454e3aa695bb7068902bdb51ef4b4b4c576c6e6756f492f1cd4d7f109424fe3511e7ee6ae46a23715214f34f8b6eaf519fd115068d691c48e2bae703
+  metadata.gz: 071f5d440a4aa831e3a988bb172a9b511d004050050f57ad56f8e094d85b9d8c50fbd90be41c43be4c27d54ff11fcad2b2776343f6b80119d508bcd9d1a33a4c
+  data.tar.gz: 599284803a78b72b3a6c6b18d32a4f2316a4ad266eaa50ff74317e529f909a4b55bc438a3c3b90e9f8950f23e77e4cf44006b76d08191e0e04740bf845f65fa4

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+# 0.6.2
+* Upgrade rake and bundler version
+
+# 0.6.1
+* Fix inheritance bug overwriting parent scope
+
+# 0.6.0
+* One level of inheritance from the parent class
+
+# 0.5.0
+* Transfer field args to setters
+
+
+# 0.4.1
+* Make setters more robust
+
+
 # 0.4.0
 * Added constant and alias_for helpers
 

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
 
@@ -74,29 +75,38 @@ 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]
-      add_setter(scope, field_name, {}, nil)
+      add_setter(scope, field_name, cleaned_args, nil)
     end
-    @scopes[scope][:fields][field_name] = {args: args.select{ |k| k != :setter}, block: block}
+    @scopes[scope][:fields][field_name] = {args: cleaned_args, block: block}
   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.deep_dup
+    elsif @scopes.nil?
+      @scopes = { ROOT =>  new_opts }
+    end
+  end
+
 end

data/lib/model_view/updater.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash'
+
 module ModelView
   class Updater
 
@@ -7,7 +9,7 @@ module ModelView
 
         setters = setters_for_scope(scope, scopes)
 
-        data.each do |key, value|
+        data.symbolize_keys.each do |key, value|
           setter = if !setters[key].nil?
             setter_for_key(setters, key)
           else
@@ -61,6 +63,7 @@ module ModelView
           .merge(scope_setters)
           .merge(extended_setters)
           .merge(included_setters)
+          .with_indifferent_access
       end
 
       def extract_setters(scope, scope_data)

data/lib/model_view/version.rb

@@ -1,3 +1,3 @@
 module ModelView
-  VERSION = "0.4.0"
-end
+  VERSION = "0.6.2"
+end

data/model_view.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "semvergen", "~> 1.9"
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake",    "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "rake",    "~> 12.3.3"
   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

@@ -26,20 +26,20 @@ describe ModelView do
 
         context "with setter set to true" do
           it "adds the field and setter to the root scope" do
-            dummy_class.field :a_field, {setter: true}
+            dummy_class.field :a_field, {setter: true, arg1: "foo"}
 
             scope_fields = dummy_class.scopes[root_scope][:fields]
-            expect(scope_fields[:a_field]).to eq({args: {}, block: nil})
+            expect(scope_fields[:a_field]).to eq({args: {arg1: "foo"}, block: nil})
 
             scope_setters = dummy_class.scopes[root_scope][:setters]
-            expect(scope_setters[:a_field]).to eq({args: {}, block: nil})
+            expect(scope_setters[:a_field]).to eq({args: {arg1: "foo"}, block: nil})
           end
         end
       end
 
       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 = 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
+
+        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 = child_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,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: model_view
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Martin Pretorius
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-06-13 00:00:00.000000000 Z
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -107,7 +121,7 @@ homepage: https://github.com/Offerzen/model_view
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,9 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Composable serialisation for models
 test_files: