component_party 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73fbc5bb12f3bbbd726ca0314afeac72fddf416b0adf9c0a324c74722675349d
-  data.tar.gz: 251c72e7dac7ad1328ba42742fa3439cfeb69b009efd1937ef981bcdf7a90aa1
+  metadata.gz: 374d3d5e8c631909ac9a9837e0b29cdde69b51dcd9b21b05677201181d15f125
+  data.tar.gz: 168a86d646ccaa73d383031086f9590e6ed996ac07d20015e1ec2fb86d9cdea7
 SHA512:
-  metadata.gz: 46b22b5d9a78f1927117e331ddcd90d07806e77f8118fe46683c281767485805ac30731aa91d8f26a0aca6f37f81255ff3b2af433bc533582c1c6c5afc92abd3
-  data.tar.gz: eac0e6c9ca872d6ba997db86c52a869186bb9e4b528746b65bf35b2797a7e1932cad5a0228c6410c25f9f172bee58ce11cd5710abb5371fa7546ede646385a35
+  metadata.gz: 1fcb150b074eca2c99f5b3a6f41366e029aaca44445ca63e9db4d8183ea323991b7543ae9654f95d0e8b08a91a3578305d9a3d31b1e3b2a3138044b19d796272
+  data.tar.gz: 41d29e1f5adac97f4c5cf4aa225c726b02174c41ae9bac65d92552bcda3b2dd9f25d5b2fdbe3791ea231a544420bed1bd19b4ba2cefab39d9717a5a89ca0f302

data/.travis.yml

@@ -1,11 +1,18 @@
 env:
   global:
     - CC_TEST_REPORTER_ID=2373c9fa7226b98ccf8bef72f133bc37b4cef57085c027e144a3b2fc71ce7558
+    - CI_NODE_TOTAL=5
   matrix:
-    - "RAILS_VERSION=4.2.0"
-    - "RAILS_VERSION=5.0.0"
-    - "RAILS_VERSION=5.1.0"
-    - "RAILS_VERSION=5.2.0"
+    - "RAILS_VERSION=4.2.0 BUNDLER_VERSION=1.17.3 CI_NODE_INDEX=1"
+    - "RAILS_VERSION=5.0.0 BUNDLER_VERSION=2.0.2 CI_NODE_INDEX=2"
+    - "RAILS_VERSION=5.1.0 BUNDLER_VERSION=2.0.2 CI_NODE_INDEX=3"
+    - "RAILS_VERSION=5.2.0 BUNDLER_VERSION=2.0.2 CI_NODE_INDEX=4"
+    - "RAILS_VERSION=6.0.0 BUNDLER_VERSION=2.0.2 CI_NODE_INDEX=5"
+
+branches:
+  only:
+    - develop
+    - master
 
 language: ruby
 
@@ -13,11 +20,16 @@ cache:
   bundler: true
 
 rvm:
- - "2.4.1"
+ - "2.5.0"
 
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 
 before_install:
+  - 'curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"'
+  - 'unzip awscli-bundle.zip'
+  - './awscli-bundle/install -b ~/bin/aws'
+  - 'export PATH=~/bin:$PATH'
+  - gem install -v ${BUNDLER_VERSION} bundler --no-rdoc --no-ri
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
 
@@ -33,4 +45,7 @@ notifications:
 
 after_script:
   - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter format-coverage -t simplecov -o ./coverage/codeclimate.$CI_NODE_INDEX.json ./coverage/spec/.resultset.json; fi
+  - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then aws s3 sync coverage/ "s3://componentparty/coverage/$TRAVIS_BUILD_NUMBER"; fi
+  - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then aws s3 sync "s3://componentparty/coverage/$TRAVIS_BUILD_NUMBER" coverage/; fi
   - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter sum-coverage --output - --parts $CI_NODE_TOTAL coverage/codeclimate.*.json | ./cc-test-reporter upload-coverage --input -; fi
+  - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage; fi 

data/component_party.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'component_party'
-  s.version     = '0.8.0'
+  s.version     = '0.9.0'
   s.date        = '2019-03-28'
   s.summary     = 'Stop using views: frontend components architecture for Ruby on Rails.'
   s.description = 'Frontend components for Ruby on Rails: group your view logic, html and css files in components to be rendered from views or directly from controllers.'
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
-  s.add_dependency 'rails', '>= 4.2.0', '< 6'
+  s.add_dependency 'rails', '>= 4.2', '<= 6.0'
 
   # Quality Control
   s.add_development_dependency 'rspec'

data/lib/component_party/action_view/component_renderer.rb

@@ -11,13 +11,19 @@ module ComponentParty
       end
 
       def render(context, options)
-        options[:file] = template_path_from_component_path(options[:component])
+        options[:template] = template_path_from_component_path(options[:component])
         options[:locals] = { vm: create_view_model(context, options) }
         super(context, options)
       end
 
-      def render_template(template, layout_name = nil, locals = nil) #:nodoc:
-        super(decorate_template(template), layout_name, locals)
+      if Rails::VERSION::STRING.start_with?('6')
+        def render_template(context, template, layout_name = nil, locals = nil) #:nodoc:
+          super(context, decorate_template(template), layout_name, locals)
+        end
+      else
+        def render_template(template, layout_name = nil, locals = nil) #:nodoc:
+          super(decorate_template(template), layout_name, locals)
+        end
       end
 
       def decorate_template(template)

data/lib/component_party/action_view/renderer.rb

@@ -2,7 +2,13 @@ module ComponentParty #:nodoc:
   # Renders a given component
   module ActionView
     module Renderer
-      def render(context, options)
+      method_to_override = if Rails::VERSION::STRING.start_with?('6')
+                             'render_to_object'
+                           else
+                             'render'
+                           end
+
+      define_method(method_to_override) do |context, options|
         if options.key?(:component)
           normalize_data_for_component_rendering!(context, options)
           ComponentParty::ActionView::ComponentRenderer.new(lookup_context, options[:component]).render(context, options)
@@ -22,15 +28,15 @@ module ComponentParty #:nodoc:
       #   :template=>"new",
       #   :layout=> a Proc
       # }
-      # rubocop:disable Metrics/LineLength
       def normalize_component_path!(_context, options)
         if options[:component] == true
-          options[:component] = Pathname.new(ComponentParty.configuration.component_folder_for_actions).join(options[:prefixes].first.to_s, options[:template]).to_s
+          options[:component] = Pathname.new(options[:prefixes].first.to_s).join(options[:template]).to_s
+          options[:prefixes] = [ComponentParty.configuration.component_folder_for_actions]
         else
           options[:component]
+          options[:prefixes] = []
         end
       end
-      # rubocop:enable all
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: component_party
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Vinícius Oyama
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+        version: '4.2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+        version: '4.2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement