magellan-publisher 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ffadcdab35bc05035387f74ffdc1069a209c56d
-  data.tar.gz: 6cc67dca0a373f051e7cdccc1272009adacf8f78
+  metadata.gz: d38adff420cc28de137ce67afb59bd8109e0a3d9
+  data.tar.gz: edf2f4bd089b5c5ca8507ffaa022130a37685782
 SHA512:
-  metadata.gz: 514fd121d2df5a1cc5607285da9224f16fb6c4cf561607beb52bf1da437548326e8b52e79b259b03590313fb9753fd027f69e2a4330d449357adc5917213baf0
-  data.tar.gz: 1c6c9d8bd218176cb470d442cc0c1428616807ea2258a99191d31c4b96329a77254fc5202e510571cb21112c8917c0b0248e46a12a6e99f6d69b5b8aebae9cd0
+  metadata.gz: eecfefcf1d081102103ff4d317ae41f71c6b7c7bb2d969494de5b7ef78b7a17481d5da196e5786f11de4bf9b9333076d19cd744e92839bda198cfeb32b02ce2f
+  data.tar.gz: c12bceffff43b22e316c5398e70548ef0a0dedd8bfe1e8e67cd3cde468fc37fe571be19e637b6c14bbf8addc4f65a42862d67257f183239c4b3f23faf5d3d9db

data/lib/magellan/publisher.rb

@@ -2,15 +2,15 @@
 
 module Magellan
   class Publisher
-    def initialize(host: "127.0.0.1", port: 5672, vhost: nil, user: nil, pass: nil, timeout: 0.3)
+    def initialize(host: nil, port: nil, vhost: nil, user: nil, pass: nil, timeout: nil)
       # RabbitMQへの接続設定を作成
       connection_settings = {
-        host:    host,
-        port:    port,
-        vhost:   vhost,
-        user:    user,
-        pass:    pass,
-        timeout: timeout,
+        host:    load_env_as_default(host,    ['MAGELLAN_PUBLISH_AMQP_ADDR'],    :string),
+        port:    load_env_as_default(port,    ['MAGELLAN_PUBLISH_AMQP_PORT'],    :integer),
+        vhost:   load_env_as_default(vhost,   ['MAGELLAN_PUBLISH_AMQP_VHOST'],   :string),
+        user:    load_env_as_default(user,    ['MAGELLAN_PUBLISH_AMQP_USER'],    :string),
+        pass:    load_env_as_default(pass,    ['MAGELLAN_PUBLISH_AMQP_PASS'],    :string),
+        timeout: load_env_as_default(timeout, ['MAGELLAN_PUBLISH_AMQP_TIMEOUT'], :float) || 0.3,
       }
 
       @conn = Bunny.new(connection_settings)
@@ -33,5 +33,42 @@ module Magellan
     def publish(topic, body)
       @exchange.publish(body, routing_key: convert_topic(topic))
     end
+
+    class << self
+      def publisher
+        @publisher ||= Magellan::Publisher.new
+      end
+
+      def publish(topic, body)
+        publisher.publish(topic, body)
+      end
+    end
+
+    private
+
+    def load_env_as_default(val, envkeys, type)
+      if is_blank?(val)
+        envkeys = Array(envkeys)
+        envkeys.each do |key|
+          val = ENV[key.to_s]
+          break if val and not(val.empty?)
+        end
+      end
+
+      if val
+        case type.to_sym
+        when :string  then val.to_s
+        when :integer then Integer(val)
+        when :float   then Float(val)
+        else val
+        end
+      else
+        nil
+      end
+    end
+
+    def is_blank?(val)
+      val.respond_to?(:empty?) ? !!val.empty? : !val
+    end
   end
 end

data/lib/magellan/publisher/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   class Publisher
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/magellan-publisher.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "bunny_mock"
 end

data/spec/magellan/publisher_spec.rb

@@ -9,31 +9,56 @@ describe Magellan::Publisher do
 
   describe "#publish" do
 
-      before do
-        @topic = "topic/aaa"
-        @rabbitmq_topic = "topic.aaa"
-        @payload = "Hello World"
-        @bunny    = BunnyMock.new
-        channel = @bunny.create_channel
-        @exchange = @bunny.exchange('test_exchange', type: :direct, durable: false, auto_delete: false)
-        expect(@exchange).to receive(:publish).with(@payload, routing_key: @rabbitmq_topic)
-
-        allow(Bunny  ).to receive(:new).and_return(@bunny)
-        allow(@bunny  ).to receive(:create_channel).and_return(channel)
-        allow(channel).to receive(:exchange).with('test_exchange', no_declare: true).and_return(@exchange)
-
-        ENV["MAGELLAN_PUBLISH_EXCHANGE"] = "test_exchange"
-        @publisher = Magellan::Publisher.new(host: "127.0.0.1",
-                                             port: 5672,
-                                             vhost: "customer1.sample_project",
-                                             user: "customer1.sample_project",
-                                             pass: "pasw1")
-      end
-
-      it do
-        @publisher.publish(@topic, @payload)
-      end
+    before do
+      @topic = "topic/aaa"
+      @rabbitmq_topic = "topic.aaa"
+      @payload = "Hello World"
+      @bunny    = BunnyMock.new
+      channel = @bunny.create_channel
+      @exchange = @bunny.exchange('test_exchange', type: :direct, durable: false, auto_delete: false)
+      expect(@exchange).to receive(:publish).with(@payload, routing_key: @rabbitmq_topic)
 
+      allow(Bunny  ).to receive(:new).and_return(@bunny)
+      allow(@bunny  ).to receive(:create_channel).and_return(channel)
+      allow(channel).to receive(:exchange).with('test_exchange', no_declare: true).and_return(@exchange)
 
+      ENV["MAGELLAN_PUBLISH_EXCHANGE"] = "test_exchange"
+      @publisher = Magellan::Publisher.new(host: "127.0.0.1",
+                                           port: 5672,
+                                           vhost: "/customer1.sample_project",
+                                           user: "customer1.sample_project",
+                                           pass: "pasw1")
+    end
+
+    it do
+      @publisher.publish(@topic, @payload)
+    end
+  end
+
+  describe ".publish" do
+    before do
+      @topic = "topic/aaa"
+      @rabbitmq_topic = "topic.aaa"
+      @payload = "Hello World"
+      @bunny    = BunnyMock.new
+      channel = @bunny.create_channel
+      @exchange = @bunny.exchange('test_exchange', type: :direct, durable: false, auto_delete: false)
+      expect(@exchange).to receive(:publish).with(@payload, routing_key: @rabbitmq_topic)
+
+      allow(Bunny  ).to receive(:new).and_return(@bunny)
+      allow(@bunny  ).to receive(:create_channel).and_return(channel)
+      allow(channel).to receive(:exchange).with('test_exchange', no_declare: true).and_return(@exchange)
+
+      ENV["MAGELLAN_PUBLISH_EXCHANGE"] = "test_exchange"
+      ENV["MAGELLAN_PUBLISH_AMQP_ADDR"] = "127.0.0.1"
+      ENV["MAGELLAN_PUBLISH_AMQP_PORT"] = "5672"
+      ENV["MAGELLAN_PUBLISH_AMQP_VHOST"] = "/customer1.sample_project"
+      ENV["MAGELLAN_PUBLISH_AMQP_USER"] = "customer1.sample_project"
+      ENV["MAGELLAN_PUBLISH_AMQP_PASS"] = "pasw1"
+    end
+
+    it do
+      Magellan::Publisher.publish(@topic, @payload)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-publisher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tomoyuki Chikanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bunny_mock
-  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: ''
 email:
 - t-chikanaga@groovenauts.jp