glib-web 0.4.74 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2809128e8efe1991ed5a12aeb78637f4e4d4f7af
-  data.tar.gz: 4896bb9197227a070abf19f033e54d4dd32efff9
+  metadata.gz: c258b37bbad81871f329c41e5b854b5b6563fb4f
+  data.tar.gz: 3e8d5f94006a46084869252b667d0c9e405de569
 SHA512:
-  metadata.gz: bbca01d80afbe23375f5caf90011dffed09e01c6cad9955d270e894934a4fd87d34afca41b495634c813985f6a9606e82e63714faedca19f5a05b527321f6678
-  data.tar.gz: b7d4840eeeae5194b8966b4458eab5674f6c9c50ede361add2068ce2d699526fb2a076671ea34cba885c863e76814fbd3c9bda7a55550923c635e936bdf469d9
+  metadata.gz: bece2c2bae109009e5b468e9e43cd52591b5c367977a8fec1b623e27876efd28d25a1432bde847943eb310fe62bef9f4e3b1b38ea93924f2767cb9e1a42c4477
+  data.tar.gz: 756e23d1771b4f1dae8eebe2d4d0f0c4f5397fc8762baac96c2c5bfe7ffc73a6fcab6cad2575d8aae760d84570edffeb456231d70a815918c234a8e5153895bf

data/app/controllers/concerns/glib/json/libs.rb

@@ -46,14 +46,28 @@ module Glib::Json::Libs
     end
   end
 
-  def json_libs_handle_404
-    if json_ui_activated?
-      render file: "#{Rails.root}/public/404.html", status: :not_found
+  def glib_json_handle_403
+    render file: Rails.root.join('public', '404.html'), status: :forbidden
+  end
+
+  def glib_json_handle_404
+    raise ActionController::RoutingError.new('Not Found')
+
+    # if json_ui_activated?
+    #   render file: Rails.root.join('public', '404.html'), status: :not_found
+    # else
+    #   raise exception
+    # end
+  end
+  
+  def glib_json_handle_500(exception)
+    if json_ui_activated? && Rails.env.production?
+      Rollbar.error(exception) if defined?(Rollbar)
+      render file: Rails.root.join('public', '500.html'), status: :internal_server_error
     else
       raise exception
     end
   end
-  
 
 
   module ClassMethods
@@ -111,11 +125,20 @@ module Glib::Json::Libs
       end
     end
 
-    def json_libs_rescue_404
-      rescue_from ActiveRecord::RecordNotFound do |exception|
-        json_libs_handle_404
+    # Call this before other rescues. Later rescue_from statements will take precedence, so more specific
+    # rescues have to be declared later.
+    def json_libs_rescue_500
+      rescue_from StandardError do |exception|
+        glib_json_handle_500(exception)
       end
     end
 
+    def json_libs_rescue_404
+      # Removed because it doesn't seem to offer anything extra
+      # rescue_from ActiveRecord::RecordNotFound do |exception|
+      #   glib_json_handle_404
+      # end
+    end
+
   end
 end

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/helpers/glib/json_ui/action_builder.rb

@@ -75,24 +75,6 @@ module Glib
         end
       end
 
-      module Http
-        class Post < Action
-          string :url, cache: true
-          hash :formData
-        end
-
-        class Patch < Action
-          string :url, cache: true
-          hash :formData
-        end
-
-        class Delete < Action
-          string :url, cache: true
-          hash :formData
-        end
-
-      end
-
       ###
     end
   end

data/app/helpers/glib/json_ui/action_builder/http.rb

@@ -0,0 +1,19 @@
+class Glib::JsonUi::ActionBuilder
+  module Http
+    class Post < Action
+      string :url, cache: true
+      hash :formData
+    end
+
+    class Patch < Action
+      string :url, cache: true
+      hash :formData
+    end
+
+    class Delete < Action
+      string :url, cache: true
+      hash :formData
+    end
+
+  end
+end

data/app/helpers/glib/json_ui/list_builders.rb

@@ -41,6 +41,11 @@ module Glib
 
         class Custom < Thumbnail
           string :template
+
+          # TODO: Experimental
+          hash :extra
+
+          # TODO: Deprecate
           hash :data
         end
       end

