asir 1.1.6 → 1.1.7

data/ChangeLog

@@ -1,3 +1,9 @@
+2012-12-11  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.1.7: New version.
+	* UriConfig: Add #path to generated #uri.
+	* XML: Coder::XML moved to asir_xml gem.
+
 2012-12-07  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.1.6: New version.

data/README.textile

@@ -1,7 +1,7 @@
 h1. Abstracting Services in Ruby
 
 * Kurt Stephens
-* 2010/08/19
+* 2012/12/11
 * Slides -- "http://kurtstephens.com/pub/abstracting_services_in_ruby/asir.slides/":http://kurtstephens.com/pub/abstracting_services_in_ruby/asir.slides/
 * Code -- "http://kurtstephens.com/pub/abstracting_services_in_ruby/":http://kurtstephens.com/pub/abstracting_services_in_ruby/
 * Git -- "http://github.com/kstephens/abstractiing_services_in_ruby":http://github.com/kstephens/abstractiing_services_in_ruby
@@ -36,7 +36,7 @@ h3. Features
 ** Time-decaying retry and polling logic.
 * Support for multiple encodings:
 ** Marshal.
-** XML.
+** XML. (gem asir_xml)
 ** JSON.
 ** YAML.
 ** Base64.
@@ -51,7 +51,3 @@ h2. Platform support
 * CRuby 2.0-head
 * JRuby 1.6.x (with JRUBY_OPTS=--1.9) IN-PROGRESS
 
-h2. Dependencies
-
-* Requires install of libxml, libxslt for XML support: rake prereq.
-

data/Rakefile

@@ -51,17 +51,6 @@ end
 
 ######################################################################
 
