hato 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c911cd9411f589c2ca7db3e534ed77b3536942b8
-  data.tar.gz: 7957d0bf047be3f829a98a9a8ff637088623586a
+  metadata.gz: 10fe52f50d0d3e9135999a5f4c52a2b7d419266f
+  data.tar.gz: 82c0ad38232cd128e4e3a834ee1f310fd2f66dcd
 SHA512:
-  metadata.gz: eba45a0d953bd29dc0d3a3bca7195b48f5ed45a1b3a4a885a67c569d6827dfb3a586a06550d6673a9f9e7477d8059f09fe30eeb3b93bbaaa298497f97ea44baf
-  data.tar.gz: f31c44905201b10fc991e91745c6c1cbf734bd0ba8023342ea1b73c218abfbb07a312632c27415e6eee7635375a8d885cf5df78aada0b6e3c2d00caafee0743c
+  metadata.gz: b6b226505e06bcea7aa9c77e1e7e4f64d21ad562db087c898667b3e41bc9c4fb0575fdf19326d03e74924606e70853ca3f1ea62e25030366d99c5657a9c50929
+  data.tar.gz: d9cec8a303fa12785af2c13a62199c30eae69e0792810edd03620870201a1474b4c38a1b1ce7ac89ff765e7cfa4c1ade0bd02b1683bc0efd884d30efb0532dd5

data/README.md

@@ -28,38 +28,20 @@ Hato::Config.define do
   host    '0.0.0.0'
   port    9699
 
+  # test by exact string mathing
   tag 'test' do
-    plugin 'Ikachan' do
-      scheme  'http'
-      host    'irc.example.com'
-      port    4979
-      channel 'hato'
+    plugin 'Plugin1' do
+      key1 'value1'
+      key2 'value2'
+      key3 'value3'
     end
+  end
 
-    plugin 'Mail' do
-      smtp address:   'smtp.example.com',
-           port:      587,
-           domain:    'example',
-           user_name: 'hato',
-           password:  'password',
-           enable_ssl: true
-
-      subject_template = <<EOS
-[<%= args[:tag] %>] Notification
-EOS
-      body_template = <<EOS
-You've got a message:
-
-<%= args[:message] %>
-EOS
-
-      message from: 'hato@example.com',
-              to:   [
-                'foo@example.com',
-                'bar@example.com',
-              ],
-              subject_template: subject_template,
-              body_template:    body_template
+  # test by regexp matching
+  tag /^test2\.([^\.]+)\.([^\.]+)$/ do |matched1, matched2|
+    plugin 'Plugin2' do
+      key1 matched1
+      key2 matched2
     end
   end
 end
@@ -67,10 +49,11 @@ end
 
 ## Plugin Architecture
 
-There have alread been some plugins:
+There have already been some plugins:
 
   * [Hato::Plugin::Ikachan](https://github.com/kentaro/hato-plugin-ikachan)
   * [Hato::Plugin::Mail](https://github.com/kentaro/hato-plugin-mail)
+  * [Hato::Plugin::Hipchat](https://github.com/banyan/hato-plugin-hipchat)
 
 You can easily extend Hato by creating your own plugins. See the source for detail. It's really easy.
 

data/hato.gemspec

@@ -29,5 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rack-test"
 end
 

data/lib/hato/config.rb

@@ -8,7 +8,7 @@ module Hato
 
       def initialize(name, &block)
         @name = name
-        instance_eval(&block)
+        @block = block
       end
 
       def method_missing(method, *args)
@@ -19,6 +19,15 @@ module Hato
         end
       end
 
+      def activate!(args = nil)
+        if !args || args.empty?
+          instance_eval(&@block)
+        else
+          instance_exec(*args, &@block)
+        end
+        self
+      end
+
       private
 
       def config
@@ -51,7 +60,14 @@ module Hato
     end
 
     def self.match(tag)
-      tags.select { |t| t.name == tag }
+      tags.inject([]) do |buf, t|
+        if t.name.kind_of?(String) && t.name == tag
+          buf << [t]
+        elsif t.name.kind_of?(Regexp) && (match = t.name.match(tag))
+          buf << [t, match[1..-1]]
+        end
+        buf
+      end
     end
 
     def self.reset
@@ -63,12 +79,22 @@ module Hato
     class Tag
       include DSL
 
+      def initialize(name, &block)
+        @name = name
+        @block = block
+      end
+
+      def activate!(args = nil)
+        @plugins = []
+        super(args)
+      end
+
       def plugins
         @plugins ||= []
       end
 
       def plugin(name, &block)
-        self.plugins << Plugin.new(name, &block)
+        self.plugins << Plugin.new(name, &block).activate!
       end
     end
 

data/lib/hato/httpd.rb

@@ -23,7 +23,7 @@ module Hato
     class App < Sinatra::Base
       enable :logging
 
-      before '/.+' do
+      before /\/.+/ do
         if settings.api_key && (settings.api_key != params[:api_key])
           halt 403, JSON.dump(
             status:  :error,

data/lib/hato/observer.rb

@@ -26,8 +26,9 @@ module Hato
     def load_plugins_for(tag)
       plugins = []
 
-      @config.match(tag).each do |matched|
-        matched.plugins.each do |plugin|
+      @config.match(tag).each do |matched_tag, args|
+        matched_tag.activate!(args)
+        matched_tag.plugins.each do |plugin|
           plugin_file_name = file_name_for(plugin.name)
           require plugin_file_name
 

data/lib/hato/version.rb

@@ -1,3 +1,3 @@
 module Hato
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/assets/config/tags_name_regexp.rb

@@ -0,0 +1,40 @@
+Hato::Config.define do
+  api_key 'test'
+  host    '0.0.0.0'
+  port    9699
+
+  tag /(.+) and (.+)/ do |match|
+    plugin 'Ikachan' do
+      scheme  'http'
+      host    'irc.example.com'
+      port    4979
+      channel 'hato'
+    end
+
+    plugin 'Mail' do
+      smtp address:   'smtp.example.com',
+           port:      587,
+           domain:    'example',
+           user_name: 'hato',
+           password:  'password',
+           enable_ssl: true
+
+      subject_template = <<EOS
+[<%= args[:tag] %>] Notification
+EOS
+      body_template = <<EOS
+You've got a message:
+
+<%= args[:message] %>
+EOS
+
+      message from: 'hato@example.com',
+              to:   [
+                'foo@example.com',
+                'bar@example.com',
+              ],
+              subject_template: subject_template,
+              body_template:    body_template
+    end
+  end
+end

data/spec/assets/lib/hato/plugin/ikachan.rb

@@ -0,0 +1,10 @@
+require 'hato/plugin'
+
+module Hato
+  module Plugin
+    class Ikachan < Base
+      def notify(args)
+      end
+    end
+  end
+end

data/spec/assets/lib/hato/plugin/mail.rb

@@ -0,0 +1,10 @@
+require 'hato/plugin'
+
+module Hato
+  module Plugin
+    class Mail < Base
+      def notify(args)
+      end
+    end
+  end
+end

data/spec/lib/hato/config_spec.rb

@@ -43,6 +43,7 @@ describe Hato::Config do
           expect(described_class.tags.size).to be == 1
 
           tag = described_class.tags.first
+          tag.activate!
           expect(tag.plugins).to be_an_instance_of Array
           expect(tag.plugins.size).to be == 2
 

data/spec/lib/hato/httpd_spec.rb

@@ -0,0 +1,40 @@
+ENV['RACK_ENV'] = 'test'
+
+require 'spec_helper'
+require 'rack/test'
+
+describe Hato::Httpd do
+  include Rack::Test::Methods
+
+  def app
+    config = Hato::Config.load(
+      File.expand_path('../../../assets/config/test.rb', __FILE__)
+    )
+    observer = Hato::Observer.new(config)
+    Hato::Httpd::App.set(:observer, observer)
+    Hato::Httpd::App.set(:api_key,  config.api_key)
+    Hato::Httpd::App.new
+  end
+
+  describe 'index' do
+    it do
+      get '/'
+      expect(last_response).to be_ok
+      expect(last_response.body).to eq('Hato https://github.com/kentaro/hato')
+    end
+  end
+
+  describe 'notify' do
+    it 'success' do
+      post '/notify', {message: 'test', tag: 'test', api_key: 'test'}
+      expect(last_response).to be_ok
+      expect(last_response.body).to eq('{"status":"success","message":"Successfully sent the message you notified to me."}')
+    end
+
+    it 'error' do
+      post '/notify', {message: 'test', tag: 'test', api_key: 'wrong_key'}
+      expect(last_response).to be_forbidden
+      expect(last_response.body).to eq('{"status":"error","message":"API key is wrong. Confirm your API key setting of server/client."}')
+    end
+  end
+end

data/spec/lib/hato/observer_spec.rb

@@ -0,0 +1,51 @@
+require_relative '../../spec_helper'
+
+describe Hato::Observer do
+  describe '.update' do
+    context "tag's name is String object in config" do
+      before do
+        Hato::Config.reset
+        config = Hato::Config.load(
+          File.expand_path('../../../assets/config/test.rb', __FILE__)
+        )
+        @observer = described_class.new(config)
+      end
+
+      it 'receive `activate!` with nil' do
+        logger = double('logger')
+        logger.stub(:error).and_return(nil)
+
+        Hato::Config::Tag.any_instance.should_receive(:activate!).with(nil)
+
+        @observer.update(
+          tag:     'test',
+          message: 'hello!',
+          logger:  logger
+        )
+      end
+    end
+
+    context "tag's name is Regexp object in config" do
+      before do
+        Hato::Config.reset
+        config = Hato::Config.load(
+          File.expand_path('../../../assets/config/tags_name_regexp.rb', __FILE__)
+        )
+        @observer = described_class.new(config)
+      end
+
+      it 'receive `activate!` with matched values' do
+        logger = double('logger')
+        logger.stub(:error).and_return(nil)
+
+        Hato::Config::Tag.any_instance.should_receive(:activate!).with(['Yang', 'Reinhard'])
+
+        @observer.update(
+          tag:     'Yang and Reinhard',
+          message: 'hello!',
+          logger:  logger
+        )
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+$LOAD_PATH.unshift File.expand_path('../assets/lib', __FILE__)
 require_relative '../lib/hato'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hato
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Notification Management Tools
 email:
 - kentarok@gmail.com
@@ -130,8 +144,13 @@ files:
 - lib/hato/observer.rb
 - lib/hato/plugin.rb
 - lib/hato/version.rb
+- spec/assets/config/tags_name_regexp.rb
 - spec/assets/config/test.rb
+- spec/assets/lib/hato/plugin/ikachan.rb
+- spec/assets/lib/hato/plugin/mail.rb
 - spec/lib/hato/config_spec.rb
+- spec/lib/hato/httpd_spec.rb
+- spec/lib/hato/observer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kentaro/hato
 licenses:
@@ -158,6 +177,11 @@ signing_key:
 specification_version: 4
 summary: A Notification Management Tools
 test_files:
+- spec/assets/config/tags_name_regexp.rb
 - spec/assets/config/test.rb
+- spec/assets/lib/hato/plugin/ikachan.rb
+- spec/assets/lib/hato/plugin/mail.rb
 - spec/lib/hato/config_spec.rb
+- spec/lib/hato/httpd_spec.rb
+- spec/lib/hato/observer_spec.rb
 - spec/spec_helper.rb