pdns-remotebackend 0.0.5 → 0.0.6

data/README.md

@@ -51,16 +51,40 @@ To start a pipe or unix server, do
 
 In addition to stubs for remotebackend, the Pdns::Remotebackend::Handler has following helpers for making records
 
-    def record_prio_ttl(qtype,qname,content,prio,ttl,auth=1)
+    # Generates a hash of resource record
+    #
+    # @param [String] qname name of record
+    # @param [String] qtype type of record
+    # @param [String] content record contents
+    # @param [Integer] prio Record priority
+    # @param [Integer] ttl Record TTL
+    # @param [Integer] auth Whether we are authoritative for the record or not
+    # @return [Hash] A resource record hash
+    def record_prio_ttl(qname,qtype,content,prio,ttl,auth=1)
       {:qtype => qtype, :qname => qname, :content => content, :priority => prio, :ttl => ttl, :auth => auth}
     end
-
-    def record_prio(qtype,qname,content,prio,auth=1)
-      record_prio_ttl(qtype,qname,content,prio,@ttl,auth)
+    
+    # Generates a hash of resource record
+    #
+    # @param [String] qname name of record
+    # @param [String] qtype type of record
+    # @param [String] content record contents
+    # @param [Integer] prio Record priority
+    # @param [Integer] auth Whether we are authoritative for the record or not
+    # @return [Hash] A resource record hash
+    def record_prio(qname,qtype,content,prio,auth=1)
+      record_prio_ttl(qname,qtype,content,prio,@ttl,auth)
     end
-
-    def record(qtype,qname,content,auth=1)
-      record_prio_ttl(qtype,qname,content,0,@ttl,auth)
+    
+    # Generates a hash of resource record
+    #
+    # @param [String] qname name of record
+    # @param [String] qtype type of record
+    # @param [String] content record contents
+    # @param [Integer] auth Whether we are authoritative for the record or not
+    # @return [Hash] A resource record hash
+    def record(qname,qtype,content,auth=1)
+      record_prio_ttl(qname,qtype,content,0,@ttl,auth)
     end
 
 ## Contributing

data/lib/pdns/remotebackend/version.rb

@@ -1,5 +1,5 @@
 module Pdns
  module Remotebackend
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
  end
 end

data/lib/pdns/remotebackend.rb

@@ -146,56 +146,55 @@ module Pdns
     #
     # @param [Socket] reader Socket to read from'
     # @param [Socket] writer Socket to write to
-    protected 
     def mainloop(reader,writer)
       h = @handler.new
       
-      begin
-        reader.each_line do |line|
-          # expect json
-          input = {}
-          line = line.strip
-          next if line.empty?
-          begin
-            input = JSON.parse(line)
-            method = "do_#{input["method"].downcase}"
-            args = input["parameters"] || {}
-
-            h.result = false
-            h.log = []
-
-            if h.respond_to?(method.to_sym) == false
-               res = false
-            else
-               h.send(method,args)
-            end
-
-            writer.puts ({:result => h.result, :log => h.log}).to_json
-          rescue JSON::ParserError
-            writer.puts ({:result => false, :log => "Cannot parse input #{line}"}).to_json
-            next
+      reader.each_line do |line|
+        # expect json
+        input = {}
+        line = line.strip
+        next if line.empty?
+        begin
+          input = JSON.parse(line)
+          method = "do_#{input["method"].downcase}"
+          args = input["parameters"] || {}
+          h.result = false
+          h.log = []
+          if h.respond_to?(method.to_sym) == false
+            res = false
+          else
+            h.send(method,args)
           end
+          writer.puts ({:result => h.result, :log => h.log}).to_json
+        rescue JSON::ParserError
+          writer.puts ({:result => false, :log => "Cannot parse input #{line}"}).to_json
+          next
         end
-      rescue SystemExit, Interrupt
-      end 
+      end
     end
   end
 
   class Pipe < Connector
     def run
-      mainloop STDIN,STDOUT
+      begin
+        mainloop STDIN,STDOUT
+      rescue SystemExit, Interrupt
+      end
     end
   end
 
   class Unix < Connector
     def run
-      @path = options[:path] || "/tmp/remotebackend.sock"
-      Socket.unix_server_loop(@path) do |sock, client_addrinfo| 
-        begin 
-           mainloop sock, sock
-        ensure
-           sock.close
+      @path = @options[:path] || "/tmp/remotebackend.sock"
+      begin 
+        Socket.unix_server_loop(@path) do |sock, client_addrinfo| 
+          begin 
+            mainloop sock, sock
+          ensure
+            sock.close
+          end
         end
+      rescue SystemExit, Interrupt 
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdns-remotebackend
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6907400 !ruby/object:Gem::Requirement
+  requirement: &6941400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6907400
+  version_requirements: *6941400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6906980 !ruby/object:Gem::Requirement
+  requirement: &6940980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6906980
+  version_requirements: *6940980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &6906560 !ruby/object:Gem::Requirement
+  requirement: &6940560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6906560
+  version_requirements: *6940560
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &6906140 !ruby/object:Gem::Requirement
+  requirement: &6940140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6906140
+  version_requirements: *6940140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &6905720 !ruby/object:Gem::Requirement
+  requirement: &6939720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6905720
+  version_requirements: *6939720
 description: This gem provides a base class and helpers for writing remotebackend
   servers for pipe/unix/. It is intended to make using remotebackend easier. For http
   support, see pdns-remotebackend-http.