cts-mpx 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f7461b875dc5f0aca3c72e969e27ad55aa0ba4
-  data.tar.gz: 7b246e09cb06aa3b55d03e38ae252c65186b8e86
+  metadata.gz: 7972d6219f8ea4529c9dc0863e85417d0948cb0c
+  data.tar.gz: 40b45a11bd0f15d0ebf9ecddb3ba74b7da06ac3f
 SHA512:
-  metadata.gz: ed2b7cb38cde63fefdc304529a621950db81e3f1bd57cb345f603bb840585b7d2c34b203f7062e8104ca2887838ff7009f1b7a4d019e05a5f541decf47461d55
-  data.tar.gz: 7a06927b1918e397f76df770c47ceeebf701d77a578f4096590ea625d86cb6672f39179642753a7ad479c324b6fc8825172ea9a672ed3cce46536413a96ba5f7
+  metadata.gz: 7eb12fb8ae45a387aa7599171b387a4412a0bd4ee4ec4fe5481b812c1fa3c2cece788a1d771630a162026ad004816e30b91f1bd6d369e58b8bcc5050b74d6ca6
+  data.tar.gz: 55392ff698ab16f63c8b6de195623e06d293ebf63083b3e983b2d002a36fd6168ec4f59fff6065b3ed69e36717efc9312ec4064c34324e950f16ac16cc0ba783

data/.rubocop.yml

@@ -55,6 +55,11 @@ Style/FrozenStringLiteralComment:
 Style/MixinUsage:
   Exclude:
   - 'bin/*'
+  - 'spec/spec_helper_shared_examples.rb'
+
+# it's about the line count, and white space on the left.
+Style/ClassAndModuleChildren:
+  Enabled: false
 
 # Purty hashes.
 Layout/AlignHash:
@@ -84,5 +89,8 @@ Metrics/ParameterLists:
 RSpec/NamedSubject:
   Enabled: false
 
+RSpec/DescribeSymbol:
+  Enabled: false
+
 Lint/Debugger:
   Enabled: false

data/EXAMPLES.md

@@ -13,8 +13,7 @@ account = 'http://access.auth.theplatform.com/data/Account/1'
 ### Login
 
 ``` ruby
-user = Cts::Mpx::User.create username: username, password: password
-user.sign_in
+user = Cts::Mpx::User.create(username: ENV["MPX_USERNAME"], password: ENV["MPX_PASSWORD"]).sign_in
 ```
 
 ### Logout
@@ -38,7 +37,7 @@ puts response.status
 
 ``` ruby
 response = Cts::Mpx::Services::Data.get user: user, service:  'Media Data Service', endpoint: 'Media', account: account, fields: 'id,guid'
-puts response.page
+puts response.page.entries
 ```
 
 ### POST
@@ -57,7 +56,7 @@ Cts::Mpx::Services::Data.put user: user, service:  'Media Data Service', endpoin
 
 ``` ruby
 response = Cts::Mpx::Services::Data.delete user: user, service:  'Media Data Service', endpoint: 'Media', account: account, fields: 'id,guid', ids: "1,2,3,4"
-puts response.page
+puts response.page.entries
 ```
 
 ## Page class
@@ -78,4 +77,17 @@ puts page.to_s
 
 ``` ruby
 puts page.to_s(true)
-```
+```
+
+## Query
+
+``` ruby
+media_query = Query.create({
+  account_id:  "http://access.auth.theplatform.com/data/Account/2034777617",
+  service:  'Media Data Service',
+  endpoint: 'Media',
+  fields:    'id,guid,title,ownerId'
+}).run user: user
+
+media_query.entries
+```

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cts-mpx (1.0.2)
-      creatable
+    cts-mpx (1.0.3)
+      creatable (~> 2.2.1)
       excon
       oj (= 3.5.0)
 
@@ -15,7 +15,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bump (0.6.1)
     coderay (1.1.2)
-    creatable (2.1.1)
+    creatable (2.2.1)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
     docile (1.3.1)

data/Guardfile

@@ -1,41 +1,38 @@
 clearing :on
 
-# guard :bundler do
-#   require 'guard/bundler'
-#   require 'guard/bundler/verify'
-#   helper = Guard::Bundler::Verify.new
+guard :bundler do
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
 
-#   files = ['Gemfile']
-#   files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
 
-#   # Assume files are symlinked from somewhere
-#   files.each { |file| watch(helper.real_path(file)) }
-# end
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
+end
 
-# guard :rubocop, cli: '-fs --color -S -a' do
-#   watch(%r{.+\.rb$}) { |m| File.dirname(m[0]) }
-#   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-# end
+guard :rubocop, cli: '-fs --color -S -a' do
+  watch(%r{.+\.rb$}) { |m| File.dirname(m[0]) }
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end
 
-# guard 'yard', server: false do
-#   watch(%r{app\/.+\.rb})
-#   watch(%r{lib\/.+\.rb})
-#   watch(%r{ext\/.+\.c})
-# end
+guard 'yard', server: false do
+  watch(%r{app\/.+\.rb})
+  watch(%r{lib\/.+\.rb})
+  watch(%r{ext\/.+\.c})
+end
 
 guard :rspec, cmd: "bundle exec rspec" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 
-  # Feel free to open issues for suggestions and improvements
-
-  # RSpec files
   rspec = dsl.rspec
   watch(rspec.spec_helper) { rspec.spec_dir }
   watch(rspec.spec_support) { rspec.spec_dir }
+  watch(%r{spec\/spec_*}) { rspec.spec_dir }
   watch(rspec.spec_files)
 
-  # Ruby files
   ruby = dsl.ruby
   dsl.watch_spec_files_for(ruby.lib_files)
 end

data/config/web_services.json

@@ -29,10 +29,10 @@
 				"schema": "1.0",
 				"methods": {
 					"getAccountInfoByIds": [
-						"AccountIds"
+						"accountIds"
 					],
 					"getParentAccountInfoByIds": [
-						"AccountIds"
+						"accountIds"
 					]
 				}
 			},

data/cts-mpx.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_runtime_dependency "creatable"
+  spec.add_runtime_dependency "creatable", "~> 2.2.1"
   spec.add_runtime_dependency "excon"
   spec.add_runtime_dependency "oj", "3.5.0"
 

data/lib/cts/mpx.rb

@@ -32,11 +32,9 @@ require 'cts/mpx/entry'
 require 'cts/mpx/entries'
 require 'cts/mpx/query'
 
-# Comcast Technical Solutions
-module Cts
-  # Media Platform
-  module Mpx
-    Services.initialize
-    Registry.initialize
-  end
+# Comcast Technical Solutions - Mpx
+module Cts::Mpx
+  Services.initialize
+  Registry.initialize
+  Driver::Connections.initialize
 end

data/lib/cts/mpx/driver.rb

@@ -4,43 +4,45 @@ module Cts
     module Driver
       module_function
 
-      #
+      # used when the token has a problem
+      class TokenError < RuntimeError
+      end
+
+      # used when the login credentials are incorrect
+      class CredentialsError < RuntimeError
+      end
+
+      # used when the services cannot be communicated with
+      class ConnectionError < RuntimeError
+      end
+
+      # used when the service returns an exception
+      class ServiceError < RuntimeError
+      end
+
       # path to our gem directory, includes support for bundled env's.
-      #
       # @return [String] full path to the root of our gem directory.
-      #
       def gem_dir
         return Dir.pwd unless Gem.loaded_specs.include? 'cts-mpx'
+
         Gem.loaded_specs['cts-mpx'].full_gem_path
       end
 
-      #
       # path to our config files
-      #
       # @return [String] full path to the root of our gem directory.
-      #
       def config_dir
         "#{gem_dir}/config"
       end
 
-      #
       # load a json file into a simple hash
-      #
       # @param [String] filename filename to load
-      #
       # @raise [RuntimeError] if the filename does not exist.
       # @raise [RuntimeError] if the file cannot be parsed, supplies the exception.
-      #
       # @return [Hash] data from the file
-      #
-      def load_json_file(filename)
-        raise "#{filename} does not exist" unless File.exist? filename
-
-        begin
-          Oj.load File.read filename
-        rescue Oj::ParseError => exception
-          raise "#{filename}: #{exception.message}"
-        end
+      def parse_json(string)
+        Oj.compat_load string
+      rescue Oj::ParseError => exception
+        raise "#{string}: #{exception.message}"
       end
     end
   end

data/lib/cts/mpx/driver/assemblers.rb

@@ -62,32 +62,18 @@ module Cts
 
           service = Services[].find { |s| s.name == service && s.endpoints.include?(endpoint) }
 
-          h = {}
-          if service.type == 'data'
-            h.merge!(token: user.token, schema: service.schema, form: service.form)
-            h.merge!(query_data(range: range, count: count, entries: entries, sort: sort))
-          else
-            h.merge!(token: user.token, schema: service.endpoints[endpoint]['schema'], form: service.form)
-          end
+          h = {
+            schema: service.type == 'data' ? service.schema : service.endpoints[endpoint]['schema'],
+            form:   service.form,
+            token:  user.token
+          }
 
           h[:account] = account_id if account_id
-          h.delete :token if user.token == 'sign_in_token'
-          h.merge! query
-          h
-        end
-
-        # Assembles range, count, entries, sort into a query
-        # @param [String] range string (service) format of a range.
-        # @param [TrueFalse] count ask for a count of objects from the services.
-        # @param [TrueFalse] entries return an array of entries.
-        # @param [String] sort set the sort field
-        # @return [Hash] assembled query for a data call
-        def query_data(range: nil, count: nil, entries: nil, sort: nil)
-          h = {}
-          h.store :range, range if range
-          h.store :count, count if count
-          h.store :entries, entries if entries
-          h.store :sort, sort if sort
+          h[:count] =   count if count
+          h[:entries] = entries if entries
+          h[:range] =   range if range
+          h[:sort] =    sort if sort
+          h[:query]&.merge! query if query.any?
           h
         end
       end

data/lib/cts/mpx/driver/connections.rb

@@ -1,40 +1,51 @@
 module Cts
   module Mpx
     module Driver
-      #
       # Container for active connections to the data service.
-      #
       module Connections
         module_function
 
-        #
         # Addressable method for active connections.   If you provide a string that is not active, an active one
         # will be created.
-        #
         # @param [String] uri uri of a service to connect to, must contain theplatform.
-        #
         # @return [Excon] assembled excon objects with service defaults.
         # @return [Excon[]] if nil, an array of all open connections.
-        #
         def [](uri = nil)
-          return @open_connections unless uri
+          return @collection unless uri
+
           begin
             parsed_uri = URI.parse uri
           rescue URI::InvalidURIError
-            raise ArgumentError, "#{uri} is not a uri"
+            raise ArgumentError, "(#{uri}) is not a uri"
           end
 
-          raise ArgumentError, "#{uri} does not contain theplatform in it." unless parsed_uri.host.include? "theplatform"
+          raise ArgumentError, "(#{uri}) does not contain theplatform in it." unless parsed_uri.host&.include? "theplatform"
+
+          c = create_connection parsed_uri unless @collection.include? parsed_uri.host
+          @collection.push c
+          @collection.last
+          c
+        end
 
-          Excon.new([parsed_uri.scheme, parsed_uri.host].join("://"), persistent: true) unless @open_connections.include? parsed_uri.host
+        def create_connection(parsed_uri)
+          Excon.new([parsed_uri.scheme, parsed_uri.host].join("://"), persistent: true)
         end
 
-        Excon.defaults[:headers] = {
-          'Content-Type'     => "application/json",
-          "User-Agent"       => "cts-mpx ruby sdk version #{Cts::Mpx::VERSION}",
-          'Content-Encoding' => 'bzip2,xz,gzip,deflate'
-        }
-        @open_connections = []
+        def collection
+          @collection
+        end
+
+        def initialize
+          Excon.defaults[:omit_nil] = true
+          Excon.defaults[:persistent] = true
+          Excon.defaults[:headers] = {
+            'Content-Type'     => "application/json",
+            "User-Agent"       => "cts-mpx ruby sdk version #{Cts::Mpx::VERSION}",
+            'Content-Encoding' => 'bzip2,xz,gzip,deflate'
+          }
+
+          @collection = []
+        end
       end
     end
   end

data/lib/cts/mpx/driver/exceptions.rb

@@ -20,7 +20,7 @@ module Cts
         # @raise [ArgumentError] if the argument is not of the correct type
         # @return [nil]
         def raise_unless_argument_error?(data, type = nil, &block)
-          raise(ArgumentError, "#{data} is not a valid #{type}") if Validators.argument_error?(data, type, &block)
+          raise(ArgumentError, "#{data || 'nil'} is not a valid #{type}") if Validators.argument_error?(data, type, &block)
 
           nil
         end
@@ -39,8 +39,11 @@ module Cts
         # @param [Object] keyword keyword to assure is supplied
         # @raise [ArgumentError] if the keyword is not suppplied
         # @return [nil]
-        def raise_unless_required_keyword?(keyword: nil)
-          raise ArgumentError, "#{keyword} is a required keyword." unless keyword && keyword
+        def raise_unless_required_keyword?(a_binding, keyword)
+          value = a_binding.local_variable_get(keyword)
+          raise ArgumentError, "#{keyword} is a required keyword." unless value
+
+          nil
         end
       end
     end

data/lib/cts/mpx/driver/helpers.rb

@@ -58,7 +58,7 @@ module Cts
         # @return [nil] nil
         #
         def required_arguments(keywords, a_binding)
-          keywords.each { |arg| Exceptions.raise_unless_required_keyword?(keyword: a_binding.local_variable_get(arg)) }
+          keywords.each { |keyword| Exceptions.raise_unless_required_keyword?(a_binding, keyword) }
           nil
         end
       end

data/lib/cts/mpx/driver/page.rb

@@ -37,7 +37,7 @@ module Cts
 
           Oj.dump(
             {
-              "xmlns"   => xmlns,
+              "$xmlns"  => xmlns,
               "entries" => entries
             },
             indent: indent_depth

data/lib/cts/mpx/driver/request.rb

@@ -44,6 +44,7 @@ module Cts
           params[:body] = payload if payload
 
           r = socket.send method, params
+
           @response = Response.create original: r
           @response
         end

data/lib/cts/mpx/driver/response.rb

@@ -1,68 +1,56 @@
 module Cts
   module Mpx
     module Driver
-      #
       # Class to contain a response from the services, has a few helper methods to make reading the data easier.
-      #
+      # @!attribute original
+      #   @return [Excon::Response] copy of the original excon response.
       class Response
         include Creatable
-
-        # @!attribute original
-        #   @return [Excon::Response] copy of the original excon response.
         attribute name: 'original', kind_of: Excon::Response
 
-        #
         # Hash output of the data returned from the services.
-        #
         # @return [Hash] Hash including keys specific to the service and type of service.
-        #
         def data
           return @data if @data
 
           raise 'response does not appear to be healthy' unless healthy?
 
+          # TODO: make the driver.load file become load string.
           begin
-            @data = Oj.load(original.body)
+            @data = Oj.compat_load(original.body)
           rescue Oj::ParseError => e
             raise "could not parse data: #{e}"
           end
+
+          raise ServiceError, "title: #{@data['title']} description: #{@data['description']} cid: (#{@data['correlationId']})" if @data['isException']
+
           @data
         end
 
-        #
         # Is the response healthy?   did it have a status code outside 2xx or 3xx.
-        #
         # @return [TrueFalse] false if status <= 199 or => 400, otherwise true.
-        #
         def healthy?
           return false if status <= 199 || status >= 400
+
           true
         end
 
-        #
         # Does this response contain a service exception
-        #
         # @return [TrueFalse] true if it does, false if it does not.
-        #
         def service_exception?
-          data['isException'] == true
+          original.body.include? '"isException":true,'
         end
 
-        #
         # a page of data, processes the response.data for any entries.
-        #
         # @return [Cts::Mpx::Driver::Page] a page of data.
-        #
         def page
           raise 'response does not appear to be healthy' unless healthy?
+
           Cts::Mpx::Driver::Page.create entries: data['entries'], xmlns: data['$xmlns']
         end
 
-        #
         # Status code of the response
-        #
         # @return [Fixnum] http status code
-        #
         def status
           original.status || nil
         end

data/lib/cts/mpx/entries.rb

@@ -11,19 +11,6 @@ module Cts
 
       attribute name: 'collection', kind_of: Array
 
-      # Create a new entries collection from a page
-      # @param [Page] page the page object to process
-      # @raise [ArgumentError] if :page is not available
-      # @return [Entries] a new entries collection
-      def self.create_from_page(page)
-        Exceptions.raise_unless_argument_error? page, Page
-        entries = page.entries.each do |e|
-          entry = Entry.create(fields:  Fields.create_from_data(data: e, xmlns: page.xmlns))
-          entry.id = entry.fields['id'] if entry.fields['id']
-        end
-        Entries.create(collection: entries)
-      end
-
       # Addressable method, indexed by entry object
       # @param [Entry] key the entry to return
       # @return [Self.collection,Entry,nil] Can return the collection, a single entry, or nil if nothing found
@@ -81,7 +68,13 @@ module Cts
       # A hash of all available entries
       # @return [Hash]
       def to_h
-        map(&:to_h)
+        output = { xmlns: {}, entries: [] }
+
+        each do |entry|
+          output[:entries].push entry.to_h[:entry]
+          output[:xmlns].merge! entry.fields.xmlns
+        end
+        output
       end
     end
   end

data/lib/cts/mpx/entry.rb

@@ -16,7 +16,6 @@ module Cts
       # @return [Entry] the resulting entry
       def self.load_by_id(user: nil, id: nil, fields: nil, account_id: nil)
         Driver::Helpers.required_arguments %i[user id], binding
-
         Driver::Exceptions.raise_unless_argument_error? user, User
         Driver::Exceptions.raise_unless_reference? id
 
@@ -28,13 +27,12 @@ module Cts
 
       # Return the id of the entry.
       # @return [Entry] the resulting entry
-      def id
-        fields['id']
-      end
+      attr_reader :id
 
       # Set the id of the entry, will check if it's a valid reference.
       # @param [String] account_id account_id to set the entry to
       # @return [Entry] the resulting entry
+      # TODO add a spec here to assure @id is set to id
       def id=(id)
         if id.nil?
           fields.remove 'id'
@@ -42,7 +40,7 @@ module Cts
         else
           Driver::Exceptions.raise_unless_reference? id
           result = Services.from_url id
-          fields['id'] = id
+          @id = fields['id'] = id
           @service = result[:service]
           @endpoint = result[:endpoint]
         end
@@ -68,8 +66,7 @@ module Cts
       # @param [String] fields comma delimited list of fields to collect
       # @return [Driver::Response] Response of the call.
       def load(user: nil, fields: nil, account_id: 'urn:theplatform:auth:root')
-        Driver::Helpers.required_arguments %i[user], binding
-
+        Driver::Exceptions.raise_unless_required_keyword? binding, :user
         Driver::Exceptions.raise_unless_argument_error? user, User
         Driver::Exceptions.raise_unless_argument_error? fields, String if fields
         Driver::Exceptions.raise_unless_reference? id
@@ -77,9 +74,11 @@ module Cts
         Registry.fetch_and_store_domain user: user, account_id: account_id
         response = Services::Data.get account_id: account_id, user: user, service: service, endpoint: endpoint, fields: fields, ids: id.split("/").last
 
-        raise 'could not load ' + id unless response.data['entries'].count.positive?
+        entries = response.data['entries']
+
+        raise "could not load #{id}" unless entries.any?
 
-        self.fields.parse data: response.data['entries'].first, xmlns: response.data['xmlns']
+        self.fields.parse data: entries.first, xmlns: response.data['xmlns']
         self
       end
 
@@ -89,19 +88,18 @@ module Cts
       def save(user: nil)
         Driver::Helpers.required_arguments %i[user], binding
         Driver::Exceptions.raise_unless_argument_error? user, User
+        raise ArgumentError, "fields['ownerId'] is a required field" unless fields['ownerId']
+        raise ArgumentError, "endpoint is a required attribute" unless endpoint
+        raise ArgumentError, "service is a required attribute" unless service
 
         p = Driver::Page.create entries: [fields.to_h], xmlns: fields.xmlns
+        Registry.fetch_and_store_domain user: user, account_id: fields["ownerId"]
 
-        if id
-          response = Services::Data.put user: user, service: service, endpoint: endpoint, page: p
-        else
-          raise ArgumentError, "service is a required keyword" unless service
-          raise ArgumentError, "endpoint is a required keyword" unless endpoint
-
-          response = Services::Data.post user: user, service: service, endpoint: endpoint, page: p
-        end
+        response_params = { account_id: fields['ownerId'], user: user, service: service, endpoint: endpoint, page: p }
+        result = Services::Data.send(id ? :put : :post, response_params)
+        result.data if result.service_exception?
 
-        response
+        self
       end
     end
   end

data/lib/cts/mpx/field.rb

@@ -12,7 +12,7 @@ module Cts
 
       attribute name: 'name', kind_of: String
       attribute name: 'value'
-      attribute name: 'xmlns', kind_of: Hash
+      attribute(name: 'xmlns', kind_of: Hash) { |o, xmlns| o.xmlns = xmlns if o.custom? }
 
       # Return just the name value as key/value
       # @return [Hash]
@@ -21,10 +21,11 @@ module Cts
       end
 
       # Determines if this field is a custom field or not
-      # @return [Symbol] :internal or :custom if it is a custom field
-      def type
-        return :custom if name.include? "$"
-        :internal
+      # @return [Symbol] true if it is a custom field
+      def custom?
+        return true if name.include? "$"
+
+        false
       end
 
       # Set the namespace of the field

data/lib/cts/mpx/fields.rb

@@ -26,8 +26,10 @@ module Cts
       # @return [Self.collection,Field,nil] Can return the collection, a single field, or nil if nothing found
       def [](key = nil)
         return @collection unless key
+
         result = @collection.find { |f| f.name == key }
         return result.value if result
+
         nil
       end
 
@@ -54,6 +56,7 @@ module Cts
       # @return [Self]
       def add(field)
         return self if @collection.include? field
+
         Driver::Exceptions.raise_unless_argument_error? field, Field
         @collection.push field
         self
@@ -83,7 +86,7 @@ module Cts
         data.delete :service
         data.delete :endpoint
         reset
-        @collection = data.map { |k, v| Field.create name: k.to_s, value: v, xmlns: xmlns }
+        @collection = data.map { |k, v| Field.create(name: k.to_s, value: v, xmlns: xmlns) }
       end
 
       # Remove a field object from the collection

data/lib/cts/mpx/query.rb

@@ -59,7 +59,7 @@ module Cts
       # List of entries created from the page
       # @return [Entries] populated Entries object
       def entries
-        Entries.create_from_page @page
+        @page.to_mpx_entries
       end
 
       # Run the query
@@ -97,13 +97,8 @@ module Cts
           output.store attribute, instance_variable_get("@#{attribute}") unless instance_variable_get("@#{attribute}").nil?
         end
 
-        unless output[:return_count].nil?
-          output[:count] = output.delete :return_count
-        end
-
-        unless output[:return_entries].nil?
-          output[:entries] = output.delete :return_entries
-        end
+        output[:count] = output.delete :return_count unless output[:return_count].nil?
+        output[:entries] = output.delete :return_entries unless output[:return_entries].nil?
 
         output
       end

data/lib/cts/mpx/registry.rb

@@ -32,8 +32,8 @@ module Cts
         return domains['urn:theplatform:auth:root'] if account_id == 'urn:theplatform:auth:root'
 
         Driver::Exceptions.raise_unless_argument_error?(user, 'User') { !user.is_a? User }
-        Driver::Exceptions.raise_unless_argument_error?(account_id, 'account_id') { !Validators.account_id? account_id }
         user.token!
+        Driver::Exceptions.raise_unless_argument_error?(account_id, 'account_id') { !Validators.account_id? account_id }
 
         response = Services::Web.post user: user, service: 'Access Data Service', endpoint: 'Registry', method: 'resolveDomain', arguments: { 'accountId' => account_id }
         response.data['resolveDomainResponse']
@@ -56,7 +56,8 @@ module Cts
       # find and store the root registry from the US
       def initialize
         @domains = {}
-        store_domain(Driver.load_json_file("#{Driver.config_dir}/root_registry_sea1.json")['resolveDomainResponse'], 'urn:theplatform:auth:root')
+        content = File.read "#{Driver.config_dir}/root_registry_sea1.json"
+        store_domain(Driver.parse_json(content)['resolveDomainResponse'], 'urn:theplatform:auth:root')
       end
     end
   end

data/lib/cts/mpx/service.rb

@@ -53,6 +53,7 @@ module Cts
           Exceptions.raise_unless_account_id account_id
           reg = Registry.domains[account_id]
           return reg[name] if reg
+
           nil
         end
 
@@ -63,6 +64,7 @@ module Cts
           Exceptions.raise_unless_account_id account_id
           u = url account_id
           return true if u
+
           false
         end
       end

data/lib/cts/mpx/services.rb

@@ -57,7 +57,7 @@ module Cts
         raise ArgumentError, 'type must be supplied' unless type
         raise ArgumentError, 'file must be supplied' unless file
 
-        @raw_reference.store(type, Driver.load_json_file(file))
+        @raw_reference.store(type, Driver.parse_json(File.read(file)))
         true
       end
 

data/lib/cts/mpx/services/data.rb

@@ -17,8 +17,10 @@ module Cts
           services = Services[].select { |s| s.type == 'data' }
           return services unless key
           raise ArgumentError, 'key must be a string' unless key.is_a? String
+
           service = services.find { |e| e.name == key }
           raise ArgumentError, "#{key} must be a service name." unless service
+
           service
         end
 
@@ -51,12 +53,10 @@ module Cts
 
           host = Driver::Assemblers.host user: user, service: service, account_id: account_id
           path = Driver::Assemblers.path service: service, endpoint: endpoint, extra_path: extra_path, ids: ids
-          query = Driver::Assemblers.query user: user, account_id: account_id, service: service, endpoint: endpoint, query: query
+          query = Driver::Assemblers.query user: user, account_id: account_id, service: service, endpoint: endpoint, query: query, range: range
+
+          query[:fields] = fields if Services[service].type == 'data' && fields
 
-          if Services[service].type == 'data'
-            query.merge! Driver::Assemblers.query_data range: range, count: count, entries: entries, sort: sort
-            query[:fields] = fields if fields
-          end
           request = Driver::Request.create(method: method, url: [host, path].join, query: query, headers: headers)
           request.call
         end
@@ -74,7 +74,6 @@ module Cts
         # @return [Response] Response of the call
         def post(user: nil, account_id: nil, service: nil, endpoint: nil, extra_path: nil, query: {}, page: nil, headers: {}, method: :post)
           prep_call(user: user, account_id: account_id, service: service, query: query, headers: headers, required_arguments: ['user', 'service', 'endpoint', 'page'], page: page, binding: binding)
-
           host = Driver::Assemblers.host user: user, service: service
           path = Driver::Assemblers.path service: service, endpoint: endpoint, extra_path: extra_path
           query = Driver::Assemblers.query user: user, account_id: account_id, service: service, endpoint: endpoint, query: query

data/lib/cts/mpx/services/ingest.rb

@@ -13,6 +13,7 @@ module Cts
         # @return [Service] a service
         def [](key = nil)
           return services unless key
+
           Driver::Exceptions.raise_unless_argument_error?(key, String)
 
           service = services.find { |e| e.name == key }

data/lib/cts/mpx/user.rb

@@ -18,7 +18,7 @@ module Cts
       attribute name: 'password', kind_of: String
       attribute name: 'idle_timeout', kind_of: Integer
       attribute name: 'duration', kind_of: Integer
-      attribute name: 'token', kind_of: String
+      attribute name: 'token', kind_of: [String, NilClass]
 
       # Attempt to sign the user in with the provided credentials
       # @param [Numeric] idle_timeout how long the token will stay alive without communicating with the services
@@ -35,8 +35,10 @@ module Cts
 
         self.token = 'sign_in_token'
         response = Services::Web.post user: self, service: 'User Data Service', endpoint: 'Authentication', method: 'signIn', arguments: arguments, headers: headers
+        self.token = nil
 
         raise "sign_in exception, status: #{response.status}" unless response.status == 200
+
         self.token = response.data['signInResponse']['token']
         self
       end

data/lib/cts/mpx/validators.rb

@@ -27,6 +27,7 @@ module Cts
       def argument_error?(data, type = nil, &block)
         return block.yield if block
         return true unless type && data.is_a?(type)
+
         false
       end
 

data/lib/cts/mpx/version.rb

@@ -1,6 +1,6 @@
 module Cts
   module Mpx
     # @return [String] frozen string of the version of Cts::Mpx
-    VERSION = "1.0.3".freeze
+    VERSION = "1.1.0".freeze
   end
 end

data/uml.nomnoml

@@ -145,7 +145,7 @@
      fetch_domain(user, account_id = 'urn:theplatform:auth:root')
      store_domain(data, account_id = 'urn:theplatform:auth:root')
      initialize
-     raise_argument_error(data, name)
+     raise_argument_exception(data, name)
  ]
  [<class> Service|
   |
@@ -239,4 +239,4 @@
 [Driver]->[Response]
 [Services]->[Data]
 [Services]->[Web]
-[Services]->[Ingest]
+[Services]->[Ingest]

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cts-mpx
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creatable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement