lapin 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWUwNTdkZDVhOGE3NGVlNzg5MTdkMjU4OWZlNjg5MjQzZTZiYmYxYw==
+  data.tar.gz: !binary |-
+    Mjk4MDRmYzRmNzQyYWVmNzZmNGQyOWE1NzBkNjhkMGQxZjgxYmJlNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NzViZmEyODczMzJkM2FiNTc2MWRiNGVlZDZkZGFhMTgxODFkZjJiYmRiNzFj
+    NGQ1ZWEwNjk1YzkyNWM5NDM5NjI3YjNkMGU3NWNlMGYyZmM4YWU2ZjUyZGE0
+    OWMyZDVjNjA5YTg2YmJhZThjYWFlYmI2ODYyMGI4ODkwYTZhMjI=
+  data.tar.gz: !binary |-
+    MjM1YjEyZmY2MGMxMWFmZTYwZTgzNDNiNDkwOTE5ODg3YmQ4NTllZDk4MjE0
+    MDA2YTg2ODk3YTAzNzZiZTU0MGE3YzcxNzRhZmYyNDQ4NGYzM2QzMzVjM2Nh
+    NmFjNDI1OGIzYjM3NjdiMzUwZGNkNDE3ZjM0MjdmNmY5OWRjMzE=

data/examples/subscriber.rb

@@ -1,13 +1,13 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 
 require "amqp"
+require "multi_json"
 
-AMQP.start(host: 'localhost') do |conn|
+AMQP.start("amqp://localhost:5672/") do |conn|
   channel  = AMQP::Channel.new(conn)
-  exchange = channel.direct('amqp.direct')
-  queue    = channel.queue("", exclusive: true)
-  queue.bind(exchange, routing_key: 'amqp.giraffi')
+  exchange = channel.fanout('logs')
+  queue    = channel.queue("", :auto_delete => true).bind(exchange, :routing_key => 'amq.giraffi')
 
   Signal.trap("INT") do
     conn.close do
@@ -17,10 +17,7 @@ AMQP.start(host: 'localhost') do |conn|
 
   puts " [*] Waiting for logs. To exit press CTRL+C"
 
-  i = 1
-  queue.subscribe do |header, payload|
-    #puts " [x] #{header}:#{payload}"
-    puts " [x] #{header} ----- #{i}"
-    i += 1
+  queue.subscribe do |metadata, payload|
+    puts " [x] #{MultiJson.load(payload)}"
   end
 end

data/lapin.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rack",        "~> 1.4.0"
-  s.add_dependency "bunny",       "~> 0.8.0"
-  s.add_dependency "multi_json",  "~> 1.3.0"
-  s.add_dependency "sinatra",     "~> 1.3.0"
+  s.add_dependency "rack",       "~> 1.5.2"
+  s.add_dependency "bunny",      "~> 0.9.0.pre7"
+  s.add_dependency "multi_json", "~> 1.6.1"
+  s.add_dependency "sinatra",    "~> 1.3.5"
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "amqp"
   s.add_development_dependency "yajl-ruby"
   s.add_development_dependency "rack-test"
   s.add_development_dependency "shoulda"

data/lib/lapin.rb

@@ -21,9 +21,10 @@ module Lapin
 
     def client
       unless @client
-        c = ::Bunny.new(Config.amqp_config)
-        c.start
-        @client = c
+        conn = Bunny.new(Config.amqp_config)
+        conn.start
+        conn.create_channel
+        @client = conn
       end
       @client
     end

data/lib/lapin/config.rb

@@ -6,7 +6,7 @@ module Lapin
 
     class << self
       attr_accessor :amqp_url, :vhost
-      attr_accessor :exchange, :routing_key
+      attr_accessor :exchange, :routing_key, :queue
       attr_accessor :logging
 
       def amqp_config
@@ -15,8 +15,8 @@ module Lapin
           :user    => uri.user,
           :pass    => uri.password,
           :host    => uri.host,
-          :port    => (uri.port || 5672),
-          :vhost   => @vhost || uri.path ,
+          :port    => uri.port || 5672,
+          :vhost   => @vhost || uri.path,
           :logging => @logging || false
         }
       rescue Object => e
@@ -32,7 +32,7 @@ module Lapin
       end
 
       def exchange
-        @exchange ||= "amq.direct"
+        @exchange ||= "amq.fanout"
       end
 
       def routing_key

data/lib/lapin/server.rb

@@ -42,7 +42,7 @@ module Lapin
 
     # Create an exchange from the current AMQP connection.
     def exchange
-      @exchange ||= Lapin.client.exchange(Config.exchange, :type => 'direct')
+      @exchange ||= Lapin.client.fanout(Config.exchange)
     end
 
     # Recieve post data, validate and redirect it
@@ -52,14 +52,13 @@ module Lapin
 
       begin
         # Set routing key from headers
-        Config.routing_key = request.env['HTTP_X_ROUTING_KEY']
+        Config.routing_key = request.env["HTTP_X_ROUTING_KEY"]
 
         # Set payload from bod
         payload = request.body.read
 
         if validate_json(payload)
-          exchange.publish(payload, :key => Config.routing_key)
-
+          exchange.publish(payload, :routing_key => Config.routing_key)
           # No Content
           status 204
         else

data/lib/lapin/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module Lapin
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/server_test.rb

@@ -23,9 +23,11 @@ class ServerTest < Test::Unit::TestCase
       m = mock()
       Bunny.expects(:new).with(Lapin::Config.amqp_config).returns(m)
       m.expects(:start)
+      m.expects(:create_channel)
+      #m.stubs(:exchange).with(Lapin::Config.exchange, {:type => 'fanout'}).returns(e)
       e = mock("exchange")
-      m.stubs(:exchange).with(Lapin::Config.exchange, {:type => 'direct'}).returns(e)
-      e.stubs(:publish).with(@payload, {:key => 'giraffi.nagios'})
+      m.stubs(:fanout).with(Lapin::Config.exchange).returns(e)
+      e.stubs(:publish).with(@payload, {:routing_key => 'giraffi.nagios'})
 
       post "/publish.json", @payload, {"CONTENT_TYPE" => "application/json", "HTTP_X_ROUTING_KEY" => "giraffi.nagios"}
       assert_equal last_request.body.string, @payload
@@ -64,7 +66,7 @@ class ServerTest < Test::Unit::TestCase
     should "return 502 when the no connection and no socket are found" do
       m = mock()
       Bunny.expects(:new).with(Lapin::Config.amqp_config).returns(m)
-      m.stubs(:start).raises(Bunny::ConnectionError.new)
+      m.stubs(:start).raises(Bunny::ConnectionError.new("No connection: socket is nil.", "localhost", 5762))
 
       post "/publish.json", @payload, {"CONTENT_TYPE" => "application/json"}
       assert_equal last_response.status, 502
@@ -73,7 +75,7 @@ class ServerTest < Test::Unit::TestCase
     should "return 502 when the broken pipe is catched" do
       m = mock()
       Bunny.expects(:new).with(Lapin::Config.amqp_config).returns(m)
-      m.stubs(:start).raises(Bunny::ServerDownError.new)
+      m.stubs(:start).raises(Bunny::TCPConnectionFailed.new("Connection failure: connection is failed.", "localhost", 5762))
 
       post "/publish.json", @payload, {"CONTENT_TYPE" => "application/json"}
       assert_equal last_response.status, 502

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: lapin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - azukiwasher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0.pre7
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: amqp
+  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
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -211,31 +202,29 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/giraffi/lapin.git
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: lapin
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A sinatra-based app that redirects data received via HTTP to an AMQP message
   broker
 test_files:
 - test/config_test.rb
 - test/server_test.rb
 - test/test_helper.rb
-has_rdoc: