pagelet_rails 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97462c6b25fab3b82e8fe2bba67bb3016e55d24e
-  data.tar.gz: 5ebaa4854e612096b42136b486fc4f7f1cdad17e
+  metadata.gz: d4e4d6d941dd7ae780bb1e934f157e092fa3a09c
+  data.tar.gz: 59f346de0c8ae0a2b8c909d6e15baad70fd73179
 SHA512:
-  metadata.gz: a6ac654ef6e579b77207b9d492c030675f35f6f5d2ca2b1767d520b95702a337ae455d07202a14f41749b0ed4451f042edc2572657780accbce91e4778c33f0e
-  data.tar.gz: 5cb1c8361d0f6223dde0b989b2dc43923144ac4c2bbd8abe7b1643631d3e144b79f5528b4b9dfae1f30d88242e7208518be42f959f3c0a70e4a0795b780f0055
+  metadata.gz: 5f834814d7a35ffe3e71079961fee5225fa51516a9c152565372d43924f8df8ea7b3cfc0e94320a4cd4d77801ba84202fad58fa0ec89dc778d9b0bb6de98e9be
+  data.tar.gz: 9ebfd6f85d0481e4878285f0d165d9207e29903b514dfcf4a0dd08a5355400657c414c5156b7c4222b412cd0ecf6bfaff7a23fd1bb1edd4ee771aa9c9ee03a6b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.2.0
+
+- Fixed bug when original html class is lost (#12)
+- Simplified rendering, now it always renders outside div container
+- New feature to trigger refresh of other pagelets on the page (`identified_by` and `trigger_change` methods)
+- `redirect_to` inside pagelet does not affect the main page when redirect destination is also pagelet
+
 ### 0.1.8
 
 - Fix executable "rails" conflicts with railties (#11)

data/app/helpers/pagelets_helper.rb

@@ -1,7 +1,7 @@
 module PageletsHelper
 
   def html_container_attributes
-    html_opts = pagelet_options.html || {}
+    html_opts = pagelet_options.html.deep_dup || {}
     classes = html_opts.fetch(:class, '').split(' ')
     classes << "pagelet-#{controller_name}"
     classes << "pagelet-#{controller_name}-#{action_name}"

data/bin/rails

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/pagelet_rails/engine', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/lib/pagelet_rails/concerns/controller.rb

@@ -60,7 +60,8 @@ module PageletRails::Concerns::Controller
   end
 
   def pagelet_encoded_original_options new_opts = {}
-    encode_data = pagelet_options.original_options.to_h.except('remote').merge(new_opts)
+    encode_data = pagelet_options.original_options.to_h
+      .with_indifferent_access.except('remote').deep_merge(new_opts)
     PageletRails::Encryptor.encode(encode_data)
   end
 
@@ -84,9 +85,23 @@ module PageletRails::Concerns::Controller
   end
 
   def redirect_to *args
-    options = args.extract_options!
-    new_params = options.merge(original_pagelet_options: pagelet_encoded_original_options)
+    begin
+      redirect_url = url_for(*args)
+      path_opts = Rails.application.routes.recognize_path(redirect_url)
+    rescue ActionController::RoutingError
+      return super
+    end
+
+    controller_class = path_opts[:controller].camelize.concat('Controller').safe_constantize
+    is_pagelet = controller_class && controller_class.include?(PageletRails::Concerns::Controller)
+
+    if is_pagelet
+      options = args.extract_options!
+      new_params = options.merge(original_pagelet_options: pagelet_encoded_original_options)
 
-    render plain: pagelet(url_for(*args, new_params))
+      render plain: pagelet(url_for(*args, new_params))
+    else
+      super
+    end
   end
 end

data/lib/pagelet_rails/version.rb

@@ -1,3 +1,3 @@
 module PageletRails
-  VERSION = '0.1.8'
+  VERSION = '0.2.0'
 end

data/pagelet_rails.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagelet_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton Katunin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - app/views/layouts/pagelet_rails/container.erb
 - app/views/layouts/pagelet_rails/inner.erb
 - app/views/layouts/pagelet_rails/loading_placeholder.erb
+- bin/rails
 - config/routes.rb
 - gemfiles/rails_4.2.8.gemfile
 - gemfiles/rails_5.0.2.gemfile