glib-web 0.4.72 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '0537383a32a92f265a5f6c483f710047653915a8'
-  data.tar.gz: f3a05908717cdc7eeb0bc3dfa3c10da75c1362a3
+SHA256:
+  metadata.gz: 030e8fab91840b4a4337ebb8e867f56b9b658ec8932716afae41f1ebb84f93ee
+  data.tar.gz: 1dc8364b2e509891eeed48c55f4aa8f9d8c89c3b9dad8dc700720d14e2b55e15
 SHA512:
-  metadata.gz: 9a81ef9ef2f78869dd599b78ada3510318da5e2329e1be7eb347db8fd8053f129e476bb71aeff58b7d48b2c12f66e97d8e2ba583100d175e4092b061a59b28f3
-  data.tar.gz: 5221c65c79a617d92e82687cd8d671ea282abfff6d722cba7de3527a78817ead690fc5ac7bfcb5ce18d255b88342e8e0601528dcb906aab36faf7b1ab1d92d55
+  metadata.gz: c94b19ff196e16ed430d973f295b64a4aa92e4a89f685e74731e5ecadb0a23a3ea39ab7aafe049e7bff46ffadb4d67f59d9a6b1791613cffcf63f66df611e806
+  data.tar.gz: 9175751c633b836d10cfc4aa67d4af2e4e7ea8b837a99dfc34bf6fe91efc3ddf932a1aa227d13097cfbdb5aaab63ca9ecdd14fd3410a114e926c2896e36c6df0

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/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/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/view_builder/panels.rb

@@ -157,10 +157,11 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class Column < View
-      # int :lg
-      # int :md
-      # int :sm
+      hash :xl
       hash :lg
+      hash :md
+      hash :sm
+      hash :xs
       views :childViews
     end
 

data/app/validators/email_typo_validator.rb

@@ -1,29 +1,29 @@
 class EmailTypoValidator < ActiveModel::EachValidator
   COMMON_FORMAT = {
     '\.\.' => '.',
-    '.con\z' => '.com',
-    '.coj\z' => '.com',
-    '.vom\z' => '.com',
-    '.xom\z' => '.com',
-    '.com[a-z]\z' => '.com',
-    '.con.' => '.com.',
-    '.orf\z' => '.org',
-    '.orf.' => '.org.',
-    '@hitmail.' => '@hotmail.',
-    '@htomail.' => '@hotmail.',
-    '@hotnail.' => '@hotmail.',
-    '@hotmil.' => '@hotmail.',
-    '@hotmal.' => '@hotmail.',
-    '@hoymail.' => '@hotmail.',
-    '@hormail.' => '@hotmail.',
-    '@hotmsil.' => '@hotmail.',
-    '@gail.' => '@gmail.',
-    '@gnail.' => '@gmail.',
-    '@gmil.' => '@gmail.',
-    '@gmal.' => '@gmail.',
-    '@gmai.' => '@gmail.',
-    '@yahho.' => '@yahoo.',
-    '@yaho.' => '@yahoo.',
+    '\.con\z' => '.com',
+    '\.coj\z' => '.com',
+    '\.vom\z' => '.com',
+    '\.xom\z' => '.com',
+    '\.com[a-z]\z' => '.com',
+    '\.con\.' => '.com.',
+    '\.orf\z' => '.org',
+    '\.orf\.' => '.org.',
+    '@hitmail\.' => '@hotmail.',
+    '@htomail\.' => '@hotmail.',
+    '@hotnail\.' => '@hotmail.',
+    '@hotmil\.' => '@hotmail.',
+    '@hotmal\.' => '@hotmail.',
+    '@hoymail\.' => '@hotmail.',
+    '@hormail\.' => '@hotmail.',
+    '@hotmsil\.' => '@hotmail.',
+    '@gail\.' => '@gmail.',
+    '@gnail\.' => '@gmail.',
+    '@gmil\.' => '@gmail.',
+    '@gmal\.' => '@gmail.',
+    '@gmai\.' => '@gmail.',
+    '@yahho\.' => '@yahoo.',
+    '@yaho\.' => '@yahoo.',
   }
 
   def validate_each(record, attribute, value)

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/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/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/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/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/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(*)
@@ -73,6 +65,7 @@ module Glib
             '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 +76,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 +100,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.72
+  version: 0.5.2
 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,6 +108,8 @@ 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
@@ -209,6 +212,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
@@ -230,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ''