glib-web 4.34.3 → 4.34.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76695fa02fe7d468260bc636b1a6dbb29bc56ca00370443a1d35b55550078bc2
-  data.tar.gz: decfecb38f65fa8ea45fcf697de4041bb1866ad4168309a2fa48b79cacb3b131
+  metadata.gz: 71657e9b80c2a5759e3df0ee81e068470bb5dfb627b8339241703b948e72129f
+  data.tar.gz: 9b754b492975ebea6d3d5b2a18b667ae00398a2f1cebdd2a6b33fcca377b8b0f
 SHA512:
-  metadata.gz: 71a7686bc096d072b110ada390d9ffbaf9e3ab7bcdb6d5016f530f3f165c9330585df4324f2f49c34c17606ad8f9d8befbe0dcac2ee35ababb0cd2d2f210decf
-  data.tar.gz: 26f6c550a14ef952113b1f435c80ff9d30bfcf91fce61773dacd9265322089c492dfc60c1c17084cc90bdb6b3b7a366fe8a9617ce6228d1622164a204185b56d
+  metadata.gz: 96e3dd7df23643cc4bdff6e7fd4d3cdc8ca0cb05c1a955686ffb94707569a16bccbd50d1ee9fcb0cb469d2c946cb96f0786c7b8590b6136d39f086848ab3350a
+  data.tar.gz: 6ca9a5ec915680ecc074c369807838e56541e3946ba928d751965198a984cee991232aa5d8be389d75fef64cd77c9502a90d6338e200cc4cfcb855746ca23391

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

