glib-web 0.5.2 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 030e8fab91840b4a4337ebb8e867f56b9b658ec8932716afae41f1ebb84f93ee
-  data.tar.gz: 1dc8364b2e509891eeed48c55f4aa8f9d8c89c3b9dad8dc700720d14e2b55e15
+SHA1:
+  metadata.gz: d3229621ccc977c76e4adc70e1ab7271a76daf08
+  data.tar.gz: fa4e7c9f17a1d9c6b6cd770771730e13f583eb7e
 SHA512:
-  metadata.gz: c94b19ff196e16ed430d973f295b64a4aa92e4a89f685e74731e5ecadb0a23a3ea39ab7aafe049e7bff46ffadb4d67f59d9a6b1791613cffcf63f66df611e806
-  data.tar.gz: 9175751c633b836d10cfc4aa67d4af2e4e7ea8b837a99dfc34bf6fe91efc3ddf932a1aa227d13097cfbdb5aaab63ca9ecdd14fd3410a114e926c2896e36c6df0
+  metadata.gz: 2c1cf1ee7207ee7fa8276d6e94df95a6079bc011f429a0d9ca87a1305e4bb7201da04d13cda66de0c5872e7e1604374065dd307144e8e8d3110fcae424d5ae9f
+  data.tar.gz: '09fb824243fc37c0cd3ce3d6f0d0b6a85944ab02fa5b88383df8be9ff93394608fc1e0c394b9eadfa7fa51dbd854da3e8cf7ee4ed1da2895cfcdec06509a731e'

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/app_feature_support_helper.rb

@@ -0,0 +1,16 @@
+module Glib
+  module AppFeatureSupportHelper
+    def glib_app_feature_supported?(name, app_version, dictionary)
+      device = (app_device_os || :default).to_sym
+
+      version = dictionary[name.to_sym].try(:[], device)
+      except = dictionary[name.to_sym].try(:[], :except).try(:[], device)
+
+      !version.nil? && (version == :all || glib_app_version_gte(version, app_version)) && (except.nil? || except.to_s != app_version)
+    end
+
+    def glib_app_version_gte(feature_version, app_version)
+      app_version.blank? || Gem::Version.new(app_version) >= Gem::Version.new(feature_version)
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module Glib
           str.slice(0,1).capitalize + str.slice(1..-1)
         end
 
-        def add_singleton_element type, name, *args
+        def add_singleton_element(type, name, *args)
           name_components = name.to_s.split('_')
           json.set! type, "#{name_components.join('/')}" if type
           args = [yield] if block_given?
@@ -22,7 +22,7 @@ module Glib
           "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
         end
 
-        def add_element_to_array type, name, *args
+        def add_element_to_array(type, name, *args)
           json.child! do
             add_singleton_element type, name, *args
           end

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

@@ -2,6 +2,7 @@ class Glib::JsonUi::ActionBuilder
   module Windows
     class Close < Action
       action :onClose
+      # action :onAfterClose
     end
 
     class CloseAll < Action

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/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
@@ -94,9 +99,12 @@ module Glib
             #   options[:leftItems]&.call @menu_builder
             # end
             # json.logoUrl "http://localhost:3000/assets/logo_dark-02d9b6a91fdbf22515da7b921d31367b70696214415f6789d2f90232e4a287b7.svg"
-            json.rightItems do
-              options[:rightItems]&.call @menu_builder
-            end
+
+            # json.rightItems do
+            #   options[:rightItems]&.call @menu_builder
+            # end
+
+            @view_builder.add_singleton_view('appBar', options)
           end
         end
 

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

@@ -1,6 +1,9 @@
 module Glib
   module JsonUi
     module StylingHelper
+
+      ### Padding
+
       def glib_json_padding_body
         { top: 12, left: 20, right: 20, bottom: 12 }
       end
@@ -9,6 +12,12 @@ module Glib
         { top: 12, bottom: 12, left: 16, right: 16 }
       end
 
+      ###
+
+
+
+      ### Image
+
       def glib_json_image_standard_url
         'https://cdn-images-1.medium.com/max/1200/1*Qc0XxYm-qAZL-7tjjlNfrg.png'
       end
@@ -20,6 +29,19 @@ module Glib
       def glib_json_image_blob_key
         'o6CKzNt67PWnkPdUEnWMt7pr'
       end
+
+      ###
+
+
+
+      ### Color
+
+      def glib_color_panel_background
+        '#b3bac2'
+      end
+
+      ###
+
     end
   end
 end

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

@@ -15,6 +15,10 @@ module Glib
         end
       end
 
+      def add_singleton_view(name, *args)
+        add_singleton_element 'view', name, *args
+      end
+
       def method_missing(m, *args)
         add_view m, *args
       end
@@ -152,26 +156,22 @@ module Glib
             block.call page.menu_builder
           end
         end
+      end
 
-        # Should be deprecated
-        # def tabButtons(block)
-        #   json.tabButtons do
-        #     block.call page.menu_builder
-        #   end
-        # end
-
-        # def options(options)
-        #   current_url = page.context.request.base_url + page.context.request.fullpath
+      class AppBar < View
+        color :color
 
-        #   buttons ->(menu) do
-        #     options.each do |tab|
-        #       menu.button text: tab[:text], disabled: tab[:url] == current_url, onClick: ->(action) do
-        #         action.windows_reload url: tab[:url]
-        #       end
-        #     end
+        # def leftButtons(block)
+        #   json.leftButtons do
+        #     block.call page.menu_builder
         #   end
         # end
 
+        def rightButtons(block)
+          json.rightButtons do
+            block.call page.menu_builder
+          end
+        end
       end
 
       class Datetime < View
@@ -182,4 +182,4 @@ module Glib
 
     end
   end
-end
+end

data/app/helpers/glib/json_ui/view_builder/fields.rb

@@ -104,6 +104,9 @@ class Glib::JsonUi::ViewBuilder
 
     class Check < Text
       string :uncheckValue
+      string :checkValue
+
+      # Where possible, use value instead of this
       bool :checked
     end
 

data/app/helpers/glib/json_ui/view_builder/panels.rb

@@ -123,6 +123,8 @@ class Glib::JsonUi::ViewBuilder
       hash :nextPage
       hash :export
       hash :import
+      action :onScrollToTop
+      action :onScrollToBottom
 
       def firstSection(block)
         json.sections [1] do

data/app/helpers/glib/urls_helper.rb

@@ -0,0 +1,7 @@
+module Glib
+  module UrlsHelper
+    def glib_url_current(new_params)
+      url_for(params.to_unsafe_h.merge(new_params.merge(only_path: false)))
+    end
+  end
+end

data/app/policies/glib/application_policy.rb

@@ -113,41 +113,17 @@ module Glib
       controller.policy_scope(record.class, policy_scope_class: policy_scope_class)
     end
 
-    # TODO: Remove. Deprecated
-    private  # Used by child
-    def public?
-      true
-    end
-
-    private  # Used by child
-    def everyone
-      true
-    end
-
-    # TODO: Deprecate `user()`
-    private  # Used by child
-    def current_user
-      user
-    end
-
-    # # TODO: Revise because it seems there is no justification for allowing owner to see any of the deleted entities, which include User, Guild, and Post
-    # private  # Used by child
-    # def not_deleted_unless_owner_or_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && (@user.id == @record.user_owner_id || block.call(@record)))
-    # end
-
-    # private  # Used by child
-    # def not_deleted_unless_moderator?(&block)
-    #   block ||= lambda { |unused_arg| @user.moderator? }
-    #   !@record.deleted? || (@user && block.call(@record))
-    # end
-
     public
     def self.args_builder
       Proc.new { |controller| [] }
     end
 
+    # TODO: Remove. Deprecated
+    # private  # Used by child
+    # def public?
+    #   true
+    # end
+
     class Scope
       attr_reader :user, :scope
 
@@ -156,9 +132,30 @@ module Glib
         @scope = scope
       end
 
+      # def current_user
+      #   user
+      # end
+
+      # To be overridden
       def resolve
         scope.none
       end
     end
+
+    private  # Used by child
+      def everyone
+        true
+      end
+
+      # def current_user
+      #   user
+      # end
+
+      # TODO: Bad pattern. Implement explicit policy parameter instead.
+      # - E.g. can? :destroy, :service_subscription_auto_renewal, { service_subscription: @service_subscription }
+      # - E.g. super class: :service_subscription_auto_renewal, { service_subscription: @service_subscription }
+      def controller_var(name)
+        controller.instance_variable_get(:"@#{name}")
+      end
   end
 end

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