coalescing_panda 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeb76aa967a3ed977bdc2b281f0bfa4330f332b8
-  data.tar.gz: 3928b5b503bda777919cb5add067217912a3db77
+  metadata.gz: b2c34217f412e2564632c2d78755b09a08304e44
+  data.tar.gz: 978545da6add23c795c1b09c4c69c0a754abe522
 SHA512:
-  metadata.gz: 89ccfe8381296e5f66618e11247feb5ee8561273a4960e5aaf8cf43c7cb6759fcd9065705edd778aef7ee6f5112ffd2c26dfdcdc6c6d2a165d16d36c07d8f84e
-  data.tar.gz: e7592b394e5192c76c782d181045ef82711e384f586785803fe805ab91cea8617fc9fb9c12eb81dde90d0149ecba05c001e31d9bcbfe52be2f7071b5c5658437
+  metadata.gz: b7450485d74c088ecda1bb8cc2097ced45117934a9306c1a40c51057ea7692e5d184bf0f2b9fd53be1cfeb13f27c36e1f6293fa2dfadd801c5bc5047c131c3d2
+  data.tar.gz: ce217b7979c44852e093c650199a3a28f91ff6502d0a55b4f6ae367602e807eb4ddf3eaf346485280ce8400b60c035b5371ea5cf54bbdaafd0a40755345a9d10

data/app/controllers/coalescing_panda/lti_controller.rb

@@ -6,6 +6,13 @@ module CoalescingPanda
     def lti_config
       lti_options = CoalescingPanda.lti_options
       lti_nav = CoalescingPanda.lti_paths
+      lti_environments = CoalescingPanda.lti_environments
+
+      if lti_environments.empty?
+        render text: 'Domains must be set in lti_environments'
+        return
+      end
+
       lti_nav[:course][:text] = params[:course_navigation_label] if params[:course_navigation_label].present?
       lti_nav[:account][:text] = params[:account_navigation_label] if params[:account_navigation_label].present?
       platform = 'canvas.instructure.com'
@@ -24,6 +31,8 @@ module CoalescingPanda
         tc.set_ext_param(platform, setting_name(k.to_s), ext_params(v))
       end
 
+      tc.set_ext_param(platform, :environments, lti_environments)
+
       #strip the launch url
       xml = tc.to_xml
       xml = xml.sub(/<blti:launch_url>.*<\/blti:launch_url>/, '') if lti_options[:launch_route].blank?
@@ -60,4 +69,4 @@ module CoalescingPanda
     end
 
   end
-end
+end

data/lib/coalescing_panda/controller_helpers.rb

@@ -74,7 +74,7 @@ module CoalescingPanda
     end
 
     def have_session?
-      if params['oauth_consumer_key'] && session['user_id'] != params['user_id']
+      if params['tool_consumer_instance_guid'] && session['user_id'] != params['user_id']
         reset_session
         logger.info("resetting session params")
         session['user_id'] = params['user_id']

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/lib/coalescing_panda.rb

@@ -15,6 +15,7 @@ module CoalescingPanda
   @@lti_navigation = {}
   @@staged_navigation = {}
   @@lti_options = {}
+  @@lti_environments = {}
 
   def self.lti_options= lti_options
     @@lti_options = lti_options
@@ -24,6 +25,14 @@ module CoalescingPanda
     @@lti_options.deep_dup
   end
 
+  def self.lti_environments=(lti_environments)
+    @@lti_environments = lti_environments
+  end
+
+  def self.lti_environments
+    @@lti_environments.deep_dup
+  end
+
   def self.register_navigation(navigation)
     @@lti_navigation[navigation] ||= {}
   end

data/spec/controllers/coalescing_panda/lti_controller_spec.rb

@@ -4,6 +4,10 @@ describe CoalescingPanda::LtiController, type: :controller do
   routes { CoalescingPanda::Engine.routes }
 
   describe '#lti_config' do
+    before :each do
+      CoalescingPanda.class_variable_set(:@@lti_navigation, {})
+      CoalescingPanda.lti_environments = { test_domain: 'test' }
+    end
 
     it 'generates lti xml config'do
       controller.main_app.stub(:test_action_url) {'foo'}
@@ -31,8 +35,14 @@ describe CoalescingPanda::LtiController, type: :controller do
       account_nav.at_xpath('lticm:property[@name="url"]').text.should == 'foo'
     end
 
-  end
+    it 'includes environment information' do
+      get(:lti_config)
+      xml = Nokogiri::XML(response.body)
+      environments = xml.at_xpath('//lticm:options[@name="environments"]')
+      environments.at_xpath('lticm:property[@name="test_domain"]').text.should == 'test'
+    end
 
+  end
 
   it 'get the url, from the action string' do
     controller.main_app.stub(:test_action_url) {'foo'}
@@ -40,5 +50,4 @@ describe CoalescingPanda::LtiController, type: :controller do
     options[:url].should == 'foo'
   end
 
-
 end