yieldmanager 0.3.5 → 0.4.0

data/TODO

@@ -2,6 +2,7 @@
 	"unknown element: {http://schemas.xmlsoap.org/wsdl/}definitions"
 * throwing warning when running in autotest, but not spec?: monkeypatch net/http?
 	"warning: peer certificate won't be verified in this SSL session"
+* DONE (chris) Monkey-patch 1.8.7 to handle targetnamespace bug
 * DONE Using :env => "test" actually hits test environment
 * DONE add session start/end
 * DONE add session block

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.4.0

data/lib/patch_detector.rb

@@ -0,0 +1,22 @@
+module PatchDetector
+  def needs_patching?(opts={})
+    
+    ruby_version, minimum_ruby_version_for_patch = opts.values_at(:ruby_version, :minimum_ruby_version_for_patch)
+    
+    [ruby_version, minimum_ruby_version_for_patch].each do |extracted_option|
+      raise(ArgumentError, "requires :ruby_version and :minimum_ruby_version_for_patch") if extracted_option.nil? || extracted_option.empty?
+    end
+    
+    return false if ruby_version.nil? || minimum_ruby_version_for_patch.nil?
+
+    minimum_ruby_version_for_patch =~ /(\d+)\.(\d+)\.(\d+)/
+    min_release_milestone, min_release_feature, min_release_bug_fix = [$1, $2, $3].collect{|m| m.to_i}
+    
+    ruby_version =~ /(\d+)\.(\d+)\.(\d+)/
+    ruby_version_milestone, ruby_version_feature, ruby_version_bug_fix = [$1, $2, $3].collect{|m| m.to_i}
+  
+    return true if (ruby_version_milestone >= min_release_milestone) && (ruby_version_feature >= min_release_feature) && (ruby_version_bug_fix >= min_release_bug_fix)  
+    return false
+  end
+end
+

data/lib/wsdl/patch.rb

@@ -0,0 +1,38 @@
+# warn "Patching WSDL::Import"
+
+module WSDL
+  class Import < Info
+    def parse_attr(attr, value)
+      case attr
+      when NamespaceAttrName
+        @namespace = value.source
+        # if @content
+        #   @content.targetnamespace = @namespace
+        # end
+        @namespace
+      when LocationAttrName
+        @location = URI.parse(value.source)
+        if @location.relative? and !parent.location.nil? and
+            !parent.location.relative?
+          @location = parent.location + @location
+        end
+        if root.importedschema.key?(@location)
+          @content = root.importedschema[@location]
+        else
+          root.importedschema[@location] = nil      # placeholder
+          @content = import(@location)
+          if @content.is_a?(Definitions)
+            @content.root = root
+            if @namespace
+              @content.targetnamespace = @namespace
+            end
+          end
+          root.importedschema[@location] = @content
+        end
+        @location
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/yieldmanager.rb

@@ -9,6 +9,14 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 module Yieldmanager
 end
 
+require 'patch_detector'
+include PatchDetector
+
 require 'yieldmanager/client'
+
+if needs_patching?(:ruby_version => RUBY_VERSION, :minimum_ruby_version_for_patch => "1.8.7")
+  require 'wsdl/patch'
+end
+
 require 'yieldmanager/builder'
 require 'yieldmanager/report'

data/lib/yieldmanager/builder.rb

@@ -17,6 +17,7 @@ module Yieldmanager
     BASE_URL = "https://api.yieldmanager.com/api-"
     BASE_URL_TEST = "https://api-test.yieldmanager.com/api-"
     WSDL_DIR = File.join(File.dirname(__FILE__), '..', '..', 'wsdls')
+    
     def self.build_wsdls_for api_version
       unless api_version.match(/^\d\.\d{2}/)
         raise ArgumentError, "Non-standard api version"

data/lib/yieldmanager/client.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'soap/wsdlDriver'
 require 'open-uri'
 require 'hpricot'

data/spec/patch_detector_spec.rb

@@ -0,0 +1,50 @@
+require File.join(File.dirname(__FILE__), *%w[spec_helper])
+
+describe PatchDetector do
+  describe "needs_patching?" do
+    before do
+      class Object
+        include PatchDetector
+      end
+    end
+    
+    describe "when invalid arguments are passed" do
+      it "should raise an ArgumentError" do
+        ruby_version, minimum_ruby_version_for_patch = "", ""
+        
+        lambda {needs_patching?(:ruby_version => ruby_version, :minimum_ruby_version_for_patch => minimum_ruby_version_for_patch)}.should raise_error
+        lambda {needs_patching?()}.should raise_error
+        lambda {needs_patching?(:fasdfasdfa => "asdfasdfda", :foo => "bar")}.should raise_error
+      end
+    end
+    
+    describe "when the current ruby version is equal to the minimum ruby version require for patch" do
+      it "should be true" do
+        ruby_version, minimum_ruby_version_for_patch = "1.8.7", "1.8.7"
+        needs_patching?(:ruby_version => ruby_version, :minimum_ruby_version_for_patch => minimum_ruby_version_for_patch).should == true        
+      end
+    end
+    
+    describe "when the current ruby version is greater than the minimum_ruby_version_for_patch" do
+      it "should return true" do
+        minimum_ruby_version_for_patch = "1.8.7"
+        
+        ruby_version_array = %w(1.8.8 1.8.9 1.8.10)
+        ruby_version_array.each do |rv|
+          needs_patching?(:ruby_version => rv, :minimum_ruby_version_for_patch => minimum_ruby_version_for_patch).should == true                          
+        end
+      end
+    end
+    
+    describe "when the current ruby version is smaller than the minimum_ruby_version_for_patch" do
+      it "should return true" do
+        minimum_ruby_version_for_patch = "1.8.7"
+        
+        ruby_version_array = %w(1.8.2 1.7.7 0.8.10)
+        ruby_version_array.each do |rv|
+          needs_patching?(:ruby_version => rv, :minimum_ruby_version_for_patch => minimum_ruby_version_for_patch).should == false
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'yieldmanager'
 require 'spec'
 require 'spec/autorun'
-
+require 'patch_detector'
 Spec::Runner.configure do |config|
   
 end

data/spec/yieldmanager/client_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-NEED_ENV_ARGS_MSG = <<EOM
+CLIENT_NEED_ENV_ARGS_MSG = <<EOM
 Please set these environment variables to match your Yieldmanager account:
 * YIELDMANAGER_USER
 * YIELDMANAGER_PASS
@@ -114,7 +114,7 @@ describe "A new Yieldmanager client" do
     unless ENV["YIELDMANAGER_USER"] &&
       ENV["YIELDMANAGER_PASS"] &&
       ENV["YIELDMANAGER_API_VERSION"]
-      raise(ArgumentError, NEED_ENV_ARGS_MSG)
+      raise(ArgumentError, CLIENT_NEED_ENV_ARGS_MSG)
     end
     @login_args ||= {
       :user => ENV["YIELDMANAGER_USER"],

data/spec/yieldmanager/report_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-NEED_ENV_ARGS_MSG = <<EOM
+REPORT_NEED_ENV_ARGS_MSG = <<EOM
 Please set these environment variables to match your Yieldmanager account:
 * YIELDMANAGER_USER
 * YIELDMANAGER_PASS
 * YIELDMANAGER_API_VERSION
-* YIELDMANAGER_CONTACT_ID
+* YIELDMANAGER_CONTACT_ID (get this from the contact_id attribute in any UI-created reportware report)
 * YIELDMANAGER_IP_ADDRESS (your external IP address)
 EOM
   
@@ -77,14 +77,15 @@ describe "A Yieldmanager report request" do
     @login_args ||= {
       :user => ENV["YIELDMANAGER_USER"],
       :pass => ENV["YIELDMANAGER_PASS"],
-      :api_version => ENV["YIELDMANAGER_API_VERSION"]
+      :api_version => ENV["YIELDMANAGER_API_VERSION"],
+      :env => "test"
     }
   end
 
   def request_xml
     unless ENV["YIELDMANAGER_CONTACT_ID"] &&
       ENV["YIELDMANAGER_IP_ADDRESS"]
-      raise(ArgumentError, NEED_ENV_ARGS_MSG)
+      raise(ArgumentError, REPORT_NEED_ENV_ARGS_MSG)
     end
     <<EOR
 <?xml version="1.0"?>

data/yieldmanager.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yieldmanager}
-  s.version = "0.3.5"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Gathen"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2010-01-05}
   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.extra_rdoc_files = [
@@ -25,10 +25,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "TODO",
      "VERSION",
+     "lib/patch_detector.rb",
+     "lib/wsdl/patch.rb",
      "lib/yieldmanager.rb",
      "lib/yieldmanager/builder.rb",
      "lib/yieldmanager/client.rb",
      "lib/yieldmanager/report.rb",
+     "spec/patch_detector_spec.rb",
      "spec/reports/sample_report.xml",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -81,7 +84,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Interact with RightMedia's YieldManager API and Reportware products}
   s.test_files = [
-    "spec/spec_helper.rb",
+    "spec/patch_detector_spec.rb",
+     "spec/spec_helper.rb",
      "spec/yieldmanager/builder_spec.rb",
      "spec/yieldmanager/client_spec.rb",
      "spec/yieldmanager/report_spec.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yieldmanager
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bill Gathen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -05:00
+date: 2010-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,10 +50,13 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- lib/patch_detector.rb
+- lib/wsdl/patch.rb
 - lib/yieldmanager.rb
 - lib/yieldmanager/builder.rb
 - lib/yieldmanager/client.rb
 - lib/yieldmanager/report.rb
+- spec/patch_detector_spec.rb
 - spec/reports/sample_report.xml
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -128,6 +131,7 @@ signing_key:
 specification_version: 3
 summary: Interact with RightMedia's YieldManager API and Reportware products
 test_files: 
+- spec/patch_detector_spec.rb
 - spec/spec_helper.rb
 - spec/yieldmanager/builder_spec.rb
 - spec/yieldmanager/client_spec.rb