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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f95792a5114c70ded6b2de1ba194a9441e3b57
-  data.tar.gz: 9142eb85489ee801ce9f5a2daffcdeb87c1351f2
+  metadata.gz: d34295d75aca72702d27339dca8e30bcfc4b5f42
+  data.tar.gz: e346638b48ba8f6bb59e3ef619702cfba4ff3a3d
 SHA512:
-  metadata.gz: 308f9481a96751413cd6799b29c0a724d06e3c3272582111703279fcf632aa0fb84584e03722cc8307e5eab087677ac5eaaed2af4660727134c653418fea3e14
-  data.tar.gz: 0eaafd723767d089620816a1b444563246c2a47387a95facf774292bcae6c7b35da5465b9f0482fb2bfdeabf9d3c1bb551dee6df5640fb4952cab6b765004696
+  metadata.gz: 80193d854a2508f0a684157315f3be2d64f86da6045bed665dc66d8d74e146964c33d1fcb7fca18d971421cbf3134b1a0b4904f9ac8e649862082ff8b0c7cfc6
+  data.tar.gz: 129464c6b469f478fba49a837674ef62d36932f4f2b480de8efe05b2e1aa053abdbd93661197e3ad3a9f3a90e7983035bb77a60baaa0e02f069761c7e47768a6

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

@@ -88,7 +88,7 @@ module IMS::LTI::Models
     def from_json(json)
       data = json.is_a?(String) ? JSON.parse(json) : json
       if data.is_a? Array
-        data.map { |hash| self.class.new.from_json(hash.to_json) }
+        data.map { |hash| self.class.from_json(hash.to_json) }
       else
         process_json_hash(data)
       end

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

@@ -6,5 +6,6 @@ module IMS::LTI::Models
     require_relative 'messages/basic_lti_launch_request'
     require_relative 'messages/content_item_selection_request'
     require_relative 'messages/content_item_selection'
+    require_relative 'messages/tool_proxy_reregistration_request'
   end
 end

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

@@ -35,6 +35,16 @@ module IMS::LTI::Models::Messages
         add_params('@deprecated_params', param, *params)
       end
 
+      def inherited(klass)
+        @descendants ||= Set.new
+        @descendants << klass
+        superclass.inherited(klass) unless(self == Message)
+      end
+
+      def descendants
+        @descendants || Set.new
+      end
+
       private
 
       def add_params(instance_variable, param, *params)
@@ -58,6 +68,8 @@ module IMS::LTI::Models::Messages
 
     end
 
+    MESSAGE_TYPE = "".freeze
+
     LAUNCH_TARGET_IFRAME = 'iframe'
     LAUNCH_TARGET_WINDOW = 'window'
 
@@ -73,18 +85,8 @@ module IMS::LTI::Models::Messages
     add_required_params :lti_message_type, :lti_version
 
     def self.generate(params)
-      case params['lti_message_type']
-        when BasicLTILaunchRequest::MESSAGE_TYPE
-          BasicLTILaunchRequest.new(params)
-        when RegistrationRequest::MESSAGE_TYPE
-          RegistrationRequest.new(params)
-        when ContentItemSelectionRequest::MESSAGE_TYPE
-          ContentItemSelectionRequest.new(params)
-        when ContentItemSelection::MESSAGE_TYPE
-          ContentItemSelection.new(params)
-        else
-          self.new(params)
-      end
+      klass = self.descendants.select{|d| d::MESSAGE_TYPE == params['lti_message_type']}.first
+      klass ? klass.new(params) : Message.new(params)
     end
 
     def initialize(attrs = {})

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

@@ -3,6 +3,7 @@ module IMS::LTI::Models::Messages
 
     add_required_params :reg_key, :reg_password, :tc_profile_url, :launch_presentation_return_url
 
+
     MESSAGE_TYPE = 'ToolProxyRegistrationRequest'
 
     def initialize(attrs = {})

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

@@ -0,0 +1,15 @@
+module IMS::LTI::Models::Messages
+  class ToolProxyReregistrationRequest < RequestMessage
+
+    add_required_params :tc_profile_url, :launch_presentation_return_url
+
+
+    MESSAGE_TYPE = 'ToolProxyReregistrationRequest'
+
+    def initialize(attrs = {})
+      super(attrs)
+      self.lti_message_type = MESSAGE_TYPE
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.28
+  version: 2.0.0.beta.29
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_oauth
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.4
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: 
 email: 
 executables: []
@@ -134,6 +176,7 @@ files:
 - lib/ims/lti/models/messages/message.rb
 - lib/ims/lti/models/messages/registration_request.rb
 - lib/ims/lti/models/messages/request_message.rb
+- lib/ims/lti/models/messages/tool_proxy_reregistration_request.rb
 - lib/ims/lti/models/parameter.rb
 - lib/ims/lti/models/product_family.rb
 - lib/ims/lti/models/product_info.rb