amq-protocol 1.3.0 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1f186e3bf24e927b6711cda58c42003a46cd481c
+  data.tar.gz: f77baf1386daf522b006608a90714df0e97781bb
+SHA512:
+  metadata.gz: 703d318cd4bddf254866c15b2870e14e28d2817687763f294e5d7c66e6c1b6026a9f60243803e29d4868129478a89ba07805610dcbbf6515159a293949b9ccad
+  data.tar.gz: 187fa32ab85369862486497e5663f229b741d9034b7e8bba2a869c9f9968b18f223df79decdf705cc00277e9ca8f1e169829edc7b3d65d2f1804cfbb48acb65d

data/.gitignore

@@ -1,5 +1,6 @@
 /*.gem
 /.rvmrc
+/.ruby-version
 tmp
 *.pyc
 /vendor/bundle

data/.travis.yml

@@ -2,14 +2,15 @@ language: ruby
 bundler_args: --without development
 script: "bundle exec rspec spec"
 rvm:
-  - 1.8.7
-  - rbx-18mode
-  - rbx-19mode
-  - 1.9.2
+  - 2.0
   - 1.9.3
-  - ruby-head
   - jruby-19mode
+  - 1.9.2
+  - rbx-19mode
+  - ruby-head
   - jruby-head
+  - 1.8.7
+  - rbx-18mode
 notifications:
   recipients:
     - michael@novemberain.com

data/Gemfile

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-source :rubygems
+source "https://rubygems.org"
 
 group :development do
   # excludes Windows, Rubinius and JRuby
@@ -8,6 +8,6 @@ group :development do
 end
 
 group :test do
-  gem "rspec", ">= 2.6.0"
+  gem "rspec", ">= 2.13.0"
   gem "effin_utf8"
 end

data/codegen/codegen.py

@@ -12,7 +12,7 @@ from amqp_codegen import *
 try:
     from mako.template import Template
 except ImportError:
-    print "Mako isn't installed. Run easy_install mako."
+    print "Mako isn't installed. Please install mako via pip or similar."
     sys.exit(1)
 
 # main class
@@ -46,10 +46,6 @@ class AmqpSpecObject(AmqpSpec):
 
         self.classes = filter(lambda klass: not klass.ignored, self.classes)
 
-# I know, I'm a bad, bad boy, but come on guys,
-# monkey-patching is just handy for this case.
-# Oh hell, why Python doesn't have at least
-# anonymous functions? This looks so ugly.
 original_init = AmqpEntity.__init__
 def new_init(self, arg):
     original_init(self, arg)

data/generate.rb

@@ -5,6 +5,8 @@ def sh(*args)
   system(*args)
 end
 
+extensions = ["codegen/rabbitmq-codegen/credit_extension.json"]
+
 spec = "codegen/rabbitmq-codegen/amqp-rabbitmq-0.9.1.json"
 unless File.exist?(spec)
   sh "git submodule update --init"
@@ -12,7 +14,7 @@ end
 
 path = "lib/amq/protocol/client.rb"
 puts "Running ./codegen/codegen.py client #{spec} #{path}"
-sh "./codegen/codegen.py client #{spec} #{path}"
+sh "./codegen/codegen.py client #{spec} #{extensions.join(' ')} #{path}"
 if File.file?(path)
   sh "ruby -c #{path}"
 end

data/lib/amq/protocol/client.rb

@@ -2165,6 +2165,129 @@ module AMQ
 
       end
 
+      class Credit < Protocol::Method
+        @name = "basic.credit"
+        @method_id = 200
+        @index = 0x003C00C8 # 60, 200, 3932360
+        @packed_indexes = [60, 200].pack(PACK_UINT16_X2).freeze
+
+        # @return
+        def self.decode(data)
+          offset = 0
+          length = data[offset, 1].unpack(PACK_CHAR).first
+          offset += 1
+          consumer_tag = data[offset, length]
+          offset += length
+          credit = data[offset, 4].unpack(PACK_UINT32).first
+          offset += 4
+          bit_buffer = data[offset, 1].unpack(PACK_CHAR).first
+          offset += 1
+          drain = (bit_buffer & (1 << 0)) != 0
+          self.new(consumer_tag, credit, drain)
+        end
+
+        attr_reader :consumer_tag, :credit, :drain
+        def initialize(consumer_tag, credit, drain)
+          @consumer_tag = consumer_tag
+          @credit = credit
+          @drain = drain
+        end
+
+        def self.has_content?
+          false
+        end
+
+        # @return
+        # [u'consumer_tag = EMPTY_STRING', u'credit = nil', u'drain = nil']
+        def self.encode(channel, consumer_tag, credit, drain)
+          buffer = ''
+          buffer << @packed_indexes
+          buffer << consumer_tag.to_s.bytesize.chr
+          buffer << consumer_tag.to_s
+          buffer << [credit].pack(PACK_UINT32)
+          bit_buffer = 0
+          bit_buffer = bit_buffer | (1 << 0) if drain
+          buffer << [bit_buffer].pack(PACK_CHAR)
+          MethodFrame.new(buffer, channel)
+        end
+
+      end
+
+      class CreditOk < Protocol::Method
+        @name = "basic.credit-ok"
+        @method_id = 201
+        @index = 0x003C00C9 # 60, 201, 3932361
+        @packed_indexes = [60, 201].pack(PACK_UINT16_X2).freeze
+
+        # @return
+        def self.decode(data)
+          offset = 0
+          available = data[offset, 4].unpack(PACK_UINT32).first
+          offset += 4
+          self.new(available)
+        end
+
+        attr_reader :available
+        def initialize(available)
+          @available = available
+        end
+
+        def self.has_content?
+          false
+        end
+
+        # @return
+        # [u'available = nil']
+        def self.encode(channel, available)
+          buffer = ''
+          buffer << @packed_indexes
+          buffer << [available].pack(PACK_UINT32)
+          MethodFrame.new(buffer, channel)
+        end
+
+      end
+
+      class CreditDrained < Protocol::Method
+        @name = "basic.credit-drained"
+        @method_id = 202
+        @index = 0x003C00CA # 60, 202, 3932362
+        @packed_indexes = [60, 202].pack(PACK_UINT16_X2).freeze
+
+        # @return
+        def self.decode(data)
+          offset = 0
+          length = data[offset, 1].unpack(PACK_CHAR).first
+          offset += 1
+          consumer_tag = data[offset, length]
+          offset += length
+          credit_drained = data[offset, 4].unpack(PACK_UINT32).first
+          offset += 4
+          self.new(consumer_tag, credit_drained)
+        end
+
+        attr_reader :consumer_tag, :credit_drained
+        def initialize(consumer_tag, credit_drained)
+          @consumer_tag = consumer_tag
+          @credit_drained = credit_drained
+        end
+
+        def self.has_content?
+          false
+        end
+
+        # @return
+        # [u'consumer_tag = EMPTY_STRING', u'credit_drained = nil']
+        def self.encode(channel, consumer_tag, credit_drained)
+          buffer = ''
+          buffer << @packed_indexes
+          buffer << consumer_tag.to_s.bytesize.chr
+          buffer << consumer_tag.to_s
+          buffer << [credit_drained].pack(PACK_UINT32)
+          MethodFrame.new(buffer, channel)
+        end
+
+      end
+
     end
 
     class Tx < Protocol::Class

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end # Protocol
 end # AMQ

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ require "amq/protocol"
 
 puts "Running on #{RUBY_VERSION}"
 
-module RubyVersionsSUpport
+module RubyVersionsSupport
   def one_point_eight?
     RUBY_VERSION =~ /^1.8/
   end
@@ -30,6 +30,6 @@ end # RubyVersionsSUpport
 RSpec.configure do |config|
   config.include AMQ::Protocol
 
-  config.include(RubyVersionsSUpport)
-  config.extend(RubyVersionsSUpport)
+  config.include(RubyVersionsSupport)
+  config.extend(RubyVersionsSupport)
 end

metadata

@@ -1,107 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amq-protocol
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.3.0
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
-  - Jakub Stastny
-  - Michael S. Klishin
-  - Theo Hultberg
-  - Mark Abramov
+authors:
+- Jakub Stastny
+- Michael S. Klishin
+- Theo Hultberg
+- Mark Abramov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-10 00:00:00 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies: []
-
-description: "  amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an\n  AMQP client: amq-protocol only handles serialization and deserialization.\n  If you want to write your own AMQP client, this gem can help you with that.\n"
-email: 
-  - michael@novemberain.com
-  - stastny@101ideas.cz
+description: |2
+    amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not an
+    AMQP client: amq-protocol only handles serialization and deserialization.
+    If you want to write your own AMQP client, this gem can help you with that.
+email:
+- michael@novemberain.com
+- stastny@101ideas.cz
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - README.md
-files: 
-  - .gitignore
-  - .gitmodules
-  - .rspec
-  - .travis.yml
-  - ChangeLog.md
-  - Gemfile
-  - LICENSE
-  - PROFILING.md
-  - README.md
-  - amq-protocol.gemspec
-  - codegen/__init__.py
-  - codegen/amqp_0.9.1_changes.json
-  - codegen/codegen.py
-  - codegen/codegen_helpers.py
-  - codegen/protocol.rb.pytemplate
-  - generate.rb
-  - lib/amq/bit_set.rb
-  - lib/amq/endianness.rb
-  - lib/amq/hacks.rb
-  - lib/amq/int_allocator.rb
-  - lib/amq/protocol.rb
-  - lib/amq/protocol/client.rb
-  - lib/amq/protocol/frame.rb
-  - lib/amq/protocol/table.rb
-  - lib/amq/protocol/table_value_decoder.rb
-  - lib/amq/protocol/table_value_encoder.rb
-  - lib/amq/protocol/type_constants.rb
-  - lib/amq/protocol/version.rb
-  - lib/amq/settings.rb
-  - spec/amq/bit_set_spec.rb
-  - spec/amq/hacks_spec.rb
-  - spec/amq/int_allocator_spec.rb
-  - spec/amq/protocol/basic_spec.rb
-  - spec/amq/protocol/blank_body_encoding_spec.rb
-  - spec/amq/protocol/channel_spec.rb
-  - spec/amq/protocol/confirm_spec.rb
-  - spec/amq/protocol/connection_spec.rb
-  - spec/amq/protocol/constants_spec.rb
-  - spec/amq/protocol/exchange_spec.rb
-  - spec/amq/protocol/frame_spec.rb
-  - spec/amq/protocol/method_spec.rb
-  - spec/amq/protocol/queue_spec.rb
-  - spec/amq/protocol/table_spec.rb
-  - spec/amq/protocol/tx_spec.rb
-  - spec/amq/protocol/value_decoder_spec.rb
-  - spec/amq/protocol/value_encoder_spec.rb
-  - spec/amq/protocol_spec.rb
-  - spec/amq/settings_spec.rb
-  - spec/spec_helper.rb
+extra_rdoc_files:
+- README.md
+files:
+- .gitignore
+- .gitmodules
+- .rspec
+- .travis.yml
+- ChangeLog.md
+- Gemfile
+- LICENSE
+- PROFILING.md
+- README.md
+- amq-protocol.gemspec
+- codegen/__init__.py
+- codegen/amqp_0.9.1_changes.json
+- codegen/codegen.py
+- codegen/codegen_helpers.py
+- codegen/protocol.rb.pytemplate
+- generate.rb
+- lib/amq/bit_set.rb
+- lib/amq/endianness.rb
+- lib/amq/hacks.rb
+- lib/amq/int_allocator.rb
+- lib/amq/protocol.rb
+- lib/amq/protocol/client.rb
+- lib/amq/protocol/frame.rb
+- lib/amq/protocol/table.rb
+- lib/amq/protocol/table_value_decoder.rb
+- lib/amq/protocol/table_value_encoder.rb
+- lib/amq/protocol/type_constants.rb
+- lib/amq/protocol/version.rb
+- lib/amq/settings.rb
+- spec/amq/bit_set_spec.rb
+- spec/amq/hacks_spec.rb
+- spec/amq/int_allocator_spec.rb
+- spec/amq/protocol/basic_spec.rb
+- spec/amq/protocol/blank_body_encoding_spec.rb
+- spec/amq/protocol/channel_spec.rb
+- spec/amq/protocol/confirm_spec.rb
+- spec/amq/protocol/connection_spec.rb
+- spec/amq/protocol/constants_spec.rb
+- spec/amq/protocol/exchange_spec.rb
+- spec/amq/protocol/frame_spec.rb
+- spec/amq/protocol/method_spec.rb
+- spec/amq/protocol/queue_spec.rb
+- spec/amq/protocol/table_spec.rb
+- spec/amq/protocol/tx_spec.rb
+- spec/amq/protocol/value_decoder_spec.rb
+- spec/amq/protocol/value_encoder_spec.rb
+- spec/amq/protocol_spec.rb
+- spec/amq/settings_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/ruby-amqp/amq-protocol
-licenses: 
-  - MIT
+licenses:
+- MIT
+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"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: amq-protocol
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AMQP 0.9.1 encoder & decoder.
 test_files: []
-
+has_rdoc: