bunny 0.1.1 → 0.2.0

data/protocol/amqp-0.8.json

@@ -614,4 +614,4 @@
 	    "name": "test"
 	}
     ]
-}
+}

data/protocol/codegen.rb

@@ -18,13 +18,8 @@ puts ERB.new(%q[
   #
   # DO NOT EDIT! (edit protocol/codegen.rb instead, and run `rake codegen`)
 
-  module AMQP
-    HEADER        = <%= s['name'].dump %>.freeze
-    VERSION_MAJOR = <%= s['major-version'] %>
-    VERSION_MINOR = <%= s['minor-version'] %>
-    PORT          = <%= s['port'] %>
-
-    class Frame
+  module Transport
+		class Frame
       def self.types
         @types ||= {}
       end
@@ -46,6 +41,13 @@ puts ERB.new(%q[
 
       FOOTER = <%= frame_end = s['constants'].find{|c| c['name'] == 'FRAME-END' }['value'] %>
     end
+	end
+	
+  module Protocol
+    HEADER        = <%= s['name'].dump %>.freeze
+    VERSION_MAJOR = <%= s['major-version'] %>
+    VERSION_MINOR = <%= s['minor-version'] %>
+    PORT          = <%= s['port'] %>
 
     RESPONSES = {
       <%- s['constants'].select{|c| c['value'] != frame_end and (200..500).include? c['value'] }.each do |c| -%>
@@ -59,115 +61,111 @@ puts ERB.new(%q[
       <%- end -%>
     ]
 
-    module Protocol
-      class Class
+    class Class
+      class << self
+        FIELDS.each do |f|
+          class_eval %[
+            def #{f} name
+              properties << [ :#{f}, name ] unless properties.include?([:#{f}, name])
+              attr_accessor name
+            end
+          ]
+        end
+        
+        def properties() @properties ||= [] end
+
+        def id()   self::ID end
+        def name() self::NAME end
+      end
+
+      class Method
         class << self
           FIELDS.each do |f|
             class_eval %[
               def #{f} name
-                properties << [ :#{f}, name ] unless properties.include?([:#{f}, name])
+                arguments << [ :#{f}, name ] unless arguments.include?([:#{f}, name])
                 attr_accessor name
               end
             ]
           end
           
-          def properties() @properties ||= [] end
+          def arguments() @arguments ||= [] end
 
-          def id()   self::ID end
-          def name() self::NAME end
+          def parent() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
+          def id()     self::ID end
+          def name()   self::NAME end
         end
 
-        class Method
-          class << self
-            FIELDS.each do |f|
-              class_eval %[
-                def #{f} name
-                  arguments << [ :#{f}, name ] unless arguments.include?([:#{f}, name])
-                  attr_accessor name
-                end
-              ]
-            end
-            
-            def arguments() @arguments ||= [] end
-
-            def parent() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
-            def id()     self::ID end
-            def name()   self::NAME end
-          end
-
-          def == b
-            self.class.arguments.inject(true) do |eql, (type, name)|
-              eql and __send__("#{name}") == b.__send__("#{name}")
-            end
-          end
-        end
-      
-        def self.methods() @methods ||= {} end
-      
-        def self.Method(id, name)
-          @_base_methods ||= {}
-          @_base_methods[id] ||= ::Class.new(Method) do
-            class_eval %[
-              def self.inherited klass
-                klass.const_set(:ID, #{id})
-                klass.const_set(:NAME, :#{name.to_s})
-                klass.parent.methods[#{id}] = klass
-                klass.parent.methods[klass::NAME] = klass
-              end
-            ]
+        def == b
+          self.class.arguments.inject(true) do |eql, (type, name)|
+            eql and __send__("#{name}") == b.__send__("#{name}")
           end
         end
       end
-
-      def self.classes() @classes ||= {} end
-
-      def self.Class(id, name)
-        @_base_classes ||= {}
-        @_base_classes[id] ||= ::Class.new(Class) do
+    
+      def self.methods() @methods ||= {} end
+    
+      def self.Method(id, name)
+        @_base_methods ||= {}
+        @_base_methods[id] ||= ::Class.new(Method) do
           class_eval %[
             def self.inherited klass
               klass.const_set(:ID, #{id})
               klass.const_set(:NAME, :#{name.to_s})
-              Protocol.classes[#{id}] = klass
-              Protocol.classes[klass::NAME] = klass
+              klass.parent.methods[#{id}] = klass
+              klass.parent.methods[klass::NAME] = klass
             end
           ]
         end
       end
     end
+
+    def self.classes() @classes ||= {} end
+
+    def self.Class(id, name)
+      @_base_classes ||= {}
+      @_base_classes[id] ||= ::Class.new(Class) do
+        class_eval %[
+          def self.inherited klass
+            klass.const_set(:ID, #{id})
+            klass.const_set(:NAME, :#{name.to_s})
+            Protocol.classes[#{id}] = klass
+            Protocol.classes[klass::NAME] = klass
+          end
+        ]
+      end
+    end
   end
     
-  module AMQP
-    module Protocol
-      <%- s['classes'].each do |c| -%>
-      class <%= c['name'].capitalize.ljust(12) %> < Class( <%= c['id'].to_s.rjust(3) %>, :<%= c['name'].ljust(12) %> ); end
+  module Protocol
+    <%- s['classes'].each do |c| -%>
+    class <%= c['name'].capitalize.ljust(12) %> < Class( <%= c['id'].to_s.rjust(3) %>, :<%= c['name'].ljust(12) %> ); end
+    <%- end -%>
+
+    <%- s['classes'].each do |c| -%>
+    class <%= c['name'].capitalize %>
+      <%- c['properties'].each do |p| -%>
+      <%= p['type'].ljust(10) %> :<%= p['name'].tr('-','_') %>
+      <%- end if c['properties'] -%>
+
+      <%- c['methods'].each do |m| -%>
+      class <%= m['name'].capitalize.gsub(/-(.)/){ "#{$1.upcase}"}.ljust(12) %> < Method( <%= m['id'].to_s.rjust(3) %>, :<%= m['name'].tr('- ','_').ljust(14) %> ); end
       <%- end -%>
 
-      <%- s['classes'].each do |c| -%>
-      class <%= c['name'].capitalize %>
-        <%- c['properties'].each do |p| -%>
-        <%= p['type'].ljust(10) %> :<%= p['name'].tr('-','_') %>
-        <%- end if c['properties'] -%>
-
-        <%- c['methods'].each do |m| -%>
-        class <%= m['name'].capitalize.gsub(/-(.)/){ "#{$1.upcase}"}.ljust(12) %> < Method( <%= m['id'].to_s.rjust(3) %>, :<%= m['name'].tr('- ','_').ljust(14) %> ); end
-        <%- end -%>
-
-        <%- c['methods'].each do |m| -%>
-        class <%= m['name'].capitalize.gsub(/-(.)/){ "#{$1.upcase}"} %>
-          <%- m['arguments'].each do |a| -%>
-          <%- if a['domain'] -%>
-          <%= s['domains'].find{|k,v| k == a['domain']}.last.ljust(10) %> :<%= a['name'].tr('- ','_') %>
-          <%- else -%>
-          <%= a['type'].ljust(10) %> :<%= a['name'].tr('- ','_') %>
-          <%- end -%>
-          <%- end if m['arguments'] -%>
-        end
-
+      <%- c['methods'].each do |m| -%>
+      class <%= m['name'].capitalize.gsub(/-(.)/){ "#{$1.upcase}"} %>
+        <%- m['arguments'].each do |a| -%>
+        <%- if a['domain'] -%>
+        <%= s['domains'].find{|k,v| k == a['domain']}.last.ljust(10) %> :<%= a['name'].tr('- ','_') %>
+        <%- else -%>
+        <%= a['type'].ljust(10) %> :<%= a['name'].tr('- ','_') %>
         <%- end -%>
+        <%- end if m['arguments'] -%>
       end
 
       <%- end -%>
     end
+
+    <%- end -%>
   end
-].gsub!(/^  /,''), nil, '>-%').result(binding)
+].gsub!(/^  /,''), nil, '>-%').result(binding)

data/spec/exchange_spec.rb

@@ -16,10 +16,52 @@ describe Bunny::Exchange do
 	end
 		
 	it "should raise an error if instantiated as non-existent type" do
-		lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(AMQP::ProtocolError)
+		lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(API::ProtocolError)
 	end
 	
-	it "should be able to create a default direct exchange" do
+	it "should allow a default direct exchange to be instantiated by specifying :type" do
+		exch = @b.exchange('amq.direct', :type => :direct)
+		exch.should be_an_instance_of Bunny::Exchange
+		exch.name.should == 'amq.direct'
+		exch.type.should == :direct
+		@b.exchanges.has_key?('amq.direct').should be true
+	end
+	
+	it "should allow a default direct exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.direct')
+		exch.should be_an_instance_of Bunny::Exchange
+		exch.name.should == 'amq.direct'
+		exch.type.should == :direct
+		@b.exchanges.has_key?('amq.direct').should be true
+	end
+	
+	it "should allow a default fanout exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.fanout')
+		exch.should be_an_instance_of Bunny::Exchange
+		exch.name.should == 'amq.fanout'
+		exch.type.should == :fanout
+		@b.exchanges.has_key?('amq.fanout').should be true
+	end
+	
+	it "should allow a default topic exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.topic')
+		exch.should be_an_instance_of Bunny::Exchange
+		exch.name.should == 'amq.topic'
+		exch.type.should == :topic
+		@b.exchanges.has_key?('amq.topic').should be true
+	end
+	
+	# headers exchange not implemented in RabbitMQ yet. Uncomment if target broker/server supports it
+	#
+	#it "should allow a default headers exchange to be instantiated without specifying :type" do
+	#	exch = @b.exchange('amq.match')
+	#	exch.should be_an_instance_of Bunny::Exchange
+	#	exch.name.should == 'amq.match'
+	#	exch.type.should == :headers
+	#	@b.exchanges.has_key?('amq.match').should be true
+	#end
+	
+	it "should create an exchange as direct by default" do
 		exch = @b.exchange('direct_defaultex')
 		exch.should be_an_instance_of Bunny::Exchange
 		exch.name.should == 'direct_defaultex'

data/spec/queue_spec.rb

@@ -53,7 +53,7 @@ describe Bunny::Queue do
 		q = @b.queue('test1')
 		msg = q.pop(:header => true)
 		msg.should be_an_instance_of Hash
-		msg[:header].should be_an_instance_of AMQP::Protocol::Header
+		msg[:header].should be_an_instance_of Protocol::Header
 		msg[:payload].should == 'This is a test message'
 		q.message_count.should == 0
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 +01:00
+date: 2009-05-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -24,27 +24,26 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - README.markdown
-- lib/amqp
-- lib/amqp.rb
-- lib/amqp/buffer.rb
+- lib/api_messages.rb
+- lib/bunny.rb
+- lib/engineroom/buffer.rb
+- lib/engineroom/frame.rb
+- lib/engineroom/protocol.rb
+- lib/engineroom/spec.rb
 - lib/bunny/exchange.rb
-- lib/amqp/frame.rb
 - lib/bunny/header.rb
-- lib/amqp/protocol.rb
 - lib/bunny/queue.rb
-- lib/amqp/client.rb
-- lib/amqp/spec.rb
-- lib/bunny.rb
+- lib/bunny/client.rb
 - examples/simple.rb
-- examples/fanout.rb
+- examples/simple_fanout.rb
 - examples/simple_consumer.rb
 - examples/simple_publisher.rb
 - examples/simple_ack.rb
+- examples/simple_topic.rb
 - spec/bunny_spec.rb
 - spec/exchange_spec.rb
 - spec/queue_spec.rb
 - protocol/amqp-0.8.json
-- protocol/amqp-0.8.xml
 - protocol/codegen.rb
 has_rdoc: true
 homepage: http://github.com/celldee/bunny

data/lib/amqp/protocol.rb

@@ -1,158 +0,0 @@
-module AMQP
-  module Protocol
-    #:stopdoc:
-    class Class::Method
-      def initialize *args
-        opts = args.pop if args.last.is_a? Hash
-        opts ||= {}
-        
-        @debug = 1 # XXX hack, p(obj) == '' if no instance vars are set
-        
-        if args.size == 1 and args.first.is_a? Buffer
-          buf = args.shift
-        else
-          buf = nil
-        end
-
-        self.class.arguments.each do |type, name|
-          val = buf ? buf.read(type) :
-                      args.shift || opts[name] || opts[name.to_s]
-          instance_variable_set("@#{name}", val)
-        end
-      end
-
-      def arguments
-        self.class.arguments.inject({}) do |hash, (type, name)|
-          hash.update name => instance_variable_get("@#{name}")
-        end
-      end
-
-      def to_binary
-        buf = Buffer.new
-        buf.write :short, self.class.parent.id
-        buf.write :short, self.class.id
-
-        bits = []
-
-        self.class.arguments.each do |type, name|
-          val = instance_variable_get("@#{name}")
-          if type == :bit
-            bits << (val || false)
-          else
-            unless bits.empty?
-              buf.write :bit, bits
-              bits = []
-            end
-            buf.write type, val
-          end
-        end
-
-        buf.write :bit, bits unless bits.empty?
-        buf.rewind
-
-        buf
-      end
-      
-      def to_s
-        to_binary.to_s
-      end
-      
-      def to_frame channel = 0
-        Frame::Method.new(self, channel)
-      end
-    end
-
-    #:startdoc:
-    #
-    # Contains a properties hash that holds some potentially interesting 
-    # information.
-    # * :delivery_mode
-    # 1 equals transient.
-    # 2 equals persistent. Unconsumed persistent messages will survive
-    # a server restart when they are stored in a durable queue.
-    # * :redelivered
-    # True or False
-    # * :routing_key
-    # The routing string used for matching this message to this queue.
-    # * :priority
-    # An integer in the range of 0 to 9 inclusive.
-    # * :content_type
-    # Always "application/octet-stream" (byte stream)
-    # * :exchange
-    # The source exchange which published this message.
-    # * :message_count
-    # The number of unconsumed messages contained in the queue.
-    # * :delivery_tag
-    # A monotonically increasing integer. This number should not be trusted
-    # as a sequence number. There is no guarantee it won't get reset.
-    class Header
-      def initialize *args
-        opts = args.pop if args.last.is_a? Hash
-        opts ||= {}
-        
-        first = args.shift
-        
-        if first.is_a? ::Class and first.ancestors.include? Protocol::Class
-          @klass = first
-          @size = args.shift || 0
-          @weight = args.shift || 0
-          @properties = opts
-
-        elsif first.is_a? Buffer or first.is_a? String
-          buf = first
-          buf = Buffer.new(buf) unless buf.is_a? Buffer
-          
-          @klass = Protocol.classes[buf.read(:short)]
-          @weight = buf.read(:short)
-          @size = buf.read(:longlong)
-
-          props = buf.read(:properties, *klass.properties.map{|type,_| type })
-          @properties = Hash[*klass.properties.map{|_,name| name }.zip(props).reject{|k,v| v.nil? }.flatten]
-
-        else
-          raise ArgumentError, 'Invalid argument'
-        end
-        
-      end
-      attr_accessor :klass, :size, :weight, :properties
-      
-      def to_binary
-        buf = Buffer.new
-        buf.write :short, klass.id
-        buf.write :short, weight # XXX rabbitmq only supports weight == 0
-        buf.write :longlong, size
-        buf.write :properties, (klass.properties.map do |type, name|
-                                 [ type, properties[name] || properties[name.to_s] ]
-                               end)
-        buf.rewind
-        buf
-      end
-      
-      def to_s
-        to_binary.to_s
-      end
-
-      def to_frame channel = 0
-        Frame::Header.new(self, channel)
-      end
-
-      def == header
-        [ :klass, :size, :weight, :properties ].inject(true) do |eql, field|
-          eql and __send__(field) == header.__send__(field)
-        end
-      end
-
-      def method_missing meth, *args, &blk
-        @properties.has_key?(meth) || @klass.properties.find{|_,name| name == meth } ? @properties[meth] :
-                                                                                       super
-      end
-    end
-
-    def self.parse buf
-      buf = Buffer.new(buf) unless buf.is_a? Buffer
-      class_id, method_id = buf.read(:short, :short)
-      classes[class_id].methods[method_id].new(buf)
-    end
-    #:stopdoc:
-  end
-end