trackerific 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f8d8435368fe38aebce7e684d4cc9d9a10dfb5
-  data.tar.gz: 39b1d8d9ee1235dc6f52f9ffd946662d07d06483
+  metadata.gz: 169cd0a3af61faa58138ed557bdf5227e0fe9236
+  data.tar.gz: 12d58f9dfdb254238d3a2dbdfb0a2addc0684d6c
 SHA512:
-  metadata.gz: 05f77c3c7b3aec5b774acc0c66ba02324f3107081af755381b2447c237253278b990031c4567ed26b9c15b32e2e1f3e554fd4ec3cefddb6eade2f9411c84c7a0
-  data.tar.gz: a85a25ce0e380e90990ac898a34e2eccd7e72f4d39dbdda5b3ea2d075bb9e3018ffc2b399bf0d97e7a37d7b62e935190f47406d22ad5652736f09c9f989b1b34
+  metadata.gz: 00c47f4f51c27141518ad2136aa2f10f198f3ada22f5a58f1a6f9bd29224753ebf0be9bd35f430172374f9ad2a3e3b21883aa6870bebbf3921d2f599a8ceb8e9
+  data.tar.gz: 184ae4fe8154dc090cfc598bdcc6f49fc9b4e3e8a78b759d8629391804b1632f8cd341a682e5d5941cb6a146438996f9e7974d6d215622c54f0b58cbb0abc9a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trackerific (0.7.4)
+    trackerific (0.7.5)
       activesupport
       builder
       httparty (>= 0.12.0)

data/lib/trackerific/builders/base/xml.rb

@@ -1,6 +1,4 @@
 class Trackerific::Builders::Base::XML < Struct
-  @xml_version = "1.0"
-
   class << self
     attr_accessor :xml_version
   end
@@ -25,8 +23,14 @@ class Trackerific::Builders::Base::XML < Struct
   def builder
     @builder ||= begin
       builder = Builder::XmlMarkup.new(target: @xml)
-      builder.instruct! :xml, version: self.class.xml_version
+      add_xml_instruct(builder)
       builder
     end
   end
+
+  def add_xml_instruct(builder)
+    unless self.class.xml_version.nil?
+      builder.instruct! :xml, version: self.class.xml_version
+    end
+  end
 end

data/lib/trackerific/builders/ups.rb

@@ -1,6 +1,8 @@
 class Trackerific::Builders::UPS < Trackerific::Builders::Base::XML.new(
   :key, :user_id, :password, :package_id)
 
+  self.xml_version = "1.0"
+
   protected
 
   # Builds the UPS track request XML

data/lib/trackerific/builders/usps.rb

@@ -1,6 +1,8 @@
 class Trackerific::Builders::USPS < Trackerific::Builders::Base::XML.new(
   :user_id, :package_id)
 
+  self.xml_version = nil
+
   protected
 
   # Builds the USPS track request XML

data/lib/trackerific/version.rb

@@ -1,3 +1,3 @@
 module Trackerific
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/fixtures/ups/request.xml

@@ -1 +1 @@
-<?xml encoding="UTF-8"?><AccessRequest><AccessLicenseNumber>KEY</AccessLicenseNumber><UserId>USER ID</UserId><Password>PASSWORD</Password></AccessRequest><TrackRequest><Request><RequestAction>Track</RequestAction><RequestOption>activity</RequestOption></Request><TrackingNumber>PACKAGE ID</TrackingNumber></TrackRequest>
+<?xml version="1.0" encoding="UTF-8"?><AccessRequest><AccessLicenseNumber>KEY</AccessLicenseNumber><UserId>USER ID</UserId><Password>PASSWORD</Password></AccessRequest><TrackRequest><Request><RequestAction>Track</RequestAction><RequestOption>activity</RequestOption></Request><TrackingNumber>PACKAGE ID</TrackingNumber></TrackRequest>

data/spec/fixtures/usps/request.xml

@@ -1 +1 @@
-<?xml encoding="UTF-8"?><TrackRequest USERID="USER ID"><TrackID ID="PACKAGE ID"/></TrackRequest>
+<TrackRequest USERID="USER ID"><TrackID ID="PACKAGE ID"/></TrackRequest>

data/spec/lib/trackerific/builders/base/xml_spec.rb

@@ -26,10 +26,15 @@ describe Trackerific::Builders::Base::XML do
       end
     end
 
-    let(:xml) do
-      '<?xml encoding="UTF-8"?><Hello>hi</Hello><World>earth</World>'
+    context "when xml_version is not present" do
+      let(:xml) { '<Hello>hi</Hello><World>earth</World>' }
+      its(:xml) { should eq xml }
     end
 
-    its(:xml) { should eq xml }
+    context "when xml_version is present" do
+      before { builder.xml_version = '1.0' }
+      let(:xml) { "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Hello>hi</Hello><World>earth</World>" }
+      its(:xml) { should eq xml }
+    end
   end
 end

data/spec/lib/trackerific/version_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe Trackerific::VERSION do
-  it { should eq "0.7.4" }
+  it { should eq "0.7.5" }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackerific
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Travis Haynes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty