unbound 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e071138d458da3ab632fd55f7208e686e55679
-  data.tar.gz: ffebd0663a8fe538b933c21cb35bd9f876ec64eb
+  metadata.gz: 268e920fce264b5a8fb5a60fc0f3b98d2648adde
+  data.tar.gz: fabfee310e6715df1e05e7ba455ae9fc64ae8f47
 SHA512:
-  metadata.gz: 3190a931ff0e491a2c772056b486cad1c35b0e54ade6c6b6cf9429dfdd154157921fac796e62b34d0ea6ae699056a968b02776723179224c337bad716de2809d
-  data.tar.gz: c539edfe6095cf3dba1c51411782ee6dcfc5f8c73e611270ebcaaa39e855dd61256c650d1f79ca6f058133c3bdadba7f08d4f75271d0317fbf5643d2d71ed15a
+  metadata.gz: 634924d61b650aeba4ee82632b34d95040da7aec61ac8a0a632fc3c4b48aeb082c0aca829b0baac77d5647880b933bf711f24f87b88eecc740489f3361dec432
+  data.tar.gz: 8029d61671926ea5874d9c2c4060cf788e11eae74e8c4d60228b9613263ee4ede4b39b20f04767a2565cea8141eb5291cf1289c55aaebeca75501dd02709560a

data/Gemfile

@@ -5,10 +5,10 @@ gem "ffi"
 
 group :development do
   gem "jeweler"
-  gem "rake"
 end
 
 group :test do
   gem "rspec"
   gem "simplecov"
+  gem "rake"
 end

data/Rakefile

@@ -9,28 +9,35 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "unbound"
-  gem.homepage = "http://github.com/justfalter/unbound-ruby"
-  gem.license = "MIT"
-  gem.summary = %Q{Unbound DNS resolver bindings for Ruby}
-  gem.description = %Q{Unbound DNS resolver bindings for Ruby}
-  gem.email = "falter@gmail.com"
-  gem.authors = ["Mike Ryan"]
-  gem.files  = Dir.glob("lib/**/*.rb") + 
-              Dir.glob("examples/*") + 
-              Dir.glob("spec/{*.rb}") + 
-              Dir.glob("spec/conf/{*.conf}") + 
-              %w(LICENSE.txt Gemfile README.md Rakefile VERSION)
+begin
+  require 'jeweler'
+rescue LoadError
+else 
+  Jeweler::Tasks.new do |gem|
+    # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+    gem.name = "unbound"
+    gem.homepage = "http://github.com/justfalter/unbound-ruby"
+    gem.license = "MIT"
+    gem.summary = %Q{Unbound DNS resolver bindings for Ruby}
+    gem.description = %Q{Unbound DNS resolver bindings for Ruby}
+    gem.email = "falter@gmail.com"
+    gem.authors = ["Mike Ryan"]
+    gem.files  = Dir.glob("lib/**/*.rb") + 
+      Dir.glob("examples/*") + 
+      Dir.glob("spec/{*.rb}") + 
+      Dir.glob("spec/conf/{*.conf}") + 
+      %w(LICENSE.txt Gemfile README.md Rakefile VERSION)
 
+  end
+  Jeweler::RubygemsDotOrgTasks.new
 end
-Jeweler::RubygemsDotOrgTasks.new
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+begin
+rescue LoadError
+else 
+  require 'rspec/core'
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+  end
 end
-

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/unbound/query_store.rb

@@ -0,0 +1,54 @@
+require 'ffi'
+
+module Unbound
+  # Tracks in-flight queries for Resolver
+  class QueryStore
+    def initialize
+      @pointer_to_query_map = {}
+    end
+
+    # Enumerates through each query.
+    def each
+      @pointer_to_query_map.each_value do |query|
+        yield(query)
+      end
+    end
+
+    # Clears all queries from the store. No special actions taken.
+    def clear
+      @pointer_to_query_map.clear
+    end
+
+    # @return [Integer] the number of queries in the store.
+    def count
+      @pointer_to_query_map.count
+    end
+
+    # Retreives the query from the store via the provided pointer.
+    # @param [FFI::Pointer] pointer
+    # @return [Unbound::Query, nil] The associated query, otherwise nil.
+    def get_by_pointer(pointer)
+      return nil if pointer.nil?
+      @pointer_to_query_map[pointer.address]
+    end
+
+    # Stores a query object, and returns a pointer suitable for passing through
+    # Unbound::Context#resolve_async.
+    # @param [Unbound::Query] query 
+    # @return [FFI::Pointer] the pointer
+    def store(query)
+      oid_ptr = FFI::Pointer.new query.object_id
+      @pointer_to_query_map[oid_ptr.address] = query
+      oid_ptr
+    end
+
+    # Deletes a query object from the store, and frees any associated pointer
+    # (if nescessary).
+    # @param [Unbound::Query] query
+    # @return [Unbound::Query] the query, if it was found. Otherwise nil.
+    def delete_query(query)
+      @pointer_to_query_map.delete(FFI::Pointer.new(query.object_id).address)
+    end
+  end
+end
+

