discorb-view 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630986b3d66bbcd57a098f84ca0d7baed2b7cf11100b6464e8d66b4eb6fbd08f
-  data.tar.gz: 8f830a89a62fe4a0acd98a54940ae830df2c3735061a00ba05d3408a66752a5a
+  metadata.gz: e4756a69740ed5a64f1ea13104a3ee0980a5f95364e93a4150ebf91559e66552
+  data.tar.gz: f3de79402b1aa23d4215e84d6988aacd754304c9c80958d72a60beed92158530
 SHA512:
-  metadata.gz: 7d8259899de9b82de7ec2a58178adcdaf2097079f7feb232f39e98718aa460e27f80831862ce0726e214b0ef42e2a28b43e1f91e3eab24cabe79dcf17caa4f17
-  data.tar.gz: 373f1ec214566f874243870bb037eb8bfb28cc292dbeba7d2497d79e2068f3c0f62e572bfa21211460b83cef255e3627220cf784fd298a7620bc4020f272af00
+  metadata.gz: 42b22a58f77541d9c0036402a7a33fc8e53aa1af08b3d2492bb4f8785ef9caffba65d30b1e8e4f62ecc8400feeb6aeea3c2f8d83ab8149772da7f037ac9c8eae
+  data.tar.gz: dc8248590703c3bf09854d61ac0851d70216d95c228dd82a53bce6a02b57fa0c3828795a901e677ce836f2b8fc3b03a7a3088cc4caa31c4b588190a1605e05b7

data/discorb-view.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "discorb", "~> 0.9.6"
+  spec.add_dependency "discorb", "~> 0.10.3"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/examples/menu.rb

@@ -3,11 +3,9 @@ require "discorb/view"
 
 client = Discorb::Client.new
 
-client.extend Discorb::View::Extension
-
-class MyMenu
-  extend Discorb::View::Base
+client.load_extension Discorb::View::Extension
 
+class MyMenu < Discorb::View::Base
   @@texts = ["A", "B"]
 
   def initialize

data/lib/discorb/view/extension.rb

@@ -3,11 +3,7 @@ module Discorb::View
   # An extension for using discorb-view.
   # @note Client must extend this class to use discorb-view.
   #
-  module Extension
-    attr_accessor :views
-
-    extend Discorb::Extension
-
+  class Extension < Discorb::Extension
     event :button_click do |interaction|
       handle_interaction(interaction)
     end
@@ -17,25 +13,30 @@ module Discorb::View
     end
 
     # @private
-    def self.extended(base)
+    def self.inherited(base)
       base.views = {}
     end
 
-    class << self
-      # @private
-      def handle_interaction(interaction)
-        unless view = @client.views[interaction.message.id.to_s]
-          @client.log.warn "View: No handler for #{interaction.message.id.to_s}"
-          return
-        end
-        handler = view.class.components[interaction.custom_id.to_sym]
-        @client.log.debug "View: Handling #{interaction.custom_id} in #{interaction.message.id}"
-        view.interaction = interaction
-        update = view.instance_exec(interaction, &handler.block)
-        return unless update
-        @client.log.debug "View: Updating view #{interaction.message.id}"
-        view.render
+    # @private
+    def handle_interaction(interaction)
+      unless view = @client.views[interaction.message.id.to_s]
+        @client.log.warn "View: No handler for #{interaction.message.id.to_s}"
+        return
+      end
+      handler = view.class.components[interaction.custom_id.to_sym]
+      @client.log.debug "View: Handling #{interaction.custom_id} in #{interaction.message.id}"
+      view.interaction = interaction
+      update = view.instance_exec(interaction, &handler.block)
+      return unless update
+      @client.log.debug "View: Updating view #{interaction.message.id}"
+      view.render
+    end
+
+    def self.loaded(client)
+      class << client
+        attr_accessor :views
       end
+      client.views = {}
     end
   end
 end

data/lib/discorb/view/version.rb

@@ -3,6 +3,6 @@
 module Discorb
   module View
     # @return [String] the version of the gem
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/discorb/view/view.rb

@@ -27,86 +27,87 @@ module Discorb::View
   # @note You should not use this class directly.
   # @abstract
   #
-  module Base
-    # @return [Hash{Symbol => Discorb::Component}] The components.
-    attr_accessor :components
-    # @return [Array<ViewHandler>] The view handlers.
-    attr_accessor :views
+  class Base
+    class << self
+      # @return [Hash{Symbol => Discorb::Component}] The components.
+      attr_accessor :components
+      # @return [Array<ViewHandler>] The view handlers.
+      attr_accessor :views
 
-    # @private
-    def self.extended(base)
-      base.prepend(Discorb::View::Base::Prepend)
-      base.components = {}
-      base.views = []
-    end
+      # @private
+      def inherited(base)
+        base.prepend(Discorb::View::Base::Prepend)
+        base.components = {}
+        base.views = []
+      end
 
-    #
-    # Adds button component to the view.
-    #
-    # @param [Symbol] id The id of the button.
-    # @param [String] label The label of the button.
-    # @param [:primary, :secondary, :success, :danger] style The style of the button.
-    # @param [Discorb::Emoji, nil] emoji The emoji of the button.
-    # @yield The block to execute when the button is clicked.
-    # @yieldparam [Discorb::MessageComponentInteraction] interaction The interaction.
-    #
-    def button(id, label, style = :secondary, emoji: nil, &block)
-      raise ArgumentError, "block required" unless block_given?
-      button = Discorb::Button.new(label, style, emoji: emoji, custom_id: id)
-      @components[id] = ComponentHandler.new(button, block)
-    end
+      #
+      # Adds button component to the view.
+      #
+      # @param [Symbol] id The id of the button.
+      # @param [String] label The label of the button.
+      # @param [:primary, :secondary, :success, :danger] style The style of the button.
+      # @param [Discorb::Emoji, nil] emoji The emoji of the button.
+      # @yield The block to execute when the button is clicked.
+      # @yieldparam [Discorb::MessageComponentInteraction] interaction The interaction.
+      #
+      def button(id, label, style = :secondary, emoji: nil, &block)
+        raise ArgumentError, "block required" unless block_given?
+        button = Discorb::Button.new(label, style, emoji: emoji, custom_id: id)
+        @components[id] = ComponentHandler.new(button, block)
+      end
 
-    #
-    # Adds select menu component to the view.
-    #
-    # @param [Symbol] id The id of the button.
-    # @param [String] label The label of the button.
-    # @param [String, nil] placeholder The placeholder of the select menu.
-    # @param [Integer, nil] min_length The minimum length of the select menu.
-    # @param [Integer, nil] max_length The max length of the select menu.
-    # @yield The block to execute when the menu is changed.
-    # @yieldparam [Discorb::MessageComponentInteraction] interaction The interaction.
-    #
-    def select_menu(id, options, placeholder = nil, min_values: nil, max_values: nil, &block)
-      raise ArgumentError, "block required" unless block_given?
-      options.map! { |option| option.is_a?(Discorb::SelectMenu::Option) ? option : Discorb::SelectMenu::Option.new(*option) }
-      menu = Discorb::SelectMenu.new(id, options, placeholder: placeholder, min_values: min_values, max_values: max_values)
-      @components[id] = ComponentHandler.new(menu, block)
-    end
+      #
+      # Adds select menu component to the view.
+      #
+      # @param [Symbol] id The id of the button.
+      # @param [String] label The label of the button.
+      # @param [String, nil] placeholder The placeholder of the select menu.
+      # @param [Integer, nil] min_length The minimum length of the select menu.
+      # @param [Integer, nil] max_length The max length of the select menu.
+      # @yield The block to execute when the menu is changed.
+      # @yieldparam [Discorb::MessageComponentInteraction] interaction The interaction.
+      #
+      def select_menu(id, options, placeholder = nil, min_values: nil, max_values: nil, &block)
+        raise ArgumentError, "block required" unless block_given?
+        options.map! { |option| option.is_a?(Discorb::SelectMenu::Option) ? option : Discorb::SelectMenu::Option.new(*option) }
+        menu = Discorb::SelectMenu.new(id, options, placeholder: placeholder, min_values: min_values, max_values: max_values)
+        @components[id] = ComponentHandler.new(menu, block)
+      end
 
-    #
-    # Add view handler to the view.
-    #
-    # @param [Proc, nil] check The check of the view handler.
-    #   The view handler will be executed when the check returns true, or check is nil.
-    # @yield The block to execute when the view handler is executed.
-    # @yieldparam [Discorb::View::Base::Prepend::Result] result The result of the view.
-    #
-    # @note There must be one handler with no check.
-    #
-    def view(check = nil, &block)
-      raise ArgumentError, "block required" unless block_given?
-      @views.insert(0, ViewHandler.new(check, block))
-    end
+      #
+      # Add view handler to the view.
+      #
+      # @param [Proc, nil] check The check of the view handler.
+      #   The view handler will be executed when the check returns true, or check is nil.
+      # @yield The block to execute when the view handler is executed.
+      # @yieldparam [Discorb::View::Base::Prepend::Result] result The result of the view.
+      #
+      # @note There must be one handler with no check.
+      #
+      def view(check = nil, &block)
+        raise ArgumentError, "block required" unless block_given?
+        @views.insert(0, ViewHandler.new(check, block))
+      end
 
-    #
-    # Starts the view.
-    #
-    # @param [Discorb::Messageable] channel The channel to send the message to.
-    #
-    def start(channel, ...)
-      client = channel.instance_variable_get(:@client)
-      if @views.empty?
-        raise "No views defined"
-      elsif not @views.any? { |v| v.check.nil? }
-        raise "No fallback view defined"
-      elsif @views.filter { |v| v.check.nil? }.count > 1
-        raise "Multiple fallback views defined"
+      #
+      # Starts the view.
+      #
+      # @param [Discorb::Messageable] channel The channel to send the message to.
+      #
+      def start(channel, ...)
+        client = channel.instance_variable_get(:@client)
+        if @views.empty?
+          raise "No views defined"
+        elsif not @views.any? { |v| v.check.nil? }
+          raise "No fallback view defined"
+        elsif @views.filter { |v| v.check.nil? }.count > 1
+          raise "Multiple fallback views defined"
+        end
+        view = new(client, channel, ...)
+        view.start
       end
-      view = new(client, channel, ...)
-      view.start
     end
-
     #
     # Modules for the prepend.
     #
@@ -125,6 +126,7 @@ module Discorb::View
         @channel = channel
         @message_id = nil
         @stopped = false
+        @components = self.class.components.dup.map { |id, component| [id, ComponentHandler.new(component.object.dup, component.block)] }.to_h
         @result = Result.new(nil, [], [])
         super(...)
       end
@@ -158,7 +160,7 @@ module Discorb::View
         components = @result.components.map do |c|
           case c
           when Symbol
-            self.class.components[c]&.object or raise ArgumentError "Unknown component ID #{c}"
+            @components[c]&.object or raise ArgumentError "Unknown component ID #{c}"
           when Button
             c
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb-view
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discorb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.3
 description:
 email:
 - sevenc-nanashi@sevenbot.jp