glib-web 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8472590ad38171de55b2e30bd3f37cceb15987354bc55ec7a1f892bd597d349f
-  data.tar.gz: eb88de5c1b0e2a85f51e70270735245f96af992085a7749f4afe54ee7a98377c
+SHA1:
+  metadata.gz: c258b37bbad81871f329c41e5b854b5b6563fb4f
+  data.tar.gz: 3e8d5f94006a46084869252b667d0c9e405de569
 SHA512:
-  metadata.gz: 46f2e0c0c52abf0c9f6e48fd8b9a42183108494c76b6849300482a97449acadb17ccb3603727641871478ed09f3b4192cd676d7e69a85f6f0bae76456108f136
-  data.tar.gz: 2777afc7ab675a44a67824514bef69d1afada4b4fd608136f485e6333cd5e464c9bceae3a50582a3611f0753ae5df31d85457c25f316fb2ad184ce7f7469aa2f
+  metadata.gz: bece2c2bae109009e5b468e9e43cd52591b5c367977a8fec1b623e27876efd28d25a1432bde847943eb310fe62bef9f4e3b1b38ea93924f2767cb9e1a42c4477
+  data.tar.gz: 756e23d1771b4f1dae8eebe2d4d0f0c4f5397fc8762baac96c2c5bfe7ffc73a6fcab6cad2575d8aae760d84570edffeb456231d70a815918c234a8e5153895bf

data/app/controllers/glib/home_controller.rb

@@ -1,6 +1,6 @@
 module Glib
   class HomeController < ApplicationController
-    if glib_auth_inited?
+    if try(:glib_auth_inited?)
       skip_before_action :glib_load_resource
       skip_before_action :glib_authorize_resource
     end

data/app/views/json_ui/garage/actions/_dialogs.json.jbuilder

@@ -79,20 +79,26 @@ section.rows builder: ->(template) do
   end
 
   template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do
-    provider = {
-      name: "facebook",
-      webRequestUrl: user_facebook_omniauth_authorize_url(format: nil, _render: nil),
-      requestUrl: user_facebook_omniauth_authorize_url(format: nil),
-      clientId: Devise.omniauth_configs[:facebook].strategy[:client_id],
-      permissions: Devise.omniauth_configs[:facebook].strategy[:scope],
-      redirectUrl: user_facebook_omniauth_callback_url(format: nil)
-    }
-
-    action.dialogs_oauth provider: provider, providerParamName: "session[oauth_provider]", callbackUrlParamName: "session[[oauth_callback_url]", onSuccess: ->(action) do
-      action.http_post url: json_ui_garage_url(path: 'actions/dialogs_oauth_post'), formData: {
-        authenticity_token: form_authenticity_token
+    if respond_to?(:user_facebook_omniauth_authorize_url)
+      provider = {
+        name: 'facebook',
+        webRequestUrl: user_facebook_omniauth_authorize_url(format: nil, _render: nil),
+        requestUrl: user_facebook_omniauth_authorize_url(format: nil),
+        clientId: Devise.omniauth_configs[:facebook].strategy[:client_id],
+        permissions: Devise.omniauth_configs[:facebook].strategy[:scope],
+        redirectUrl: user_facebook_omniauth_callback_url(format: nil)
       }
+      action.dialogs_oauth provider: provider, providerParamName: 'session[oauth_provider]', callbackUrlParamName: 'session[[oauth_callback_url]', onSuccess: ->(subaction) do
+        subaction.http_post url: json_ui_garage_url(path: 'actions/dialogs_oauth_post'), formData: {
+          authenticity_token: form_authenticity_token
+        }
+      end
+    else
+      action.dialogs_alert message: 'To enable this, set up omniauth using devise'
+      # E.g.
+      # Add `devise :omniauthable, omniauth_providers: %i[facebook]` to user.rb
+      # Add `gem 'omniauth-facebook'` to Gemfile
+      # Add `config.omniauth :facebook` to devise.rb
     end
   end
-
-end
+end

data/app/views/json_ui/garage/lists/_infinite_scroll_section.json.jbuilder

@@ -1,10 +1,20 @@
-json.rows do
+
+# json.rows do
+#   batch_count = 30
+#   batch_count.times do |i|
+#     index = page * batch_count + i
+#     json.child! do
+#       json.template 'thumbnail'
+#       json.title "Item #{index}"
+#     end
+#   end
+# end
+
+section = json_ui_section json
+section.rows builder: ->(row) do
   batch_count = 30
   batch_count.times do |i|
     index = page * batch_count + i
-    json.child! do
-      json.template 'thumbnail'
-      json.title "Item #{index}"
-    end
+    row.thumbnail title: "Item #{index}"
   end
 end

data/app/views/json_ui/garage/notifications/index.json.jbuilder

@@ -1,23 +1,5 @@
 json.title 'Notifications'
 
-# json.ws({
-#   "socket" => {
-#     "endpoint" => "/socket/websocket",
-#     "params" => {
-#       "vsn": "2.0.0"
-#     }
-#   },
-#   # "topic" => "room:30",
-#   # "event" => "comments_updated",
-#   "topic" => "links",
-#   "event" => "new_link_added",
-#   "header" => {
-#     "user_id" => 2,
-#     "prev_item_id" => nil,
-#     "last_item_id" => nil
-#   }
-# })
-
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
 
@@ -31,31 +13,6 @@ page.list firstSection: ->(section) do
 
     template.thumbnail title: 'WebSocket Real-time Update', onClick: ->(action) do
       action.windows_open url: json_ui_garage_url(path: 'notifications/web_socket')
-      # dialogs_notification title: 'Hello World', message: 'This is a notification', onClick: ->(subaction) do
-      #   subaction.dialogs_alert message: 'Perform action'
-      # end
     end
-
-    # template.thumbnail title: 'Send WebSocket Notification', onClick: ->(action) do
-    #   json.action "ws/push"
-    #   json.topic "links"
-    #   json.event "new_link"
-    #   json.payload({
-    #     "club_id": "2",
-    #     "room_id": "30",
-    #     "user_id": "2"
-    #       #  title: "TITLE",
-    #       #  url: "URL"
-    #   })
-
-    #     # "topic": "room:30",
-    #     # "event": "create_comment",
-    #     # "payload": {
-    #     #   "club_id": "2",
-    #     #   "room_id": "30",
-    #     #   "user_id": "2"
-    #     # }
-
-    # end
   end
 end

data/app/views/json_ui/garage/views/_chart_data.json.jbuilder

@@ -14,4 +14,4 @@ if page_index < 3
       json.points (from.month.ago.to_date..to.month.ago.to_date).map { |d| { x: d, y: 100 + rand(40) } }
     end
   ]
-end
+end

data/app/views/json_ui/garage/views/calendar_data.json.jbuilder

@@ -1,34 +1,30 @@
-
-json.events do
-  
-  json.child! do
-    json.start '2018-12-14'
-    json.end '2018-12-17'
-    json.text 'Hackathon'
-    json.onClick do
-      json.action 'dialogs/alert-v1'
-      json.message 'At Town Hall'
+section = json_ui_section json
+section.rows builder: ->(row) do
+  row.custom title: 'Hackathon',
+    extra: {
+      start: '2018-12-14',
+      end: '2018-12-17'
+    },
+    onClick: ->(action) do
+      action.dialogs_alert message: 'At Town Hall'
     end
-  end
 
-  json.child! do
-    json.start '2018-12-30'
-    json.end '2018-12-30'
-    json.text 'Birthday'
-    json.onClick do
-      json.action 'dialogs/alert-v1'
-      json.message 'At home'
+  row.custom title: 'Birthday',
+    extra: {
+      start: '2018-12-30',
+      end: '2018-12-30'
+    },
+    onClick: ->(action) do
+      action.dialogs_alert message: 'At home'
     end
-  end
 
-  json.child! do
-    json.start '2018-12-31'
-    json.end '2018-12-31'
-    json.text 'Conference'
-    json.onClick do
-      json.action 'dialogs/alert-v1'
-      json.message 'In Perth'
+  row.custom title: 'Conference',
+    extra: {
+      start: '2018-12-31',
+      end: '2019-01-02'
+    },
+    onClick: ->(action) do
+      action.dialogs_alert message: 'In Perth'
     end
-  end
 
 end

data/lib/glib/crypt.rb

@@ -1 +1 @@
-require_relative './crypt/utils'
+require_relative './crypt/utils'

data/lib/glib/dynamic_text.rb

@@ -1 +1 @@
-require_relative './dynamic_text/config'
+require_relative './dynamic_text/config'

data/lib/glib/json_crawler/http.rb

@@ -58,7 +58,9 @@ module Glib
             history << url
           end
 
-          @context.assert_match(URI_REGEXP, url)
+          if !URI_REGEXP.match(url)
+            raise "Invalid URL: `#{url}`. Make sure to use the absolute URL."
+          end
 
           http_header = {
             'Client-DeviceOS' => user[:device],
@@ -76,7 +78,7 @@ module Glib
             @context.send(method, url, params: params, headers: http_header)
             raw_response = @context.response
             response = Response.new(raw_response.code.to_i, raw_response.headers, raw_response.media_type, raw_response.body)
-            
+
             if (controller = @context.controller)
               Glib::JsonCrawler::Coverage.coverage_files.add(controller.class.instance_method(controller.action_name).source_location.first)
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - ''
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ''