onsip 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d9fc8dc9a886ee239ec320aa8c27adea4697a5
-  data.tar.gz: 08ecd59f82a4ad20f350535bd8da44775158b92b
+  metadata.gz: e86219349aaabe949b5c8d61fa83a7532fec8049
+  data.tar.gz: 5e2a2ce635807c8e79db668e63cd5ab3f9e54346
 SHA512:
-  metadata.gz: 8cda2045fc2b2d029fecd28248b7f28c46fec22c90eba6bf5887faa40e81018a9d8d79f99c9714d37db90562ea535de9cb0ceb1f922c831416ee34994a819e44
-  data.tar.gz: 0d057b432720b144eb15f2ba11cb7c8de229debe0a3cc8f72d150f4c737db6b94372bac7abeccbaff6625ea5eb94550d9c4054408613e7fda277c6e345655e85
+  metadata.gz: 775131b7aad62549de28d8d0d600d443faa312cc38dd88f83a4f8c5dbc799c2cb9cbdd335e5f4048b5fa3b01f8249a6dbed5528949c0fa5bdd587c979da10c59
+  data.tar.gz: 29ccf0628368492cfd8ce9c97c68b4b7eb00d25bec4d01a6dd8b8ba1fd3d2b5bc8f11edbac0cccd5500336feb8491acd8ac5666f2ff9b85d16fc66db78d3e017

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/bin/onsip

@@ -9,6 +9,8 @@ opts = Trollop::options do
   opt :uri, "OnSIP URI", :type => :string
   opt :username, "OnSIP Username", :type => :string
   opt :password, "OnSIP Password", :type => :string
+  opt :log_response_headers, "Log Response Headers", :type => :boolean
+  opt :log_response_body, "Log Response Body", :type => :boolean
 end
 
 uri = opts.delete :uri
@@ -19,8 +21,8 @@ begin
   OnSIP.connect(uri, opts)
   OnSIP.auth!(username, password)
 rescue StandardError => e
-  OnSIP.logger.debug e.message
-  OnSIP.logger.debug e.backtrace.join("\n")
+  OnSIP.logger.warn e.message
+  OnSIP.logger.warn e.backtrace.join("\n")
 end
 
 pry.binding

data/lib/onsip/connection.rb

@@ -2,11 +2,15 @@ module OnSIP
   class Connection
 
     USER_AGENT = "onsip-client v#{OnSIP::VERSION}"
+    DEFAULT_OPTIONS = {
+      :log_response_headers => false,
+      :log_response_body => false
+    }
 
     attr_accessor :options, :faraday
 
     def initialize(options = {})
-      @options = options
+      @options = DEFAULT_OPTIONS.merge(options)
       @faraday = self.create_faraday(options[:uri])
     end
 
@@ -19,7 +23,7 @@ module OnSIP
 
         c.response :json,  :content_type => /\bjson$/
         c.response :mashify
-        c.response :logger, OnSIP.logger
+        c.response :logger, OnSIP.logger if @options[:log_response_headers]
 
         c.use :instrumentation
         c.adapter Faraday.default_adapter
@@ -36,6 +40,7 @@ module OnSIP
         env[:total_time] = Time.now.utc.to_f - sent_at.utc.to_f if sent_at
         env[:request_params] = params
         env[:request_options] = options
+        OnSIP.logger.debug env.body if @options[:log_response_body]
         callback.call(env) if callback
       }
 

data/lib/onsip/session.rb

@@ -15,6 +15,10 @@ module OnSIP
       @attributes.UserId
     end
 
+    def established?
+      @attributes.IsEstablished && @attributes.IsEstablished.downcase == 'true'
+    end
+
     def user
       @user ||= User.read(self.user_id)
     end
@@ -23,6 +27,12 @@ module OnSIP
       @account ||= self.user.account
     end
 
+    def destroy!
+      session = self.class.destroy!(self.id)
+      self.attributes.merge!(session.attributes)
+      self
+    end
+
     module ClassMethods
       def create(username, password)
         response = OnSIP.connection.get('/api', {'Action' => 'SessionCreate', 'Username' => username, 'Password' => password, 'Output' => 'json'}, {})
@@ -31,14 +41,25 @@ module OnSIP
 
       def process_create_session_response(response)
         session = nil
-        r = response.env.body['Response']['Context']
-
-        if r['Request'] && (r['Request']['IsValid'] == 'true') && r['Session']
-          h = r['Session'].delete_if { |key| %w().include?(key) }
-          session = new h
-        else
-          raise OnSIPRequestException, 'Problem with session request'
-        end
+
+        key_path = %w(Response Context Session)
+        a = ResponseParser.parse_response response, key_path
+        session = (a.map { |h| new h }).first if a
+
+        session
+      end
+
+      def destroy!(session_id)
+        response = OnSIP.connection.get('/api', {'Action' => 'SessionDestroy', 'SessionId' => session_id, 'Output' => 'json'}, {})
+        process_destroy_session_response response
+      end
+
+      def process_destroy_session_response(response)
+        session = nil
+
+        key_path = %w(Response Context Session)
+        a = ResponseParser.parse_response response, key_path
+        session = (a.map { |h| new h }).first if a
 
         session
       end

data/lib/onsip/version.rb

@@ -1,3 +1,3 @@
 module OnSIP
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/onsip.rb

@@ -22,7 +22,6 @@ module OnSIP
   autoload :CDR, 'onsip/models/cdr'
 
   module ClassMethods
-    attr_accessor :session
     attr_writer :logger
 
     def logger
@@ -38,7 +37,7 @@ module OnSIP
 
     def connect(uri, options = {})
       @options = Hashie::Mash.new options
-      @connection = Connection.new(:uri => uri)
+      @connection = Connection.new(options.merge({:uri => uri}))
     end
 
     def connection
@@ -50,8 +49,18 @@ module OnSIP
     end
 
     def auth!(username, password)
-      @session = Session.create(username, password)
+      @username, @password = username, password
+      @session = Session.create(@username, @password)
     end
+
+    def session
+      if @session && @session.established?
+        @session
+      elsif @username && @password
+        @session = Session.create(@username, @password)
+      end
+    end
+
   end
 
   extend ClassMethods

data/onsip.gemspec

@@ -23,10 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'ffaker', '~> 1.15.0'
   spec.add_development_dependency 'machinist', '~> 2.0'
-  spec.add_development_dependency 'webmock', '~> 1.17.4'
+  spec.add_development_dependency 'webmock', '~> 1.20.4'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
   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'
   spec.add_runtime_dependency 'trollop', '~> 2.0'
   spec.add_runtime_dependency 'multi_json', '~> 1.10.1'

data/spec/lib/onsip/session_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe OnSIP::Session 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?.*SessionCreate.*'))
+    .to_return({
+      :body => body,
+      :status => 200,
+      :headers => { 'Content-Type' => 'application/json; charset=utf-8' }
+    })
+    OnSIP.connect('http://api.onsip.com')
+  end
+
+  describe "with valid username and password" do
+    it "can be created" do
+      session = OnSIP::Session.create('test', 'password')
+      expect(session.class).to eq OnSIP::Session
+    end
+
+    it "should be established" do
+      session = OnSIP::Session.create('test', 'password')
+      expect(session.established?).to be(true)
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,94 @@
+$:.push File.expand_path('../lib', __FILE__)
+require 'bundler/setup'
+require 'webmock/rspec'
+require 'onsip'
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onsip
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Keith Larrimore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.4
+        version: 1.20.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.4
+        version: 1.20.4
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +285,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -290,6 +305,8 @@ files:
 - lib/onsip/session.rb
 - lib/onsip/version.rb
 - onsip.gemspec
+- spec/lib/onsip/session_spec.rb
+- spec/spec_helper.rb
 homepage: http://icehook.com
 licenses:
 - MIT
@@ -314,4 +331,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OnSIP ruby client.
-test_files: []
+test_files:
+- spec/lib/onsip/session_spec.rb
+- spec/spec_helper.rb