ims-lti 2.0.0.beta.29 → 2.0.0.beta.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34295d75aca72702d27339dca8e30bcfc4b5f42
-  data.tar.gz: e346638b48ba8f6bb59e3ef619702cfba4ff3a3d
+  metadata.gz: 6c2af2a10db5b2ed1ba1c946bdbfb7b07bd4d733
+  data.tar.gz: 00b8c3301b940f227c5e694a93a9e2ac0a906fd4
 SHA512:
-  metadata.gz: 80193d854a2508f0a684157315f3be2d64f86da6045bed665dc66d8d74e146964c33d1fcb7fca18d971421cbf3134b1a0b4904f9ac8e649862082ff8b0c7cfc6
-  data.tar.gz: 129464c6b469f478fba49a837674ef62d36932f4f2b480de8efe05b2e1aa053abdbd93661197e3ad3a9f3a90e7983035bb77a60baaa0e02f069761c7e47768a6
+  metadata.gz: 4b9e9087df014ed6cf2b10572ae24401339d08ab9c2d57b7957df65b90c49ecf51885e29a9839aee0f7236fc0fc67c108b9a88506e97994f5d3e6c40006c6eb2
+  data.tar.gz: 14de49fcd0fd56c4fb1c29e7fdd2ba12315ba4303e4ca0b37a9fc97d1b42c14734759a556ed67f3033cbf8a0de6bd6906d9d58ce9abc04a295cdb88a43c18cee

data/lib/ims/lti/errors/invalid_tool_consumer_profile.rb

@@ -0,0 +1,4 @@
+module IMS::LTI::Errors
+  class InvalidToolConsumerProfile < StandardError
+  end
+end

data/lib/ims/lti/errors.rb

@@ -2,5 +2,6 @@ module IMS::LTI
   module Errors
     require_relative 'errors/invalid_lti_config_error'
     require_relative 'errors/tool_proxy_registration_error'
+    require_relative 'errors/invalid_tool_consumer_profile'
   end
 end

data/lib/ims/lti/models/lti_model.rb

@@ -1,6 +1,7 @@
 module IMS::LTI::Models
   class LTIModel
     LTI_VERSION_2P0 = 'LTI-2p0'
+    LTI_VERSION_2P0 = 'LTI-2p1'
 
     def initialize(attributes = {})
       self.attributes = attributes

data/lib/ims/lti/models/service_owner.rb

@@ -1,8 +1,10 @@
 module IMS::LTI::Models
   class ServiceOwner < LTIModel
+    add_attribute :id, json_key:'@id'
     add_attribute :description, relation: 'IMS::LTI::Models::LocalizedText'
     add_attribute :timestamp, json_converter:'IMS::LTI::Converters::TimeJSONConverter'
     add_attribute :service_owner_name, relation: 'IMS::LTI::Models::LocalizedName'
+    add_attribute :support, relation:'IMS::LTI::Models::Contact'
 
     def create_service_owner_name(name, key = 'service_owner.name')
       @service_owner_name = LocalizedName.new(name, key)

data/lib/ims/lti/services/tool_proxy_validator.rb

@@ -0,0 +1,135 @@
+module IMS::LTI::Services
+  class ToolProxyValidator
+
+    attr_reader :tool_proxy
+
+    def initialize(tool_proxy)
+      @tool_proxy = tool_proxy
+    end
+
+    def tool_consumer_profile
+      return @tool_consumer_profile if @tool_consumer_profile
+
+      connection = Faraday.new
+      response = connection.get(tool_proxy.tool_consumer_profile)
+      @tool_consumer_profile = IMS::LTI::Models::ToolConsumerProfile.new.from_json(response.body)
+      @tool_consumer_profile
+    end
+
+    def tool_consumer_profile=(tcp)
+      tcp = IMS::LTI::Models::ToolConsumerProfile.from_json(tcp) unless tcp.is_a?(IMS::LTI::Models::ToolConsumerProfile)
+      if tool_proxy.tool_consumer_profile != tcp.id
+        raise IMS::LTI::Errors::InvalidToolConsumerProfile, "Tool Consumer Profile @id doesn't match the Tool Proxy"
+      end
+      @tool_consumer_profile = tcp
+    end
+
+    def capabilities_offered
+      tool_consumer_profile.capabilities_offered
+    end
+
+    def invalid_services
+      services = tool_proxy.security_contract.services
+      services_used = services.each_with_object({}) do |s, hash|
+        hash[s.service.split('#').last.strip] = s.actions
+        hash
+      end
+      services_offered = tool_consumer_profile.services_offered.each_with_object({}) do |s, hash|
+        hash[s.id.split(':').last.split('#').last.strip] = s.actions
+        hash
+      end
+      invalid_services = services_used.each_with_object({}) do |(id, actions), hash|
+        if services_offered.keys.include?(id)
+          actions_used = normalize_strings(*services_offered[id])
+          actions_offered = normalize_strings(*actions)
+          invalid_actions = actions_offered - actions_used
+          hash[id] = invalid_actions unless invalid_actions.empty?
+        else
+          hash[id] = actions
+        end
+        hash
+      end
+      invalid_services
+    end
+
+    def invalid_message_handlers
+      ret_val = {}
+      tool_profile = tool_proxy.tool_profile
+      #singleton_message_handlers = tool_profile.messages
+      invalid_rhs = validate_resource_handlers(tool_profile.resource_handlers)
+      ret_val[:resource_handlers] = invalid_rhs unless invalid_rhs.empty?
+      invalid_singleton_message_handlers = validate_singleton_message_handlers(tool_profile.messages)
+      ret_val[:singleton_message_handlers] = invalid_singleton_message_handlers unless invalid_singleton_message_handlers.empty?
+      ret_val
+    end
+
+    def valid?
+      invalid_services.empty? && invalid_message_handlers.empty?
+    end
+
+
+    private
+
+    def normalize_strings(string, *strings)
+      strings.push(string)
+      normalized = strings.map { |s| s.upcase.strip }
+      normalized
+    end
+
+    def validate_message_handlers(message_handlers)
+      message_handlers.each_with_object([]) do |mh, array|
+        invalid_capabilities = mh.enabled_capabilities - capabilities_offered
+        invalid_parameters = validate_parameters(mh.parameters)
+        if !invalid_parameters.empty? || !invalid_capabilities.empty?
+          hash = {message_type: mh.message_type, }
+          hash[:invalid_capabilities] = invalid_capabilities unless invalid_capabilities.empty?
+          hash[:invalid_parameters] = invalid_parameters unless invalid_parameters.empty?
+          array << hash
+        end
+        array
+      end
+    end
+
+    def validate_parameters(parameters)
+      parameters.each_with_object([]) do |p, array|
+        if !p.fixed? && !capabilities_offered.include?(p.variable)
+          array << {name: p.name, variable: p.variable}
+        end
+      end
+    end
+
+    def validate_message_types(message_handlers)
+      message_handlers.each_with_object([]) do |mh, array|
+        array << mh.message_type unless capabilities_offered.include?(mh.message_type)
+        array
+      end
+    end
+
+    def validate_resource_handlers(resource_handlers)
+      resource_handlers.each_with_object([]) do |rh, array|
+        invalid_message_types = validate_message_types(rh.messages)
+        invalid_mhs = validate_message_handlers(rh.messages)
+        if !invalid_mhs.empty? || !invalid_message_types.empty?
+          hash = {
+              code: rh.resource_type.code,
+          }
+          hash[:messages] = invalid_mhs unless invalid_mhs.empty?
+          hash[:invalid_message_types] = invalid_message_types unless invalid_message_types.empty?
+          array << hash
+        end
+        array
+      end
+    end
+
+    def validate_singleton_message_handlers(message_handlers)
+      hash = {}
+      invalid_messages = validate_message_handlers(message_handlers)
+      invalid_message_types = validate_message_types(message_handlers)
+      hash[:messages] = invalid_messages unless invalid_messages.empty?
+      hash[:invalid_message_types] = invalid_message_types unless invalid_message_types.empty?
+      hash
+    end
+
+
+  end
+end

data/lib/ims/lti/services.rb

@@ -2,5 +2,6 @@ module IMS::LTI
   module Services
     require_relative 'services/tool_proxy_registration_service'
     require_relative 'services/tool_config'
+    require_relative 'services/tool_proxy_validator'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.29
+  version: 2.0.0.beta.30
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_oauth
@@ -151,6 +151,7 @@ files:
 - lib/ims/lti/converters/time_json_converter.rb
 - lib/ims/lti/errors.rb
 - lib/ims/lti/errors/invalid_lti_config_error.rb
+- lib/ims/lti/errors/invalid_tool_consumer_profile.rb
 - lib/ims/lti/errors/tool_proxy_registration_error.rb
 - lib/ims/lti/models.rb
 - lib/ims/lti/models/base_url_choice.rb
@@ -197,6 +198,7 @@ files:
 - lib/ims/lti/services.rb
 - lib/ims/lti/services/tool_config.rb
 - lib/ims/lti/services/tool_proxy_registration_service.rb
+- lib/ims/lti/services/tool_proxy_validator.rb
 - lib/ims/lti/version.rb
 homepage: http://github.com/instructure/ims-lti
 licenses: