metadata_presenter 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79790874d3e01606cda561899935a3161a7a018606ca7c2e1ea37e5675576b4e
-  data.tar.gz: 27ae8bc8e77f8e6dd3ca586c14ee2e435c6af695f5924d0de5b44ad6c262e167
+  metadata.gz: d1b2ff20300f6b643a7c83f8885c640b375babed55cd30798ca079bbd67b0506
+  data.tar.gz: ba841ff80433e9ff917a2d006eca7a53f618193640815e7594415a8945003c57
 SHA512:
-  metadata.gz: 571d8aa49dfbe9a66cacf7c92e2bd9b1817146c4d02b56003f737c0e1dbd385f702d59bdb952a76fccff5e97c3adf499183422297cd935d09a955e217917d702
-  data.tar.gz: 5b8531e7ec4c675fe2ee9b547a677660712641ac0f634ec9ca023802bec0ab57b5a0f7e897684e378783bc4f0949124de6d19e605a3a687bca54de9201b688dc
+  metadata.gz: 1298d445703206b693fb9153255362433a4476bca5e982aac89a847c8a902013d066e729bdf645ba48fd0b5f4a780b972a94a14740b3db8ba55879439e6fd33f
+  data.tar.gz: 12439df97cda7c675df1f53ebb4151ebdfc64509c64ce08b466c9f16ed67b2f02fb06e9777458c5da37bfc27c54ad5f4368372f07c56292a624d2d36f24196ef

data/Rakefile

@@ -21,7 +21,7 @@ end
 
 task default: :rspec
 
-APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
 Bundler::GemHelper.install_tasks

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -17,7 +17,7 @@ module MetadataPresenter
     private
 
     def not_found
-      render template: 'errors/404', status: 404
+      render template: 'errors/404', status: :not_found
     end
 
     def redirect_to_page(url)

data/app/helpers/metadata_presenter/application_helper.rb

@@ -12,9 +12,9 @@ module MetadataPresenter
     #   <%=m '# Some markdown' %>
     #
     def m(text)
-      (Kramdown::Document.new(text).to_html).html_safe
+      Kramdown::Document.new(text).to_html.html_safe
     end
-    alias to_markdown m
+    alias_method :to_markdown, :m
 
     def default_text(property)
       MetadataPresenter::DefaultText[property]

data/app/models/metadata_presenter/component.rb

@@ -4,7 +4,7 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   end
 
   def humanised_title
-    self.label || self.legend
+    label || legend
   end
 
   def items

data/app/models/metadata_presenter/date_field.rb

@@ -9,7 +9,9 @@ module MetadataPresenter
     end
 
     def present?
+      # rubocop:disable Rails/Present
       !blank?
+      # rubocop:enable Rails/Present
     end
 
     def blank?

data/app/models/metadata_presenter/metadata.rb

@@ -9,8 +9,8 @@ class MetadataPresenter::Metadata
     @editor = editor
   end
 
-  def to_json
-    self.to_h.to_json
+  def to_json(*_args)
+    to_h.to_json
   end
 
   def id
@@ -21,7 +21,7 @@ class MetadataPresenter::Metadata
     metadata._type
   end
 
-  def respond_to_missing?(method_name, include_private = false)
+  def respond_to_missing?(method_name, _include_private = false)
     metadata.respond_to?(method_name)
   end
 

data/app/models/metadata_presenter/page.rb

@@ -11,7 +11,7 @@ module MetadataPresenter
     end
 
     def editable_attributes
-      self.to_h.reject { |k,_| k.in?([:_id, :_type, :steps]) }
+      to_h.reject { |k, _| k.in?(%i[_id _type steps]) }
     end
 
     def components

data/app/models/metadata_presenter/page_answers.rb

@@ -12,16 +12,14 @@ module MetadataPresenter
       ValidateAnswers.new(self, components: components).valid?
     end
 
-    def components
-      page.components
-    end
+    delegate :components, to: :page
 
-    def respond_to_missing?(method_name, include_private = false)
+    def respond_to_missing?(method_name, _include_private = false)
       method_name.to_s.in?(components.map(&:id))
     end
 
-    def method_missing(method_name, *args, &block)
-      component = components.find { |component| component.id == method_name.to_s }
+    def method_missing(method_name, *_args)
+      component = components.find { |c| c.id == method_name.to_s }
 
       if component && component.type == 'date'
         date_answer(component.id)
@@ -42,7 +40,7 @@ module MetadataPresenter
         GOVUKDesignSystemFormBuilder::Elements::Date::SEGMENTS[:month],
         GOVUKDesignSystemFormBuilder::Elements::Date::SEGMENTS[:year]
       ].map do |segment|
-        answers["#{component_id.to_s}(#{segment})"]
+        answers["#{component_id}(#{segment})"]
       end
     end
 

data/app/models/metadata_presenter/service.rb

@@ -1,6 +1,6 @@
 class MetadataPresenter::Service < MetadataPresenter::Metadata
   def pages
-    @_pages ||= metadata.pages.map do |page|
+    @pages ||= metadata.pages.map do |page|
       MetadataPresenter::Page.new(page, editor: editor?)
     end
   end

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -1,10 +1,10 @@
 module MetadataPresenter
   class PageAnswersPresenter
-    FIRST_ANSWER = 0.freeze
-    NO_USER_INPUT = %w(page.checkanswers page.confirmation page.content).freeze
+    FIRST_ANSWER = 0
+    NO_USER_INPUT = %w[page.checkanswers page.confirmation page.content].freeze
 
     def self.map(view:, pages:, answers:)
-      user_input_pages(pages).map do |page|
+      user_input_pages(pages).map { |page|
         Array(page.components).map do |component|
           new(
             view: view,
@@ -13,7 +13,7 @@ module MetadataPresenter
             answers: answers
           )
         end
-      end.reject { |page| page.empty? }
+      }.reject(&:empty?)
     end
 
     def self.user_input_pages(pages)
@@ -21,6 +21,7 @@ module MetadataPresenter
     end
 
     attr_reader :view, :component, :page, :answers
+
     delegate :url, to: :page
     delegate :humanised_title, to: :component
 
@@ -37,6 +38,7 @@ module MetadataPresenter
       value = @page_answers.send(component.id)
 
       return '' if value.blank?
+
       if self.class.private_method_defined?(component.type.to_sym)
         send(component.type.to_sym, value)
       else
@@ -62,7 +64,7 @@ module MetadataPresenter
     end
 
     def checkboxes(value)
-      value.join("<br>").html_safe
+      value.join('<br>').html_safe
     end
   end
 end

data/app/validators/metadata_presenter/validate_answers.rb

@@ -8,7 +8,7 @@ module MetadataPresenter
     end
 
     def valid?
-      validators.map { |validator| validator.valid? }.all?
+      validators.map(&:valid?).all?
     end
 
     def invalid?
@@ -18,20 +18,20 @@ module MetadataPresenter
     private
 
     def validators
-      components.map do |component|
+      components.map { |component|
         component_validations(component).map do |key|
           "MetadataPresenter::#{key.classify}Validator".constantize.new(
             page_answers: page_answers,
             component: component
           )
         end
-      end.compact.flatten
+      }.compact.flatten
     end
 
     def component_validations(component)
       return [] if component.validation.blank?
 
-      component.validation.select { |_,value| value.present? }.keys
+      component.validation.select { |_, value| value.present? }.keys
     end
   end
 end

data/app/validators/metadata_presenter/validate_schema.rb

@@ -37,7 +37,7 @@ class MetadataPresenter::ValidateSchema
       JSON::Validator.add_schema(jschema)
       JSON::Validator.schema_for_uri(schema_name).schema
     rescue Errno::ENOENT
-      raise SchemaNotFoundError.new("Schema not found => #{schema_name}")
+      raise SchemaNotFoundError, "Schema not found => #{schema_name}"
     end
   end
 end

data/lib/metadata_presenter/test_helpers.rb

@@ -5,7 +5,7 @@ module MetadataPresenter
     end
 
     def fixtures_directory
-      @_fixtures_directory ||=
+      @fixtures_directory ||=
         Pathname.new(MetadataPresenter::Engine.root.join('fixtures'))
     end
 

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.22.0'
+  VERSION = '0.23.0'.freeze
 end

metadata

@@ -1,35 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: govuk_design_system_formbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 2.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.4
-    - - "<"
+        version: 2.1.5
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -45,35 +53,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: govuk_design_system_formbuilder
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 6.0.3.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 6.0.3.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: brakeman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: better_errors
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +143,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +185,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: site_prism
+  name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-console
+  name: site_prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,7 +213,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +227,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: brakeman
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="