rbc 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a3731beac6830ccaeb731bea39085387a18fa60
-  data.tar.gz: fefacafc5c889919dfd74a1980ef2db4a7a20662
+  metadata.gz: 58bec22030a792ff01fa066a212112f31b5b79ab
+  data.tar.gz: 5718e2a4934ff95b6bd3c2f31388144ebc25967a
 SHA512:
-  metadata.gz: 3f58393a6e1ad1752f7ea19b773fee346df289bc807547ad16a5182cc86e268d8107ad6e9396e30336ff02f02efa765f770fadcc21f1eb8bec1ffb3abbcce561
-  data.tar.gz: 24c0edf06d10c7d91b6eb2995ad369c70102be9424d76ee28c860f9e55e720944c43dd771e9cda3f7cdda491cb2330ce894d41028c53ca57890a834db471a892
+  metadata.gz: 06115488596735702907f26c2ee7f7ac76aa0e4d75498fea9687377b59076f2b16a85a3500506942703e56d020f5233c8bd2cd6fb866aa6b3e9aa2f35bd36c3c
+  data.tar.gz: 78097bcc290d74b60cf552f320f59c80177c06bbbc8669168584db209df589ff90b4c522c1a9b386b551944b37e5ab3d8e96deb90d3885bde9a1c2c484884f88

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbc (0.2.8)
+    rbc (0.2.9)
       httparty (~> 0.9, >= 0.9.0)
       nokogiri (>= 1.5.5)
 

data/lib/rbc.rb

@@ -6,9 +6,9 @@ class RBC
   include RBCVersion
   include BSIServices
   BSI_INSTANCES = {
-    :mirror     => 'https://websvc-mirror.bsisystems.com:2271/bsi/xmlrpc',
-    :staging    => 'https://websvc-mirror.bsisystems.com:2271/bsi/xmlrpc',
-    :production => 'https://websvc.bsisystems.com:2262/bsi/xmlrpc'
+    'mirror'     => 'https://websvc-mirror.bsisystems.com:2271/bsi/xmlrpc',
+    'staging'    => 'https://websvc-mirror.bsisystems.com:2271/bsi/xmlrpc',
+    'production' => 'https://websvc.bsisystems.com:2262/bsi/xmlrpc'
   }
 
   attr_accessor :session_id, :url_target, :creds, :test, :common
@@ -22,6 +22,8 @@ class RBC
 
   # Initialize connection based on provided credentials
   def initialize(creds, options={:debug=>false, :stealth=>false, :instance=>:mirror})
+    options[:stealth]   ||= false
+    options[:instance]  ||= 'mirror'
     raise ArgumentError, """
 No credentials hash provided, expected a hash in the form of:
   {
@@ -30,11 +32,12 @@ No credentials hash provided, expected a hash in the form of:
     :server   => 'MYBSIDATABASE',
   }
     """ if creds.class != Hash || creds[:user].nil? || creds[:pass].nil? || creds[:server].nil?
-    raise ArgumentError, 'Please provide either a valid instance or specify a custom url using option key :url => \'https://...\'' if BSI_INSTANCES[options[:instance]].nil? && options[:url].nil? && options[:stealth]==false
-    options[:url] = BSI_INSTANCES[options[:instance]] unless options[:url]
-    self.url_target = options[:url]
 
-    raise RuntimError, "Invalid url" unless url_target.match(/^https?:\/\/(.+):\d{4}\/bsi\/xmlrpc$/)
+    options[:url] ||= BSI_INSTANCES[options[:instance].to_s]
+    @url_target = options[:url]
+    if options[:stealth]==false && @url_target.nil?
+      raise ArgumentError, 'Please provide either a valid instance key or specify a custom url using option key :url => \'https://...\''
+    end
 
     self.session_id = creds[:session_id] if creds[:session_id]
     services = YAML::load(File.open(File.join(File.dirname(__FILE__), 'service_spec.yaml')))

data/lib/rbc/version.rb

@@ -1,3 +1,3 @@
 module RBCVersion
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/rbc_spec.rb

@@ -13,11 +13,13 @@ describe RBC do
       expect{RBC.new([])}.to raise_error(ArgumentError)
       expect{RBC.new({:user => 'me'})}.to raise_error(ArgumentError)
       expect{RBC.new({:user => 'me', :pass => 'too'})}.to raise_error(ArgumentError)
+      expect{RBC.new({:user => 'me', :pass => 'too', :server => 'my_server'}, {:instance => :bad_instance})}.to raise_error(ArgumentError)
     end
 
     it 'takes an optional instance parameter' do
       @bsi = RBC.new({:user => 'me', :pass => 'pass', :server => 'server'}, {:instance => :mirror})
-      expect(@bsi.url_target).to eq(RBC::BSI_INSTANCES[:mirror])
+      expect(@bsi.url_target).to eq(RBC::BSI_INSTANCES['mirror'])
+      expect(@bsi.url_target)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbc
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Elijah Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler