yieldmanager 0.4.0 → 0.4.1

data/README.rdoc

@@ -1,7 +1,7 @@
 = yieldmanager
 
-This gem offers full access to YieldManager's API tools (read/write) and
-(eventually) ad-hoc reporting through the Reportware tool.
+This gem offers read/write access to YieldManager's API tools and
+ad-hoc reporting through the Reportware tool.
 
 Currently it generates a fresh wsdl from the api.yieldmanager.com site the
 first time you use a service (in the future it will use locally-cached
@@ -41,6 +41,8 @@ To access the test environment, use this:
 		:env => "test"
 	)
 
+The keys can also be passed as string: 'user', 'pass', 'api_version' and 'env'.
+
 *NOTE* Changing the environment after creation has no effect!
 
 === Finding available services

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/yieldmanager/client.rb

@@ -42,13 +42,22 @@ module Yieldmanager
     # * :api_version (required) - Yieldmanager API version (i.e., "1.30")
     # * :env (optional) - Yieldmanager environment "prod" or "test" (defaults to prod)
     def initialize(options = nil)
-      unless options && options[:user] && options[:pass] && options[:api_version]
+      unless options &&
+        (options[:user] || options['user']) &&
+        (options[:pass] || options['pass']) &&
+        (options[:api_version] || options['api_version'])
         raise ArgumentError, ":user, :pass and :api_version are required"
       end
-      @user = options[:user]
-      @pass = options[:pass]
-      @api_version = options[:api_version]
-      @env = options[:env] ||= "prod"
+      @user = options[:user] ||= options['user']
+      @pass = options[:pass] ||= options['pass']
+      @api_version = options[:api_version] ||= options['api_version']
+      if options[:env]
+        @env = options[:env]
+      elsif options['env']
+        @env = options['env']
+      else
+        @env = "prod"
+      end
       @wsdl_dir = "#{WSDL_DIR}/#{@api_version}/#{@env}"
       wrap_services
     end

data/spec/yieldmanager/client_spec.rb

@@ -13,19 +13,32 @@ describe "A new Yieldmanager client" do
   end
   
   it "requires :user, :pass and :api_version as args" do
-    @ym.user.should equal(login_args[:user])
-    @ym.pass.should equal(login_args[:pass])
-    @ym.api_version.should equal(login_args[:api_version])
+    @ym.user.should == login_args[:user]
+    @ym.pass.should == login_args[:pass]
+    @ym.api_version.should == login_args[:api_version]
     lambda { Yieldmanager::Client.new() }.should raise_error(ArgumentError)
     lambda { Yieldmanager::Client.new({}) }.should raise_error(ArgumentError)
   end
   
+  it "accepts 'user', 'pass' and 'api_version' as args" do
+    ym = Yieldmanager::Client.new(
+      'user' => ENV['YIELDMANAGER_USER'],
+      'pass' => ENV['YIELDMANAGER_PASS'],
+      'api_version' => ENV['YIELDMANAGER_API_VERSION'])
+    ym.user.should == ENV['YIELDMANAGER_USER']
+    ym.pass.should == ENV['YIELDMANAGER_PASS']
+    ym.api_version.should == ENV['YIELDMANAGER_API_VERSION']
+  end
+  
   it "defaults to prod, accepts override to test" do
     @ym.env.should == "prod"
     @ym.contact.inspect.should match("api.yieldmanager.com")
     ym_test = Yieldmanager::Client.new(login_args.merge(:env => "test"))
     ym_test.env.should == "test"
     ym_test.contact.inspect.should match("api-test.yieldmanager.com")
+    ym_test2 = Yieldmanager::Client.new(login_args.merge('env' => "test"))
+    ym_test2.env.should == "test"
+    ym_test2.contact.inspect.should match("api-test.yieldmanager.com")
   end
   
   it "displays available services" do

data/yieldmanager.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yieldmanager}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Gathen"]
-  s.date = %q{2010-01-05}
+  s.date = %q{2010-01-12}
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yieldmanager
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Bill Gathen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -05:00
+date: 2010-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency