ims-lti 2.0.0.beta.33 → 2.0.0.beta.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f7ca9f95d162869f61b7be229823b6527794b2
-  data.tar.gz: 2c5c99b0aae8dcff4d0b7f53b458c82d216827b1
+  metadata.gz: a3580b05cd173bd267f4ce2af4d46521d9afc29a
+  data.tar.gz: 731cc56752b637a036a3bb38a261b7fc7d4be577
 SHA512:
-  metadata.gz: 5de3464ec8244a7219970c5997f0e947a075c4b946f336ac621e56e8fdfc85b2437f4236c731c3bf1fe84f82069973fc3e289a4970a8f838adfc01007b5809f6
-  data.tar.gz: 80ae95913258f6169702a55fb5c9b5778523d4ca67d2c80034bf3c8379a35e5d8d290cf8c7b7cb3bb4721c00f189c3585000ec87acc5fbf618d3480678ccb234
+  metadata.gz: 8a8dc1aa1542a813c11ebb940b2be6ddcb017a84fd0014c5d00d58ca82bdfd6752972fa7405adf3091517dc4300d31926748733bada9134690d37906f41351f0
+  data.tar.gz: 544957240d256b9c6a96963bbad5a588d52d6dd8ab9bdcfab03dceacec4e455a6e1697a547b7adc764ccdbf64cc077bdeafedfd590bfd8d8c29bc238fb0aa965

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

@@ -87,7 +87,8 @@ module IMS::LTI::Models
     end
 
     def from_json(json)
-      data = json.is_a?(String) ? JSON.parse(json) : json
+      # JSON.parse(json.to_json) is a quick and dirty way to clone the json object passed in
+      data = json.is_a?(String) ? JSON.parse(json) : JSON.parse(json.to_json)
       if data.is_a? Array
         data.map { |hash| self.class.from_json(hash.to_json) }
       else
@@ -210,4 +211,4 @@ module IMS::LTI::Models
     end
 
   end
-end
+end

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

@@ -16,25 +16,34 @@ module IMS::LTI::Services
       tool_consumer_profile.services_offered.map(&:profile)
     end
 
-    def register_tool_proxy(tool_proxy)
+    def register_tool_proxy(tool_proxy, reregistration_confirm_url = nil, shared_secret = nil)
       service = tool_consumer_profile.services_offered.find { |s| s.formats.include?('application/vnd.ims.lti.v2.toolproxy+json') && s.actions.include?('POST') }
 
       SimpleOAuth::Header::ATTRIBUTE_KEYS << :body_hash unless SimpleOAuth::Header::ATTRIBUTE_KEYS.include? :body_hash
       tool_proxy_json = tool_proxy.to_json
       body_hash = Digest::SHA1.base64digest tool_proxy_json
-      
+
+      if reregistration?
+        consumer_key = tool_proxy.tool_proxy_guid
+        consumer_secret = shared_secret
+      else
+        consumer_key = @registration_request.reg_key
+        consumer_secret = @registration_request.reg_password
+      end
+
       conn = Faraday.new do |conn|
-        conn.request :oauth, {:consumer_key => @registration_request.reg_key, :consumer_secret => @registration_request.reg_password, :body_hash => body_hash}
+        conn.request :oauth, {:consumer_key => consumer_key, :consumer_secret => consumer_secret, :body_hash => body_hash}
         conn.adapter :net_http
       end
 
       response = conn.post do |req|
         req.url service.endpoint
         req.headers['Content-Type'] = 'application/vnd.ims.lti.v2.toolproxy+json'
+        req.headers['VND-IMS-CONFIRM-URL'] = reregistration_confirm_url if reregistration_confirm_url
         req.body = tool_proxy_json
       end
 
-      if response.status == 201
+      if response.status == 201 || (response.status == 200 && reregistration?)
         IMS::LTI::Models::ToolProxy.new.from_json(tool_proxy.to_json).from_json(response.body)
       else
         raise IMS::LTI::Errors::ToolProxyRegistrationError.new(response.status, response.body)
@@ -66,6 +75,9 @@ module IMS::LTI::Services
       orig_capabilities - capabilites
     end
 
+    def reregistration?
+      @registration_request.is_a?(IMS::LTI::Models::Messages::ToolProxyReregistrationRequest)
+    end
 
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.33
+  version: 2.0.0.beta.34
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_oauth
@@ -28,112 +28,112 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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: 
@@ -142,21 +142,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ims/lti/converters/time_json_converter.rb
+- Changelog.txt
+- LICENSE.txt
+- README.md
+- lib/ims.rb
+- lib/ims/lti.rb
 - lib/ims/lti/converters.rb
+- 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/errors.rb
+- lib/ims/lti/models.rb
 - lib/ims/lti/models/base_url_choice.rb
 - lib/ims/lti/models/base_url_selector.rb
 - lib/ims/lti/models/contact.rb
 - lib/ims/lti/models/content_item_container.rb
 - lib/ims/lti/models/content_item_placement.rb
+- lib/ims/lti/models/content_items.rb
 - lib/ims/lti/models/content_items/content_item.rb
 - lib/ims/lti/models/content_items/file_item.rb
 - lib/ims/lti/models/content_items/lti_link_item.rb
-- lib/ims/lti/models/content_items.rb
 - lib/ims/lti/models/icon_endpoint.rb
 - lib/ims/lti/models/icon_info.rb
 - lib/ims/lti/models/image.rb
@@ -164,6 +170,7 @@ files:
 - lib/ims/lti/models/localized_text.rb
 - lib/ims/lti/models/lti_model.rb
 - lib/ims/lti/models/message_handler.rb
+- lib/ims/lti/models/messages.rb
 - lib/ims/lti/models/messages/basic_lti_launch_request.rb
 - lib/ims/lti/models/messages/content_item_selection.rb
 - lib/ims/lti/models/messages/content_item_selection_request.rb
@@ -171,7 +178,6 @@ files:
 - 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/messages.rb
 - lib/ims/lti/models/parameter.rb
 - lib/ims/lti/models/product_family.rb
 - lib/ims/lti/models/product_info.rb
@@ -189,17 +195,11 @@ files:
 - lib/ims/lti/models/tool_setting.rb
 - lib/ims/lti/models/tool_setting_container.rb
 - lib/ims/lti/models/vendor.rb
-- lib/ims/lti/models.rb
+- 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/services.rb
 - lib/ims/lti/version.rb
-- lib/ims/lti.rb
-- lib/ims.rb
-- LICENSE.txt
-- README.md
-- Changelog.txt
 homepage: http://github.com/instructure/ims-lti
 licenses:
 - MIT
@@ -210,17 +210,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for creating IMS LTI tool providers and consumers