panda_pal 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1164ef591f74187ec2470b392262e36ff6b91ff3
-  data.tar.gz: 2f2c732c8b6df412444fa77a5fbd1ba51c611be3
+  metadata.gz: 3ab758dc4994760c0c91ba55bce063fc48ea21f1
+  data.tar.gz: f78acd01750b1da73ab02f6afda4bf519d86833b
 SHA512:
-  metadata.gz: c6236a460d0d220ce7f8218d7c3b3c7baaf2cfdfc0b788c137299957e1e1a6dcf2afedbd5bc14d45c5dafa024f344891c1076c695950c40a9c3a44e0df90b23f
-  data.tar.gz: c3958f07c9e2536f3cacb67cd49fd049e00421c37213611b03b7540ebb3cd65f699df065b7b25e926e09cb6bdf00c979bf495431f6b10c17a80d32f31afaa1be
+  metadata.gz: 20edbe332ee651b90b28b4fc3e31a9f419d8ab8fe4d524bd06c740cd317891904a78325e3b08da626ec14c067c7f9b15566457b87c145d427eed47a55106941b
+  data.tar.gz: 29ff89b6b555eeec77c8ec749d56e587b34dd2417a399a9188660f3c8aea10a9174bde3471d6808254611947e5640d18938c99e21c02ff04935a1e7efd0929a0

data/app/controllers/panda_pal/lti_controller.rb

@@ -38,7 +38,7 @@ module PandaPal
       #strip the launch url
       xml = tc.to_xml
       xml = xml.sub(/<blti:launch_url>.*<\/blti:launch_url>/, '') if lti_options[:launch_route].blank?
-      render :xml => xml
+      render xml: xml
     end
 
     def ext_params(options)

data/app/models/panda_pal/session.rb

@@ -1,6 +1,6 @@
 module PandaPal
   class Session < ActiveRecord::Base
-    belongs_to :panda_pal_organization
+    belongs_to :panda_pal_organization, class_name: 'PandaPal::Organization'
 
     validates :panda_pal_organization_id, presence: true
 

data/config/initializers/apartment.rb

@@ -1,7 +1,7 @@
 require 'apartment/elevators/generic'
 
 Apartment.configure do |config|
-  config.excluded_models = ['PandaPal::Organization', 'PandaPal::Session', 'Delayed::Job']
+  config.excluded_models = ['PandaPal::Organization', 'PandaPal::Session']
 
   config.tenant_names = lambda {
     PandaPal::Organization.pluck(:name)

data/db/migrate/20160412205931_create_panda_pal_organizations.rb

@@ -1,4 +1,4 @@
-class CreatePandaPalOrganizations < ActiveRecord::Migration
+class CreatePandaPalOrganizations < ActiveRecord::Migration[5.1]
   def change
     create_table :panda_pal_organizations do |t|
       t.string :name

data/db/migrate/20160413135653_create_panda_pal_sessions.rb

@@ -1,4 +1,4 @@
-class CreatePandaPalSessions < ActiveRecord::Migration
+class CreatePandaPalSessions < ActiveRecord::Migration[5.1]
   def change
     create_table :panda_pal_sessions do |t|
       t.string :session_key

data/db/migrate/20160425130344_add_panda_pal_organization_to_session.rb

@@ -1,4 +1,4 @@
-class AddPandaPalOrganizationToSession < ActiveRecord::Migration
+class AddPandaPalOrganizationToSession < ActiveRecord::Migration[5.1]
   def change
     add_column :panda_pal_sessions, :panda_pal_organization_id, :integer
     add_index :panda_pal_sessions, :panda_pal_organization_id

data/db/migrate/20170106165533_add_salesforce_id_to_organizations.rb

@@ -1,4 +1,4 @@
-class AddSalesforceIdToOrganizations < ActiveRecord::Migration
+class AddSalesforceIdToOrganizations < ActiveRecord::Migration[5.1]
   def change
     add_column :panda_pal_organizations, :salesforce_id, :string, unique: true
   end

data/lib/panda_pal/engine.rb

@@ -1,5 +1,4 @@
 require 'apartment'
-require 'delayed_job_active_record'
 require 'ims/lti'
 
 module PandaPal

data/lib/panda_pal/plugins.rb

@@ -1,3 +1,3 @@
 module PandaPal::Plugins
-  require_relative 'plugins/apartment_delayed_jobs_plugin'
+
 end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "1.0.5"
+  VERSION = "2.0.0"
 end

data/panda_pal.gemspec

@@ -6,8 +6,8 @@ require "panda_pal/version"
 Gem::Specification.new do |s|
   s.name        = "panda_pal"
   s.version     = PandaPal::VERSION
-  s.authors     = ["Ben Young"]
-  s.email       = ["byoung@instructure.com"]
+  s.authors     = ["Ben Young", "Cody Tanner"]
+  s.email       = ["byoung@instructure.com", "ctanner@instructure.com"]
   s.homepage    = "http://instructure.com"
   s.summary     = "LTI mountable engine"
   s.license     = "MIT"
@@ -15,13 +15,11 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc", "panda_pal.gemspec"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "rails", ">= 4.2.0"
-  s.add_dependency "pg", '~> 0.18.4'
+  s.add_dependency "rails", ">= 5.1.0"
+  s.add_dependency "pg", '~> 0.20'
   s.add_dependency 'apartment', '~> 1.2.0'
-  s.add_dependency 'delayed_job_active_record'
   s.add_dependency 'ims-lti', '~> 2.1.0'
 
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'factory_girl_rails'
   s.add_development_dependency 'test_after_commit'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Young
+- Cody Tanner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: apartment
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
-  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: ims-lti
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +112,7 @@ dependencies:
 description: 
 email:
 - byoung@instructure.com
+- ctanner@instructure.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -157,10 +131,8 @@ files:
 - app/views/layouts/panda_pal/application.html.erb
 - app/views/panda_pal/lti/launch.html.erb
 - config/initializers/apartment.rb
-- config/initializers/delayed_job.rb
 - config/routes.rb
 - db/migrate/20160412205931_create_panda_pal_organizations.rb
-- db/migrate/20160413132229_create_delayed_jobs.rb
 - db/migrate/20160413135653_create_panda_pal_sessions.rb
 - db/migrate/20160425130344_add_panda_pal_organization_to_session.rb
 - db/migrate/20170106165533_add_salesforce_id_to_organizations.rb
@@ -170,7 +142,6 @@ files:
 - lib/panda_pal/helpers/controller_helper.rb
 - lib/panda_pal/helpers/route_helper.rb
 - lib/panda_pal/plugins.rb
-- lib/panda_pal/plugins/apartment_delayed_jobs_plugin.rb
 - lib/panda_pal/version.rb
 - lib/tasks/panda_pal_tasks.rake
 - panda_pal.gemspec
@@ -238,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: LTI mountable engine
@@ -287,4 +258,3 @@ test_files:
 - spec/models/panda_pal/session_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/config/initializers/delayed_job.rb

@@ -1 +0,0 @@
-Delayed::Worker.plugins << PandaPal::Plugins::ApartmentDelayedJobsPlugin

data/db/migrate/20160413132229_create_delayed_jobs.rb

@@ -1,23 +0,0 @@
-class CreateDelayedJobs < ActiveRecord::Migration
-  def self.up
-    create_table :delayed_jobs, force: true do |table|
-      table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
-      table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
-      table.text :handler,                 null: false # YAML-encoded string of the object that will do work
-      table.text :last_error                           # reason for last failure (See Note below)
-      table.datetime :run_at                           # When to run. Could be Time.zone.now for immediately, or sometime in the future.
-      table.datetime :locked_at                        # Set when a client is working on this object
-      table.datetime :failed_at                        # Set when all retries have failed (actually, by default, the record is deleted instead)
-      table.string :locked_by                          # Who is working on this object (if locked)
-      table.string :queue                              # The name of the queue this job is in
-      table.string :tenant
-      table.timestamps null: true
-    end
-
-    add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
-  end
-
-  def self.down
-    drop_table :delayed_jobs
-  end
-end

data/lib/panda_pal/plugins/apartment_delayed_jobs_plugin.rb

@@ -1,43 +0,0 @@
-module PandaPal::Plugins
-  class ApartmentDelayedJobsPlugin < ::Delayed::Plugin
-    callbacks do |lifecycle|
-      lifecycle.around(:enqueue) do |job, *args, &block|
-        current_tenant = Apartment::Tenant.current
-
-        #make sure enqueue on public tenant unless we are testing since delayed job is set to run immediately
-        Apartment::Tenant.switch!('public') unless Rails.env.test?
-        job.tenant = current_tenant
-        begin
-          block.call(job, *args)
-        rescue Exception => e
-          Rails.logger.error("Error enqueing job #{job.to_s} - #{e.backtrace}")
-        ensure
-          #switch back to prev tenant
-          Apartment::Tenant.switch!(current_tenant)
-        end
-      end
-
-
-      lifecycle.before(:perform) do |worker, *args, &block|
-        tenant = args.first.tenant
-        Apartment::Tenant.switch!(tenant) if tenant.present?
-        Rails.logger.debug("Running job with tenant #{Apartment::Tenant.current}")
-      end
-
-      lifecycle.around(:invoke_job) do |job, *args, &block|
-        begin
-          block.call(job, *args)
-        ensure
-          Apartment::Tenant.switch!('public')
-          Rails.logger.debug("Resetting Tenant back to: #{Apartment::Tenant.current}")
-        end
-      end
-
-      lifecycle.after(:failure) do |job, *args|
-        Rails.logger.error("Job failed on tenant: #{Apartment::Tenant.current}")
-      end
-
-
-    end
-  end
-end