coalescing_panda 0.0.11 → 1.0.0

data/app/controllers/coalescing_panda/lti_controller.rb

@@ -11,7 +11,6 @@ module CoalescingPanda
       tc = IMS::LTI::ToolConfig.new(:title => lti_options[:title], :launch_url => (lti_options[:launch_url])|| 'ABC')
       tc.set_ext_param(platform, :domain, request.host)
       tc.set_ext_param(platform, :privacy_level, 'public')
-
       if(lti_options.has_key?(:custom_fields))
         tc.set_ext_param(platform, :custom_fields, lti_options[:custom_fields])
       
@@ -21,7 +20,7 @@ module CoalescingPanda
       end
 
       lti_nav.each do |k, v|
-        tc.set_ext_param(platform, "#{k.to_s}_navigation".to_sym, ext_params(v) )
+        tc.set_ext_param(platform, setting_name(k.to_s), ext_params(v) )
       end
 
       #strip the launch url
@@ -30,6 +29,14 @@ module CoalescingPanda
     end
 
     private
+
+    def setting_name(name)
+      tail = ''
+      if(name == 'course' || name == 'account')
+        tail = '_navigation' unless name.include? "_navigation"
+      end
+      (name+tail).to_sym
+    end
       
     def ext_params(options)
       url = options.delete(:url)

data/lib/coalescing_panda/controller_helpers.rb

@@ -1,26 +1,28 @@
 module CoalescingPanda
   module ControllerHelpers
 
-    def canvas_oauth2
-      user_id = params['user_id']
-      uri = URI.parse(params['launch_presentation_return_url'])
-      api_domain = uri.host
-      api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
-      scheme = uri.scheme + '://'
+    def canvas_oauth2(*roles)
+      if lti_authorize!(*roles)
+        user_id = params['user_id']
+        uri = URI.parse(params['launch_presentation_return_url'])
+        api_domain = uri.host
+        api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
+        scheme = uri.scheme + '://'
 
-      if token = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, api_domain).pluck(:api_token).first
-        @client = Bearcat::Client.new(token: token, prefix: scheme+api_domain)
-      elsif @lti_account = params['oauth_consumer_key'] && LtiAccount.find_by_key(params['oauth_consumer_key'])
-        client_id = @lti_account.oauth2_client_id
-        client = Bearcat::Client.new(prefix: scheme+api_domain)
-        @lti_params = params.to_hash
-        @canvas_url = client.auth_redirect_url(client_id,
-                                               coalescing_panda.oauth2_redirect_url({key: params['oauth_consumer_key'],
-                                               user_id: user_id, api_domain: api_domain}))
-        #delete the added params so the original oauth sig still works
-        @lti_params.delete('action')
-        @lti_params.delete('controller')
-        render 'coalescing_panda/oauth2/oauth2'
+        if token = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, api_domain).pluck(:api_token).first
+          @client = Bearcat::Client.new(token: token, prefix: scheme+api_domain)
+        elsif @lti_account = params['oauth_consumer_key'] && LtiAccount.find_by_key(params['oauth_consumer_key'])
+          client_id = @lti_account.oauth2_client_id
+          client = Bearcat::Client.new(prefix: scheme+api_domain)
+          @lti_params = params.to_hash
+          @canvas_url = client.auth_redirect_url(client_id,
+                                                 coalescing_panda.oauth2_redirect_url({key: params['oauth_consumer_key'],
+                                                                                       user_id: user_id, api_domain: api_domain}))
+          #delete the added params so the original oauth sig still works
+          @lti_params.delete('action')
+          @lti_params.delete('controller')
+          render 'coalescing_panda/oauth2/oauth2'
+        end
       end
     end
 
@@ -30,34 +32,43 @@ module CoalescingPanda
         @tp = IMS::LTI::ToolProvider.new(@lti_account.key, @lti_account.secret, params)
         authorized = @tp.valid_request?(request)
       end
-      authorized = authorized && (roles == 0 || (roles & lti_roles).count > 0)
-      authorized = authorized && @lti_account.validate_nonce(params['oauth_nonce'], DateTime.strptime(params['oauth_timestamp'],'%s'))
+      authorized = authorized && (roles.count == 0 || (roles & lti_roles).count > 0)
+      authorized = authorized && @lti_account.validate_nonce(params['oauth_nonce'], DateTime.strptime(params['oauth_timestamp'], '%s'))
       if !authorized
         render :text => 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized
       end
+      authorized
+    end
+
+    def lti_editor_button_response(return_type, return_params)
+      valid_return_types = [:image_url, :iframe, :url]
+      raise "invalid editor button return type #{return_type}" unless valid_return_types.include?(return_type)
+      return_params[:return_type] = return_type.to_s
+      return_url = "#{params['launch_presentation_return_url']}?#{return_params.to_query}"
+      redirect_to return_url
     end
 
     def lti_roles
-        @lti_roles ||= params['roles'].split(',').map { |role|
-          case role.downcase.strip
-            when 'admin'
-              :admin
-            when 'urn:lti:instrole:ims/lis/administrator'
-              :admin
-            when 'learner'
-              :student
-            when 'instructor'
-              :teacher
-            when 'urn:lti:role:ims/lis/teachingassistant'
-              :ta
-            when 'contentdeveloper'
-              :designer
-            when 'urn:lti:instrole:ims/lis/observer'
-              :observer
-            else
-              :none
-          end
-        }.uniq
+      @lti_roles ||= params['roles'].split(',').map { |role|
+        case role.downcase.strip
+          when 'admin'
+            :admin
+          when 'urn:lti:instrole:ims/lis/administrator'
+            :admin
+          when 'learner'
+            :student
+          when 'instructor'
+            :teacher
+          when 'urn:lti:role:ims/lis/teachingassistant'
+            :ta
+          when 'contentdeveloper'
+            :designer
+          when 'urn:lti:instrole:ims/lis/observer'
+            :observer
+          else
+            :none
+        end
+      }.uniq
     end
 
     def canvas_environment

data/lib/coalescing_panda/engine.rb

@@ -3,6 +3,14 @@ module CoalescingPanda
     config.autoload_once_paths += Dir["#{config.root}/lib/**/"]
     isolate_namespace CoalescingPanda
 
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match root.to_s
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    end
+
     initializer 'coalescing_panda.app_controller' do |app|
       OAUTH_10_SUPPORT = true
       ActiveSupport.on_load(:action_controller) do
@@ -14,11 +22,13 @@ module CoalescingPanda
       ActionDispatch::Routing::Mapper.send :include, CoalescingPanda::RouteHelpers
     end
 
-    initializer 'coalescing_panda.route_options' do |app|
-      ActiveSupport.on_load(:disable_dependency_loading) do
+    initializer 'coalescing_panda.route_options', :after => :disable_dependency_loading do |app|
+      ActiveSupport.on_load(:action_controller) do
+        #force the routes to load
+        Rails.application.reload_routes!
         CoalescingPanda::propagate_lti_navigation
       end
     end
-     
+
   end
 end

data/lib/coalescing_panda/route_helpers.rb

@@ -3,7 +3,7 @@ module CoalescingPanda
     def lti_nav(nav, *rest, &block)
       base_path = Rails.application.routes.named_routes[:coalescing_panda].path.spec
       raise LtiNavigationInUse.new('CoalescingPanda must be mounted before defining lti_nav routes') if base_path.blank?
-      valid_options = [:course, :user, :account, :editor, :external_tool]
+      valid_options = [:course, :user, :account, :editor_button, :external_tool]
       if rest.empty? && nav.is_a?(Hash)
         options = nav
         nav, to = options.find {|name, _value| valid_options.include? name}

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = "0.0.11"
+  VERSION = "1.0.0"
 end

data/lib/coalescing_panda.rb

@@ -9,7 +9,7 @@ module CoalescingPanda
 
   @@lti_navigation = {}
   @@staged_navigation = {}
-  @@lti_options
+  @@lti_options = {}
 
   def self.lti_options= lti_options
     @@lti_options = lti_options
@@ -20,7 +20,7 @@ module CoalescingPanda
   end
 
   def self.register_navigation(navigation)
-    @@lti_navigation[navigation] = {}
+    @@lti_navigation[navigation] ||= {}
   end
 
   def self.stage_navigation(navigation, options)

data/spec/controllers/coalescing_panda/lti_controller_spec.rb

@@ -16,11 +16,13 @@ describe CoalescingPanda::LtiController do
 
     it 'generates lti nav config' do
       controller.main_app.stub(:test_action_url) {'foo'}
-      CoalescingPanda.lti_navigation(:account, {
+      CoalescingPanda.stage_navigation(:account, {
         url: 'test_action',
         text: 'My Title',
         enabled: false
       })
+      CoalescingPanda.register_navigation(:account)
+      CoalescingPanda.propagate_lti_navigation
       get(:lti_config)
       xml = Nokogiri::XML(response.body)
       account_nav = xml.at_xpath('//lticm:options[@name="account_navigation"]')

data/spec/dummy/config/initializers/lti_initializer.rb

@@ -0,0 +1 @@
+CoalescingPanda.lti_options= {title:'LTI Tool'}

data/spec/dummy/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
 
-  lti_mount CoalescingPanda::Engine, at: "/lti", lti_options:{title:'LTI Tool'}
+  mount CoalescingPanda::Engine, at: "/lti", lti_options:{title:'LTI Tool'}
 
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131114150001) do
+ActiveRecord::Schema.define(version: 20131119165343) do
 
   create_table "coalescing_panda_canvas_api_auths", force: true do |t|
     t.string   "user_id"
@@ -21,4 +21,20 @@ ActiveRecord::Schema.define(version: 20131114150001) do
     t.datetime "updated_at"
   end
 
+  create_table "coalescing_panda_lti_accounts", force: true do |t|
+    t.string   "name"
+    t.string   "key"
+    t.string   "secret"
+    t.string   "oauth2_client_id"
+    t.string   "oauth2_client_key"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "coalescing_panda_lti_nonces", force: true do |t|
+    t.integer  "coalescing_panda_lti_account_id"
+    t.string   "nonce"
+    t.datetime "timestamp"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: ims-lti
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - nathanm@instructure.com
@@ -224,6 +240,7 @@ files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/lti_initializer.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
@@ -285,6 +302,7 @@ test_files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/lti_initializer.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb