telegrator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1570bb5bb5f21daeb0442224c24fbd454de61540
-  data.tar.gz: a4e20acf9ea74b51ffdae4ebb9febceb1e853c44
+  metadata.gz: e1ad76a03640833177bec21dd4edccb7c8ac5027
+  data.tar.gz: 4c1b58e2ed91b1e2919fd72e7f727eea75789e92
 SHA512:
-  metadata.gz: 68bdb6495e650a711fad8435149da2b35e8dd7e9a9371a3b223f42b038d1fc651bfc67a4780a5e2f93b6fdf46dc958561704f6401c4beb8719007850352a04ab
-  data.tar.gz: 6a92a1a93d1b65e149283576abedee0bed95bf399c54989c9e4d7ffffde9d4a3f96b8337a208f9f074687c37d0d8f9d52bf8db10a202230139956bd29c336d43
+  metadata.gz: 3139ea3b7a0b80928f39a8bde4f55883960ceda918254f968b22142e38b244f87bbafc6a05ce93d57ca735d22bfef219d8be5dff355007d0125de2c4027fd66a
+  data.tar.gz: dcf50f2af18f666b9c55d6d97d9ebd6a31b6b7ccada47b1fb42c7457088697fb4327d3f4c876965f7b2ca51c122a10f7f0e4be6f0551f0888b115ff8504bf53c

data/lib/telegrator/cli.rb

@@ -2,6 +2,12 @@ require 'thor'
 
 module Telegrator
   class CLI < Thor
