rounders 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d43d6c063f0538d31a42c0e9fe432c561bd8595
-  data.tar.gz: 6d763ff7a6dd32348ab9b93d9bd03694894dfd02
+  metadata.gz: fbacabd11969fabf95be68cfb36d3dbce926bc05
+  data.tar.gz: 664540bd14ff7515e03130ca7845b074926ac99e
 SHA512:
-  metadata.gz: 69fe8f516ebb23184ac4a8b017eb9661c533da9fdf8a7f55ae9460e904a21ab6333d686f065df9036fe4e6bf7fa7bc8391fbba9994bdcdb89b42ac56dbb44377
-  data.tar.gz: 4af7f4544a1b0aca2ddb86487de29c778e2f6f81ee4da4ad816cd162f9b29eed1db81a65e2c619ab8c8ee403be930f5dddeb21bd4a972f4b1d14b0453b83bd8c
+  metadata.gz: c2b12d795afc2f201a9b2b79893848d6a6f36fe14050705b882d8f4e5eddb0790dd44b42c0f7f40c655694e819fdb983cb82b0c97839436ea8579d07b70d9b46
+  data.tar.gz: 1677df996af52e83e94683778803a449a33447415d09c05593f23aa00685bceab828409ee7e3ad0d4d84155395e798e4d6309428706dd9d0cb4b0c46894e4146

data/.rubocop.yml

@@ -1,11 +1,11 @@
 
 AllCops:
-  TargetRubyVersion: 2.3.4
+  TargetRubyVersion: 2.3
   Exclude:
      - 'vendor/**/*'
      - 'spec/fixtures/**/*'
      - 'tmp/**/*'
-     - 'templates/**/*'
+     - 'lib/rounders/generators/**/templates/**/*'
 ##################### Metrics ##################################
 
 Metrics/LineLength:

data/bin/rounders

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'bundler'
+
 require 'rounders'
 
 Rounders::Commander.start(ARGV)

data/lib/rounders/application.rb

@@ -1,16 +1,6 @@
-module Rounders
-  class Application
-    extend Dry::Configurable
-
-    setting :load_path, [
-      'config/initializers/*.rb'
-    ], reader: true
-
-    setting :app_path, 'app', reader: true
+require_relative 'configuration'
 
-    # logger is the logger that will be used for Rounders.logger
-    setting :logger, Rounders::Logger.get_logger, reader: true
-
-    setting :store, :memory, reader: true
+module Rounders
+  class Application < Rounders::DefaultConfiguration
   end
 end

data/lib/rounders/configuration.rb

@@ -0,0 +1,17 @@
+module Rounders
+  class DefaultConfiguration
+    extend Topping::Configurable::HQ
+
+    config :load_path,  required: true, default: [
+      'config/initializers/*.rb'
+    ]
+
+    config :app_path, required: true, default: 'app', type: String
+
+    # logger is the logger that will be used for Rounders.logger
+    config :logger, required: true, default: Rounders::Logger.get_logger
+
+    # Use temporaly store
+    config :store, required: true, default: :memory, type: Symbol
+  end
+end

data/lib/rounders/generators/app/templates/config/application.rb

@@ -1,5 +1,4 @@
-Rounders::Application.configure do |config|
+class Rounders::<%= class_name %> < Rounders::Application
   # config.logger = Logger.new('log/rounders.log')
-
   # config.store = :memory
 end

data/lib/rounders/generators/handler/templates/%underscored_name%_handler.rb.tt

@@ -1,8 +1,12 @@
-class <%= class_name %> < Rounders::Handlers::Handler
-<% handlers.each do |handler| %>
-  on({ body: 'example' }, :<%= handler %>)<% end -%>
-<% handlers.each do |handler| %>
+module Rounders
+  module Handlers
+    class <%= class_name %> < Rounders::Handlers::Handler
+    <% handlers.each do |handler| %>
+      on({ body: 'example' }, :<%= handler %>)<% end -%>
+    <% handlers.each do |handler| %>
 
-  def <%= handler %>(mail)
-  end<% end %>
+      def <%= handler %>(mail)
+      end<% end %>
+    end
+  end
 end

data/lib/rounders/generators/matcher/templates/%underscored_name%_matcher.rb.tt

@@ -1,4 +1,8 @@
-class <%= class_name %> < Rounders::Matchers::Matcher
-  def match(message)
+module Rounders
+  module Matchers
+    class <%= class_name %> < Rounders::Matchers::Matcher
+      def match(message)
+      end
+    end
   end
 end

data/lib/rounders/generators/plugin/templates/spec/spec_helper.rb.tt

@@ -120,4 +120,5 @@ end
 
 
 require 'rounders'
+require 'rounders/spec'
 require 'rounders/<%= underscored_name %>'

data/lib/rounders/generators/receiver/templates/%underscored_name%_receiver.rb.tt

@@ -1,12 +1,16 @@
-class <%= class_name %> < Rounders::Receivers::Receiver
-  def initialize()
-  end
+module Rounders
+  module Receivers
+    class <%= class_name %> < Rounders::Receivers::Receiver
+      def initialize
+      end
 
-  def receive
-  end
+      def receive
+      end
 
-  class << self
-    def receive
+      class << self
+        def receive
+        end
+      end
     end
   end
 end

data/lib/rounders/handlers/handler.rb

@@ -2,6 +2,7 @@ module Rounders
   module Handlers
     class Handler
       include Rounders::Plugins::Pluggable
+      include Topping::Configurable::Branch
       attr_reader :matches, :rounder
 
       class << self
@@ -14,8 +15,9 @@ module Rounders
           end
         end
 
-        def inherited(child_class)
-          Rounders.handlers << child_class
+        def inherited(klass)
+          super
+          Rounders.handlers << klass
         end
 
         def dispatch(rounder, mails)

data/lib/rounders/matchers/matcher.rb

@@ -1,5 +1,7 @@
 module Rounders
   module Matchers
+    include Topping::Configurable::Branch
+
     class NoImplementError < StandardError
     end
     class Matcher
@@ -21,6 +23,7 @@ module Rounders
 
       class << self
         def inherited(klass)
+          super
           Rounders.matchers[klass.symbol] = klass
         end
 

data/lib/rounders/receivers/mail.rb

@@ -1,30 +1,31 @@
 module Rounders
   module Receivers
     class Mail < Rounders::Receivers::Receiver
-      setting :protocol, :imap
-      setting :options, {}
-      setting :mail_server_setting
+      config :protocol, default: :imap, required: true
+      config :options, default: {}, required: true
+      config :mail_server_setting, default: {}, required: true
+
       DEFAULT_FIND_OPTION = {
         keys: %w[NOT SEEN]
       }.freeze
 
-      def initialize(client: nil, options: {})
-        @client = client
-        @options = DEFAULT_FIND_OPTION.merge(options)
+      def client
+        return @client if @client
+        retriever = Rounders::Receivers::Mail.parser.lookup_retriever_method(config.protocol)
+        @client = retriever.new(config.mail_server_setting)
+      end
+
+      def options
+        @options ||= DEFAULT_FIND_OPTION.merge(config.options)
       end
 
       def receive
-        @client.find(@options).map { |message| Rounders::Mail.new(message) }
+        client.find(options).map { |message| Rounders::Mail.new(message) }
       end
 
       class << self
         def create
-          config = Mail.config
-          retriever = parser.lookup_retriever_method(config.protocol)
-          new(
-            client: retriever.new(config.mail_server_setting),
-            options: config.options
-          )
+          new
         end
 
         def receive

data/lib/rounders/receivers/receiver.rb

@@ -1,11 +1,13 @@
 module Rounders
   module Receivers
     class Receiver
+      include Topping::Configurable::Branch
+
       class << self
-        def inherited(child_class)
-          child_class.include Rounders::Plugins::Pluggable
-          child_class.extend Dry::Configurable
-          Rounders.receivers << child_class
+        def inherited(klass)
+          super
+          klass.include Rounders::Plugins::Pluggable
+          Rounders.receivers << klass
         end
 
         def receive

data/lib/rounders/rounder.rb

@@ -15,7 +15,7 @@ module Rounders
     end
 
     def store
-      @store ||= Rounders.stores[Rounders::Application.store].new
+      @store ||= Rounders.stores[Rounders::Application.config.store].new
     end
 
     private
@@ -44,7 +44,7 @@ module Rounders
     end
 
     def load_config
-      Rounders::Application.load_path.each do |path|
+      Rounders::Application.config.load_path.each do |path|
         Pathname.glob(File.join(Dir.pwd, path)).each do |config|
           require_relative config
         end
@@ -74,6 +74,7 @@ module Rounders
     end
 
     def setup
+      Topping.build
       daemon
       dotenv
       pid

data/lib/rounders/spec.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.before(:each) do
+    Topping.build
+  end
+end

data/lib/rounders/stores/store.rb

@@ -2,6 +2,7 @@ module Rounders
   module Stores
     class Store
       include Rounders::Plugins::Pluggable
+      include Topping::Configurable::Branch
 
       def [](key)
         data[key]

data/lib/rounders/version.rb

@@ -1,3 +1,3 @@
 module Rounders
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/rounders.rb

@@ -1,9 +1,11 @@
 require 'rounders/version'
 
+require 'bundler'
+require 'bundler/setup'
+require 'forwardable'
 require 'thor'
 require 'thor/group'
-require 'dry-configurable'
-require 'forwardable'
+require 'topping'
 require 'mail'
 require 'dotenv'
 
@@ -14,7 +16,7 @@ require 'rounders/util'
 module Rounders
   # Your code goes here...
   CONFIG_DIR_PATH = File.join(Dir.pwd, 'config').freeze
-  APP_PATH = File.join(Dir.pwd, Rounders::Application.app_path).freeze
+  APP_PATH = File.join(Dir.pwd, Rounders::Application.config.app_path).freeze
 
   class << self
     attr_accessor :logger
@@ -40,7 +42,7 @@ module Rounders
     end
   end
 
-  self.logger = Rounders::Application.logger
+  self.logger = Rounders::Application.config.logger
 end
 
 require 'rounders/mail'

data/rounders.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rubocop', '~> 1.2.0'
   spec.add_development_dependency 'pry'
   spec.add_dependency 'dotenv'
-  spec.add_dependency 'dry-configurable'
+  spec.add_dependency 'topping'
   spec.add_dependency 'mail', '~> 2.6.4'
   spec.add_dependency 'mail-gpg'
   spec.add_dependency 'hanami-utils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rounders
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - akira.takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: topping
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -260,6 +260,7 @@ files:
 - lib/rounders/commands/global_command.rb
 - lib/rounders/commands/local_command.rb
 - lib/rounders/commands/sub_commands/generate.rb
+- lib/rounders/configuration.rb
 - lib/rounders/generators/app/app_generator.rb
 - lib/rounders/generators/app/templates/.rspec
 - lib/rounders/generators/app/templates/Gemfile
@@ -316,6 +317,7 @@ files:
 - lib/rounders/receivers/mail.rb
 - lib/rounders/receivers/receiver.rb
 - lib/rounders/rounder.rb
+- lib/rounders/spec.rb
 - lib/rounders/stores/memory.rb
 - lib/rounders/stores/store.rb
 - lib/rounders/util.rb
@@ -341,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: bot-ish pluggable incoming mail processing framework