pagelet_rails 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a94ff187b504886484c7a6ea7f3e7606ee8a1b4
-  data.tar.gz: da24f459abc2b52b87bc687332467e5d37383bb3
+  metadata.gz: 97462c6b25fab3b82e8fe2bba67bb3016e55d24e
+  data.tar.gz: 5ebaa4854e612096b42136b486fc4f7f1cdad17e
 SHA512:
-  metadata.gz: 944a95a469bf4d377f17ba270bdd2dcf53034e6218b39415ae5529b60e649b51d8f0d427ef0d52e5e94ad1acd5083d20fc02ab42d14b065415b8d52456955507
-  data.tar.gz: bfec15b0d980d68efac76521ef017ef82ecd0713babce334f1e8ed5708e5a1e87eda3ff83c57dd72ac73c6579517d6512f701ac5e0623320525825a8d5371cf8
+  metadata.gz: a6ac654ef6e579b77207b9d492c030675f35f6f5d2ca2b1767d520b95702a337ae455d07202a14f41749b0ed4451f042edc2572657780accbce91e4778c33f0e
+  data.tar.gz: 5cb1c8361d0f6223dde0b989b2dc43923144ac4c2bbd8abe7b1643631d3e144b79f5528b4b9dfae1f30d88242e7208518be42f959f3c0a70e4a0795b780f0055

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.1.8
+
+- Fix executable "rails" conflicts with railties (#11)
+- Added trial feature to trigger updates
+
 ### 0.1.7
 
 - fixed Rails 5.1

data/README.md

@@ -171,12 +171,17 @@ You can specify html attributes to pagelet with `html` option
 
 ### placeholder
 
+Configuration for placeholder before pagelet is loaded.
+
 ```erb
 <%= pagelet :pagelets_current_time, placeholder: { text: 'Loading...', height: 300 } %>
 ```
 
-Configuration for placeholder before pagelet is loaded.
+or use your own placeholder template
 
+```erb
+ <%= pagelet :pagelets_current_time, placeholder: { view: 'path_to_template' } %>
+```
 
 ### other
 

data/app/assets/javascripts/pagelet_rails.js

@@ -75,7 +75,7 @@
   };
 
   root.loadPagelets = function(selector) {
-    selector = selector || '[data-widget-url]';
+    selector = selector || '[data-pagelet-load]';
     var groups = {};
 
     $(selector).each(function(index, elem) {
@@ -112,14 +112,26 @@
     }
   };
 
-  root.pageletArrived = function(id, content) {
+  root.pageletArrived = function(id, content, tags) {
     root.placeToContainer(id, content);
     root.processDataRemoteTags();
+    root.tagsChanged(id, tags);
     $(document).trigger('pagelet-loaded');
   };
 
   root.placeToContainer = function(id, content) {
-    $('#' + id).html(content);
+    $('#' + id).replaceWith(content);
+  };
+
+  root.tagsChanged = function(id, tags) {
+    if (tags && tags.length > 0) {
+      var selector = $();
+      tags.forEach(function(tag) {
+        selector = selector.add('[data-pagelet-tags~="' + tag + '"]:not(#' + id + ')');
+      });
+
+      root.loadPagelets(selector);
+    }
   };
 
   root.processDataRemoteTags = function() {

data/app/controllers/pagelet_proxy_controller.rb

@@ -10,7 +10,7 @@ class PageletProxyController < ::ApplicationController
     response.stream.write "\n"
 
     @urls.each do |url|
-      response.stream.write pagelet(url)
+      response.stream.write pagelet(url, skip_parent_params: true)
       response.stream.write "\n\n//\n\n"
     end
   ensure

data/app/helpers/pagelets_helper.rb

@@ -10,7 +10,16 @@ module PageletsHelper
     html_opts[:class] = classes.join(' ')
 
     html_opts['data-pagelet-container'] = true
-    html_opts['data-pagelet-options'] = pagelet_encoded_original_options
+    html_opts['data-pagelet-options'] = pagelet_encoded_original_options(
+      html: {id: html_opts[:id]}
+    )
+
+    if Rails.env.development?
+      html_opts['data-debug'] = PageletRails::Encryptor.decode(html_opts['data-pagelet-options'])
+    end
+
+    html_opts['data-pagelet-tags'] = identified_by.join(' ')
+    html_opts['data-widget-url'] = url_for(params.to_unsafe_h)
 
     if pagelet_options.ajax_group
       html_opts['data-pagelet-group'] = pagelet_options.ajax_group
@@ -66,18 +75,20 @@ module PageletsHelper
       p_options.deep_merge! html: { id: html_id }
 
       add_pagelet_stream html_id, &Proc.new {
-        pagelet path, p_options.merge(remote: false, skip_container: true)
+        pagelet path, p_options.merge(remote: false)
       }
     end
 
-    parent_params =
-      if params.respond_to?(:to_unsafe_h)
-        params.to_unsafe_h
-      else
-        params.to_h
-      end
+    unless p_options.delete(:skip_parent_params)
+      parent_params =
+        if params.respond_to?(:to_unsafe_h)
+          params.to_unsafe_h
+        else
+          params.to_h
+        end
 
-    p_options.deep_merge! parent_params: parent_params
+      p_options.deep_merge!(parent_params: parent_params)
+    end
 
     c = controller_class.new
     c.pagelet_options p_options

data/app/views/layouts/pagelet_rails/container.erb

@@ -1,8 +1,3 @@
-<% if pagelet_request? || pagelet_options.skip_container %>
+<%= content_tag :div, html_container_attributes do %>
   <%= content_for?(:content) ? yield(:content) : yield %>
-
-<% else %>
-  <%= content_tag :div, html_container_attributes do %>
-    <%= content_for?(:content) ? yield(:content) : yield %>
-  <% end %>
 <% end %>

data/lib/pagelet_rails/concerns/controller.rb

@@ -8,6 +8,9 @@ module PageletRails::Concerns::Controller
     include PageletRails::Concerns::Options
     include PageletRails::Concerns::Cache
     include PageletRails::Concerns::Placeholder
+    include PageletRails::Concerns::Tags
+
+    include PageletsHelper
 
     prepend_before_action :merge_original_pagelet_options
     prepend_before_action :append_pagelet_view_paths
@@ -52,11 +55,12 @@ module PageletRails::Concerns::Controller
     if params[:original_pagelet_options]
       opts = PageletRails::Encryptor.decode(params[:original_pagelet_options])
       pagelet_options(opts)
+      pagelet_options(original_options: opts)
     end
   end
 
-  def pagelet_encoded_original_options
-    encode_data = pagelet_options.original_options.to_h.except('remote')
+  def pagelet_encoded_original_options new_opts = {}
+    encode_data = pagelet_options.original_options.to_h.except('remote').merge(new_opts)
     PageletRails::Encryptor.encode(encode_data)
   end
 
@@ -79,4 +83,10 @@ module PageletRails::Concerns::Controller
     render_remotely
   end
 
+  def redirect_to *args
+    options = args.extract_options!
+    new_params = options.merge(original_pagelet_options: pagelet_encoded_original_options)
+
+    render plain: pagelet(url_for(*args, new_params))
+  end
 end

data/lib/pagelet_rails/concerns/placeholder.rb

@@ -31,7 +31,7 @@ module PageletRails::Concerns::Placeholder
       render body: "<!--#include virtual=\"#{path}\" -->"
     else
       if pagelet_options.remote != :stream
-        pagelet_options html: { 'data-widget-url' => url_for(data) }
+        pagelet_options html: { 'data-pagelet-load' => 'true' }
       end
 
       default_view = '/layouts/pagelet_rails/loading_placeholder'

data/lib/pagelet_rails/concerns/response_wrapper.rb

@@ -21,7 +21,7 @@ module PageletRails::Concerns::ResponseWrapper
           js = ActionController::Base.helpers.escape_javascript html
 
           html = ActionController::Base.helpers.raw(
-            "PageletRails.pageletArrived('#{id}', '#{js}');"
+            "PageletRails.pageletArrived('#{id}', '#{js}', #{trigger_change.to_json.html_safe});"
           )
 
           self.response_body = [html]

data/lib/pagelet_rails/concerns/tags.rb

@@ -0,0 +1,24 @@
+module PageletRails::Concerns::Tags
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :identified_by
+    helper_method :trigger_change
+  end
+
+  def trigger_change tag = nil
+    @trigger_change ||= []
+    if tag.present?
+      @trigger_change << tag
+    end
+    @trigger_change
+  end
+
+  def identified_by tag = nil
+    @identified_by ||= []
+    if tag.present?
+      @identified_by << tag
+    end
+    @identified_by
+  end
+end

data/lib/pagelet_rails/version.rb

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

data/lib/pagelet_rails.rb

@@ -22,6 +22,7 @@ module PageletRails
       autoload :Placeholder
       autoload :ResponseWrapper
       autoload :Routes
+      autoload :Tags
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagelet_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Anton Katunin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,8 +140,7 @@ description: Improve perceived performance of your rails application with minimu
   effort
 email:
 - antulik@gmail.com
-executables:
-- rails
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -166,7 +165,6 @@ 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
@@ -180,6 +178,7 @@ files:
 - lib/pagelet_rails/concerns/placeholder.rb
 - lib/pagelet_rails/concerns/response_wrapper.rb
 - lib/pagelet_rails/concerns/routes.rb
+- lib/pagelet_rails/concerns/tags.rb
 - lib/pagelet_rails/encryptor.rb
 - lib/pagelet_rails/engine.rb
 - lib/pagelet_rails/router.rb

data/bin/rails

@@ -1,13 +0,0 @@
-#!/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'