+    desc "version", "Print version info"
+    def version
+      say "Telegrator #{Telegrator::VERSION}"
+    end
+    map %w(-v --version) => :version
+
     register(
       Generators::Bot,
       'bot',

data/lib/telegrator/generators/bot/generator.rb

@@ -18,6 +18,9 @@ module Telegrator
       class_option :database, type: :string, aliases: '-d', default: 'postgresql', enum: DATABASES,
                               desc: 'Preconfigure for selected database'
 
+      class_option :skip_bundler, type: :boolean, default: false,
+                                  desc: 'Skip Bundler'
+
       class_option :skip_capistrano, type: :boolean, default: false,
                                      desc: 'Skip Capistrano'
 
@@ -37,7 +40,6 @@ module Telegrator
 
       def create_root_files
         template 'gitignore.tt', '.gitignore'
-        inside { run 'git init' }
 
         template 'env.tt', '.env.sample'
         template 'env.tt', '.env'
@@ -45,6 +47,7 @@ module Telegrator
         template 'Gemfile.tt'
         template 'Rakefile.tt'
         template 'Capfile.tt' unless options[:skip_capistrano]
+        template 'config.ru.tt' unless options[:skip_webhook]
       end
 
       # === app/ directory ===
@@ -70,6 +73,11 @@ module Telegrator
         directory 'app/models'
       end
 
+      def create_services
+        template 'app/services.rb'
+        directory 'app/services'
+      end
+
       def create_workers
         template 'app/workers.rb'
         directory 'app/workers'
@@ -109,6 +117,11 @@ module Telegrator
         create_file 'log/.keep'
       end
 
+      def init
+        inside { run 'git init' }
+        inside { run 'bundle install' } unless options[:skip_bundler]
+      end
+
       private
 
       DATABASES.each do |db|

data/lib/telegrator/generators/bot/templates/app/services.rb.tt

@@ -0,0 +1,3 @@
+module Services
+  autoload :Processor, 'services/processor'
+end

data/lib/telegrator/generators/bot/templates/app/services/processor.rb.tt

@@ -0,0 +1,49 @@
+module Services
+  class Processor
+    HANDLERS = {
+      '\A\/start(\s.*|\z)' => Commands::Start,
+      '\A\/stop\z'         => Commands::Stop
+    }.freeze
+
+    def self.call(*args)
+      new(*args).call
+    end
+
+    def initialize(message_dump)
+      @message_dump = message_dump
+    end
+
+    def call
+      process_message YAML.load(@message_dump)
+    end
+
+    private
+
+    def process_message(message)
+      user = user_by_message(message)
+      command_klass(message).invoke(message, user)
+    end
+
+    def user_by_message(message)
+      from = message.from
+      user = Models::User.find_or_initialize_by(telegram_id: from.id)
+      if user.new_record?
+        user.update(first_name: from.first_name, last_name: from.last_name, username: from.username)
+      end
+      user
+    end
+
+    def command_klass(message)
+      command_klass_by_text(message.text) || Commands::Missing
+    end
+
+    def command_klass_by_text(text)
+      key = HANDLERS.keys.find { |regex| /#{regex}/ =~ prepare_text(text) }
+      HANDLERS[key]
+    end
+
+    def prepare_text(text)
+      text.strip
+    end
+  end
+end

data/lib/telegrator/generators/bot/templates/app/workers/processor.rb.tt

@@ -1,41 +1,7 @@
 module Workers
   class Processor < Base
-    HANDLERS = {
-      '\A\/start(\s.*|\z)' => Commands::Start,
-      '\A\/stop\z'         => Commands::Stop
-    }.freeze
-
     def perform(message_dump)
-      process_message YAML.load(message_dump)
-    end
-
-    private
-
-    def process_message(message)
-      user = user_by_message(message)
-      command_klass(message).invoke(message, user)
-    end
-
-    def user_by_message(message)
-      from = message.from
-      user = Models::User.find_or_initialize_by(telegram_id: from.id)
-      if user.new_record?
-        user.update(first_name: from.first_name, last_name: from.last_name, username: from.username)
-      end
-      user
-    end
-
-    def command_klass(message)
-      command_klass_by_text(message.text) || Commands::Missing
-    end
-
-    def command_klass_by_text(text)
-      key = HANDLERS.keys.find { |regex| /#{regex}/ =~ prepare_text(text) }
-      HANDLERS[key]
-    end
-
-    def prepare_text(text)
-      text.strip
+      Services::Processor.call(message_dump)
     end
   end
 end

data/lib/telegrator/generators/bot/templates/config.ru.tt

@@ -0,0 +1,17 @@
+require 'rack/contrib'
+require File.expand_path('../config/boot', __FILE__)
+
+class Listener
+  def call(env)
+    req = Rack::Request.new(env)
+
+    update = Telegram::Bot::Types::Update.new(req.params)
+    Services::Processor.call YAML.dump(update.current_message)
+
+    [200, {}, []]
+  end
+end
+
+use Rack::PostBodyContentTypeParser
+
+run Listener.new

data/lib/telegrator/generators/bot/templates/config/boot.rb.tt

@@ -11,4 +11,5 @@ require 'commands'
 require 'keyboards'
 <%- end -%>
 require 'models'
+require 'services'
 require 'workers'

data/lib/telegrator/generators/bot/templates/config/deploy.rb.tt

@@ -18,4 +18,4 @@ set :default_env, path: '~/.rbenv/shims:~/.rbenv/bin:$PATH'
 
 set :sidekiq_pid, File.join(shared_path, 'tmp', 'pids', 'sidekiq.pid')
 set :sidekiq_config, File.join(current_path, 'config', 'sidekiq.yml')
-set :sidekiq_require, File.join(current_path, 'app', 'boot.rb')
+set :sidekiq_require, File.join(current_path, 'config', 'boot.rb')

data/lib/telegrator/version.rb

@@ -1,3 +1,3 @@
 module Telegrator
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/telegrator.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'thor', '~> 0.19.1'
+  spec.add_runtime_dependency 'thor', '~> 0.20.0'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegrator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Aleksey Ivanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,10 +117,13 @@ files:
 - lib/telegrator/generators/bot/templates/app/models.rb.tt
 - lib/telegrator/generators/bot/templates/app/models/base.rb.tt
 - lib/telegrator/generators/bot/templates/app/models/user.rb.tt
+- lib/telegrator/generators/bot/templates/app/services.rb.tt
+- lib/telegrator/generators/bot/templates/app/services/processor.rb.tt
 - lib/telegrator/generators/bot/templates/app/workers.rb.tt
 - lib/telegrator/generators/bot/templates/app/workers/base.rb.tt
 - lib/telegrator/generators/bot/templates/app/workers/processor.rb.tt
 - lib/telegrator/generators/bot/templates/bin/bot
+- lib/telegrator/generators/bot/templates/config.ru.tt
 - lib/telegrator/generators/bot/templates/config/boot.rb.tt
 - lib/telegrator/generators/bot/templates/config/deploy.rb.tt
 - lib/telegrator/generators/bot/templates/config/deploy/production.rb.tt
@@ -157,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A generator to set up new Telegram bot easily