ims-lti 2.0.0.beta.11 → 2.0.0.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f30f9afef013c59d05a728bbe3dabe7c1d732e7
-  data.tar.gz: d4fd6ab606ace57581ad64e958fbf36b9dd4cb54
+  metadata.gz: 40b8de748fa6f881fb3ba1c3970b1ef79bec9951
+  data.tar.gz: e4d254ce59b3a7c473ecaa2f8d36d4a9f61cb33c
 SHA512:
-  metadata.gz: 3b761640b405e04c4c67d6350a87129bfc29a81ee1177647b18edb6dc3e431715fbc12ce618747206f223c8f626a29e02e14787371f2b94d8a3d5bf140be2a40
-  data.tar.gz: c1de59d4c61e50d8dd425ccf1e80c5fc1b899aa2b4c2427c4f5137a8bcf689f8b28d8714a892e747ea0d4073edb1db03911114bda20966b9fd2da1c955d20167
+  metadata.gz: 4304bfac89685bf37fb8d175965abc3bd0e7e838de7e1ce74e12383fb9af0231e02ca85337240baf0abeba794874d7bbcbdb4c7abd848a1240f29a62f15a46cd
+  data.tar.gz: df72ec7a90e013d9d3a08aa46f1f64b0203c82cbed242b196f5278ad563f42dc2f837696c47eab28875f44f9096d14fc85d65dec61b601ef763c99f3a9539655

data/lib/ims/lti/models/messages/basic_lti_launch_request.rb

@@ -1,10 +1,10 @@
 module IMS::LTI::Models::Messages
-  class BasicLTILaunchRequest < IMS::LTI::Models::Messages::Message
+  class BasicLTILaunchRequest < Message
 
-    required_params :resource_link_id
-    recommended_params :context_id, :launch_presentation_return_url, :tool_consumer_instance_guid
-    optional_params :context_type, :role_scope_mentor, :user_image
-    deprecated_params :context_title, :context_label, :resource_link_title, :resource_link_description,
+    add_required_params :resource_link_id
+    add_recommended_params :context_id, :launch_presentation_return_url, :tool_consumer_instance_guid
+    add_optional_params :context_type, :role_scope_mentor, :user_image
+    add_deprecated_params :context_title, :context_label, :resource_link_title, :resource_link_description,
                       :lis_person_name_given, :lis_person_name_family, :lis_person_name_full,
                       :lis_person_contact_email_primary, :user_image, :lis_person_sourcedid,
                       :lis_course_offering_sourcedid, :lis_course_section_sourcedid,

data/lib/ims/lti/models/messages/message.rb

@@ -2,33 +2,53 @@ module IMS::LTI::Models::Messages
   class Message
     class << self
 
-      def required_params(param, *params)
-        add_params(param, *params)
+      def required_params
+        supers_params('@required_params') | (@required_params || [])
       end
 
-      def recommended_params(param, *params)
-        add_params(param, *params)
+      def add_required_params(param, *params)
+        add_params('@required_params', param, *params)
       end
 
-      def optional_params(param, *params)
-        add_params(param, *params)
+      def recommended_params
+        supers_params('@recommended_params') | (@recommended_params || [])
       end
 
-      def deprecated_params(param, *params)
-        add_params(param, *params)
+      def add_recommended_params(param, *params)
+        add_params('@recommended_params', param, *params)
+      end
+
+      def optional_params
+        supers_params('@optional_params') | (@optional_params || [])
+      end
+
+      def add_optional_params(param, *params)
+        add_params('@optional_params', param, *params)
+      end
+
+      def deprecated_params
+        supers_params('@deprecated_params') | (@deprecated_params || [])
+      end
+
+      def add_deprecated_params(param, *params)
+        add_params('@deprecated_params', param, *params)
       end
 
       private
 
-      def add_params(param, *params)
-        params.unshift(param)
-        @parameters ||= superclass.instance_variable_get('@parameters') || []
-        @parameters += params
+      def add_params(instance_variable, param, *params)
+        instance_var = self.instance_variable_get(instance_variable) || []
+        instance_var |= params.unshift(param)
+        self.instance_variable_set(instance_variable, instance_var)
         attr_accessor(params.shift, *params)
       end
 
       def parameters
-        @parameters ||= []
+        required_params + recommended_params + optional_params + deprecated_params
+      end
+
+      def supers_params(instance_variable)
+        superclass == Object ? [] : superclass.instance_variable_get(instance_variable) || []
       end
 
     end
@@ -44,9 +64,9 @@ module IMS::LTI::Models::Messages
 
     attr_accessor :launch_url, *OAUTH_KEYS
 
-    required_params :lti_message_type, :lti_version
-    recommended_params :user_id, :roles, :launch_presentation_document_target, :launch_presentation_width, :launch_presentation_height
-    optional_params :launch_presentation_local, :launch_presentation_css_url
+    add_required_params :lti_message_type, :lti_version
+    add_recommended_params :user_id, :roles, :launch_presentation_document_target, :launch_presentation_width, :launch_presentation_height
+    add_optional_params :launch_presentation_local, :launch_presentation_css_url
 
     def initialize(attrs = {})
 
@@ -68,11 +88,11 @@ module IMS::LTI::Models::Messages
     end
 
     def add_custom_params(params)
-      params.each { |k,v| k.to_s.start_with?('custom_') ? @custom_params[k.to_s] = v : @custom_params["custom_#{k.to_s}"] = v }
+      params.each { |k, v| k.to_s.start_with?('custom_') ? @custom_params[k.to_s] = v : @custom_params["custom_#{k.to_s}"] = v }
     end
 
     def get_custom_params
-      @custom_params.inject({}) { |hash, (k,v)| hash[k.gsub(/\Acustom_/, '')] = v ; hash }
+      @custom_params.inject({}) { |hash, (k, v)| hash[k.gsub(/\Acustom_/, '')] = v; hash }
     end
 
     def post_params
@@ -111,8 +131,7 @@ module IMS::LTI::Models::Messages
     private
 
     def parameters
-
-      self.class.instance_variable_get("@parameters").inject({}) do |h, param|
+      self.class.send("parameters").inject({}) do |h, param|
         value = instance_variable_get("@#{param.to_s}")
         h[param.to_s] = value unless value.nil?
         h

data/lib/ims/lti/models/messages/registration_request.rb

@@ -1,12 +1,12 @@
 module IMS::LTI::Models::Messages
   class RegistrationRequest < Message
 
-    required_params :reg_key, :reg_password, :tc_profile_url, :launch_presentation_return_url
+    add_required_params :reg_key, :reg_password, :tc_profile_url, :launch_presentation_return_url
 
     MESSAGE_TYPE = 'ToolProxyRegistrationRequest'
 
-    def initialize(attributes = {})
-      super(attributes)
+    def initialize(attrs = {})
+      super(attrs)
       self.lti_message_type = MESSAGE_TYPE
     end
 

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

@@ -0,0 +1,10 @@
+class ServiceDefinition
+  attr_reader :name, :formats, :paramater_variables
+
+  def initialize(name, formats, parameter_variables = [])
+    @name = name
+    @formats = formats
+    @parameter_variables = parameter_variables
+  end
+
+end

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

@@ -0,0 +1,30 @@
+class ServiceLookup
+
+  TOOL_SETTING_SERVICE = ServiceDefinition.new(
+    'ToolSettingsContainer Service',
+    %w(application/vnd.ims.lti.v2.toolsettings+json application/vnd.ims.lti.v2.toolsettings.simple+json),
+    %w(LtiLink.custom.url ToolProxyBinding.custom.url ToolProxy.custom.url)
+  )
+
+  TOOL_CONSUMER_PROFILE_SERVICE = ServiceDefinition.new(
+    'ToolConsumerProfile Service',
+    %w(application/vnd.ims.lti.v2.toolconsumerprofile+json),
+    []
+  )
+
+  TOOL_PROXY_SERVICE = ServiceDefinition.new(
+    'ToolProxy Service',
+    %w(application/vnd.ims.lti.v2.toolproxy+json),
+    []
+  )
+
+  def self.services
+    [TOOL_SETTING_SERVICE, TOOL_CONSUMER_PROFILE_SERVICE, TOOL_PROXY_SERVICE]
+  end
+
+  def self.lookup(format)
+    services.select { |service| service.formats.include? format }
+  end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.11
+  version: 2.0.0.beta.12
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_oauth
@@ -139,6 +139,8 @@ files:
 - lib/ims/lti/models/tool_setting_container.rb
 - lib/ims/lti/models/vendor.rb
 - lib/ims/lti/services.rb
+- lib/ims/lti/services/service_definition.rb
+- lib/ims/lti/services/service_lookup.rb
 - lib/ims/lti/services/tool_proxy_registration_service.rb
 - lib/ims/lti/version.rb
 homepage: http://github.com/instructure/ims-lti