@@ -85,16 +85,16 @@ page.form id: 'form', url: json_ui_garage_url(path: 'forms/generic_post'), metho
 
   languages = {
     'East Asia' => {
-      'zh' => 'Chinese',
-      'ja' => 'Japanese',
-      'ko' => 'Korean',
+      'cn' => 'Chinese',
+      'jp' => 'Japanese',
+      'kr' => 'Korean',
     },
     'Middle East' => {
-      'ar' => 'Arabic',
-      'hi' => 'Hindi',
+      'sa' => 'Arabic',
+      'in' => 'Hindi',
     },
     'Europe' => {
-      'nl' => 'Dutch',
+      'an' => 'Dutch',
       'en' => 'English',
       'fr' => 'French',
       'de' => 'German',
@@ -109,7 +109,7 @@ page.form id: 'form', url: json_ui_garage_url(path: 'forms/generic_post'), metho
   options = []
   languages.each do |group, sub|
     options << { type: 'label', text: group }
-    options.concat(sub.map { |k, v| { value: k, text: v, subtitle: 'Country' } })
+    options.concat(sub.map { |k, v| { value: k, text: v, subtitle: 'Country', imageUrl: "https://flagsapi.com/#{k.upcase}/flat/24.png" } })
     options << { type: 'divider' }
   end
 
@@ -118,7 +118,7 @@ page.form id: 'form', url: json_ui_garage_url(path: 'forms/generic_post'), metho
     width: 'matchParent',
     label: 'Primary Language',
     options: options,
-    value: 'nl',
+    value: 'an',
     accessory: ->(accessory) do
       accessory.header padding: { x: 16, y: 10 }, childViews: ->(header) do
         header.label text: 'Header'
@@ -146,7 +146,7 @@ page.form id: 'form', url: json_ui_garage_url(path: 'forms/generic_post'), metho
     width: 'matchParent',
     label: 'Primary Language',
     options: options,
-    value: ['ja', 'de'],
+    value: ['jp', 'de'],
     accessory: ->(view) do
         view.footer padding: { x: 16, y: 10 }, width: 'matchParent', styleClass: 'sticky-footer', childViews: ->(footer) do
           footer.panels_flow width: 'matchParent', styleClass: 'justify-end', childViews: ->(hori) do

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

@@ -68,6 +68,9 @@ json_ui_page json do |page|
         template.thumbnail title: 'Table (Web Only)', subtitle: 'Rows with columns', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'tables/index')
         end
+        template.thumbnail title: 'Tree', subtitle: 'Tree like view just like folder and subfolder', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/tree')
+        end
 
       end
     end, ->(section) do
@@ -131,10 +134,6 @@ json_ui_page json do |page|
           action.windows_open url: json_ui_garage_url(path: 'panels/grid')
         end
 
-        template.thumbnail title: 'Tree', subtitle: 'Tree like view just like folder and subfolder', onClick: ->(action) do
-          action.windows_open url: json_ui_garage_url(path: 'panels/tree')
-        end
-
         template.thumbnail title: 'List Template Accessory', onClick: ->(action) do
           # TODO
         end

data/app/views/json_ui/garage/panels/tree.json.jbuilder

@@ -9,7 +9,7 @@ onDropFile = ->(action) do
     end
 end
 onDropView = ->(action) do
-  action.http_post url: json_ui_garage_url(path: 'forms/generic_post_all')
+  action.http_post url: json_ui_garage_url(path: 'forms/generic_post_all', source_item_id: '{{moved[item_id]}}')
 end
 
 json_ui_page json do |page|
@@ -38,7 +38,7 @@ json_ui_page json do |page|
               id: 'pop',
               title: 'Pop',
               icon: { name: 'folder', size: 24, color: '#6e6e6e' },
-              dropData: { genre: 'pop' },
+              dropData: { genre: 'pop', item_id: 1 },
               onClick: ->(action) { action.windows_reload url: json_ui_garage_current_url(selected: 'pop') },
               subtitle: params['selected'] == 'pop' ? 'Pop music is a genre of popular music that originated in its modern' : nil,
               rows: ['pop-1.mp3', 'pop-2.mp3', 'pop-3.mp3']
@@ -46,7 +46,7 @@ json_ui_page json do |page|
               id: 'arab',
               title: 'Arabian',
               icon: { name: 'folder', size: 24, color: '#6e6e6e' },
-              dropData: { genre: 'arab' },
+              dropData: { genre: 'arab', item_id: 2 },
               onClick: ->(action) { action.windows_reload url: json_ui_garage_current_url(selected: 'arab') },
               subtitle: params['selected'] == 'arab' ? 'Arabic music is the music of the Arab world' : nil,
               rows: ['arabian-1.mp3', 'arabian-2.mp3', 'arabian-3.mp3']
@@ -55,7 +55,7 @@ json_ui_page json do |page|
               title: 'Phonk',
               onClick: ->(action) { action.windows_reload url: json_ui_garage_current_url(selected: 'phonk') },
               icon: { name: 'folder', size: 24, color: '#6e6e6e' },
-              dropData: { genre: 'phonk' },
+              dropData: { genre: 'phonk', item_id: 3 },
               subtitle: params['selected'] == 'phonk' ? 'Phonk is a subgenre of hip hop and trap music' : nil,
               rows: ['phonk1.mp3', 'phonk-2.mp3', { id: 'hard-phonk', title: 'Hard Phonk', rows: ['hard-phonk-1.mp3', 'hard-phonk-2.mp3'] }]
           end

data/lib/glib/json_crawler/router.rb

@@ -1,10 +1,12 @@
+require 'damerau-levenshtein'
+
 module Glib
   module JsonCrawler
     class Router
       attr_reader :read_only_actions # deprecated
       attr_reader :logger, :last_log, :deferred_actions
       attr_reader :http_actions
-      attr_accessor :host
+      attr_accessor :host, :skip_similar_page
 
       def log(action, url, response = nil)
         @last_log = [
@@ -53,6 +55,7 @@ module Glib
         @host ||= 'localhost:3000'
         @page_specs = []
         @page_urls = []
+        @skip_similar_page = false
       end
 
       def step(http, args)
@@ -85,6 +88,8 @@ module Glib
         assert_target_ids_exist(params)
 
         if action.present?
+          return if similar_page?(params)
+
           @depth += 1
           case action
           when 'initiate_navigation'
@@ -205,6 +210,22 @@ module Glib
         regex = Regexp.new("#{host}.+(?<!\.pdf)$")
         regex.match(url)
       end
+
+      private
+        def similar_page?(params)
+          return false if http_actions.blank? || params['url'].blank?
+          return false if !skip_similar_page
+
+          result = false
+          http_actions.each do |http_action|
+            next if http_action[1].blank?
+            distance = ::DamerauLevenshtein.distance(http_action[1], params['url'])
+            result = (distance <= 1) && (http_action[0] == params['action'])
+
+            break if result
+          end
+          result
+        end
     end
   end
 end

data/lib/glib/test_helpers.rb

@@ -7,10 +7,10 @@ module Glib
     end
 
     module ClassMethods
-      def define_crawler_test(user, crawled_at, dump_path:, &on_after_crawl)
+      def define_crawler_test(user, crawled_at, dump_path: , skip_similar_page: false, &on_after_crawl)
         test "crawl api for #{user[:email]} #{user[:device]} #{user[:version] || 'current'}" do
           Timecop.freeze(crawled_at || user[:crawled_at]) do
-            router = crawl_json_pages(user, dump_actions: dump_path.present?, dump_path: dump_path)
+            router = crawl_json_pages(user, dump_actions: dump_path.present?, dump_path: dump_path, skip_similar_page: skip_similar_page)
             on_after_crawl&.call(router)
           end
 
@@ -36,10 +36,11 @@ module Glib
       assert_equal JSON.parse(expected), JSON.parse(result), "Result mismatch! #{__git_is_available? ? `git diff #{__controller_log_dir}/#{__controller_log_file}` : ''}"
     end
 
-    def crawl_json_pages(user, log_file: nil, dump_actions: false, dump_path: nil, &block)
+    def crawl_json_pages(user, log_file: nil, dump_actions: false, dump_path: nil, skip_similar_page: false, &block)
       __execute_crawler(user, inspect_http: true) do |router, http|
         path = user[:path] ? "#{user[:path]}?format=json" : '/users/me?format=json&redirect=default'
         router.host = HOST
+        router.skip_similar_page = skip_similar_page
         router.step(
           http,
           'onClick' => {

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.34.3
+  version: 4.34.5
 platform: ruby
 authors:
 - ''
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2019-10-04 00:00:00.000000000 Z
@@ -122,7 +122,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+- !ruby/object:Gem::Dependency
+  name: damerau-levenshtein
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
 email: ''
 executables: []
 extensions: []
@@ -426,10 +440,10 @@ files:
 - lib/glib/value.rb
 - lib/glib/version.rb
 - lib/tasks/db.rake
-homepage:
+homepage: 
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -445,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []