glib-web 0.4.71 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 484c96e0a3248d0e41548a4d4527edeb53748679
-  data.tar.gz: 416c21f0c017de9501bdcd5e2d3444c8f5896056
+SHA256:
+  metadata.gz: 92d880220ff29cbee352b8077c541e62b548796b4f1e7ef760f1f3b2967360be
+  data.tar.gz: 8d2f3393a965980996dc0408859f130551d7c840a88bd11435ecb48ee64aba99
 SHA512:
-  metadata.gz: 2dccc517539bf275df626b273dd724b72fa651ad17f50ef4a7c6d1680f745b5dbbd01d8b061af9b603f0d237312d2139d31a88a538ac901192dad19fb2cea58a
-  data.tar.gz: 85fb1678e0bee26f9c53fdd3eb0e1c5a7ea6fe27f8ec06bfafc07df09301ea413c7decd40ea1f3a1a30c292657ee1e8a61faefceda07415605c8b5b8d2397054
+  metadata.gz: a75416c64751c7b4680104e9bcd199bfec7945bf34a4e7cdc58f4fb9deadc16aa1a79e54e0d50dd3f968e133f6583f39fa0ef4979f2bff0e952eabf4ebc65593
+  data.tar.gz: f9024d9668c9e6198db90494237f7ca0f2a87199fbe5c1c17d2410f3382b1cd6600c8862aeb700171ab08172704b59bfa6a93359cda6ba57a11bea77f2aa93f3

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/app/views/json_ui/garage/pages/full_width_height.json.jbuilder

@@ -1,17 +1,16 @@
 json.title 'Pages'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
 
-  page.header padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(header) do
-    header.h1 text: 'Header'
-  end
+page.header padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(header) do
+  header.h1 text: 'Header'
+end
 
-  page.body height: 'matchParent', padding: glib_json_padding_body, childViews: ->(body) do
-    body.button width: 'matchParent', height: 'matchParent', text: 'Full Width/Height'
-  end
+page.body height: 'matchParent', padding: glib_json_padding_body, childViews: ->(body) do
+  body.button width: 'matchParent', height: 'matchParent', text: 'Full Width/Height'
+end
 
-  page.footer height: 80, padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
-    footer.h1 text: 'Footer'
-  end
+page.footer height: 80, padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
+  footer.h1 text: 'Footer'
 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/windows_open.rb

@@ -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

@@ -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(*)
@@ -83,6 +75,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

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

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("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.71
+  version: 0.5.1
 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: ''