pechkin 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9031bb8570fd2ca66241e30271167194aebae7a832ecdc3b98fb07630505e2
-  data.tar.gz: 57685b4ededcd3935e412611750b0ed716f386b5d759f88004993cd64162f90d
+  metadata.gz: 966f3990124a55de12aa9c9d29af6e1cec929fd316e64db6940bcec3157f5828
+  data.tar.gz: cc818d878a47c8c7ff816c20e42cdc0a0a02e7046e8955f82290794c6e3179dd
 SHA512:
-  metadata.gz: 3d04eab93cb96a74e68a1f3d7b47707c917c8909b20d251180db0dadfa0144b35b38ac6be19dfed89c4fc66f1ab50ae9d83f9f4df7782bd05c1b085e246d388a
-  data.tar.gz: 680509c985a97814062b85d3039268334f8b8b5623a4724c772c2c054f4fdbcddf32d13c2dd94d2932119a9c445c1664472730eb5c2f1ceda982d9314584155b
+  metadata.gz: 9765527f70a1565db8cb5192579b6ba3d6529de6ead792be6825ff8818077ffcef46f67d91e5ac62745553532391a92cfb96c8ee5130681b248e99c55479532b
+  data.tar.gz: 4a0e8de6ec9c458a895e4df1b26b2a5b89c66d581e4cbd8cdec300bf137a0783838e6c3340f7984f9801913e9e7661c44ab6e87d5954d79d0769111ae618aaaf

data/lib/pechkin.rb

@@ -55,22 +55,29 @@ module Pechkin # :nodoc:
     end
 
     def send_data
-      ch, msg = options.send_data.match(%r{^([^/]+)/(.+)}) do |m|
-        [m[1], m[2]]
-      end
+      ch, msg = parse_endpoint(options.send_data)
 
       raise "#{ch}/#{msg} not found" unless handler.message?(ch, msg)
 
-      data = options.data
-      if data.start_with?('@')
-        f = data[1..-1]
-        raise "File not found #{f}" unless File.exist?(f)
-
-        data = IO.read(f)
-      end
+      data = read_data(options.data)
 
       handler.preview = options.preview
       handler.handle(ch, msg, JSON.parse(data, symbolize_names: true))
     end
+
+    def read_data(data)
+      return data unless data.start_with?('@')
+
+      file = data[1..-1]
+      raise "File not found #{file}" unless File.exist?(file)
+
+      IO.read(file)
+    end
+
+    def parse_endpoint(endpoint)
+      endpoint.match(%r{^([^/]+)/(.+)}) do |m|
+        [m[1], m[2]]
+      end
+    end
   end
 end

data/lib/pechkin/app.rb

@@ -40,8 +40,8 @@ module Pechkin
     def call(env)
       RequestHandler.new(handler, env).handle
     rescue StandardError => e
-      body = '{"status": "error", "reason":"' + e.message + '"'
-      ['503', { 'Content-Type' => 'application/json' }, body]
+      body = { status: 'error', reason: e.message }.to_json
+      ['503', { 'Content-Type' => 'application/json' }, [body]]
     end
   end
 
@@ -95,7 +95,7 @@ module Pechkin
     end
 
     def response(code, body)
-      [code.to_s, DEFAULT_HEADERS, body]
+      [code.to_s, DEFAULT_HEADERS, [body]]
     end
 
     def post?

data/lib/pechkin/handler.rb

@@ -25,7 +25,7 @@ module Pechkin
       # Find message and try substitute values to message parameters.
       message_config = substitute(data, fetch_message(channel_config, msg_id))
 
-      data = (message_config['parameters'] || {}).merge(data)
+      data = (message_config['variables'] || {}).merge(data)
       template = message_config['template']
 
       text = ''

data/lib/pechkin/version.rb

@@ -1,7 +1,7 @@
 module Pechkin
   # Keeps actual version
   module Version
-    VERSION = [1, 0, 0].freeze
+    VERSION = [1, 0, 1].freeze
     class << self
       def version_string
         VERSION.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: prometheus-client
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.6
 description: 
 email: ilya.arkhanhelsky at gmail.com
 executables: