coalescing_panda 1.1.5 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +8 -8
  2. data/app/models/coalescing_panda/lti_account.rb +2 -1
  3. data/db/migrate/20140722210735_add_settings_to_coalescing_panda_lti_account.rb +5 -0
  4. data/lib/coalescing_panda/controller_helpers.rb +3 -2
  5. data/lib/coalescing_panda/version.rb +1 -1
  6. data/spec/dummy/log/development.log +0 -0
  7. metadata +5 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NTMzZDY0MDE4ZTRjOWFiMmFjNzY3YmJlZjRiNjhjYzEzMGE0NzVlNg==
4
+ NGIzOGVmYzdiZWY1ODNjYmEwM2UyNjg2NmUzZDgxOWU5NjkwOTk4ZA==
5
5
  data.tar.gz: !binary |-
6
- ODgyNzdmMzRlM2NlN2MyNjJmM2YyNzAwOTJiY2I0ODEyNTI2MzM4YQ==
6
+ N2M2YmFlM2Q1YzdmMWE0NGFhNmNkNDNkNTQ3MDVhNDcwNzdlYTAyOA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZDg2YWMwMDk3NmNlNzViM2FhNmQxMzlhM2M3N2Y5OWI0MTdhOGI2NzIzNmM3
10
- MWI3YjRjZWJlODg3Mjg2YjU5ZjU5Y2ViYmU0ZjRmMWY2MTVkOWU0NjNhOTlk
11
- ODMxMGM0OGZiY2ZmMjEwZmVjYTI2NWY0NzMwNjU2ZWZhNjk2ZTg=
9
+ OTJlODE2MTU4OGZkZGIxYjk1ZmU5NWNkZjU3ZTc5OGY2NWRhYzFhN2FhNTkz
10
+ MWVkMDQyOWI3NzIzMWNlOGUyMWFhMWQxMjU2NDZjNTI0NWNhNWIwMmEzMWY2
11
+ YTQzYmE0ZjZiZDZkZDUxNmE1MDZjMWVhYWQyNGJlNGQ0ODJiMDU=
12
12
  data.tar.gz: !binary |-
13
- MDdlYTkwMzIxNzA3NTZmZmY4ZjYzNjgzYWYwMjJmNzNkOWMzNmZkOGEwZWE4
14
- NmRmNTQyY2EzYzQyOGNhMTFmMDNmOGZlNTkwYjQzMWVkMzg1YmViYzIwYmVm
15
- ZmM4YTA3MTljZTU3NmIxZmE5ZTlhNzlmODBiNDA2OWY2MWI2MTc=
13
+ ZGI1NTU1MDM0NWQ1YzE2NzlmNGM2NjYwOTA4MDdiY2EzMzAxOWI1OTIxYjQ5
14
+ NmIyMWJiNzcxOTc3Mjc2Nzc5MjI0MDA0MmMwODliNjE3OTI1OGFlZGQxODNk
15
+ ZGQ5ZGRhY2JiYTEwYmExMGRjYTAwODIwMjA4MzZhNWZlNmM1ODg=
data/app/models/coalescing_panda/lti_account.rb CHANGED
@@ -6,7 +6,8 @@ module CoalescingPanda
6
6
  :foreign_key => :coalescing_panda_lti_account_id,
7
7
  :class_name => 'CoalescingPanda::LtiNonce'
8
8
 
9
- attr_accessible :name, :key, :secret, :oauth2_client_id, :oauth2_client_key
9
+ attr_accessible :name, :key, :secret, :oauth2_client_id, :oauth2_client_key, :settings
10
+ serialize :settings
10
11
 
11
12
  def validate_nonce(nonce, timestamp)
12
13
  cleanup_nonce
data/db/migrate/20140722210735_add_settings_to_coalescing_panda_lti_account.rb ADDED
@@ -0,0 +1,5 @@
1
+ class AddSettingsToCoalescingPandaLtiAccount < ActiveRecord::Migration
2
+ def change
3
+ add_column :coalescing_panda_lti_accounts, :settings, :text
4
+ end
5
+ end
data/lib/coalescing_panda/controller_helpers.rb CHANGED
@@ -5,13 +5,14 @@ module CoalescingPanda
5
5
  return if have_session?
6
6
  if lti_authorize!(*roles)
7
7
  user_id = params['user_id']
8
- uri = URI.parse(params['launch_presentation_return_url'])
8
+ launch_presentation_return_url = @lti_account.settings[:launch_presentation_return_url] || params['launch_presentation_return_url']
9
+ uri = URI.parse(launch_presentation_return_url)
9
10
  api_domain = uri.host
10
11
  api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
11
12
  scheme = uri.scheme + '://'
12
13
  @lti_params = params.to_hash
13
14
  session['user_id'] = user_id
14
- session['uri'] = params['launch_presentation_return_url']
15
+ session['uri'] = launch_presentation_return_url
15
16
  session['lis_person_sourcedid'] = params['lis_person_sourcedid']
16
17
  session['oauth_consumer_key'] = params['oauth_consumer_key']
17
18
 
data/lib/coalescing_panda/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CoalescingPanda
2
- VERSION = '1.1.5'
2
+ VERSION = '1.1.6'
3
3
  end
data/spec/dummy/log/development.log ADDED
File without changes
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: coalescing_panda
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 1.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Mills
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-17 00:00:00.000000000 Z
11
+ date: 2014-07-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -271,6 +271,7 @@ files:
271
271
  - db/migrate/20131114150001_create_coalescing_panda_canvas_api_auths.rb
272
272
  - db/migrate/20131118211442_create_coalescing_panda_lti_accounts.rb
273
273
  - db/migrate/20131119165343_create_coalescing_panda_lti_nonces.rb
274
+ - db/migrate/20140722210735_add_settings_to_coalescing_panda_lti_account.rb
274
275
  - lib/coalescing_panda.rb
275
276
  - lib/coalescing_panda/controller_helpers.rb
276
277
  - lib/coalescing_panda/engine.rb
@@ -308,6 +309,7 @@ files:
308
309
  - spec/dummy/config/locales/en.yml
309
310
  - spec/dummy/config/routes.rb
310
311
  - spec/dummy/db/schema.rb
312
+ - spec/dummy/log/development.log
311
313
  - spec/dummy/public/404.html
312
314
  - spec/dummy/public/422.html
313
315
  - spec/dummy/public/500.html
@@ -367,6 +369,7 @@ test_files:
367
369
  - spec/dummy/config/routes.rb
368
370
  - spec/dummy/config.ru
369
371
  - spec/dummy/db/schema.rb
372
+ - spec/dummy/log/development.log
370
373
  - spec/dummy/public/404.html
371
374
  - spec/dummy/public/422.html
372
375
  - spec/dummy/public/500.html