lite-component 1.0.11 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d80713505881c685b68cc3a8a5cb9442bec310351d4225b151f759770c12e5e
-  data.tar.gz: 87a603392431946bed13580336860d07a750cac9af35e27a087fc4402b506572
+  metadata.gz: 2d9bdfa9c79cc9a007b6b1e35c42072dcbbbf6cf319c09b7d69738ef0133f284
+  data.tar.gz: 790df7f0ced92eec0f4403740ac4e433dc80e11f1f5ab2305d3d2fe935359afd
 SHA512:
-  metadata.gz: a91cf54a2dbeff070e6a671cf59a1006d037666ea3552c8aa4ab68f943fa1e2cbc597399dcf5c959267a729c10abe4f3e5229e18fe8364e4603ca6222c42ad1e
-  data.tar.gz: a32a1cf7dad38912c7b54cd80b4dbb4635c2a794216f98395f229045e210e2f2f0d021cde47cf2b856ef6f66ad59d32ed322320308c20a071cec83280b6ebc24
+  metadata.gz: bda36b4310e86b25b3f1f6e57b24a42b8a1eec4afe178bcdcf4886a7bffcd025de9110a15aba00589062c3aacf5ae5294763acccfa70bd2690f8a45229db4196
+  data.tar.gz: 139d5bd118979cdb4d6ed7edcfe5f5e95e34d517aba028a5ef6bd462fe5955e7a2c36bed6dd7381bd79bba81eb69b95d48d3dbbc65f09eb870d26d9e507b917f

data/.rubocop.yml

@@ -1,10 +1,16 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
   DisplayStyleGuide: true
+  NewCops: enable
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
     - 'spec/**/**/*'
@@ -44,3 +50,5 @@ Style/HashTransformKeys:
   Enabled: true
 Style/HashTransformValues:
   Enabled: true
+Style/SlicingWithRange:
+  Enabled: false

data/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2021-01-20
+### Added
+- Add improved collection rendering
+### Removed
+- Collection class is no longer needed
+
 ## [1.0.11] - 2020-04-24
 ### Added
 - Added `to_h` and  `to_hash` aliases for dumping locals

data/Gemfile.lock

@@ -1,59 +1,60 @@
 PATH
   remote: .
   specs:
-    lite-component (1.0.11)
+    lite-component (1.1.0)
       actionview
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.1)
+      actionview (= 6.1.1)
+      activesupport (= 6.1.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.1.1)
+      activesupport (= 6.1.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.2.2)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ast (2.4.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.1)
     builder (3.2.4)
     colorize (0.8.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
-    diff-lcs (1.3)
-    erubi (1.9.0)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
     fasterer (0.8.3)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    i18n (1.8.2)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    loofah (2.5.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
-    rack (2.2.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -61,50 +62,57 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    ruby_parser (3.14.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.1.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby_parser (3.15.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.14.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    sexp_processor (4.15.2)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -118,6 +126,7 @@ DEPENDENCIES
   rspec
   rubocop
   rubocop-performance
+  rubocop-rake
   rubocop-rspec
 
 BUNDLED WITH

data/lib/lite/component.rb

@@ -2,7 +2,7 @@
 
 require 'action_view'
 
-%w[version engine iteration collection locals base].each do |filename|
+%w[version engine iteration locals base].each do |filename|
   require "lite/component/#{filename}"
 end
 

data/lib/lite/component/base.rb

@@ -8,23 +8,24 @@ module Lite
       include ActionView::Helpers
 
       attr_accessor :components
-      attr_reader :context, :options
-      attr_writer :iteration
+      attr_reader :context, :iteration, :options
 
-      # rubocop:disable Lint/UnusedMethodArgument
+      # rubocop:disable Layout/LineLength
       def initialize(context, options = {}, &block)
+        @components = []
+        @iteration = (options[:locals] || {}).delete(:iteration) || Lite::Component::Iteration.new(1, 0)
+
         @context = context
         @options = default_options.deep_merge(options)
 
-        @components = []
-
-        yield(self) if block_given?
+        yield(self) if block
       end
-      # rubocop:enable Lint/UnusedMethodArgument
+      # rubocop:enable Layout/LineLength
 
       alias helpers context
       alias c context
       alias h helpers
+      alias i iteration
 
       class << self
 
@@ -53,12 +54,6 @@ module Lite
         components << [name, options, block]
       end
 
-      def iteration
-        @iteration ||= Lite::Component::Iteration.new(1, 0)
-      end
-
-      alias i iteration
-
       def locals
         @locals ||= Lite::Component::Locals.new(options[:locals])
       end
@@ -69,13 +64,9 @@ module Lite
         return unless render?
 
         collection = options.delete(:collection)
-        return render_content if collection.nil? || !collection.respond_to?(:each)
+        return render_collection(collection) if collection.respond_to?(:each)
 
-        Lite::Component::Collection.render(
-          collection,
-          component: self,
-          spacer_template: options.delete(:spacer_template)
-        )
+        render_content
       end
 
       def render?
@@ -109,6 +100,22 @@ module Lite
         }
       end
 
+      # rubocop:disable Metrics/AbcSize
+      def render_collection(collection)
+        collection_size = collection.size
+        spacer_template = options.delete(:spacer_template)
+
+        results = collection.each_with_object([]).with_index do |(item, array), index|
+          array << context.render(spacer_template) if index.positive? && spacer_template
+          iteration = Lite::Component::Iteration.new(collection_size, index)
+          instance = self.class.new(context, locals: { object: item, iteration: iteration })
+          array << instance.render
+        end
+
+        context.safe_join(results)
+      end
+      # rubocop:enable Metrics/AbcSize
+
       def yield_content
         components.map do |name, options, block|
           klass = self.class.build(name)

data/lib/lite/component/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Component
 
-    VERSION ||= '1.0.11'
+    VERSION ||= '1.1.0'
 
   end
 end

data/lite-component.gemspec

@@ -46,5 +46,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-component
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors:
 - Juan Gomez
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - j.gomez@drexed.com
 executables: []
@@ -166,7 +180,6 @@ files:
 - lib/generators/rails/templates/component.scss
 - lib/lite/component.rb
 - lib/lite/component/base.rb
-- lib/lite/component/collection.rb
 - lib/lite/component/engine.rb
 - lib/lite/component/iteration.rb
 - lib/lite/component/locals.rb
@@ -176,7 +189,7 @@ homepage: http://drexed.github.io/lite-component
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: Generate component from collections of data points
 test_files: []

data/lib/lite/component/collection.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-module Lite
-  module Component
-    class Collection
-
-      attr_reader :collection, :component, :spacer_template
-
-      def initialize(collection, component:, spacer_template: nil)
-        @collection = collection
-        @component = component
-        @spacer_template = spacer_template
-      end
-
-      class << self
-
-        def render(collection, component)
-          klass = new(collection, component)
-          klass.render
-        end
-
-      end
-
-      def render
-        component.context.safe_join(iterated_collection)
-      end
-
-      private
-
-      def collection_size
-        @collection_size ||= begin
-          if collection.respond_to?(:size)
-            collection.size
-          elsif collection.respond_to?(:to_a)
-            collection.to_a.size
-          elsif collection.respond_to?(:to_hash)
-            collection.to_hash.size
-          end
-        end
-      end
-
-      # rubocop:disable Metrics/AbcSize
-      def iterated_collection
-        collection.each_with_object([]).with_index do |(object, array), index|
-          component.iteration = Lite::Component::Iteration.new(collection_size, index)
-          component.options.deep_merge!(locals: { object: object, iteration: component.iteration })
-          content = component.render_content
-          next if content.nil?
-
-          array << content
-          next unless spacer_template && !component.iteration.last?
-
-          array << component.context.render(spacer_template)
-        end
-      end
-      # rubocop:enable Metrics/AbcSize
-
-    end
-  end
-end