yieldmanager 0.9.0 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/soap4r_19_patch/xsd/iconvcharset.rb

@@ -0,0 +1,42 @@
+# XSD4R - Charset handling with iconv.
+# # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+#
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+#
+# PATCH CLONED FROM THIS GITHUB PULL REQUEST https://github.com/felipec/soap4r/pull/6
+#
+
+unless ''.respond_to? :encode
+  require 'iconv'
+end
+
+module XSD
+
+
+class IconvCharset
+  if ''.respond_to? :encode
+    def self.safe_iconv(to, from, str)
+      str.encode(to, from, :invalid => :replace, :undef => :replace, :replace => '?')
+    end
+  else
+    def self.safe_iconv(to, from, str)
+      iconv = Iconv.new(to, from)
+      out = ""
+      begin
+        out << iconv.iconv(str)
+      rescue Iconv::IllegalSequence => e
+        out << e.success
+        ch, str = e.failed.split(//, 2)
+        out << '?'
+        warn("Failed to convert #{ch}")
+        retry
+      end
+      return out
+    end
+  end
+end
+
+
+end

data/lib/yieldmanager/report.rb

@@ -57,6 +57,10 @@ module Yieldmanager
       hashes
     end
 
+    def pause
+      sleep(5)
+    end
+
 private
     
     def request_report_token token, report, xml
@@ -68,13 +72,24 @@ private
       60.times do |secs| # Poll until report ready
         report_url = report.status(token,report_token)
         break if report_url != nil
-        sleep(5)
+        pause
       end
       report_url
     end
     
     def retrieve_data url
-      doc = open(url) { |f| Hpricot(f) }
+      retries = 5
+      doc = nil
+      while (doc == nil && retries > 0) do
+        begin
+          doc = parse_data(url)
+        rescue Exception => e
+          retries = retries - 1
+          pause
+        end
+      end
+      raise "Failed pulling report data from #{url}" unless doc
+
       (doc/"header column").each do |col|
         headers << col.inner_html
       end
@@ -87,6 +102,10 @@ private
         data << row
       end
     end
+
+    def parse_data url
+      open(url) { |f| Hpricot(f) }
+    end
     
     class ReportRow < Array
       def initialize report

data/spec/yieldmanager/report_spec.rb

@@ -98,11 +98,12 @@ describe "A Yieldmanager report request" do
     report.headers[0] = 'new_first'
     report.data.first.by_name('new_first').should == "one"
   end
-  
-  it "complains if report token is nil"
-  
-  # need configurable pause and attempts to keep this from running 5 mins!
-  it "throws ReportTimeoutException if report data never returns"
+
+  it "complains if report URL doesn't exist, even after retries" do
+    report = Yieldmanager::Report.new
+    report.stub(:pause) {} # don't make me wait
+    expect{ report.send(:retrieve_data,"http://i_dont_exist.com") }.to raise_error
+  end
   
   def login_args
     unless ENV["YIELDMANAGER_USER"] &&

data/yieldmanager.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{yieldmanager}
-  s.version = "0.9.0"
+  s.name = "yieldmanager"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Bill Gathen}]
-  s.date = %q{2012-01-24}
-  s.description = %q{This gem offers full access to YieldManager's API tools (read/write) as well as ad-hoc reporting through the Reportware tool}
-  s.email = %q{bill@billgathen.com}
+  s.authors = ["Bill Gathen"]
+  s.date = "2012-08-24"
+  s.description = "This gem offers full access to YieldManager's API tools (read/write) as well as ad-hoc reporting through the Reportware tool"
+  s.email = "bill@billgathen.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md",
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/soap4r_19_patch/soap/generator.rb",
     "lib/soap4r_19_patch/soap/property.rb",
     "lib/soap4r_19_patch/xsd/charset.rb",
+    "lib/soap4r_19_patch/xsd/iconvcharset.rb",
     "lib/soap4r_19_patch/xsd/xmlparser.rb",
     "lib/wsdl/patch.rb",
     "lib/yieldmanager.rb",
@@ -45,10 +46,10 @@ Gem::Specification.new do |s|
     "spec/yieldmanager/report_spec.rb",
     "yieldmanager.gemspec"
   ]
-  s.homepage = %q{http://github.com/billgathen/yieldmanager}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Interact with RightMedia's YieldManager API and Reportware products}
+  s.homepage = "http://github.com/billgathen/yieldmanager"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Interact with RightMedia's YieldManager API and Reportware products"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yieldmanager
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153058260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *2153058260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153057440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,29 +37,44 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153057440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2153056600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153056600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: soap4r
-  requirement: &2153055860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153055860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.8
 description: This gem offers full access to YieldManager's API tools (read/write)
   as well as ad-hoc reporting through the Reportware tool
 email: bill@billgathen.com
@@ -79,6 +99,7 @@ files:
 - lib/soap4r_19_patch/soap/generator.rb
 - lib/soap4r_19_patch/soap/property.rb
 - lib/soap4r_19_patch/xsd/charset.rb
+- lib/soap4r_19_patch/xsd/iconvcharset.rb
 - lib/soap4r_19_patch/xsd/xmlparser.rb
 - lib/wsdl/patch.rb
 - lib/yieldmanager.rb
@@ -111,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Interact with RightMedia's YieldManager API and Reportware products