data/app/helpers/glib/json_ui/menu_builder.rb

@@ -35,6 +35,7 @@ module Glib
 
       class Label < MenuItem
         string :text
+        singleton_array :styleClass, :styleClasses
 
         # Override
         def created

data/app/helpers/glib/json_ui/page_helper.rb

@@ -17,22 +17,27 @@ module Glib
         @__json_ui_page
       end
 
-      # Use this only if you need to generate json independently from the current `json_ui_page`
-      def json_ui_menu(&block)
-        @__json_ui_menu_page ||= Page.new(Jbuilder.new, self)
-        json = @__json_ui_menu_page.json
-        json.nil!
-        block&.call @__json_ui_menu_page.menu_builder
-        json.attributes!
-      end
-
-      # Use this only if you need to generate json independently from the current `json_ui_page`
-      def json_ui_panel(&block)
-        @__json_ui_panel_page ||= Page.new(Jbuilder.new, self)
-        json = @__json_ui_panel_page.json
-        json.nil!
-        block&.call @__json_ui_panel_page.view_builder
-        json.attributes!
+      # # Use this only if you need to generate json independently from the current `json_ui_page`
+      # def json_ui_menu(&block)
+      #   @__json_ui_menu_page ||= Page.new(Jbuilder.new, self)
+      #   json = @__json_ui_menu_page.json
+      #   json.nil!
+      #   block&.call @__json_ui_menu_page.menu_builder
+      #   json.attributes!
+      # end
+
+      # # Use this only if you need to generate json independently from the current `json_ui_page`
+      # def json_ui_panel(&block)
+      #   @__json_ui_panel_page ||= Page.new(Jbuilder.new, self)
+      #   json = @__json_ui_panel_page.json
+      #   json.nil!
+      #   block&.call @__json_ui_panel_page.view_builder
+      #   json.attributes!
+      # end
+
+      def json_ui_section(json, &block)
+        @__json_ui_section ||= Page.new(json, self)
+        @__json_ui_section.list_section_builder
       end
 
       class Page

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

@@ -79,17 +79,26 @@ section.rows builder: ->(template) do
   end
 
   template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do
-    provider = {
-      name: "facebook",
-      webRequestUrl: "https://www.facebook.com/v3.1/dialog/oauth?auth_type=rerequest&client_id=CLIENT_ID&redirect_uri=http%3A%2F%2Fwww.lvh.me%3A3000%2Foauth_callback%2Ffacebook&response_type=code&scope=email",
-      requestUrl: "https://www.facebook.com/v3.1/dialog/oauth",
-      clientId: "CLIENT_ID",
-      redirectUrl: "http://www.lvh.me:3000/oauth_callback/facebook.json"
-    }
-
-    action.dialogs_oauth provider: provider, providerParamName: "session[oauth_provider]", callbackUrlParamName: "session[[oauth_callback_url]", onSuccess: ->(action) do
-      action.http_post url: 'TODO: post params to server'
+    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/actions/_http.json.jbuilder

@@ -0,0 +1,18 @@
+
+section.header padding: glib_json_padding_list, childViews: ->(header) do
+  header.h3 text: 'HTTP'
+end
+
+section.rows builder: ->(template) do
+  template.thumbnail title: 'http/post', onClick: ->(action) do
+    action.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'New Joe' }
+  end
+
+  template.thumbnail title: 'http/patch', onClick: ->(action) do
+    action.http_patch url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Edit Joe' }
+  end
+
+  template.thumbnail title: 'http/delete', onClick: ->(action) do
+    action.http_delete url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Delete Joe' }
+  end
+end

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

@@ -0,0 +1,17 @@
+section.header padding: glib_json_padding_list, childViews: ->(header) do
+  header.h3 text: 'Reload'
+  header.spacer height: 6
+  header.label text: 'Reload does not open a new page/screen. Click reload a few times, then click back and notice that it goes back to the page before the reload.'
+end
+
+section.rows builder: ->(template) do
+  template.thumbnail title: "windows/reload (timestamp: #{DateTime.current.to_i})", onClick: ->(action) do
+    action.windows_reload
+  end
+
+  reload_counter = params[:reload_counter].to_i
+  reload_counter = 0 if reload_counter > 5
+  template.thumbnail title: "windows/reload with URL (counter: #{reload_counter})", onClick: ->(action) do
+    action.windows_reload url: json_ui_garage_url(path: 'actions/index', reload_counter: reload_counter + 1)
+  end
+end

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

@@ -0,0 +1,6 @@
+facebook_graph = Koala::Facebook::API.new(params[:credentials][:token])
+profile = facebook_graph.get_object('me')
+
+json_ui_response json do |action|
+  action.dialogs_alert message: profile
+end

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

@@ -15,24 +15,9 @@ json_ui_page json do |page|
     end, ->(section) do
       render "#{@path_prefix}/actions/timeouts", section: section
     end, ->(section) do
-      section.header padding: glib_json_padding_list, childViews: ->(header) do
-        header.h3 text: 'Reload'
-        header.spacer height: 6
-        header.label text: 'Reload does not open a new page/screen. Click reload a few times, then click back and notice that it goes back to the page before the reload.'
-      end
-
-      section.rows builder: ->(template) do
-        template.thumbnail title: "windows/reload (timestamp: #{DateTime.current.to_i})", onClick: ->(action) do
-          action.windows_reload
-        end
-
-        reload_counter = params[:reload_counter].to_i
-        reload_counter = 0 if reload_counter > 5
-        template.thumbnail title: "windows/reload with URL (counter: #{reload_counter})", onClick: ->(action) do
-          action.windows_reload url: json_ui_garage_url(path: 'actions/index', reload_counter: reload_counter + 1)
-        end
-
-      end
+      render "#{@path_prefix}/actions/http", section: section
+    end, ->(section) do
+      render "#{@path_prefix}/actions/reload", section: section
     end
   ]
 end

data/app/views/json_ui/garage/forms/dynamic_select_data.json.jbuilder

@@ -6,18 +6,33 @@ if page < 2
   json.nextPageUrl json_ui_garage_url(path: 'forms/dynamic_select_data', page: page + 1)
 end
 
-json.rows do
+# json.rows do
 
+#   count_per_page = 20
+#   count_per_page.times do |i|
+#     json.child! do
+#       index = page * count_per_page + i
+#       json.template 'thumbnail'
+#       json.title "City #{index} (#{params[:q]})"
+#       json.subtitle "State #{index}"
+#       json.subsubtitle "Country #{index}"
+#       json.value "id#{index}"
+#       json.text "Item #{index}"
+#     end
+#   end
+# end
+
+section = json_ui_section json
+section.rows builder: ->(row) do
   count_per_page = 20
   count_per_page.times do |i|
-    json.child! do
-      index = page * count_per_page + i
-      json.template 'thumbnail'
-      json.title "City #{index} (#{params[:q]})"
-      json.subtitle "State #{index}"
-      json.subsubtitle "Country #{index}"
-      json.value "id#{index}"
-      json.text "Item #{index}"
-    end
+    index = page * count_per_page + i
+    row.custom title: "City #{index} (#{params[:q]})",
+      subtitle: "State #{index}",
+      subsubtitle: "Country #{index}",
+      extra: {
+        value: "id#{index}",
+        text: "Item #{index}"
+      }
   end
 end

data/app/views/json_ui/garage/forms/file_upload.json.jbuilder

@@ -8,18 +8,18 @@ options = {
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.form options.merge(childViews: ->(form) do
     rules1 = { fileType: "image/*", maxFileSize: 5000 }
     rules2 = { fileType: "image/*", maxFileSize: 1, fileTypeErrorText: 'Invalid!', maxFileSizeErrorText: 'Too big!' }
-    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules1, directUploadUrl: rails_direct_uploads_url, 
+    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Landscape Photo', accepts: rules1, directUploadUrl: rails_direct_uploads_url, 
       value: 'eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4',
       fileUrl: 'https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100',
       fileTitle: '1 month ago',
-      placeholderView: { type: 'image', width: 100, height: 100 }
+      placeholderView: { type: 'image', width: 100, height: 75, url: 'https://www.atms.com.au/wp-content/uploads/2019/10/placeholder-1-1024x683.png?x93630' }
 
-    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules2, directUploadUrl: rails_direct_uploads_url,
-      placeholderView: { type: 'avatar', width: 100, height: 100 }
+    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Avatar', accepts: rules2, directUploadUrl: rails_direct_uploads_url,
+      placeholderView: { type: 'avatar', width: 100, height: 100, url: 'data:image/jpeg;base64,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' }
 
     form.fields_submit text: 'Submit'
     # form.button text: 'Submit', onClick: ->(action) { action.forms_submit }

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/lists/templating.json.jbuilder

@@ -14,7 +14,7 @@ json_ui_page json do |page|
       end
       template.thumbnail title: 'Item with subtitle', subtitle: 'Item subtitle'
       template.thumbnail title: 'Item with chips', chips: ->(menu) do
-        menu.button text: 'FInished', styleClass: 'info'
+        menu.button text: 'Finished', styleClass: 'info'
         menu.button props: { text: 'Succeeded', styleClass: 'success' }
       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/config/routes.rb

@@ -2,5 +2,7 @@ Glib::Web::Engine.routes.draw do
   scope module: :glib do
     get 'json_ui_garage', to: 'home#json_ui_garage'
     post 'json_ui_garage', to: 'home#json_ui_garage'
+    patch 'json_ui_garage', to: 'home#json_ui_garage'
+    delete 'json_ui_garage', to: 'home#json_ui_garage'
   end
 end

data/lib/glib-web.rb

@@ -5,3 +5,4 @@ require "glib/json_crawler"
 
 require 'glib/dynamic_text'
 require 'glib/crypt'
+require 'glib/test_helpers'

data/lib/glib/json_crawler/action_crawlers/nav_initiate.rb

@@ -3,9 +3,9 @@ module Glib
     class NavInitiate < ActionCrawler
       def initialize(http, args, action)
         super(http)
-
+        
         @http = http
-        if (json = @http.get args['url'], action) && (left_drawer = json['leftDrawer'])
+        if (json = (@http.get args['url'], action, args.except('url'))) && (left_drawer = json['leftDrawer'])
           crawl left_drawer['header']&.[]('childViews')
           crawl left_drawer['rows']
         end

data/lib/glib/json_crawler/action_crawlers/windows_open.rb

@@ -4,7 +4,7 @@ module Glib
       def initialize(http, args, action)
         @http = http
         if (url = args['url'])
-          json = @http.get url, action
+          json = @http.get(url, action, args.except('url'))
 
           unless json.nil?
             crawl json['header']&.[]('childViews')
@@ -12,11 +12,16 @@ module Glib
             crawl json['footer']&.[]('childViews')
 
             json['rightNavButtons']&.each do |button|
-              click button
+              if button['buttons'].present?
+                button['buttons'].each do |inner_button|
+                  click inner_button
+                end
+              else
+                click button
+              end
             end
           end
         end
-
       end
     end
   end

data/lib/glib/json_crawler/http.rb

@@ -20,8 +20,8 @@ module Glib
         @router = router
       end
 
-      def get(url, action, inspect_result = true)
-        fetch(:get, url, action, {}, inspect_result)
+      def get(url, action, params = {}, inspect_result = true)
+        fetch(:get, url, action, params, inspect_result)
       end
 
       def post(url, action, params)
@@ -40,14 +40,6 @@ module Glib
         fetch(:delete, url, action, {})
       end
 
-      def controller
-        @context.integration_session.controller
-      end
-
-      def action_name
-        controller.action_name.to_sym
-      end
-
       private
         Response = Struct.new :code, :headers, :media_type, :body do
           def initialize(*)
@@ -66,13 +58,16 @@ 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],
             'Client-Version' => user[:version],
             'X-CSRF-Token' => user[:token]
           }
+          http_header.merge!(params[:headers]) if params[:headers].present?
 
           params.each do |name, value|
             params[name] = '' if value.is_a?(Array) && value.size == 0
@@ -83,6 +78,10 @@ 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
           rescue => ex
             if !inspect_result
               case ex
@@ -103,7 +102,7 @@ module Glib
             if (code = response.code) == 302
               redirect_uri = URI(response.headers['Location'])
               redirect_uri.query = [redirect_uri.query, 'format=json'].compact.join('&')
-              get redirect_uri.to_s, action
+              get redirect_uri.to_s, action, params
             else
               response_times << response.headers['X-Runtime'].to_f
               @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"

data/lib/glib/json_crawler/router.rb

@@ -19,10 +19,6 @@ module Glib
       end
 
       def step(http, args)
-        if (controller = http.controller)
-          Glib::JsonCrawler::Coverage.coverage_files.add(controller.class.instance_method(http.action_name).source_location.first)
-        end
-
         case args['view']
         when 'fields/submit-v1', 'fields/submit'
           @depth += 1
@@ -73,7 +69,7 @@ module Glib
         @depth += 1
         target_router.read_only_actions.each do |crawler_action|
           action, url = crawler_action
-          http.get url, action, false
+          http.get(url, action, {}, false)
         end
       end
 

data/lib/glib/test_helpers.rb

@@ -0,0 +1,40 @@
+module Glib
+  module TestHelpers
+    def response_assert_equal
+      expected = __get_previous_result_from_git
+      result = __log(response.body)
+      assert_equal JSON.parse(expected), JSON.parse(result), "Result mismatch! #{__git_is_available? ? `git diff #{__log_dir}/#{__log_file}` : ''}"
+    end
+
+    private
+      def __git_is_available?
+        @__git_is_available ||= (`git status 2>&1` =~ /fatal/).nil?
+      end
+
+      def __log_dir
+        if @__log_dir.nil?
+          @__log_dir = File.expand_path("#{Rails.root}/test/controllers/#{self.class.to_s.underscore}_results", File.dirname(__FILE__))
+          unless File.directory?(@__log_dir)
+            FileUtils.mkdir_p(@__log_dir)
+          end
+        end
+        @__log_dir
+      end
+      
+      def __log_file
+        @__log_file ||= "#{self.method_name}.json"
+      end
+      
+      def __log json
+        File.open("#{File.join(__log_dir, __log_file)}", "w") do |f|
+          f << JSON.pretty_generate( JSON.parse(json) )
+        end
+        json
+      end
+      
+      def __get_previous_result_from_git
+        `git checkout -- "#{File.join(__log_dir, __log_file)}" > /dev/null 2>&1` if __git_is_available?
+        File.exists?(File.join(__log_dir, __log_file)) ? File.open(File.join(__log_dir, __log_file)).read : "\{\}"
+      end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.74
+  version: 0.5.4
 platform: ruby
 authors:
 - ''
@@ -79,6 +79,7 @@ files:
 - app/helpers/glib/json_ui/abstract_builder.rb
 - app/helpers/glib/json_ui/action_builder.rb
 - app/helpers/glib/json_ui/action_builder/dialogs.rb
+- app/helpers/glib/json_ui/action_builder/http.rb
 - app/helpers/glib/json_ui/action_builder/sheets.rb
 - app/helpers/glib/json_ui/action_builder/snackbars.rb
 - app/helpers/glib/json_ui/action_builder/windows.rb
@@ -107,10 +108,13 @@ files:
 - app/views/app/views/json_ui/vue/renderer.html.erb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/_dialogs.json.jbuilder
+- app/views/json_ui/garage/actions/_http.json.jbuilder
+- app/views/json_ui/garage/actions/_reload.json.jbuilder
 - app/views/json_ui/garage/actions/_sheets.json.jbuilder
 - app/views/json_ui/garage/actions/_snackbars.json.jbuilder
 - app/views/json_ui/garage/actions/_timeouts.json.jbuilder
 - app/views/json_ui/garage/actions/_windows.json.jbuilder
+- app/views/json_ui/garage/actions/dialogs_oauth_post.json.jbuilder
 - app/views/json_ui/garage/actions/index.json.jbuilder
 - app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder
 - app/views/json_ui/garage/forms/basic.json.jbuilder
@@ -209,6 +213,7 @@ files:
 - lib/glib/json_crawler/coverage.rb
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
+- lib/glib/test_helpers.rb
 - lib/glib/value.rb
 - lib/glib/version.rb
 - lib/tasks/db.rake