data/lib/unbound/resolver.rb

@@ -2,6 +2,7 @@ require 'unbound/bindings'
 require 'unbound/result'
 require 'unbound/context'
 require 'unbound/callbacks_mixin'
+require 'unbound/query_store'
 
 module Unbound
   # A simple asynchronous resolver
@@ -12,7 +13,7 @@ module Unbound
     #  resolver.
     def initialize(ctx)
       @ctx = ctx
-      @queries = {}
+      @queries = QueryStore.new
       @resolve_callback_func = FFI::Function.new(
         :void, [:pointer, :int, :pointer], 
         self.method(:resolve_callback))
@@ -25,7 +26,7 @@ module Unbound
         end
       end
       on_finish do |query|
-        @queries.delete(query.object_id)
+        @queries.delete_query(query)
       end
     end
 
@@ -41,9 +42,7 @@ module Unbound
     end
 
     def resolve_callback(oid_ptr, err, result_ptr)
-      return if oid_ptr.nil?
-      oid = oid_ptr.address
-      query = @queries[oid]
+      query = @queries.get_by_pointer(oid_ptr)
       return if query.nil?
 
       if err == 0
@@ -63,7 +62,7 @@ module Unbound
 
     # Cancel all outstanding queries.
     def cancel_all
-      @queries.each_value do |query|
+      @queries.each do |query|
         query.cancel!
       end
       @queries.clear
@@ -95,20 +94,19 @@ module Unbound
       if query.started?
         raise QueryAlreadyStarted.new
       end
-      @queries[query.object_id] = query
       # Add all of our callbacks, if any have been registered.
       query.on_start(*@callbacks_start) unless @callbacks_start.empty?
       query.on_answer(*@callbacks_answer) unless @callbacks_answer.empty?
       query.on_error(*@callbacks_error) unless @callbacks_error.empty?
       query.on_cancel(*@callbacks_cancel)
       query.on_finish(*@callbacks_finish)
-      oid_ptr = FFI::Pointer.new query.object_id
+      ptr = @queries.store(query)
       async_id = @ctx.resolve_async(
         query.name, 
         query.rrtype, 
         query.rrclass, 
         @resolve_callback_func, 
-        oid_ptr)
+        ptr)
       query.start!(async_id)
     end
   end

data/spec/query_store_spec.rb

@@ -0,0 +1,139 @@
+require 'spec_helper'
+
+describe Unbound::QueryStore do
+  let(:query_store) {
+    Unbound::QueryStore.new
+  }
+
+  def new_query(num)
+    Unbound::Query.new("somedomain#{num}.com", 1, 1)
+  end
+
+  describe "#each" do
+    it "should yield as many times as there are queries in the store" do
+      5.times do |i|
+        query_store.store(new_query(i))
+      end
+      expect {|b| query_store.each(&b)}.to yield_control.exactly(5).times
+    end
+    it "should yield the set of query objects we put into it" do
+      expected_queries = []
+      actual_queries = []
+      5.times do |i|
+        query = new_query(i)
+        expected_queries << query
+        query_store.store(query)
+      end
+      query_store.each do |query|
+        actual_queries << query
+      end
+      expect(actual_queries).to match_array(expected_queries)
+    end
+  end
+  describe "#clear" do
+    it "should cause the count to drop to 0" do
+      expect(query_store.count).to eq(0)
+      5.times do |i|
+        query_store.store(new_query(i))
+      end
+      expect(query_store.count).to eq(5)
+      query_store.clear
+      expect(query_store.count).to eq(0)
+    end
+    it "should remove all queries from the store, making it so they cannot be retreived" do
+      queries = {}
+      5.times do |i|
+        query = new_query(i)
+        ptr = query_store.store(query)
+        queries[ptr] = query
+      end
+
+      queries.each_pair do |ptr, query|
+        expect(query_store.get_by_pointer(ptr)).to be(query)
+      end
+
+      query_store.clear
+      queries.each_pair do |ptr, query|
+        expect(query_store.get_by_pointer(ptr)).to be_nil
+      end
+    end
+  end
+  describe "#count" do
+    it "should be 0 if there's nothing in there" do
+      expect(query_store.count).to eq(0)
+    end
+    it "should be 5 if five distinct queries have been added" do
+      5.times do |i|
+        query_store.store(new_query(i))
+      end
+      expect(query_store.count).to eq(5)
+    end
+    it "should be 1 if the same query was added 5 times" do
+      query = new_query(1)
+      5.times do |i|
+        query_store.store(query)
+      end
+      expect(query_store.count).to eq(1)
+    end
+  end
+  describe "#store" do 
+    it "should return a pointer" do
+      expect(query_store.store(new_query(1))).to be_a(FFI::Pointer)
+    end
+    it "should increase the count" do
+      query = new_query(1)
+      expect(query_store.count).to eq(0)
+      query_store.store(query)
+      expect(query_store.count).to eq(1)
+    end
+  end
+  describe "#get_by_pointer" do
+    it "should return the query associated with the provided pointer" do
+      query1 = new_query(1)
+      query2 = new_query(2)
+      query3 = new_query(3)
+      query4 = new_query(4)
+      query5 = new_query(5)
+      ptr1 = query_store.store(query1)
+      ptr2 = query_store.store(query2)
+      ptr3 = query_store.store(query3)
+      ptr4 = query_store.store(query4)
+      ptr5 = query_store.store(query5)
+      expect(query_store.get_by_pointer(ptr1)).to be(query1)
+      expect(query_store.get_by_pointer(ptr2)).to be(query2)
+      expect(query_store.get_by_pointer(ptr3)).to be(query3)
+      expect(query_store.get_by_pointer(ptr4)).to be(query4)
+      expect(query_store.get_by_pointer(ptr5)).to be(query5)
+    end
+    it "should return nil if the provided pointer is not associated with a query" do
+      expect(query_store.get_by_pointer(FFI::Pointer.new(1234))).to be_nil
+    end
+  end
+  describe "#delete_query" do
+    it "should make it so the query can no longer be retreived from the store" do
+      query1 = new_query(1)
+      query2 = new_query(2)
+      ptr1 = query_store.store(query1)
+      ptr2 = query_store.store(query2)
+      expect(query_store.get_by_pointer(ptr1)).to be(query1)
+      expect(query_store.get_by_pointer(ptr2)).to be(query2)
+      query_store.delete_query(query1)
+      expect(query_store.get_by_pointer(ptr1)).to be_nil
+      expect(query_store.get_by_pointer(ptr2)).to be(query2)
+      query_store.delete_query(query2)
+      expect(query_store.get_by_pointer(ptr1)).to be_nil
+      expect(query_store.get_by_pointer(ptr2)).to be_nil
+    end
+    it "should return the query that was deleted" do
+      query1 = new_query(1)
+      ptr1 = query_store.store(query1)
+      expect(query_store.delete_query(query1)).to be(query1)
+    end
+    it "should return nil if the query was not in the store" do
+      query1 = new_query(1)
+      expect(query_store.delete_query(query1)).to be_nil
+    end
+  end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unbound
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mike Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,20 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: Unbound DNS resolver bindings for Ruby
 email: falter@gmail.com
 executables: []
@@ -73,6 +59,7 @@ files:
 - lib/unbound/context.rb
 - lib/unbound/exceptions.rb
 - lib/unbound/query.rb
+- lib/unbound/query_store.rb
 - lib/unbound/resolver.rb
 - lib/unbound/result.rb
 - spec/callback_array_spec.rb
@@ -80,6 +67,7 @@ files:
 - spec/conf/test_config.conf
 - spec/context_spec.rb
 - spec/query_spec.rb
+- spec/query_store_spec.rb
 - spec/resolver_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb