ims-lti 1.1.12 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3519a3ee6fb782c4ed97fcb89652c2011a3bb602
-  data.tar.gz: 495e959fd7bcddd71da5ead3ec88745109aae5c6
+  metadata.gz: 349045d52db72ab3885b106c5874f5e6c217fed2
+  data.tar.gz: 3dd49abc26a739d0c313f8bdb477317a79c2598d
 SHA512:
-  metadata.gz: a046a0db9890831af84705ca31d11d409ee3095b58e56e1bfd1eb458163a9856fbbff51bd7738d87a776d97bc7a88fc74b62980a64a8553437bb66592178499f
-  data.tar.gz: ac7793788cb184c463f10e977dfac0f448c840f99ca4f9a11cc9bd1af6142d6896b9d1a1fa8419afd404b16c4ca6967315e38429cf0c17ccfb719e0273998371
+  metadata.gz: 14f47290fd89679b75b5e5b4957b08c9431e50b69632a313f89a194454b61126c8ee801b5329b246b8c64d7458698629bb289de1c66450498f20051be803506c
+  data.tar.gz: befc124ca8958e2912466f3a79dd8f20a9105cba6614a3bfe96d374d6dcffa2634493138a08727ef7ffc1d1a929624ee8d3b40e92cfe6f69b5d53f1f984172d0

data/Changelog

@@ -1,3 +1,7 @@
+2016-10-05 Version 1.1.13
+    * Fix Oauth::Unauthorized initialization bug
+    * Relax oauth dependency
+
 2016-06-16 Version 1.1.12
     * Add support for detecting observer role
 

data/README.md

@@ -16,14 +16,14 @@ To require the library in your project:
 To validate the OAuth signatures you need to require the appropriate request
 proxy for your application. For example:
 
+    # For a Rails 5 (and 2.3) app:
+    require 'oauth/request_proxy/action_controller_request'
+
     # For a Sinatra or a Rails 3 or 4 app:
     require 'oauth/request_proxy/rack_request'
     # You also need to explicitly enable OAuth 1 support in the environment.rb or an initializer:
     OAUTH_10_SUPPORT = true
 
-    # For a Rails 2.3 app:
-    require 'oauth/request_proxy/action_controller_request'
-
 For further information see the [oauth-ruby](https://github.com/oauth-xx/oauth-ruby) project.
 
 As a quick debugging note, if you forget that step, you'll get an error like:

data/lib/ims/lti/outcome_request.rb

@@ -148,18 +148,43 @@ module IMS::LTI
       extention_process_xml(doc)
     end
 
+    def generate_request_xml
+      raise IMS::LTI::InvalidLTIConfigError, "`@operation` and `@lis_result_sourcedid` are required" unless has_request_xml_attributes?
+      builder = Builder::XmlMarkup.new #(:indent=>2)
+      builder.instruct!
+
+      builder.imsx_POXEnvelopeRequest("xmlns" => "http://www.imsglobal.org/services/ltiv1p1/xsd/imsoms_v1p0") do |env|
+        env.imsx_POXHeader do |header|
+          header.imsx_POXRequestHeaderInfo do |info|
+            info.imsx_version "V1.0"
+            info.imsx_messageIdentifier @message_identifier || IMS::LTI::generate_identifier
+          end
+        end
+        env.imsx_POXBody do |body|
+          body.tag!(@operation + 'Request') do |request|
+            request.resultRecord do |record|
+              record.sourcedGUID do |guid|
+                guid.sourcedId @lis_result_sourcedid
+              end
+              results(record)
+            end
+          end
+        end
+      end
+    end
+
     private
-    
+
     def extention_process_xml(doc)
     end
-    
+
     def has_result_data?
       !!score
     end
-    
+
     def results(node)
       return unless has_result_data?
-      
+
       node.result do |res|
         result_values(res)
       end
@@ -178,29 +203,8 @@ module IMS::LTI
       @consumer_key && @consumer_secret && @lis_outcome_service_url && @lis_result_sourcedid && @operation
     end
 
-    def generate_request_xml
-      builder = Builder::XmlMarkup.new #(:indent=>2)
-      builder.instruct!
-
-      builder.imsx_POXEnvelopeRequest("xmlns" => "http://www.imsglobal.org/services/ltiv1p1/xsd/imsoms_v1p0") do |env|
-        env.imsx_POXHeader do |header|
-          header.imsx_POXRequestHeaderInfo do |info|
-            info.imsx_version "V1.0"
-            info.imsx_messageIdentifier @message_identifier || IMS::LTI::generate_identifier
-          end
-        end
-        env.imsx_POXBody do |body|
-          body.tag!(@operation + 'Request') do |request|
-            request.resultRecord do |record|
-              record.sourcedGUID do |guid|
-                guid.sourcedId @lis_result_sourcedid
-              end
-              results(record)
-            end
-          end
-        end
-      end
+    def has_request_xml_attributes?
+      @operation && @lis_result_sourcedid
     end
-
   end
 end

data/lib/ims/lti/request_validator.rb

@@ -18,14 +18,20 @@ module IMS::LTI
     def valid_request?(request, handle_error=true)
       begin
         @oauth_signature_validator = OAuth::Signature.build(request, :consumer_secret => @consumer_secret)
-        @oauth_signature_validator.verify() or raise OAuth::Unauthorized
+        @oauth_signature_validator.verify() or raise OAuth::Unauthorized.new(request)
         true
-      rescue OAuth::Signature::UnknownSignatureMethod, OAuth::Unauthorized
+      rescue OAuth::Signature::UnknownSignatureMethod
         if handle_error
           false
         else
           raise $!
         end
+      rescue OAuth::Unauthorized
+        if handle_error
+          false
+        else
+          raise OAuth::Unauthorized.new(request)
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Instructure
@@ -28,32 +28,24 @@ dependencies:
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.5
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 0.4.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,4 +109,3 @@ signing_key:
 specification_version: 4
 summary: Ruby library for creating IMS LTI tool providers and consumers
 test_files: []
-has_rdoc: