dry-view 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ba3055d4bb318adbf1cc7718433873c0f8726e26
-  data.tar.gz: 9e09c2f6cf9b340010dcda9319c23b6d78d48c61
+SHA256:
+  metadata.gz: ce2a157debc72c52b51ea0111281241d65c8b6c30284a28d42fa8f24c70a3660
+  data.tar.gz: fa47926b849a06728df59429b1ee419651d06477d308cd8d9c0068d78fc911f5
 SHA512:
-  metadata.gz: 0decd3ced65ee18f4f4bd95c18af6866c53fba4ed92c1e6a2774f8e8bdc787183ee90a260c5904c5a9b661cf106f822e60bd48ba4b4d89ff33fad630daf1eccc
-  data.tar.gz: 5b7792fd0b18d5c9dcd2c10d53d3f817fd643ee90e97d866f68e8920f543126d4fed444afa9e0cae1193fa7cde5794cb9d54a16d8d63a1f9314228bc23171308
+  metadata.gz: 1a0d5e51ea2e331216e7a0efdce0e995155b2e9bef0bc8b94eb565165331fbd553c0aff1585a607523b5c94a80500c3f0d28881c953f118c6458f77ae980168b
+  data.tar.gz: 0256d4aa8f7365f4d9f9d98c21ae0dfa2fa5a5c4ff540a3127e3036780078cb96a947fc3bd2933be4157213741772ed21c1d4eee89e64e17e50d7475869d87a3

data/.travis.yml

@@ -1,28 +1,18 @@
 language: ruby
-dist: trusty
-sudo: false
 cache: bundler
 bundler_args: --without tools benchmarks
 before_install:
   - gem update --system
-  - rvm @global do gem uninstall bundler -a -x
-  - rvm @global do gem install bundler -v 1.13.7
 script:
   - bundle exec rake
 after_success:
     # Send coverage report from the job #1 == current MRI release
   - '[ "${TRAVIS_JOB_NUMBER#*.}" = "1" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'
 rvm:
+  - 2.5.0
   - 2.4.2
-  - 2.3.5
-  - 2.2.8
-  - jruby-9.1.6.0
-env:
-  global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
-matrix:
-  allow_failures:
-    - rvm: jruby-9.1.6.0
+  - 2.3.6
+  - jruby-9.1.10.0
 notifications:
   email: false
   webhooks:
@@ -31,6 +21,3 @@ notifications:
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
-addons:
-  code_climate:
-    repo_token: c1c8f334714254acf5da901ca4da6afe24b15408074faae27159e3d14a450b62

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.5.0 / 2018-01-23
+
+### Added
+
+* Support for parts with decorated attributes (timriley + GustavoCaso)
+* Ability to easily create another part instance via `Part#new` (GustavoCaso)
+
+[Compare v0.4.0...v0.5.0](https://github.com/dry-rb/dry-view/compare/v0.4.0...v0.5.0)
+
 # 0.4.0 / 2017-11-01
 
 ### Added

data/README.md

@@ -1,15 +1,14 @@
 [gitter]: https://gitter.im/dry-rb/chat
 [gem]: https://rubygems.org/gems/dry-view
 [travis]: https://travis-ci.org/dry-rb/dry-view
-[code_climate]: https://codeclimate.com/github/dry-rb/dry-view
 [inch]: http://inch-ci.org/github/dry-rb/dry-view
 
 # dry-view [![Join the Gitter chat](https://badges.gitter.im/Join%20Chat.svg)][gitter]
 
 [![Gem Version](https://img.shields.io/gem/v/dry-view.svg)][gem]
 [![Build Status](https://img.shields.io/travis/dry-rb/dry-view.svg)][travis]
-[![Code Climate](https://img.shields.io/codeclimate/github/dry-rb/dry-view.svg)][code_climate]
-[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/dry-rb/dry-view.svg)][code_climate]
+[![Maintainability](https://api.codeclimate.com/v1/badges/de81a8026a2e7f64e4df/maintainability)](https://codeclimate.com/github/dry-rb/dry-view/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/de81a8026a2e7f64e4df/test_coverage)](https://codeclimate.com/github/dry-rb/dry-view/test_coverage)
 [![API Documentation Coverage](http://inch-ci.org/github/dry-rb/dry-view.svg)][inch]
 
 

data/lib/dry/view/decorator.rb

@@ -18,9 +18,9 @@ module Dry
             call(singular_name, obj, renderer: renderer, context: context, **singular_options)
           }
 
-          klass.new(name: name, value: arr, renderer: renderer, context: context)
+          klass.new(name: name, value: arr, decorator: self, renderer: renderer, context: context)
         else
-          klass.new(name: name, value: value, renderer: renderer, context: context)
+          klass.new(name: name, value: value, decorator: self, renderer: renderer, context: context)
         end
       end
 

data/lib/dry/view/part.rb

@@ -11,7 +11,7 @@ module Dry
         value
       ].freeze
 
-      include Dry::Equalizer(:_name, :_value, :_context, :_renderer)
+      include Dry::Equalizer(:_name, :_value, :_decorator, :_context, :_renderer)
 
       attr_reader :_name
 
@@ -21,11 +21,30 @@ module Dry
 
       attr_reader :_renderer
 
-      def initialize(name:, value:, renderer: MissingRenderer.new, context: nil)
+      attr_reader :_decorator
+
+      attr_reader :_decorated_attributes
+
+      # @api public
+      def self.decorate(*names, **options)
+        names.each do |name|
+          decorated_attributes[name] = options
+        end
+      end
+
+      # @api private
+      def self.decorated_attributes
+        @decorated_attributes ||= {}
+      end
+
+      # FIXME: does MissingRenderer.new lead to needless allocations of MissingRenderer? We only need one globally.
+      def initialize(name:, value:, decorator: Dry::View::Decorator.new, renderer: MissingRenderer.new, context: nil)
         @_name = name
         @_value = value
         @_context = context
         @_renderer = renderer
+        @_decorator = decorator
+        @_decorated_attributes = {}
       end
 
       def _render(partial_name, as: _name, **locals, &block)
@@ -36,10 +55,23 @@ module Dry
         _value.to_s
       end
 
+      def new(klass = (self.class), name: (_name), value: (_value), **options)
+        klass.new(
+          name: name,
+          value: value,
+          context: _context,
+          renderer: _renderer,
+          decorator: _decorator,
+          **options,
+        )
+      end
+
       private
 
       def method_missing(name, *args, &block)
-        if _value.respond_to?(name)
+        if self.class.decorated_attributes.key?(name)
+          _resolve_decorated_attribute(name)
+        elsif _value.respond_to?(name)
           _value.public_send(name, *args, &block)
         elsif CONVENIENCE_METHODS.include?(name)
           __send__(:"_#{name}", *args, &block)
@@ -55,6 +87,18 @@ module Dry
           renderer: _renderer,
         )
       end
+
+      def _resolve_decorated_attribute(name)
+        _decorated_attributes.fetch(name) {
+          _decorated_attributes[name] = _decorator.(
+            name,
+            _value.__send__(name),
+            renderer: _renderer,
+            context: _context,
+            **self.class.decorated_attributes[name],
+          )
+        }
+      end
     end
   end
 end

data/lib/dry/view/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module View
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/spec/fixtures/templates_override/_hello.html.slim

@@ -0,0 +1 @@
+h1 Partial new hello

data/spec/integration/part/decorated_attributes_spec.rb

@@ -0,0 +1,157 @@
+RSpec.describe 'Part / Decorated attributes' do
+  let(:article_class) {
+    Class.new do
+      attr_reader :title, :author, :comments
+
+      def initialize(title:, author:, comments:)
+        @title = title
+        @author = author
+        @comments = comments
+      end
+    end
+  }
+
+  let(:author_class) {
+    Class.new do
+      attr_reader :name
+
+      def initialize(name:)
+        @name = name
+      end
+    end
+  }
+
+  let(:comment_class) {
+    Class.new do
+      attr_reader :author, :body
+
+      def initialize(author:, body:)
+        @author = author
+        @body = body
+      end
+    end
+  }
+
+  let(:article) {
+    article_class.new(
+      title: 'Hello world',
+      author: author_class.new(name: 'Jane Doe'),
+      comments: [
+        comment_class.new(author: author_class.new(name: 'Sue Smith'), body: 'Great article')
+      ]
+    )
+  }
+
+  describe 'using default decorator' do
+    subject(:article_part) {
+      article_part_class.new(
+        name: :article,
+        value: article,
+      )
+    }
+
+    describe 'decorating without options' do
+      describe 'multiple declarations' do
+        let(:article_part_class) {
+          Class.new(Dry::View::Part) do
+            decorate :author
+            decorate :comments
+          end
+        }
+
+        it 'decorates exposures with the standard Dry::View::Part class' do
+          expect(article_part.author).to be_a Dry::View::Part
+          expect(article_part.comments[0]).to be_a Dry::View::Part
+        end
+      end
+
+      describe 'single declaration' do
+        let(:article_part_class) {
+          Class.new(Dry::View::Part) do
+            decorate :author, :comments
+          end
+        }
+
+        it 'decorates exposures with the standard Dry::View::Part class' do
+          expect(article_part.author).to be_a Dry::View::Part
+          expect(article_part.comments[0]).to be_a Dry::View::Part
+        end
+      end
+    end
+
+    describe 'decorating with part class specified' do
+      before do
+        module Test
+          class AuthorPart < Dry::View::Part
+          end
+
+          class CommentPart < Dry::View::Part
+          end
+        end
+      end
+
+      let(:article_part_class) {
+        Class.new(Dry::View::Part) do
+          decorate :author, as: Test::AuthorPart
+          decorate :comments, as: Test::CommentPart
+        end
+      }
+
+      it 'deorates exposures with the specified part class' do
+        expect(article_part.author).to be_a Test::AuthorPart
+        expect(article_part.comments[0]).to be_a Test::CommentPart
+      end
+    end
+  end
+
+  describe 'using custom decorator' do
+    let(:article_part_class) {
+        Class.new(Dry::View::Part) do
+          decorate :author
+          decorate :comments
+        end
+      }
+
+    subject(:article_part) {
+      article_part_class.new(
+        name: :article,
+        value: article,
+        decorator: decorator,
+      )
+    }
+
+    let(:decorator) {
+      Class.new(Dry::View::Decorator) do
+        def part_class(name, value, **options)
+          if !options.key?(:as)
+            part_name = Dry::Core::Inflector.camelize(name)
+            begin
+              Test.const_get(:"#{part_name}Part")
+            rescue NameError
+              super
+            end
+          else
+            super
+          end
+        end
+      end.new
+    }
+
+    before do
+      module Test
+        class AuthorPart < Dry::View::Part
+        end
+
+        class CommentPart < Dry::View::Part
+          decorate :author
+        end
+      end
+    end
+
+    it 'deorates exposures using the custom decorator' do
+      expect(article_part.author).to be_a Test::AuthorPart
+      expect(article_part.comments[0]).to be_a Test::CommentPart
+      expect(article_part.comments[0].author).to be_a Test::AuthorPart
+    end
+  end
+end

data/spec/unit/part_spec.rb

@@ -40,6 +40,16 @@ RSpec.describe Dry::View::Part do
       end
     end
 
+    describe '#new' do
+      it 'preserves decorator, renderer, and context' do
+        new_part = part.new(value: 'new value')
+
+        expect(new_part._decorator).to eql part._decorator
+        expect(new_part._renderer).to eql part._renderer
+        expect(new_part._context).to eql part._context
+      end
+    end
+
     describe '#method_missing' do
       let(:value) { double(greeting: 'hello from value') }
 
@@ -67,7 +77,7 @@ RSpec.describe Dry::View::Part do
     let(:value) { double('value') }
     let(:context) { double('context') }
 
-    describe '#new' do
+    describe '#initialize' do
       it 'can be initialized' do
         expect(part).to be_an_instance_of(Dry::View::Part)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-view
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Solnica
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -161,9 +161,11 @@ files:
 - spec/fixtures/templates/users/_row.html.slim
 - spec/fixtures/templates/users/_tbody.html.slim
 - spec/fixtures/templates/users_with_count.html.slim
+- spec/fixtures/templates_override/_hello.html.slim
 - spec/fixtures/templates_override/users.html.slim
 - spec/integration/decorator_spec.rb
 - spec/integration/exposures_spec.rb
+- spec/integration/part/decorated_attributes_spec.rb
 - spec/integration/view_spec.rb
 - spec/spec_helper.rb
 - spec/unit/controller_spec.rb
@@ -193,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Functional view rendering system
@@ -217,9 +219,11 @@ test_files:
 - spec/fixtures/templates/users/_row.html.slim
 - spec/fixtures/templates/users/_tbody.html.slim
 - spec/fixtures/templates/users_with_count.html.slim
+- spec/fixtures/templates_override/_hello.html.slim
 - spec/fixtures/templates_override/users.html.slim
 - spec/integration/decorator_spec.rb
 - spec/integration/exposures_spec.rb
+- spec/integration/part/decorated_attributes_spec.rb
 - spec/integration/view_spec.rb
 - spec/spec_helper.rb
 - spec/unit/controller_spec.rb