onsip 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d756dbee6749a9399eefa71653ff605ce1181167
-  data.tar.gz: 777b636d24fcf319c711edf35a79f2b0cf7650f2
+  metadata.gz: d3799330e51714e247923ae9e1523ef2a6a349bc
+  data.tar.gz: 5485de0a71597a66071fba8ba4d8d14e07aee7c9
 SHA512:
-  metadata.gz: e5358759f94c71ac2e61f02738d613e5c6d7d2988f81a6b54f778085425202beec664018d9b1cc301519c905af2fa40c1e5781aa71b2548c322e598ec14725ec
-  data.tar.gz: c2be2aead48b8afc2ad3378543f0f8ec74bd7016a11784bc4d3354d90b4e5cddd5c8ea927fff17ea93ee1c3a75f48c9138660372b85eaf7ef25dad8ce8b41702
+  metadata.gz: 6010ab6d5f48a46599584ec91fe9553d4b13bef40d6887e02133e82baf38880770218234f831ccb14dde30e80c6cc40b7e31aac7b9f12d403ef55a909f9122f8
+  data.tar.gz: 95d5e1a40bd7c5fe7c90705ae117761451e3e22f0250a8a32e8ce9279ef0c12448f0754c7fbb677365a83d620327409b0225ee67e1f3856cea3fdb274e1f43fc

data/lib/onsip/exceptions.rb

@@ -6,6 +6,18 @@ module OnSIP
       def initialize(object)
         @object = object
       end
+
+      def message
+        if @object && @object.kind_of?(Hash)
+          @object[:message]
+        else
+          @object.to_s
+        end
+      end
+
+      def to_s
+        self.message
+      end
     end
 
     class OnSIPRequestError < OnSIPError

data/lib/onsip/model.rb

@@ -9,6 +9,19 @@ module OnSIP
 
     module ClassMethods
 
+      DEFAULT_OPTIONS = {}
+
+      def merge_params(default_options = {}, options = {})
+        merged_params = {}
+
+        default_options.each do |opt,h|
+          v = options[opt] || h[:v]
+          merged_params[h[:k]] = v
+        end
+
+        merged_params
+      end
+
     end
 
     extend ClassMethods

data/lib/onsip/models/user.rb

@@ -55,8 +55,24 @@ module OnSIP
     end
 
     module ClassMethods
-      def browse(account_id)
-        params = {'Action' => 'UserBrowse', 'AccountId' => account_id, 'SessionId' => OnSIP.session.id, 'Output' => 'json'}
+      include Model::ClassMethods
+
+      DEFAULT_OPTIONS = {
+        :browse => {
+          :order_by => {:k => 'OrderBy', :v => 'UserId'},
+          :limit => {:k => 'Limit', :v => 100},
+          :offset => {:k => 'Offset', :v => 0},
+          :calc_found => {:k => 'CalcFound', :v => true}
+        }
+      }
+
+      def browse(account_id, options = {})
+        params = merge_params(DEFAULT_OPTIONS[:browse], options)
+        params = params.merge({'Action' => 'UserBrowse',
+                               'AccountId' => account_id,
+                               'SessionId' => OnSIP.session.id,
+                               'Output' => 'json'})
+
         response = OnSIP.connection.get('/api', params, {})
         yield response if block_given?
         process_browse_user_response response

data/lib/onsip/version.rb

@@ -1,3 +1,3 @@
 module OnSIP
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/onsip.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'trollop'
 require 'multi_json'
 require 'awesome_print'
+require 'active_support'
 require 'active_support/core_ext'
 require 'hashie'
 require 'faraday'

data/onsip.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rb-fsevent', '~> 0.9.3'
   spec.add_development_dependency 'simplecov', '~> 0.8.2'
   spec.add_development_dependency 'rspec', '>= 3.1.0'
-  spec.add_runtime_dependency 'activesupport', ['>= 3.0.0', '<= 4.0.0']
+  spec.add_runtime_dependency 'activesupport', '>= 4.0.0'
   spec.add_runtime_dependency 'trollop', '~> 2.0'
   spec.add_runtime_dependency 'multi_json', '~> 1.10.1'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.1'

data/spec/lib/onsip/model_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe OnSIP::Model do
+  before :each do
+
+  end
+
+  describe "ClassMethods" do
+    it "can merge params" do
+      params = OnSIP::Model.merge_params({:test => {:k => 'Test', :v => 123}}, {:test => 456})
+      expect(params).to eq({'Test' => 456})
+    end
+  end
+
+end

data/spec/lib/onsip/models/account_spec.rb

@@ -2,39 +2,39 @@ require 'spec_helper'
 
 describe OnSIP::Account do
   before :each do
-
-    success_body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T20:34:18+00:00", "Duration"=>"50", "Parameters"=>{"Parameter"=>[{"Name"=>"AccountId", "Value"=>"27370"}, {"Name"=>"Action", "Value"=>"AccountRead"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"1vflpm8sa25vt88o6nsl60lgi5"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"1vflpm8sa25vt88o6nsl60lgi5", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"AccountRead"=>{"Account"=>{"AccountId"=>"27370", "Receivable"=>"0.00", "Promocode"=>{}, "Productcode"=>"platform", "PerUserPricing"=>"false", "ResellerBilling"=>"false", "BalanceSeconds"=>"0", "EscrowSecondsUpdate"=>"0", "EscrowSecondsCredit"=>"0", "Balance"=>"00.00", "CreditLimit"=>"0.00", "Recharge"=>"false", "RechargeLevel"=>"0.00", "RechargeThreshold"=>"0.00", "Modified"=>"2014-12-03T19:04:34+00:00", "Created"=>"2014-03-24T14:15:44+00:00", "Contact"=>{"Name"=>"Bar  Foo", "Organization"=>"IceHook Systems", "Address"=>"123 Main St", "City"=>"New York", "State"=>"NY", "Zipcode"=>"100000", "Country"=>"United States of America", "CountryId"=>"207", "Phone"=>"1-212-555-1212", "Email"=>"test@icehook.com", "Modified"=>"2014-03-24T14:15:44+00:00"}, "CreditCard"=>{"CreditCardId"=>"12345", "AccountId"=>"54321", "CreditCardType"=>"3", "Name"=>"Foo Bar", "LastFour"=>"****", "Expiration"=>"01/2017", "Modified"=>"2014-10-15T18:07:36+00:00", "FirstName"=>"Foo", "LastName"=>"Bar", "Address"=>"123 Main St", "City"=>"New York", "State"=>"NY", "Zipcode"=>"10000", "CountryId"=>"207", "Phone"=>"1-212-555-1212", "IPAddress"=>"127.0.0.1"}}}}}}.to_json
-    stub_request(:get, Regexp.new('http://success.onsip.com/api?.*AccountRead.*'))
-    .to_return({
-      :body => success_body,
-      :status => 200,
-      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
-    })
-
-    failed_body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"false", "Errors"=>{"Error"=>{"Code"=>"AccountAuthorization.Required", "Message"=>"Permission to perform the requested action has not been granted."}}}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T21:36:21+00:00", "Duration"=>"41", "Parameters"=>{"Parameter"=>[{"Name"=>"AccountId", "Value"=>"12345"}, {"Name"=>"Action", "Value"=>"AccountRead"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"j3kmb4boemqnl6u1vsip210rp7"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"j3kmb4boemqnl6u1vsip210rp7", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}}}.to_json
-    stub_request(:get, Regexp.new('http://fail.onsip.com/api?.*AccountRead.*'))
-    .to_return({
-      :body => failed_body,
-      :status => 200,
-      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
-    })
-
     OnSIP.session = OnSIP::Session.new("IsEstablished" => "true")
   end
 
-  describe "Onsip::Account.read" do
-    it "has a valid id" do
+  describe "read" do
+
+    success_body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T20:34:18+00:00", "Duration"=>"50", "Parameters"=>{"Parameter"=>[{"Name"=>"AccountId", "Value"=>"27370"}, {"Name"=>"Action", "Value"=>"AccountRead"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"1vflpm8sa25vt88o6nsl60lgi5"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"1vflpm8sa25vt88o6nsl60lgi5", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"AccountRead"=>{"Account"=>{"AccountId"=>"27370", "Receivable"=>"0.00", "Promocode"=>{}, "Productcode"=>"platform", "PerUserPricing"=>"false", "ResellerBilling"=>"false", "BalanceSeconds"=>"0", "EscrowSecondsUpdate"=>"0", "EscrowSecondsCredit"=>"0", "Balance"=>"00.00", "CreditLimit"=>"0.00", "Recharge"=>"false", "RechargeLevel"=>"0.00", "RechargeThreshold"=>"0.00", "Modified"=>"2014-12-03T19:04:34+00:00", "Created"=>"2014-03-24T14:15:44+00:00", "Contact"=>{"Name"=>"Bar  Foo", "Organization"=>"IceHook Systems", "Address"=>"123 Main St", "City"=>"New York", "State"=>"NY", "Zipcode"=>"100000", "Country"=>"United States of America", "CountryId"=>"207", "Phone"=>"1-212-555-1212", "Email"=>"test@icehook.com", "Modified"=>"2014-03-24T14:15:44+00:00"}, "CreditCard"=>{"CreditCardId"=>"12345", "AccountId"=>"54321", "CreditCardType"=>"3", "Name"=>"Foo Bar", "LastFour"=>"****", "Expiration"=>"01/2017", "Modified"=>"2014-10-15T18:07:36+00:00", "FirstName"=>"Foo", "LastName"=>"Bar", "Address"=>"123 Main St", "City"=>"New York", "State"=>"NY", "Zipcode"=>"10000", "CountryId"=>"207", "Phone"=>"1-212-555-1212", "IPAddress"=>"127.0.0.1"}}}}}}.to_json
+    before { custom_stub(success_body, 'success', 'AccountRead') }
+
+    it "with a valid id" do
       OnSIP.connect('http://success.onsip.com')
       account = OnSIP::Account.read('27370')
       expect(account.class).to eq OnSIP::Account
     end
 
-    it "has an invalid id" do
+    failed_body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"false", "Errors"=>{"Error"=>{"Code"=>"AccountAuthorization.Required", "Message"=>"Permission to perform the requested action has not been granted."}}}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T21:36:21+00:00", "Duration"=>"41", "Parameters"=>{"Parameter"=>[{"Name"=>"AccountId", "Value"=>"12345"}, {"Name"=>"Action", "Value"=>"AccountRead"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"j3kmb4boemqnl6u1vsip210rp7"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"j3kmb4boemqnl6u1vsip210rp7", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}}}.to_json
+    before { custom_stub(failed_body, 'fail', 'AccountRead') }
+
+    it "with an invalid id" do
       OnSIP.connect('http://fail.onsip.com')
       account = nil
       expect { account = OnSIP::Account.read('12345') }.to raise_error(OnSIP::Exceptions::OnSIPRequestError)
       expect(account).to be(nil)
     end
+
+  end
+
+  describe "add" do
+  end
+
+  describe "browse" do
+  end
+
+  describe "UserEditContact" do
   end
 
 end

data/spec/lib/onsip/models/external_address_spec.rb

@@ -2,15 +2,17 @@ require 'spec_helper'
 
 describe OnSIP::ExternalAddress do
   before :each do
-
-    body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T17:39:53+00:00", "Duration"=>"30", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"SessionCreate"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"Password", "Value"=>"******"}, {"Name"=>"Username", "Value"=>"icehook"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"j2vtu1bk7rsdpklofplu07ocq1", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"SessionCreate"=>{}}}}.to_json
-    stub_request(:get, Regexp.new('http://api.onsip.com/api?.*ExternalAddressAdd.*'))
-    .to_return({
-      :body => body,
-      :status => 200,
-      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
-    })
     OnSIP.connect('http://api.onsip.com')
+    OnSIP.session = OnSIP::Session.new("IsEstablished" => "true")
   end
 
+  describe "browse" do
+    body =  {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-05T20:13:59+00:00", "Duration"=>"17", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"ExternalAddressBrowse"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"lu2qftbuv883gu5iu5qofrva90"}, {"Name"=>"UserId", "Value"=>"266848"}, {"Name"=>"Limit", "Value"=>"20"}, {"Name"=>"Offset", "Value"=>"0"}, {"Name"=>"CalcFound", "Value"=>"true"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"lu2qftbuv883gu5iu5qofrva90", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"ExternalAddressBrowse"=>{"ExternalAddresses"=>{"@attributes"=>{"Limit"=>"20", "Offset"=>"0"}}}}}}.to_json
+    before { custom_stub(body, 'api', 'ExternalAddressBrowse') }
+
+    it "with valid id" do
+      ea = OnSIP::ExternalAddress.browse({'UserId' => '266848'})
+      expect(ea).to be_empty
+    end
+  end
 end

data/spec/lib/onsip/models/organization_spec.rb

@@ -2,15 +2,17 @@ require 'spec_helper'
 
 describe OnSIP::Organization do
   before :each do
-
-    body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T17:39:53+00:00", "Duration"=>"30", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"SessionCreate"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"Password", "Value"=>"******"}, {"Name"=>"Username", "Value"=>"icehook"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"j2vtu1bk7rsdpklofplu07ocq1", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"SessionCreate"=>{}}}}.to_json
-    stub_request(:get, Regexp.new('http://api.onsip.com/api?.*OrganizationAdd.*'))
-    .to_return({
-      :body => body,
-      :status => 200,
-      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
-    })
     OnSIP.connect('http://api.onsip.com')
+    OnSIP.session = OnSIP::Session.new("IsEstablished" => "true")
   end
 
+  describe "read" do
+    body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-05T19:13:17+00:00", "Duration"=>"24", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"OrganizationRead"}, {"Name"=>"OrganizationId", "Value"=>"30096"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"7kq545de3001r1h2vfmrh15ag3"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"7kq545de3001r1h2vfmrh15ag3", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"OrganizationRead"=>{"Organization"=>{"OrganizationId"=>"30096", "AccountId"=>"27370", "Service"=>"platform", "Domain"=>"sip.firertc.com", "CallerId"=>{}, "CallerIdName"=>{}, "CallerIdNumber"=>{}, "Status"=>"enabled", "ExtendedDialing"=>"false", "E911Provisioning"=>"false", "BusyLampField"=>"true", "Authenticated"=>"true", "RegistrationLimit"=>"5000", "Modified"=>"2014-11-24T19:24:03+00:00", "Created"=>"2014-03-24T14:15:44+00:00", "Contact"=>{"Name"=>"Foo  Bar", "Organization"=>"IceHook Systems", "Address"=>"123 Main st", "City"=>"New York", "State"=>"NY", "Zipcode"=>"10000", "Country"=>"United States of America", "CountryId"=>"207", "Phone"=>"1-212-222-6263", "Email"=>"foo@example.com", "Modified"=>"2014-03-24T14:15:44+00:00"}}}}}}.to_json
+    before { custom_stub(body, 'api', 'OrganizationRead') }
+
+    it "with valid id" do
+      org = OnSIP::Organization.read('30096')
+      expect(org.class).to eq OnSIP::Organization
+    end
+  end
 end

data/spec/lib/onsip/models/user_address_spec.rb

@@ -2,15 +2,17 @@ require 'spec_helper'
 
 describe OnSIP::UserAddress do
   before :each do
-
-    body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T17:39:53+00:00", "Duration"=>"30", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"SessionCreate"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"Password", "Value"=>"******"}, {"Name"=>"Username", "Value"=>"icehook"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"j2vtu1bk7rsdpklofplu07ocq1", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"SessionCreate"=>{}}}}.to_json
-    stub_request(:get, Regexp.new('http://api.onsip.com/api?.*UserAddressAdd.*'))
-    .to_return({
-      :body => body,
-      :status => 200,
-      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
-    })
     OnSIP.connect('http://api.onsip.com')
+    OnSIP.session = OnSIP::Session.new("IsEstablished" => "true")
   end
 
+  describe "browse" do
+    body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-05T20:02:37+00:00", "Duration"=>"20", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"UserAddressBrowse"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"lu2qftbuv883gu5iu5qofrva90"}, {"Name"=>"UserId", "Value"=>"252683"}, {"Name"=>"Limit", "Value"=>"20"}, {"Name"=>"Offset", "Value"=>"0"}, {"Name"=>"CalcFound", "Value"=>"true"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"lu2qftbuv883gu5iu5qofrva90", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"UserAddressBrowse"=>{"UserAddresses"=>{"@attributes"=>{"Limit"=>"20", "Offset"=>"0", "Found"=>"1"}, "UserAddress"=>{"UserId"=>"252683", "AuthUsername"=>"bharris_firertc", "AuthPassword"=>"eUDkEdMnuqiWr2jA", "Timeout"=>"20", "E911LocationId"=>{}, "DoNotDisturb"=>"false", "Address"=>{"AddressId"=>"787282", "Username"=>"bharris", "Domain"=>"sip.firertc.com", "Type"=>"user", "Name"=>"Brendon Harris", "Modified"=>"2014-09-30T18:32:13+00:00", "Created"=>"2014-09-30T18:32:13+00:00", "CplText"=>"<cpl xmlns=\"urn:ietf:params:xml:ns:cpl\"/>"}}}}}}}.to_json
+    before { custom_stub(body, 'api', 'UserAddressBrowse') }
+
+    it "with valid id" do
+      ua = OnSIP::UserAddress.browse({'UserId' => '266848'})
+      expect(ua).to include OnSIP::UserAddress
+    end
+  end
 end

data/spec/lib/onsip/models/user_spec.rb

@@ -1,25 +1,52 @@
 require 'spec_helper'
 
 describe OnSIP::User do
-  before :each do
 
-    body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T20:17:17+00:00", "Duration"=>"46", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"UserRead"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"bvb4thhuk1d7tb2bddf09teqr4"}, {"Name"=>"UserId", "Value"=>"260161"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"bvb4thhuk1d7tb2bddf09teqr4", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"UserRead"=>{"User"=>{"UserId"=>"260161", "OrganizationId"=>"30096", "AccountId"=>"27370", "Flags"=>"32", "Status"=>"disabled", "Domain"=>"sip.firertc.com", "Username"=>"test3_firertc", "Password"=>"**********", "AuthUsername"=>"test3_firertc", "Modified"=>"2014-11-24T19:24:03+00:00", "Created"=>"2014-11-03T19:30:08+00:00", "Ack911"=>"1970-01-01T00:00:00+00:00", "SurveyCompleted"=>"1970-01-01T00:00:00+00:00", "AckTrunkingTerms"=>"1970-01-01T00:00:00+00:00", "AckTrunkingE911"=>"1970-01-01T00:00:00+00:00", "AckHostedTerms"=>"1970-01-01T00:00:00+00:00", "AckHostedE911"=>"1970-01-01T00:00:00+00:00", "ExtendedDialing"=>"false", "PSTNForwarding"=>"false", "E911Provisioning"=>"false", "PSTNTrunking"=>"false", "FreePSTNTrunking"=>"false", "BusyLampField"=>"true", "Contact"=>{"Name"=>"test", "Organization"=>"IceHook Systems", "Address"=>"123 Main St", "City"=>"New York", "State"=>"NY", "Zipcode"=>"10000", "Country"=>"United States of America", "CountryId"=>"207", "Phone"=>"1-212-555-1212", "Email"=>"test@icehook.com", "Modified"=>"2014-11-03T19:30:08+00:00"}, "Roles"=>{"Role"=>{"Name"=>"User"}}}}}}}.to_json
-    stub_request(:get, Regexp.new('http://api.onsip.com/api?.*UserRead.*'))
-    .to_return({
-      :body => body,
-      :status => 200,
-      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
-    })
-    OnSIP.connect('http://api.onsip.com')
+  before :each do
     OnSIP.session = OnSIP::Session.new("IsEstablished" => "true")
   end
 
-  describe "with valid id" do
-    it "can be read" do
+  describe "read" do
+    read_body = {"Response"=>{"Context"=>{"Action"=>{"IsCompleted"=>"true"}, "Request"=>{"IsValid"=>"true", "DateTime"=>"2014-12-04T20:17:17+00:00", "Duration"=>"46", "Parameters"=>{"Parameter"=>[{"Name"=>"Action", "Value"=>"UserRead"}, {"Name"=>"Output", "Value"=>"json"}, {"Name"=>"SessionId", "Value"=>"bvb4thhuk1d7tb2bddf09teqr4"}, {"Name"=>"UserId", "Value"=>"260161"}]}}, "Session"=>{"IsEstablished"=>"true", "SessionId"=>"bvb4thhuk1d7tb2bddf09teqr4", "UserId"=>"212762", "Roles"=>{"Role"=>{"Name"=>"Account Admin"}}}}, "Result"=>{"UserRead"=>{"User"=>{"UserId"=>"260161", "OrganizationId"=>"30096", "AccountId"=>"27370", "Flags"=>"32", "Status"=>"disabled", "Domain"=>"sip.firertc.com", "Username"=>"test3_firertc", "Password"=>"**********", "AuthUsername"=>"test3_firertc", "Modified"=>"2014-11-24T19:24:03+00:00", "Created"=>"2014-11-03T19:30:08+00:00", "Ack911"=>"1970-01-01T00:00:00+00:00", "SurveyCompleted"=>"1970-01-01T00:00:00+00:00", "AckTrunkingTerms"=>"1970-01-01T00:00:00+00:00", "AckTrunkingE911"=>"1970-01-01T00:00:00+00:00", "AckHostedTerms"=>"1970-01-01T00:00:00+00:00", "AckHostedE911"=>"1970-01-01T00:00:00+00:00", "ExtendedDialing"=>"false", "PSTNForwarding"=>"false", "E911Provisioning"=>"false", "PSTNTrunking"=>"false", "FreePSTNTrunking"=>"false", "BusyLampField"=>"true", "Contact"=>{"Name"=>"test", "Organization"=>"IceHook Systems", "Address"=>"123 Main St", "City"=>"New York", "State"=>"NY", "Zipcode"=>"10000", "Country"=>"United States of America", "CountryId"=>"207", "Phone"=>"1-212-555-1212", "Email"=>"test@icehook.com", "Modified"=>"2014-11-03T19:30:08+00:00"}, "Roles"=>{"Role"=>{"Name"=>"User"}}}}}}}.to_json
+    before { custom_stub(read_body, 'read', 'UserRead') }
+
+    it "with valid id" do
+      OnSIP.connect('http://read.onsip.com')
       user = OnSIP::User.read('260161')
       expect(user.class).to eq OnSIP::User
     end
 
   end
 
+  describe "add" do
+    add_body = {"Response"=>{"Context"=>{"Action"=>{ "IsCompleted"=>"true" },"Request"=>{"IsValid"=>"true","DateTime"=>"2014-04-21T16:19:55+00:00","Duration"=>"165","Parameters"=>{"Parameter"=>[{"Name"=>"Action","Value"=>"UserAdd"},{"Name"=>"SessionId","Value"=>"thqqva0i6jp3ea1ved17shcdg7"},{"Name"=>"OrganizationId","Value"=>"25018"},{"Name"=>"Username","Value"=>"docs"},{"Name"=>"Domain","Value"=>"example.onsip.com"},{"Name"=>"Name","Value"=>"Docs"},{"Name"=>"Email","Value"=>"docs@example.onsip.com"},{"Name"=>"AuthUsername","Value"=>"example"},{"Name"=>"Password","Value"=>"******"},{"Name"=>"PasswordConfirm","Value"=>"******"},{"Name"=>"Role","Value"=>"User"}]}},"Session"=>{"IsEstablished"=>"true","SessionId"=>"thqqva0i6jp3ea1ved17shcdg7","UserId"=>"152255","Roles"=>{"Role"=>{ "Name"=>"Account Admin" }}}},"Result"=>{"UserAdd"=>{"User"=>{"UserId"=>"218339","OrganizationId"=>"25018","AccountId"=>"22543","Flags"=>"0","Status"=>"enabled","Domain"=>"example.onsip.com","Username"=>"example","Password"=>"QPD2MLQhdaHB2hBW","AuthUsername"=>"example","Modified"=>"2014-04-21T16:19:55+00:00","Created"=>"2014-04-21T16:19:55+00:00","Ack911"=>"1970-01-01T00:00:00+00:00","SurveyCompleted"=>"1970-01-01T00:00:00+00:00","AckTrunkingTerms"=>"1970-01-01T00:00:00+00:00","AckTrunkingE911"=>"1970-01-01T00:00:00+00:00","AckHostedTerms"=>"1970-01-01T00:00:00+00:00","AckHostedE911"=>"1970-01-01T00:00:00+00:00","ExtendedDialing"=>"false","PSTNForwarding"=>"false","E911Provisioning"=>"false","PSTNTrunking"=>"false","FreePSTNTrunking"=>"false","BusyLampField"=>"false","Contact"=>{"Name"=>"Docs","Organization"=>"example","Address"=>"55 broad street","City"=>"Brooklyn","State"=>"NY","Zipcode"=>"11201","Country"=>"United States of America","CountryId"=>"207","Phone"=>"1-555-555-5555","Email"=>"docs@example.onsip.com","Modified"=>"2014-04-21T16:19:55+00:00"},"Roles"=>{"Role"=>{ "Name"=>"User" }}}}}}}.to_json
+    before {
+      stub_request(:get, Regexp.new("http://add.onsip.com/api?.*UserAdd.*"))
+      .to_return({
+        :body => add_body,
+        :status => 200,
+        :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
+        })
+    }
+
+
+    it "with valid orgnization and attrs" do
+      OnSIP.connect('http://add.onsip.com')
+      org = OnSIP::Organization.new
+      attrs = {
+        'SessionId' => 'thqqva0i6jp3ea1ved17shcdg7',
+        'OrganizationId' => '2501',
+        'Username' => 'docs',
+        'Domain' => 'example.onsip.com',
+        'Name' => 'Docs',
+        'Email' => 'docs@example.onsip.com',
+        'AuthUsername' => 'example',
+        'Password' => 'mysuperpassword',
+        'PasswordConfirm' => 'mysuperpassword'
+      }
+      user = OnSIP::User.add(org, attrs)
+      expect(user.class).to eq OnSIP::User
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'bundler/setup'
 require 'webmock/rspec'
 require 'onsip'
+require 'support/helpers'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -31,6 +32,8 @@ RSpec.configure do |config|
     #   # => "be bigger than 2 and smaller than 4"
     # ...rather than:
     #   # => "be bigger than 2"
+
+    config.include Helpers
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 

data/spec/support/helpers.rb

@@ -0,0 +1,12 @@
+module Helpers
+  
+  def custom_stub(body, uri_matcher, uri_params)
+    stub_request(:get, Regexp.new("http://#{uri_matcher}.onsip.com/api?.*#{uri_params}.*"))
+    .to_return({
+      :body => body,
+      :status => 200,
+      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
+      })
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onsip
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Keith Larrimore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,9 +155,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
@@ -165,9 +162,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -311,6 +305,7 @@ files:
 - lib/onsip/session.rb
 - lib/onsip/version.rb
 - onsip.gemspec
+- spec/lib/onsip/model_spec.rb
 - spec/lib/onsip/models/account_spec.rb
 - spec/lib/onsip/models/cdr_spec.rb
 - spec/lib/onsip/models/external_address_spec.rb
@@ -320,6 +315,7 @@ files:
 - spec/lib/onsip/response_parser_spec.rb
 - spec/lib/onsip/session_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 homepage: http://icehook.com
 licenses:
 - MIT
@@ -345,6 +341,7 @@ signing_key:
 specification_version: 4
 summary: OnSIP ruby client.
 test_files:
+- spec/lib/onsip/model_spec.rb
 - spec/lib/onsip/models/account_spec.rb
 - spec/lib/onsip/models/cdr_spec.rb
 - spec/lib/onsip/models/external_address_spec.rb
@@ -354,3 +351,4 @@ test_files:
 - spec/lib/onsip/response_parser_spec.rb
 - spec/lib/onsip/session_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb