cts-mpx 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e447aa1b9c22663d6f59d10a51598047822603
-  data.tar.gz: e783c916b10517ca47ecbde40749eedd2f5fefc6
+  metadata.gz: '093703b1860e83e394cabc1a41265df8f68aaae1'
+  data.tar.gz: 7015a35fe53ed1ee309e3091ab25dcdd4da757c3
 SHA512:
-  metadata.gz: b8924578fbb7ed2f6fcc71ef7489123613b7394b6f46702b7374086cc3f44a50acd8742c0247260f8d92630bd750778e4552c08451cc4386af8df91c79c30ff1
-  data.tar.gz: f14cb79c5e448985b7df72bb280795022e7180234c2fde3649be7c269284090ca40eb9cb2bb9fe24f3766deb597128e01b2327dbb74cc1c060dbbd547c960b20
+  metadata.gz: 25e01f7ffa9ec6df19006c2a387dc80186f53556595939ef04fe609feddd6d5d193508e242cb8e96537bf8d4c7d438a817dc861f8bc3fd03620517d21a7b7534
+  data.tar.gz: 5738666bc5198383797fcc9db6bc6a116a2e7a5c8bf8310e749bbe0f7cef2b2b6e15ceea96546711009d6f59a9f56f28d388f679f19f96b1dd659c75ec032b80

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cts-mpx (1.0.1)
-      creatable (= 1.0.1)
+    cts-mpx (1.0.2)
+      creatable
       excon
       oj (= 3.5.0)
 
@@ -13,26 +13,17 @@ GEM
     ast (2.4.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    builder (3.2.3)
     bump (0.6.1)
     coderay (1.1.2)
-    creatable (1.0.1)
+    creatable (2.1.1)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
     docile (1.3.1)
     erubis (2.7.0)
+    eventmachine (1.2.7)
     excon (0.62.0)
-    faraday (0.15.2)
-      multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     formatador (0.2.5)
-    geminabox (1.1.0)
-      builder
-      faraday
-      httpclient (>= 2.2.7)
-      nesty
-      reentrant_flock
-      sinatra (>= 1.2.7)
     gli (2.17.2)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -59,19 +50,20 @@ GEM
       guard (>= 1.1.0)
       yard (>= 0.7.0)
     hirb (0.7.3)
-    httpclient (2.8.3)
+    htmlentities (4.3.4)
     interception (0.5)
     json (2.1.0)
+    kramdown (1.17.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.0)
-    multipart-post (2.0.0)
-    mustermann (1.0.3)
+    mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nesty (1.0.2)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -89,15 +81,13 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    rack (2.0.5)
-    rack-protection (2.0.3)
-      rack
     rainbow (3.0.0)
     rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    reentrant_flock (0.1.1)
+    reverse_markdown (1.1.0)
+      nokogiri
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -132,11 +122,17 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
-    sinatra (2.0.3)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.3)
+    solargraph (0.28.2)
+      coderay (~> 1.1)
+      eventmachine (~> 1.2, >= 1.2.5)
+      htmlentities (~> 4.3, >= 4.3.4)
+      kramdown (~> 1.16)
+      parser (~> 2.4)
+      reverse_markdown (~> 1.0, >= 1.0.5)
+      rubocop (~> 0.52)
+      thor (~> 0.19, >= 0.19.4)
       tilt (~> 2.0)
+      yard (~> 0.9)
     thor (0.20.0)
     tilt (2.0.8)
     unicode-display_width (1.4.0)
@@ -150,7 +146,6 @@ DEPENDENCIES
   bundler
   cts-mpx!
   erubis
-  geminabox
   gli
   guard
   guard-bundler
@@ -166,7 +161,8 @@ DEPENDENCIES
   rubocop-rspec
   simplecov
   simplecov-console
+  solargraph
   yard
 
 BUNDLED WITH
-   1.16.1
+   1.16.5

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: :spec

data/config/root_registry_sea1.json

@@ -1,118 +1,118 @@
 {
   "resolveDomainResponse": {
-    "Message Data Service": "http://data.message.theplatform.com/message",
-    "User Data Service": "https://identity.auth.theplatform.com/idm",
-    "Publish Data Service read-only": "http://data.publish.theplatform.com/publish",
+    "ACS Data Service": "http://data.acs.euid.theplatform.com/acsdata",
+    "ACS Data Service read-only": "http://data.acs.euid.theplatform.com/acsdata",
+    "Access Data Service": "http://access.auth.theplatform.com",
+    "Access Data Service audience": "http://enduser.access.auth.theplatform.com",
+    "Access Data Service audience read-only": "http://enduser.access.auth.theplatform.com",
+    "Access Data Service master": "http://access.auth.theplatform.com",
+    "Access Data Service read-only": "http://access.auth.theplatform.com",
+    "Account Data Service": "http://mps.theplatform.com",
+    "Account Data Service read-only": "http://mps.theplatform.com",
+    "Address Service": "https://address.commerce.theplatform.com/address",
+    "Address Service read-only": "https://address.commerce.theplatform.com/address",
+    "Admin Storefront Service": "https://admin.storefront.commerce.theplatform.com/storefront",
+    "Alternate Content Data Service": "https://data.altcontent.tv.theplatform.com/altcontent",
+    "Checkout Service": "https://checkout.commerce.theplatform.com/checkout",
+    "Commerce Configuration Data Service": "https://data.configuration.commerce.theplatform.com/configuration",
+    "Commerce Configuration Data Service read-only": "https://read.data.configuration.commerce.theplatform.com/configuration",
     "Commerce End User Notification Service": "https://euns.commerce.theplatform.com/euns",
+    "Commerce Event Data Service": "https://data.event.commerce.theplatform.com/event",
+    "Commerce Event Data Service read-only": "https://data.event.commerce.theplatform.com/event",
+    "Concurrency Service": "https://concurrency.delivery.theplatform.com/concurrency",
     "Console Data Service": "http://data.mpx.theplatform.com/cds",
-    "Selector Service": "http://link.theplatform.com/s",
-    "Ingest Data Service": "http://adapter.ingest.theplatform.com/adapter",
-    "FeedReader Data Service read-only": "https://feedreader.ingest.theplatform.com/feedreader",
+    "Console Data Service read-only": "http://data.mpx.theplatform.com/cds",
     "Conviva Insights": "https://viewerinsights.theplatform.com/sso/thePlatform?url={account}&endpoint=Basic&token={token}",
-    "Ingest Service": "http://ingest.theplatform.com",
-    "ACS Data Service read-only": "http://data.acs.euid.theplatform.com/acsdata",
-    "Storefront Service": "https://storefront.commerce.theplatform.com/storefront",
-    "FeedReader Data Service": "https://feedreader.ingest.theplatform.com/feedreader",
-    "Sharing Data Service": "http://data.share.theplatform.com/sharing",
-    "TV Listing Data Service read-only": "http://read.data.listing.tv.theplatform.com/listing",
-    "Static Web Files": "http://web.theplatform.com",
-    "Publish Service": "http://publish.theplatform.com",
-    "Selector Reporting Service": "http://release.theplatform.com",
-    "Entertainment Feeds Service": "http://feed.entertainment.tv.theplatform.com/f",
-    "User Profile Metadata Service": "http://userprofiles.community.theplatform.com/userprofile",
-    "WatchFolder Data Service": "https://watchfolder.ingest.theplatform.com/wf",
-    "Task Service": "http://data.task.theplatform.com/task",
+    "Cue Point Data Service": "http://data.cuepoint.theplatform.com/cuepoint",
     "Cue Point Data Service read-only": "http://data.cuepoint.theplatform.com/cuepoint",
-    "Validation Data Service": "http://data.validation.theplatform.com/validation",
-    "Order Data Service read-only": "https://read.order.commerce.theplatform.com/order",
+    "Decision Manager Service": "https://decide.altcontent.tv.theplatform.com/d",
+    "Delivery Data Service": "http://data.delivery.theplatform.com/delivery",
+    "Delivery Data Service read-only": "http://data.delivery.theplatform.com/delivery",
+    "End User Data Service": "https://euid.theplatform.com/idm",
+    "End User Data Service read-only": "https://euid.theplatform.com/idm",
+    "Entertainment Data Service": "http://data.entertainment.tv.theplatform.com/entertainment",
+    "Entertainment Data Service read-only": "http://read.data.entertainment.tv.theplatform.com/entertainment",
+    "Entertainment Feeds Service": "http://feed.entertainment.tv.theplatform.com/f",
     "Entertainment Ingest Data Service": "http://data.ingest.tv.theplatform.com/ingest",
-    "Order Item Data Service read-only": "http://order.commerce.theplatform.com/order",
+    "Entertainment Ingest Data Service read-only": "http://data.ingest.tv.theplatform.com/ingest",
+    "Entitlement Data Service": "http://data.entitlement.theplatform.com/eds",
+    "Entitlement Data Service read-only": "http://data.entitlement.theplatform.com/eds",
     "Entitlement License Service": "http://entitlement.theplatform.com/license",
     "Entitlement Web Service": "http://entitlement.theplatform.com/ent",
-    "Access Data Service read-only": "http://access.auth.theplatform.com",
-    "Selector Reporting Service read-only": "http://mps.theplatform.com",
-    "Publish Data Service": "http://data.publish.theplatform.com/publish",
-    "User Data Service master": "https://identity.auth.theplatform.com/idm",
-    "Alternate Content Data Service": "https://data.altcontent.tv.theplatform.com/altcontent",
-    "Validation Service": "http://validation.theplatform.com/validation",
-    "Selector Web Service": "http://link.theplatform.com",
-    "Promotion Service": "https://promotion.commerce.theplatform.com/promotion",
+    "FeedReader Data Service": "https://feedreader.ingest.theplatform.com/feedreader",
+    "FeedReader Data Service read-only": "https://feedreader.ingest.theplatform.com/feedreader",
+    "Feeds Data Service": "http://data.feed.theplatform.com/feed",
     "Feeds Data Service read-only": "http://read.data.feed.theplatform.com/feed",
-    "Player Service": "http://player.theplatform.com",
-    "Workflow Data Service": "http://data.workflow.theplatform.com/workflow",
-    "Delivery Data Service": "http://data.delivery.theplatform.com/delivery",
+    "Feeds Service": "http://feed.theplatform.com/f",
+    "File Management Service": "http://fms.theplatform.com",
+    "Flash Access Service": "http://flashaccess.entitlement.theplatform.com",
+    "Fulfillment Service": "https://fulfillment.commerce.theplatform.com/fulfillment",
+    "Ingest Data Service": "http://adapter.ingest.theplatform.com/adapter",
+    "Ingest Data Service read-only": "http://adapter.ingest.theplatform.com/adapter",
+    "Ingest Service": "http://ingest.theplatform.com",
+    "Key Data Service": "https://data.key.entitlement.theplatform.com/key",
     "Key Data Service read-only": "https://data.key.entitlement.theplatform.com/key",
-    "TV Listing Data Service": "http://data.listing.tv.theplatform.com/listing",
-    "Address Service": "https://address.commerce.theplatform.com/address",
-    "Commerce Event Data Service": "https://data.event.commerce.theplatform.com/event",
-    "End User Data Service read-only": "https://euid.theplatform.com/idm",
-    "Access Data Service": "http://access.auth.theplatform.com",
+    "Ledger Data Service": "https://ledger.commerce.theplatform.com/ledger",
     "Ledger Data Service read-only": "https://ledger.commerce.theplatform.com/ledger",
-    "Product Feeds Service": "http://feed.product.theplatform.com/f",
-    "Message Data Service read-only": "http://data.message.theplatform.com/message",
     "Live Event Data Service": "http://data.liveevent.theplatform.com/liveevent",
+    "Live Event Data Service read-only": "http://data.liveevent.theplatform.com/liveevent",
+    "Live Event Service": "http://liveevent.theplatform.com",
+    "Manifest Redirect Service": "http://redirect.manifest.theplatform.com/r",
+    "Media Data Service": "http://data.media.theplatform.com/media",
     "Media Data Service read-only": "http://read.data.media.theplatform.com/media",
-    "Player Data Service": "http://data.player.theplatform.com/player",
-    "Entitlement Data Service read-only": "http://data.entitlement.theplatform.com/eds",
+    "Message Data Service": "http://data.message.theplatform.com/message",
+    "Message Data Service read-only": "http://data.message.theplatform.com/message",
+    "Order Data Service": "https://order.commerce.theplatform.com/order",
+    "Order Data Service read-only": "https://read.order.commerce.theplatform.com/order",
+    "Order Item Data Service": "http://order.commerce.theplatform.com/order",
+    "Order Item Data Service read-only": "http://order.commerce.theplatform.com/order",
+    "PDK": "https://pdk.theplatform.com",
+    "PDK 6": "https://pdk.theplatform.com/pdk6",
+    "Payment Data Service": "https://payment.commerce.theplatform.com/payment",
     "Payment Data Service read-only": "https://payment.commerce.theplatform.com/payment",
-    "Validation Data Service read-only": "http://data.validation.theplatform.com/validation",
-    "Address Service read-only": "https://address.commerce.theplatform.com/address",
-    "Console Data Service read-only": "http://data.mpx.theplatform.com/cds",
-    "Ingest Data Service read-only": "http://adapter.ingest.theplatform.com/adapter",
+    "Payment Service": "https://payment.commerce.theplatform.com/payment",
+    "Player Data Service": "http://data.player.theplatform.com/player",
     "Player Data Service read-only": "http://read.data.player.theplatform.com/player",
+    "Player Service": "http://player.theplatform.com",
+    "Product Data Service": "http://data.product.theplatform.com/product",
+    "Product Data Service read-only": "http://read.data.product.theplatform.com/product",
+    "Product Feeds Service": "http://feed.product.theplatform.com/f",
     "Promotion Data Service": "https://promotion.commerce.theplatform.com/promotion",
-    "comScore Digital Analytix": "http://comscore.theplatform.com?token={token}&account={account}&display=account",
+    "Promotion Data Service read-only": "https://promotion.commerce.theplatform.com/promotion",
+    "Promotion Service": "https://promotion.commerce.theplatform.com/promotion",
+    "Publish Data Service": "http://data.publish.theplatform.com/publish",
+    "Publish Data Service read-only": "http://data.publish.theplatform.com/publish",
+    "Publish Service": "http://publish.theplatform.com",
+    "Sales Tax Service": "https://tax.commerce.theplatform.com/tax",
+    "Selector Reporting Service": "http://release.theplatform.com",
+    "Selector Reporting Service read-only": "http://mps.theplatform.com",
+    "Selector Service": "http://link.theplatform.com/s",
+    "Selector Web Service": "http://link.theplatform.com",
+    "Sharing Data Service": "http://data.share.theplatform.com/sharing",
     "Sharing Data Service read-only": "http://data.share.theplatform.com/sharing",
-    "WatchFolder Data Service read-only": "https://watchfolder.ingest.theplatform.com/wf",
-    "Admin Storefront Service": "https://admin.storefront.commerce.theplatform.com/storefront",
-    "Commerce Configuration Data Service": "https://data.configuration.commerce.theplatform.com/configuration",
-    "Commerce Configuration Data Service read-only": "https://read.data.configuration.commerce.theplatform.com/configuration",
-    "PDK 6": "https://pdk.theplatform.com/pdk6",
+    "Shopping Cart Service": "https://shoppingcart.commerce.theplatform.com/cart",
+    "Static Web Files": "http://web.theplatform.com",
+    "Storefront Service": "https://storefront.commerce.theplatform.com/storefront",
     "Stub Ingest Service": "http://ingest-stub.ingest.theplatform.com/service/ingest/mps",
-    "Entertainment Ingest Data Service read-only": "http://data.ingest.tv.theplatform.com/ingest",
-    "Commerce Event Data Service read-only": "https://data.event.commerce.theplatform.com/event",
-    "Key Data Service": "https://data.key.entitlement.theplatform.com/key",
-    "User Profile Data Service read-only": "http://data.userprofile.community.theplatform.com/userprofile",
-    "Order Item Data Service": "http://order.commerce.theplatform.com/order",
-    "Concurrency Service": "https://concurrency.delivery.theplatform.com/concurrency",
-    "Delivery Data Service read-only": "http://data.delivery.theplatform.com/delivery",
+    "TV Listing Data Service": "http://data.listing.tv.theplatform.com/listing",
+    "TV Listing Data Service read-only": "http://read.data.listing.tv.theplatform.com/listing",
+    "Task Service": "http://data.task.theplatform.com/task",
     "Task Service read-only": "http://data.task.theplatform.com/task",
-    "Checkout Service": "https://checkout.commerce.theplatform.com/checkout",
-    "Fulfillment Service": "https://fulfillment.commerce.theplatform.com/fulfillment",
-    "Payment Service": "https://payment.commerce.theplatform.com/payment",
-    "Sales Tax Service": "https://tax.commerce.theplatform.com/tax",
-    "Access Data Service audience": "http://enduser.access.auth.theplatform.com",
-    "Promotion Data Service read-only": "https://promotion.commerce.theplatform.com/promotion",
-    "Account Data Service read-only": "http://mps.theplatform.com",
-    "End User Data Service": "https://euid.theplatform.com/idm",
-    "Feeds Data Service": "http://data.feed.theplatform.com/feed",
-    "Product Data Service": "http://data.product.theplatform.com/product",
-    "PDK": "https://pdk.theplatform.com",
+    "User Data Service": "https://identity.auth.theplatform.com/idm",
+    "User Data Service master": "https://identity.auth.theplatform.com/idm",
     "User Data Service read-only": "https://identity.auth.theplatform.com/idm",
     "User Profile Data Service": "http://data.userprofile.community.theplatform.com/userprofile",
-    "Manifest Redirect Service": "http://redirect.manifest.theplatform.com/r",
-    "Feeds Service": "http://feed.theplatform.com/f",
-    "Shopping Cart Service": "https://shoppingcart.commerce.theplatform.com/cart",
-    "ACS Data Service": "http://data.acs.euid.theplatform.com/acsdata",
-    "Live Event Data Service read-only": "http://data.liveevent.theplatform.com/liveevent",
-    "Decision Manager Service": "https://decide.altcontent.tv.theplatform.com/d",
+    "User Profile Data Service read-only": "http://data.userprofile.community.theplatform.com/userprofile",
+    "User Profile Metadata Service": "http://userprofiles.community.theplatform.com/userprofile",
+    "Validation Data Service": "http://data.validation.theplatform.com/validation",
+    "Validation Data Service read-only": "http://data.validation.theplatform.com/validation",
+    "Validation Service": "http://validation.theplatform.com/validation",
+    "WatchFolder Data Service": "https://watchfolder.ingest.theplatform.com/wf",
+    "WatchFolder Data Service read-only": "https://watchfolder.ingest.theplatform.com/wf",
+    "Windows Media License Generator Service": "http://208.79.64.254/LicenseServer",
     "Windows Media License Service": "https://wm.entitlement.theplatform.com/wmlicense",
-    "Media Data Service": "http://data.media.theplatform.com/media",
-    "Flash Access Service": "http://flashaccess.entitlement.theplatform.com",
-    "Ledger Data Service": "https://ledger.commerce.theplatform.com/ledger",
-    "Entertainment Data Service": "http://data.entertainment.tv.theplatform.com/entertainment",
-    "Access Data Service master": "http://access.auth.theplatform.com",
-    "Cue Point Data Service": "http://data.cuepoint.theplatform.com/cuepoint",
+    "Workflow Data Service": "http://data.workflow.theplatform.com/workflow",
     "Workflow Data Service read-only": "http://data.workflow.theplatform.com/workflow",
-    "Entertainment Data Service read-only": "http://read.data.entertainment.tv.theplatform.com/entertainment",
-    "Access Data Service audience read-only": "http://enduser.access.auth.theplatform.com",
-    "Product Data Service read-only": "http://read.data.product.theplatform.com/product",
-    "Payment Data Service": "https://payment.commerce.theplatform.com/payment",
-    "File Management Service": "http://fms.theplatform.com",
-    "Windows Media License Generator Service": "http://208.79.64.254/LicenseServer",
-    "Order Data Service": "https://order.commerce.theplatform.com/order",
-    "Live Event Service": "http://liveevent.theplatform.com",
-    "Account Data Service": "http://mps.theplatform.com",
-    "Entitlement Data Service": "http://data.entitlement.theplatform.com/eds"
+    "comScore Digital Analytix": "http://comscore.theplatform.com?token={token}&account={account}&display=account"
   }
 }

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", "1.0.1"
+  spec.add_runtime_dependency "creatable"
   spec.add_runtime_dependency "excon"
   spec.add_runtime_dependency "oj", "3.5.0"
 
@@ -39,5 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-console"
+  spec.add_development_dependency "solargraph"
   spec.add_development_dependency "yard"
 end

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

@@ -19,7 +19,7 @@ module Cts
           user.token!
 
           service = Services[service]
-          u = URI.parse service.url
+          u = URI.parse service.url(account_id)
 
           [u.scheme, u.host].join('://')
         end
@@ -34,7 +34,7 @@ module Cts
         # @return [String] assembled path for a data call
         def path(service: nil, endpoint: nil, extra_path: nil, ids: nil, account_id: 'urn:theplatform:auth:root')
           Helpers.required_arguments %i[service endpoint], binding
-          service = Services[service]
+          service = Services[].find { |s| s.name == service && s.endpoints.include?(endpoint) }
 
           path = "#{URI.parse(service.url(account_id)).path}/#{service.path}/#{endpoint}"
           path += "/#{extra_path}" if extra_path
@@ -56,11 +56,11 @@ module Cts
         # @raise [ArgumentError] if user, service or endpoint is not supplied
         # @raise [RuntimeError] if the user token is not set
         # @return [Hash] assembled query for a data call
-        def query(user: nil, account: nil, service: nil, endpoint: nil, query: {}, range: nil, count: nil, entries: nil, sort: nil)
+        def query(user: nil, account_id: nil, service: nil, endpoint: nil, query: {}, range: nil, count: nil, entries: nil, sort: nil)
           Helpers.required_arguments %i[user service endpoint], binding
           user.token!
 
-          service = Services[service]
+          service = Services[].find { |s| s.name == service && s.endpoints.include?(endpoint) }
 
           h = {}
           if service.type == 'data'
@@ -70,7 +70,7 @@ module Cts
             h.merge!(token: user.token, schema: service.endpoints[endpoint]['schema'], form: service.form)
           end
 
-          h[:account] = account if account
+          h[:account] = account_id if account_id
           h.delete :token if user.token == 'sign_in_token'
           h.merge! query
           h

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

@@ -10,6 +10,7 @@ module Cts
         # @return [nil]
         def raise_unless_account_id(argument)
           raise ArgumentError, "#{argument} is not a valid account_id" unless Validators.account_id? argument
+
           nil
         end
 
@@ -19,12 +20,8 @@ module Cts
         # @raise [ArgumentError] if the argument is not of the correct type
         # @return [nil]
         def raise_unless_argument_error?(data, type = nil, &block)
-          msg = "#{data} is not a valid #{type}"
-          if block
-            raise ArgumentError, msg unless Validators.argument_error?(data, type, &block)
-          elsif Validators.argument_error?(data, type, &block)
-            raise ArgumentError, msg
-          end
+          raise(ArgumentError, "#{data} is not a valid #{type}") if Validators.argument_error?(data, type, &block)
+
           nil
         end
 
@@ -34,6 +31,7 @@ module Cts
         # @return [nil]
         def raise_unless_reference?(argument)
           raise ArgumentError, "#{argument} is not a valid reference" unless Validators.reference? argument
+
           nil
         end
 

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

@@ -7,7 +7,7 @@ module Cts
       # @attribute xmlns
       #   @return [Hash] active namespace received for this page
       class Page
-        extend Creatable
+        include Creatable
         include Enumerable
 
         attribute name: 'entries', kind_of: Array
@@ -18,6 +18,16 @@ module Cts
           @xmlns = {}
         end
 
+        def to_mpx_entries
+          c = @entries.map do |e|
+            r = Entry.new
+            r.fields = Fields.create_from_data(data: e, xmlns: xmlns)
+          end
+
+          e = Entries.create collection: c
+          e
+        end
+
         # return a json copy of the object, useful for later interpreation
         # @param [Object] indent_depth sets indent depth to 2 if not nil
         # @return [String] json serialized copy of the page

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

@@ -17,7 +17,7 @@ module Cts
       # @attribute headers
       #   @return [Hash] headers to transmit to the services along with the request
       class Request
-        extend Creatable
+        include Creatable
 
         attribute name: 'method', kind_of: Symbol
         attribute name: 'url', kind_of: String

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

@@ -5,7 +5,7 @@ module Cts
       # Class to contain a response from the services, has a few helper methods to make reading the data easier.
       #
       class Response
-        extend Creatable
+        include Creatable
 
         # @!attribute original
         #   @return [Excon::Response] copy of the original excon response.

data/lib/cts/mpx/entries.rb

@@ -6,7 +6,8 @@ module Cts
     class Entries
       include Enumerable
       include Driver
-      extend Creatable
+      include Creatable
+      extend Forwardable
 
       attribute name: 'collection', kind_of: Array
 
@@ -16,14 +17,11 @@ module Cts
       # @return [Entries] a new entries collection
       def self.create_from_page(page)
         Exceptions.raise_unless_argument_error? page, Page
-        entries = new
-        page.entries.each do |e|
-          entry = Entry.new
-          entry.fields = Fields.create_from_data(data: e, xmlns: page.xmlns)
+        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']
-          entries.add entry
         end
-        entries
+        Entries.create(collection: entries)
       end
 
       # Addressable method, indexed by entry object
@@ -31,15 +29,25 @@ module Cts
       # @return [Self.collection,Entry,nil] Can return the collection, a single entry, or nil if nothing found
       def [](key = nil)
         return @collection unless key
+
         @collection.find { |e| e.id == key }
       end
 
+      def +(other)
+        Entries.create collection: @collection += other.collection
+      end
+
+      def -(other)
+        Entries.create collection: @collection += other.collection
+      end
+
       # Add an entry object to the collection
       # @param [Entry] entry instantiated Entry to include
       # @raise [ArgumentError] if entry is not an Entry
       # @return [Self]
       def add(entry)
         return self if @collection.include? entry
+
         Exceptions.raise_unless_argument_error? entry, Entry
         @collection.push entry
         self

data/lib/cts/mpx/entry.rb

@@ -2,7 +2,7 @@ module Cts
   module Mpx
     # ORM style class to contain any entry from the data services.
     class Entry
-      extend Creatable
+      include Creatable
 
       attribute name: 'endpoint', kind_of: String
       attribute name: 'fields', kind_of: Fields
@@ -14,7 +14,7 @@ module Cts
       # @param [String] id long form id to look up
       # @param [String] fields comma delimited list of fields to collect
       # @return [Entry] the resulting entry
-      def self.load_by_id(user: nil, id: nil, fields: nil)
+      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
@@ -22,7 +22,7 @@ module Cts
 
         e = new
         e.id = id
-        e.load user: user, fields: nil
+        e.load user: user, fields: fields, account_id: account_id
         e
       end
 
@@ -35,13 +35,17 @@ module Cts
       # 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
-      def id=(account_id)
-        Driver::Exceptions.raise_unless_reference? account_id
-        result = Services.from_url account_id
-        fields['id'] = account_id
-
-        @service = result[:service]
-        @endpoint = result[:endpoint]
+      def id=(id)
+        if id.nil?
+          fields.remove 'id'
+          @id, @service, @endpoint = nil
+        else
+          Driver::Exceptions.raise_unless_reference? id
+          result = Services.from_url id
+          fields['id'] = id
+          @service = result[:service]
+          @endpoint = result[:endpoint]
+        end
       end
 
       # Initialize an entry.
@@ -63,16 +67,20 @@ module Cts
       # @param [User] user user to make calls with
       # @param [String] fields comma delimited list of fields to collect
       # @return [Driver::Response] Response of the call.
-      def load(user: nil, fields: nil)
+      def load(user: nil, fields: nil, account_id: 'urn:theplatform:auth:root')
         Driver::Helpers.required_arguments %i[user], binding
 
         Driver::Exceptions.raise_unless_argument_error? user, User
         Driver::Exceptions.raise_unless_argument_error? fields, String if fields
         Driver::Exceptions.raise_unless_reference? id
 
-        response = Services::Data.get user: user, service: service, endpoint: endpoint, fields: fields, ids: id.split("/").last
+        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?
+
         self.fields.parse data: response.data['entries'].first, xmlns: response.data['xmlns']
-        response
+        self
       end
 
       # Save the entry to the remote services.

data/lib/cts/mpx/field.rb

@@ -8,7 +8,7 @@ module Cts
     # @attribute xmlns namespace of the field
     #   @return [Hash]
     class Field
-      extend Creatable
+      include Creatable
 
       attribute name: 'name', kind_of: String
       attribute name: 'value'

data/lib/cts/mpx/fields.rb

@@ -5,7 +5,7 @@ module Cts
     #   @return [Field[]]
     class Fields
       include Enumerable
-      extend Creatable
+      include Creatable
 
       attribute name: 'collection', kind_of: Array
 
@@ -79,6 +79,7 @@ module Cts
       # @return [Field[]] returns a collection of fields
       def parse(xmlns: nil, data: nil)
         Driver::Exceptions.raise_unless_argument_error? data, Hash
+
         data.delete :service
         data.delete :endpoint
         reset

data/lib/cts/mpx/query.rb

@@ -26,10 +26,9 @@ module Cts
     # @attribute sort
     #   @return [String] string to sort in the service shell style
     class Query
-      extend Creatable
-      attr_accessor :sort
+      include Creatable
 
-      attribute name: 'account', kind_of: String
+      attribute name: 'account_id', kind_of: String
       attribute name: 'endpoint', kind_of: String
       attribute name: 'extra_path', kind_of: String
       attribute name: 'fields', kind_of: String
@@ -37,15 +36,15 @@ module Cts
       attribute name: 'page', kind_of: Driver::Page
       attribute name: 'query', kind_of: Hash
       attribute name: 'range', kind_of: String
-      attribute name: 'return_count', kind_of: FalseClass
-      attribute name: 'return_entries', kind_of: TrueClass
+      attribute name: 'return_count'
+      attribute name: 'return_entries'
       attribute name: 'service', kind_of: String
       attribute name: 'sort', kind_of: String
 
       # List of attributes availble
       # @return [Symbol[]]
       def attributes
-        %i[account endpoint extra_path fields ids query range return_count return_entries service sort]
+        %i[account_id endpoint extra_path fields ids query range return_count return_entries service sort]
       end
 
       # Instiatiate a page and query, set return's to false.
@@ -82,9 +81,7 @@ module Cts
       # @param [Boolean] include_entries include the entries array or not
       # @return [Hash]
       def to_h(include_entries: true)
-        h = {
-          params: params
-        }
+        h = { params: params }
         h[:entries] = entries.to_h if include_entries
         h
       end

data/lib/cts/mpx/registry.rb

@@ -16,6 +16,7 @@ module Cts
       # @raise (see #fetch_domain)
       # @return [Hash] hash of the newly fetched domain
       def fetch_and_store_domain(user, account_id = 'urn:theplatform:auth:root')
+        account_id ||= 'urn:theplatform:auth:root'
         result = fetch_domain user, account_id
         store_domain result, account_id
         domains[account_id]
@@ -29,8 +30,9 @@ module Cts
       # @return [Hash] hash of the newly fetched domain
       def fetch_domain(user, account_id = 'urn:theplatform:auth:root')
         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 }
+
+        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!
 
         response = Services::Web.post user: user, service: 'Access Data Service', endpoint: 'Registry', method: 'resolveDomain', arguments: { 'accountId' => account_id }
@@ -46,6 +48,7 @@ module Cts
       def store_domain(data, account_id = 'urn:theplatform:auth:root')
         raise ArgumentError, "#{account_id} is not a valid account_id" unless Validators.account_id? account_id
         raise ArgumentError, "#{data} is not a valid Hash" unless data.is_a? Hash
+
         @domains.store account_id, data
         nil
       end

data/lib/cts/mpx/service.rb

@@ -49,6 +49,7 @@ module Cts
         # @param [String] account_id long form account id (ownerId)
         # @return [String] the url string or nil if none available
         def url(account_id = 'urn:theplatform:auth:root')
+          account_id ||= 'urn:theplatform:auth:root'
           Exceptions.raise_unless_account_id account_id
           reg = Registry.domains[account_id]
           return reg[name] if reg

data/lib/cts/mpx/services.rb

@@ -13,8 +13,10 @@ module Cts
       def [](key = nil)
         return @services unless key
         raise 'key must be a string' unless key.is_a? String
+
         service = @services.find { |e| e.name == key }
         raise "#{key} must be a service name." unless service
+
         service
       end
 
@@ -22,15 +24,25 @@ module Cts
       # @param [String] url url to parse
       # @return [Hash] including service and endpoint as string.
       def from_url(url)
-        service = Services[].find { |s| url.include? s.uri_hint if s.uri_hint }
+        type = 'data' if url.include? 'data'
+        uri = URI.parse url
+
+        service = Services[].find { |s| uri.host.include?(s.uri_hint) if s.uri_hint && s.type == type }
         return nil unless service
 
         {
           service:  service.name,
-          endpoint: /data\/([A-Z].*)\//.match(url)[1]
+          endpoint: endpoint_regex(url)
         }
       end
 
+      # check url structure for correct endpoint
+      # @param [String] url to parse for a match
+      # @return [String] results of regex matching
+      def endpoint_regex(url)
+        /data\/([a-zA-Z]*\/Field)|data\/([a-zA-Z]*)\//.match(url)&.[](1, 2)&.select { |e| e unless e.nil? }[0]
+      end
+
       # Load references and services from disk.
       def initialize
         load_references
@@ -44,6 +56,7 @@ module Cts
       def load_reference_file(file: nil, type: nil)
         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))
         true
       end
@@ -100,6 +113,7 @@ module Cts
         return @raw_reference unless key
         raise 'key must be a string' unless key.is_a? String
         raise "#{key} is not in the reference library." unless @raw_reference.include? key
+
         @raw_reference[key]
       end
 

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

@@ -26,8 +26,8 @@ module Cts
         # @raise (see #get)
         # @param (see #get)
         # @return (see #get)
-        def delete(user: nil, account: nil, service: nil, endpoint: nil, sort: nil, extra_path: nil, range: nil, ids: nil, query: {}, headers: {}, count: nil, entries: nil)
-          get(user: user, account: account, service: service, endpoint: endpoint, sort: sort, extra_path: extra_path, range: range, ids: ids, query: query, headers: headers, count: count, entries: entries, method: :delete)
+        def delete(user: nil, account_id: nil, service: nil, endpoint: nil, sort: nil, extra_path: nil, range: nil, ids: nil, query: {}, headers: {}, count: nil, entries: nil)
+          get(user: user, account_id: account_id, service: service, endpoint: endpoint, sort: sort, extra_path: extra_path, range: range, ids: ids, query: query, headers: headers, count: count, entries: entries, method: :delete)
         end
 
         # Procedural method to GET data from the data services
@@ -46,12 +46,12 @@ module Cts
         # @param [String] sort set the sort field
         # @raise (see #prep_call)
         # @return [Response] Response of the call
-        def get(user: nil, account: nil, service: nil, fields: nil, endpoint: nil, sort: nil, extra_path: nil, range: nil, ids: nil, query: {}, headers: {}, count: nil, entries: nil, method: :get)
-          prep_call(user: user, account: account, service: service, query: query, headers: headers, required_arguments: ['user', 'service', 'endpoint'], binding: binding)
+        def get(user: nil, account_id: nil, service: nil, fields: nil, endpoint: nil, sort: nil, extra_path: nil, range: nil, ids: nil, query: {}, headers: {}, count: nil, entries: nil, method: :get)
+          prep_call(user: user, account_id: account_id, service: service, query: query, headers: headers, required_arguments: ['user', 'service', 'endpoint'], binding: binding)
 
-          host = Driver::Assemblers.host user: user, service: service
+          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: account, service: service, endpoint: endpoint, query: query
+          query = Driver::Assemblers.query user: user, account_id: account_id, service: service, endpoint: endpoint, query: query
 
           if Services[service].type == 'data'
             query.merge! Driver::Assemblers.query_data range: range, count: count, entries: entries, sort: sort
@@ -72,12 +72,12 @@ module Cts
         # @param [String] service title of a service
         # @raise (see #prep_call)
         # @return [Response] Response of the call
-        def post(user: nil, account: nil, service: nil, endpoint: nil, extra_path: nil, query: {}, page: nil, headers: {}, method: :post)
-          prep_call(user: user, account: account, service: service, query: query, headers: headers, required_arguments: ['user', 'service', 'endpoint', 'page'], page: page, binding: binding)
+        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: account, service: service, endpoint: endpoint, query: query
+          query = Driver::Assemblers.query user: user, account_id: account_id, service: service, endpoint: endpoint, query: query
 
           request = Driver::Request.create(method: method, url: [host, path].join, query: query, headers: headers, payload: page.to_s)
           request.call
@@ -87,8 +87,8 @@ module Cts
         # @param (see #post)
         # @raise (see #post)
         # @return (see #post)
-        def put(user: nil, account: nil, service: nil, endpoint: nil, extra_path: nil, query: {}, page: nil, headers: {})
-          post(user: user, account: account, service: service, endpoint: endpoint, extra_path: extra_path, query: query, page: page, headers: headers, method: :put)
+        def put(user: nil, account_id: nil, service: nil, endpoint: nil, extra_path: nil, query: {}, page: nil, headers: {})
+          post(user: user, account_id: account_id, service: service, endpoint: endpoint, extra_path: extra_path, query: query, page: page, headers: headers, method: :put)
         end
 
         # Helper method to assure that everything is is ok to call the methods above
@@ -111,12 +111,11 @@ module Cts
         # @private
         def prep_call(args = {})
           Driver::Helpers.required_arguments args[:required_arguments], args[:binding]
-          args[:user].token!
+          Driver::Helpers.raise_if_not_a([args[:user]], User) if args[:user]
           Driver::Helpers.raise_if_not_a_hash [args[:query], args[:headers]]
-
           Driver::Helpers.raise_if_not_a([args[:page]], Driver::Page) if args[:page]
-
-          Registry.fetch_and_store_domain(args[:user], args[:account]) unless self[args[:service]].url?
+          args[:user].token!
+          Registry.fetch_and_store_domain(args[:user], args[:account_id])
         end
       end
     end

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

@@ -15,8 +15,8 @@ module Cts
         # @return [Service] a service
         def [](key = nil)
           return services unless key
-          Driver::Exceptions.raise_unless_argument_error?(key, String)
 
+          Driver::Exceptions.raise_unless_argument_error?(key, String)
           service = services.find { |e| e.name == key }
           Driver::Exceptions.raise_unless_argument_error?(service, Driver::Service)
 
@@ -40,9 +40,9 @@ module Cts
           service = Services[service]
           method_list = service.endpoints[endpoint]['methods']
           Driver::Exceptions.raise_unless_argument_error?(arguments, Hash)
-          Driver::Exceptions.raise_unless_argument_error?(method, 'method') { method_list.key?(method) }
+          Driver::Exceptions.raise_unless_argument_error?(method, 'method') { !method_list.key?(method) }
 
-          arguments.each_key { |k| Driver::Exceptions.raise_unless_argument_error?(arguments, 'argument') { method_list[method].include? k.to_s } }
+          arguments.each_key { |k| Driver::Exceptions.raise_unless_argument_error?(arguments, 'argument') { !method_list[method].include? k.to_s } }
 
           h = {}
           h[method] = arguments
@@ -78,7 +78,7 @@ module Cts
           host = Driver::Assemblers.host user: user, service: service
           path = Driver::Assemblers.path service: service, endpoint: endpoint, extra_path: extra_path
           payload = assemble_payload service: service, endpoint: endpoint, method: method, arguments: arguments
-          query = Driver::Assemblers.query user: user, account: account, service: service, endpoint: endpoint, query: query
+          query = Driver::Assemblers.query user: user, account_id: account, service: service, endpoint: endpoint, query: query
 
           ### Request
           request = Driver::Request.create(method: :post, url: [host, path].join, query: query, payload: Oj.dump(payload), headers: headers)

data/lib/cts/mpx/user.rb

@@ -12,13 +12,13 @@ module Cts
     # @attribute token
     #   @return [String] the retrieved token
     class User
-      extend Creatable
+      include Creatable
 
-      attribute name: 'username', type: 'accessor', kind_of: String
-      attribute name: 'password', type: 'accessor', kind_of: String
-      attribute name: 'idle_timeout', type: 'accessor', kind_of: Integer
-      attribute name: 'duration', type: 'accessor', kind_of: Integer
-      attribute name: 'token', type: 'accessor', kind_of: String
+      attribute name: 'username', kind_of: String
+      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
 
       # 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
@@ -26,6 +26,7 @@ module Cts
       # @return [Self]
       def sign_in(idle_timeout: nil, duration: nil)
         raise 'token is already set, use sign_out first.' if token
+
         arguments = {}
 
         arguments['idleTimeout'] if idle_timeout
@@ -45,7 +46,7 @@ module Cts
       def sign_out
         arguments = { "token" => token }
         response = Services::Web.post user: self, service: 'User Data Service', endpoint: 'Authentication', method: 'signOut', arguments: arguments
-        self.token = nil if response.status == 200
+        @token = nil if response.status == 200
         nil
       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.1".freeze
+    VERSION = "1.0.2".freeze
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cts-mpx
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creatable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -329,7 +343,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - CONTRIBUTING
-- COPYRIGHT
 - EXAMPLES.md
 - Gemfile
 - Gemfile.lock

data/COPYRIGHT

@@ -1,10 +0,0 @@
-Copyright 2018 Comcast Cable Communications Management, LLC
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.