pleiades 0.1.1 → 0.1.2

data/lib/pleiades/generators/pleiades/setup/templates/api_controller.rb

@@ -1,25 +1,14 @@
 require 'pleiades'
 
 class Line::ApiController < ApplicationController
-  def client
-    @client ||= Line::Bot::Client.new { |config|
-      config.channel_secret = ENV["LINE_CHANNEL_SECRET"]
-      config.channel_token = ENV["LINE_CHANNEL_TOKEN"]
-    }
-  end
+  include Pleiades::Client
 
   def callback
-    body = request.body.read
-
-    signature = request.env['HTTP_X_LINE_SIGNATURE']
-    client.validate_signature(body, signature) || head(:bad_request)
-
-    events = client.parse_events_from(body)
+    validate_signature || head(:bad_request)
 
     events.each do |event|
-      command = Pleiades::Command.get(event)
-      command.call
-      head :ok if command.success?
+      Pleiades::Command.get(event).call
     end
+    head :ok
   end
 end

data/lib/pleiades/generators/pleiades/setup/templates/base_command.rb

@@ -1,6 +1,4 @@
 class BaseCommand < Pleiades::Command::BaseCommand
-  include CommandCommon
-
   def call
     success!
     show_event if disp?
@@ -9,11 +7,11 @@ class BaseCommand < Pleiades::Command::BaseCommand
   private
 
   def disp?
-    Rails.env.development? && Pleiades::Config.disp_console
+    Rails.env.development? && Pleiades::Config.debug.disp_console
   end
 
   def show_event
-    mes = <<~MES
+    p <<~MES
       \n
       \n
       |------------------------------------|
@@ -22,7 +20,5 @@ class BaseCommand < Pleiades::Command::BaseCommand
       \n
       event:#{@event.type}
     MES
-
-    p mes
   end
 end

data/lib/pleiades/generators/pleiades/setup/templates/command_common.erb

@@ -1,13 +1,9 @@
 module CommandCommon
   extend ActiveSupport::Concern
+  include Pleiades::Client
 
   included do
-    def client
-      @client ||= Line::Bot::Client.new { |config|
-        config.channel_secret = ENV['LINE_CHANNEL_SECRET']
-        config.channel_token = ENV['LINE_CHANNEL_TOKEN']
-      }
-    end<% if options['user_related_files'] %>
+<% if options['user_related_files'] %>
 
     def current_user
       @user ||= User.find_by_line_id(@event.source.user_id)

data/lib/pleiades/railtie.rb

@@ -1,18 +1,10 @@
 module Pleiades
   class Railtie < ::Rails::Railtie
     generators do
-
-      generator_names = %w(
-                            install
-                            setup
-                            command
-                          )
-
-      generator_path = './generators/pleiades'.freeze
-      generator_names
-        .map  { |f| "#{generator_path}/#{f}/#{f}_generator.rb" }
+      Dir
+        .glob("#{File.expand_path('generators/pleiades', __dir__)}/*")
+        .map  { |f| "#{f}/#{File.basename(f)}_generator.rb" }
         .each { |f| require_relative f }
-
     end
   end
 end

data/lib/pleiades/version.rb

@@ -1,3 +1,3 @@
 module Pleiades
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'.freeze
 end

data/pleiades.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'bundler', '~> 2.0'
+  spec.add_dependency 'freeezer'
   spec.add_dependency 'line-bot-api', '~> 1.12.0'
   spec.add_development_dependency 'rails', '~> 5.2.3'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pleiades
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - HarukiKubota
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: freeezer
+  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'
 - !ruby/object:Gem::Dependency
   name: line-bot-api
   requirement: !ruby/object:Gem::Requirement
@@ -99,17 +113,26 @@ files:
 - bin/setup
 - lib/pleiades.rb
 - lib/pleiades/core.rb
-- lib/pleiades/core/.keep
+- lib/pleiades/core/client.rb
+- lib/pleiades/core/client/wrapper.rb
 - lib/pleiades/core/command.rb
 - lib/pleiades/core/command/base_command.rb
-- lib/pleiades/core/command/event_proccessor.rb
-- lib/pleiades/core/command/nest_blocks.rb
+- lib/pleiades/core/command/executor.rb
+- lib/pleiades/core/command/factory.rb
 - lib/pleiades/core/command/router.rb
+- lib/pleiades/core/command/routing/event_judge_methods.rb
+- lib/pleiades/core/command/routing/event_proccessor.rb
+- lib/pleiades/core/command/routing/nest_blocks.rb
+- lib/pleiades/core/command/routing/path_builder.rb
+- lib/pleiades/core/command/routing/reflection.rb
+- lib/pleiades/core/command/routing/result.rb
+- lib/pleiades/core/command/routing/route_refine.rb
+- lib/pleiades/core/command/routing/validator.rb
+- lib/pleiades/core/command/routing_proxy.rb
 - lib/pleiades/core/config.rb
 - lib/pleiades/core/constants.rb
 - lib/pleiades/core/util.rb
 - lib/pleiades/core_ext.rb
-- lib/pleiades/core_ext/.keep
 - lib/pleiades/core_ext/line/bot.rb
 - lib/pleiades/core_ext/line/bot/event.rb
 - lib/pleiades/core_ext/line/bot/event/base.rb
@@ -120,7 +143,9 @@ files:
 - lib/pleiades/generators/pleiades/install/USAGE
 - lib/pleiades/generators/pleiades/install/install_generator.rb
 - lib/pleiades/generators/pleiades/install/templates/config.yml
+- lib/pleiades/generators/pleiades/install/templates/pleiades.rb
 - lib/pleiades/generators/pleiades/install/templates/router.rb
+- lib/pleiades/generators/pleiades/install/templates/routing_proxy.rb
 - lib/pleiades/generators/pleiades/setup/setup_generator.rb
 - lib/pleiades/generators/pleiades/setup/templates/api_controller.rb
 - lib/pleiades/generators/pleiades/setup/templates/base_command.rb
@@ -149,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: LINEBotSDKの拡張Gem。

data/lib/pleiades/core/command/event_proccessor.rb

@@ -1,87 +0,0 @@
-module Pleiades
-  module Command
-    module EventProccessor
-      extend ActiveSupport::Concern
-
-      def method_missing(method, **args)
-        return super unless event_types.include?(method.to_s)
-
-        args.merge! type: method.to_s
-
-        exe_event_method args
-      end
-
-      private
-
-      def event_types
-        Pleiades::Constants::Events::TYPES
-      end
-
-      def exe_event_method(args)
-        procs(args[:type]).each_with_object([true]) do |proc, arr|
-          next unless arr.last
-
-          arr << proc.call(args)
-        end
-      end
-
-      def procs(method_name)
-        proc_method_names = %i[
-                              route_unfixid?
-                              matching_events?
-                              route_fix!
-                            ]
-
-        proc_method_names.insert(2, :"#{method_name}_judge_method") if judge_method_defined?(method_name)
-        proc_method_names.map { |n| method(n) }
-      end
-
-      def route_unfixid?(_args)
-        !Router.path_found?
-      end
-
-      def matching_events?(args)
-        @event.type == args[:type]
-      end
-
-      def route_fix!(args)
-        Router.path = normalize_path args[:scope], args[:action]
-      end
-
-      def judge_method_defined?(method)
-        private_methods.include?(:"#{method}_judge_method")
-      end
-
-      def text_judge_method(args)
-        decision_operator =
-          case args[:pattern]
-          when Regexp
-            '=~'
-          when String
-            '=='
-          end
-        eval("args[:pattern] #{decision_operator} @event.text")
-      end
-
-      def sticker_judge_method(args)
-        convert_to_reg = -> (id) do
-          case id
-          when String, Integer
-            return '*'.eql?(id) ? /^\d+$/ : /^#{id}$/
-          when Array
-            return /^#{id.join('|')}$/
-          end
-          id
-        end
-
-        p, s = @event.sticker_ids
-        convert_to_reg.(args[:package_id]) =~ p &&
-          convert_to_reg.(args[:sticker_id]) =~ s
-      end
-
-      def postback_judge_method(args)
-        normalize_path(args[:scope], args[:action]) == @event.action
-      end
-    end
-  end
-end

data/lib/pleiades/core/command/nest_blocks.rb

@@ -1,55 +0,0 @@
-require 'active_support/core_ext'
-
-module Pleiades
-  module Command
-    module NestBlocks
-      extend ActiveSupport::Concern
-
-      def scope(*scopes, &block)
-        scopes.each { |s| nest_block __callee__, s, &block }
-      end
-      alias :scope_append scope
-      alias :scope_unshift scope
-
-      def action(*actions, &block)
-        actions.each { |a| nest_block __callee__, a, &block }
-      end
-
-      private
-
-      def default_options
-        {
-          scope: [],
-          action: ''
-        }
-      end
-
-      def nest_block(method, context, &block)
-        @_options = __send__ "merge_#{method}", context
-        Pleiades::Command::Router.new(@_options).instance_eval(&block)
-      end
-
-      def merge_scope(context)
-        operator =
-          if /^merge_scope(_append)?$/ =~  __callee__
-            :append
-          elsif /^merge_scope_unshift$/ =~ __callee__
-            :unshift
-          end
-        __merge__ ->(option) { option[:scope].__send__ operator, context }
-      end
-      alias :merge_scope_append merge_scope
-      alias :merge_scope_unshift merge_scope
-
-      def merge_action(context)
-        __merge__ ->(option) { option[:action] = context }
-      end
-
-      def __merge__(proc)
-        dup_options = @options.deep_dup
-        proc.call(dup_options)
-        dup_options
-      end
-    end
-  end
-end