-desc "Install system prerequites"
-task :prereq do
-  case RUBY_PLATFORM
-  when /darwin/i
-    sh "sudo port install libxml libxslt"
-  when /linux/i
-    sh "sudo apt-get install libxml2-dev libxslt1-dev"
-  end
-end
-
-######################################################################
 desc "Create slides."
 task :slides => 
   [

data/asir.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     gem.add_dependency "uuid", "~> 2.3.6"
   end
   s.add_dependency "httpclient", "~> 2.3.0"
-  s.add_dependency "libxml-ruby", "~> 2.3.3"
   s.add_dependency "rack", "~> 1.4.1"
   s.add_dependency "json", ">= 1.5.3"
 

data/lib/asir/transport/tcp_socket.rb

@@ -9,7 +9,7 @@ module ASIR
       # !SLIDE
       # TCP Socket Client
       def _client_connect!
-        sock = TCPSocket.open(address, port)
+        sock = TCPSocket.open(host, port)
       end
 
       # !SLIDE

data/lib/asir/uri_config.rb

@@ -11,7 +11,8 @@ module ASIR
     alias :address= :host=
 
     def uri
-      @uri ||= "#{scheme}://#{host}:#{port}"
+      @uri ||=
+        "#{scheme}://#{host}:#{port}#{path}".freeze
     end
 
     def _uri
@@ -22,7 +23,7 @@ module ASIR
     def scheme
       @scheme ||=
         (@uri && _uri.scheme) ||
-        @scheme_default ||
+        scheme_default ||
         S_TCP
     end
     S_TCP = 'tcp'.freeze
@@ -30,7 +31,7 @@ module ASIR
     def host
       @host ||=
         (@uri && _uri.host) ||
-        @host_default ||
+        host_default ||
         S_LOCALHOST
     end
     S_LOCALHOST = '127.0.0.1'.freeze
@@ -38,14 +39,17 @@ module ASIR
     def port
       @port ||=
         (@uri && _uri.port) ||
-        @port_default ||
+        port_default ||
         (raise Error, "#{self.class}: port not set.")
     end
 
     def path
       @path ||=
-        (@uri && _uri.path) ||
-        @path_default
+        (@uri && (
+          p = _uri.path
+          p = nil if p.empty?
+          p)) ||
+        path_default
     end
   end
 end

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: libxml-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +280,6 @@ files:
 - spec/thread_pool_spec.rb
 - spec/thread_variable_spec.rb
 - spec/transport_spec.rb
-- spec/xml_spec.rb
 - spec/yaml_spec.rb
 - stylesheets/slides.css
 homepage: http://github.com/kstephens/abstracting_services_in_ruby
@@ -314,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4585865116450200509
+      hash: -3323359045445920418
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -323,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4585865116450200509
+      hash: -3323359045445920418
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -342,5 +325,4 @@ test_files:
 - spec/thread_pool_spec.rb
 - spec/thread_variable_spec.rb
 - spec/transport_spec.rb
-- spec/xml_spec.rb
 - spec/yaml_spec.rb

data/spec/xml_spec.rb

@@ -1,144 +0,0 @@
-require File.expand_path('../spec_helper', __FILE__)
-require 'asir/coder/xml'
-
-describe "ASIR::Coder::XML" do
-  before(:each) do 
-    @enc = ASIR::Coder::XML.new
-    @dec = @enc.dup
-  end
-
-  basic_objs = [ ]
-
-  [
-   nil,
-   true,
-   false,
-  ].each do | x |
-    basic_objs << x
-    it "should handle #{x.inspect}" do
-      xml = @enc.prepare.encode(x)
-      xml.should == "<#{x.class.name} />"
-      @dec.prepare.decode(xml).should == x
-    end
-  end
-
-  [
-   1234,
-   1.234,
-  ].each do | x |
-    basic_objs << x
-    it "should handle #{x.inspect}" do
-      xml = @enc.prepare.encode(x)
-      xml.should == "<#{x.class.name} v=\"#{x.to_s}\" />"
-      @dec.prepare.decode(xml).should == x
-    end
-  end
-
-  [
-   :symbol,
-  ].each do | x |
-    basic_objs << x
-    it "should handle #{x.inspect}" do
-      xml = @enc.prepare.encode(x)
-      xml.should == "<#{x.class.name} >#{x.to_s}</#{x.class.name}>"
-      @dec.prepare.decode(xml).should == x
-    end
-  end
-
-  [
-   'String',
-  ].each do | x |
-    basic_objs << x
-    it "should handle #{x.inspect}" do
-      xml = @enc.prepare.encode(x)
-      xml.should == "<#{x.class.name} id=\"1\" >#{x.to_s}</#{x.class.name}>"
-      @dec.prepare.decode(xml).should == x
-    end
-  end
-
-  it "should handle empty Array" do
-    x = [ ]
-    xml = @enc.prepare.encode(x)
-    xml.should == "<#{x.class.name} id=\"1\" ></#{x.class.name}>"
-    @dec.prepare.decode(xml).should == x
-  end
-
-  it "should handle Array" do
-    x = [ *basic_objs ]
-    xml = @enc.prepare.encode(x)
-    xml.should =~ %r{\A<#{x.class.name} id=\"1\" ><NilClass /><TrueClass /><FalseClass /><Fixnum v="1234" /><Float v="1.234" /><Symbol >symbol</Symbol><String id=\"[^"]+\" >String</String></#{x.class.name}>\Z} # " emacs
-    @dec.prepare.decode(xml).should == x
-  end
-
-  it "should handle empty Hash" do
-    x = { }
-    xml = @enc.prepare.encode(x)
-    xml.should == "<#{x.class.name} id=\"1\" ></#{x.class.name}>"
-    @dec.prepare.decode(xml).should == x
-  end
-
-  it "should handle Hash" do
-    x = Hash[ *basic_objs.map{|e| e.inspect}.zip(basic_objs).flatten ]
-    xml = @enc.prepare.encode(x)
-    xml.should =~ %r{\A<#{x.class.name} id=\"1\" >}
-    xml.should =~ %r{</#{x.class.name}>\Z}
-    basic_objs.each do | v |
-      vx = @enc.dup.encode(v)
-      vx = vx.gsub(/id="[^"]+"/, 'id="\d+"')
-      xml.should =~ Regexp.new(vx)
-      xml.should =~ %r{ >#{v.inspect}</String>}
-    end
-    @dec.prepare.decode(xml).should == x
-  end
-
-  class ASIR::Coder::XML::Test
-    attr_accessor :a, :h, :o
-  end
-
-  it "should handle deep objects" do
-    x = ASIR::Coder::XML::Test.new
-    x.a = [ *basic_objs ]
-    x.h = Hash[ *basic_objs.map{|e| e.inspect}.zip(basic_objs).flatten ]
-    x.o = ASIR::Coder::XML::Test.new
-    x.o.a = 123
-    xml = @enc.prepare.encode(x)
-    xml.should =~ %r{<#{x.class.name.gsub('::', '.')} id=\"1\" >}
-    xml.should =~ %r{</#{x.class.name.gsub('::', '.')}>}
-    y = @dec.prepare.decode(xml)
-    y.a.should == x.a
-    y.h.should == x.h
-    y.o.class.should == ASIR::Coder::XML::Test
-    y.o.a.should == x.o.a
-    x.instance_variables.sort { |a, b| a.to_s <=> b.to_s}.should == 
-      y.instance_variables.sort { | a, b | a.to_s <=> b.to_s }
-  end
-
-  it "should handle multiple references to same objects." do
-    x = Hash[ *basic_objs.map{|e| e.inspect}.zip(basic_objs).flatten ]
-    y = [ 1, 2 ]
-    x = [ x, x, y, y ]
-    xml = @enc.prepare.encode(x)
-    y = @dec.prepare.decode(xml)
-    y[0].object_id.should == y[1].object_id
-    y[2].object_id.should == y[3].object_id
-  end
-
-  it "should handle self-referencing Array." do
-    x = [ 1 ]
-    x << x
-    xml = @enc.prepare.encode(x)
-    y = @dec.prepare.decode(xml)
-    y[0].should == x[0]
-    y[1].object_id.should == y.object_id
-  end
-
-  it "should handle self-referencing Hash." do
-    x = { :a => 1 }
-    x[:self] = x
-    xml = @enc.prepare.encode(x)
-    y = @dec.prepare.decode(xml)
-    y[:a].should == x[:a]
-    y[:self].object_id.should == y.object_id
-  end
-
-end