kamiliff 0.16.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923af087cbb7e01f33610fa15c0f57c28d7d341f57e21ab0e896e6daa66f2301
-  data.tar.gz: c215fab6cc29f24acdd7cf94b308e7a3561edd3818335a8f0da208ead09fe238
+  metadata.gz: d812733308fb2c84752e60e36240a89031899474b0e6ab2fa49e8ce4d0ebe0e2
+  data.tar.gz: 6843aa34d820b9d9f1f30099d7afd02afddec981c86c944ec46a914a4b027cc7
 SHA512:
-  metadata.gz: 5d2aa3a7ac569d545d8aa6b83b1479ed3f260951bef938aaa8661f36aa48dfadfe0ad50cd62696d36ee5358bb0cbb5ba8e1c5e757b00e7c6eb36ddac23b0e4dc
-  data.tar.gz: 87cf2a57d14ac68b80c914a302a483d714972ff5bba961788841bbadf50d31ca55ee066645286713afa57db3cf2d018890e83021c91132bec249f242e7d42887
+  metadata.gz: '085dbadbcae74022d46f4d9544d59e5a61cb47e0b7e0c2c323fe4e224c418dfdd7e83f83dee728672ba2f66db124513276869d5f9334e9736760bb3406d96b64'
+  data.tar.gz: c736f723a51c9b743770ee1ed2a7204ceaed298032be0ac2a09854ada1850ba83372b7a128cc925a0748c92e93cdfa52c72ad57cb9ee5813d98cfb4832475b5a

data/app/controllers/liff_controller.rb

@@ -1,5 +1,5 @@
 
-class LiffController < ApplicationController
+class LiffController < ActionController::Base
   layout false, only: :route
 
   def entry
@@ -32,9 +32,12 @@ class LiffController < ApplicationController
     # env = {Rack::RACK_INPUT => StringIO.new}
 
     res = Rails.application.routes.router.serve(request)
+    # res[0]: http state code
+    # res[1]: headers
+    # res[2]: response
     res[2].body
-  rescue Exception => e
-    res[2].to_s
+  rescue NoMethodError => e
+    res&.to_s || e.full_message
   end
 
   def source_info
@@ -45,11 +48,14 @@ class LiffController < ApplicationController
     source_group_id = context["roomId"] || context["groupId"] || context["userId"]
     source_user_id = context["userId"]
 
+    profile = params["profile"]
+
     {
       platform_type: 'line',
       source_type: source_type,
       source_group_id: source_group_id,
       source_user_id: source_user_id,
+      profile: profile
     }
   end
 end

data/app/helpers/liff_helper.rb

@@ -1,6 +1,10 @@
 module LiffHelper
   def liff_path(params)
     liff = LiffService.new(params)
-    "#{liff.url}/liff_entry?#{params.to_query}"
+    if ENV["LIFF_MODE"]&.downcase == "replace"
+      return "#{liff.url}/liff_entry?#{params.to_query}"
+    end
+    # liff mode is Concatenate
+    "#{liff.url}?#{params.to_query}"
   end
 end

data/app/views/layouts/liff.html.erb

@@ -5,14 +5,28 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <meta name="viewport" content="width=device-width, initial-scale=1" >
-    <script src="https://static.line-scdn.net/liff/edge/2.1/sdk.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
+    <script src="https://static.line-scdn.net/liff/edge/versions/2.5.0/sdk.js"></script>
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <% asset_application_js_path = Dir.glob("#{Rails.root}/app/assets/javascripts/application.*").first %>
+    <% if asset_application_js_path.present? %>
+      <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <% end %>
+
+    <% webpacker_application_js_path = Dir.glob("#{Rails.root}/app/javascript/packs/application.*").first %>
+    <% if webpacker_application_js_path.present? %>
+      <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <% end %>
+
+    <% has_jquery = [asset_application_js_path, webpacker_application_js_path].compact.map do |path|
+      (File.read(path) =~ /jquery/i).present?
+    end.any? %>
 
+    <% unless has_jquery %>
+      <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+    <% end %>
+
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
     <script>
       function liff_send_text_message(text){
         liff.sendMessages(

data/app/views/liff/entry.html.erb

@@ -50,12 +50,15 @@
       if (!liff.isLoggedIn()) {
         liff.login();
       }else{
-        const data = {};
-        data.context = liff.getContext();
-        data.path = "<%= @liff.path %>";
-        <% if !@need_reload %>
-          route(data);
-        <% end %>
+        liff.getProfile().then(profile => {
+          const data = {};
+          data.context = liff.getContext();
+          data.profile = profile;
+          data.path = "<%= @liff.path %>";
+          <% if !@need_reload %>
+            route(data);
+          <% end %>
+        })
       }
     })
     .catch((err) => {

data/lib/kamiliff/services/liff_service.rb

@@ -20,7 +20,7 @@ class LiffService
     self.size = size.to_s.upcase
     raise "liff_size should be compact, tall or full." unless size.in? %w[COMPACT TALL FULL]
     self.url = ENV["LIFF_#{size}"]
-    raise "LIFF_#{size} should be in the env variables" if url.empty?
+    raise "LIFF_#{size} should be in the env variables" if url.blank?
     self.id = url[(url.rindex('/')+1)..-1]
   end
 end

data/lib/kamiliff/version.rb

@@ -1,3 +1,3 @@
 module Kamiliff
-  VERSION = '0.16.0'
+  VERSION = '0.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamiliff
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.21.0
 platform: ruby
 authors:
 - etrex kuo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,7 +54,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,8 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An easy way to use LINE Front-end Framework(LIFF) on rails.
 test_files: []