coalescing_panda 3.1.14 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75bb0823e059437a2bedb8ca7ab4466acf23c8ed
-  data.tar.gz: 968119a570275210936b6be62b9ad2edf4d057ac
+  metadata.gz: 9ef35686d23d7f299ecc2807b2435732888589cf
+  data.tar.gz: 51613fba18fa072c99adda16f4e9284808d793fc
 SHA512:
-  metadata.gz: d39869116feb62358aa9624cc11f8da32d527b42508dab31ccbc6b1718987aa55227dc17176835cead154af82c8af37a1097a9c0121acae7c72c88f355823878
-  data.tar.gz: 9542ef19da48cbb910e8d810ab5153bf3ee288ea57342229277fa545345bbc0e71e62922cad286fe7893d9a18b4f0438de2fdd4f6cd576c6a89ea882ba952c8c
+  metadata.gz: 64a522af26c2c7eda7c5b3f6127d5706acba6a73dbe6aa90a873f7740ba4ac6ed36d1ec061d529e1b31f58a04df96fcb6647839148cee2266b07e2675dd9fec3
+  data.tar.gz: 477682394ab7feefcf5b30f51b9c3d8cb5f2a8c2aac7612fa58979f46d071bd03a119c03836cdf35bdf40a0ad9b20553880bb2ab0ac1d4571a1648919deefaf9

data/app/models/coalescing_panda/canvas_batch.rb

@@ -1,5 +1,6 @@
 module CoalescingPanda
   class CanvasBatch < ActiveRecord::Base
+    belongs_to :context, polymorphic: true
     default_scope { order('created_at DESC') }
   end
 end

data/app/models/coalescing_panda/course.rb

@@ -9,6 +9,7 @@ module CoalescingPanda
     has_many :users, through: :sections, source: :users, class_name: 'CoalescingPanda::User'
     has_many :groups, :as => :context, class_name: 'CoalescingPanda::Group'
     has_many :group_memberships, through: :groups, source: :group_memberships, class_name: 'CoalescingPanda::GroupMembership'
+    has_many :canvas_batches, as: :context
 
     validates :coalescing_panda_lti_account_id, presence: true
     validates :canvas_course_id, presence: true

data/app/models/coalescing_panda/workers/course_miner.rb

@@ -7,7 +7,7 @@ class CoalescingPanda::Workers::CourseMiner
     @course = course
     @account = course.account
     @options = options
-    @batch = CoalescingPanda::CanvasBatch.create(status: "Queued")
+    @batch = CoalescingPanda::CanvasBatch.create(context: course, status: "Queued")
   end
 
   def api_client

data/db/migrate/20150210180516_add_context_to_canvas_batch.rb

@@ -0,0 +1,6 @@
+class AddContextToCanvasBatch < ActiveRecord::Migration
+  def change
+    add_column :coalescing_panda_canvas_batches, :context_id, :integer
+    add_column :coalescing_panda_canvas_batches, :context_type, :string
+  end
+end

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '3.1.14'
+  VERSION = '3.2.0'
 end

data/spec/dummy/db/schema.rb

@@ -11,13 +11,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150107205413) do
+ActiveRecord::Schema.define(version: 20150210180516) do
 
   create_table "coalescing_panda_assignments", force: true do |t|
-    t.integer  "coalescing_panda_course_id",        null: false
+    t.integer  "coalescing_panda_course_id"
     t.string   "name"
-    t.text     "description"
-    t.string   "canvas_assignment_id",              null: false
+    t.string   "description"
+    t.string   "canvas_assignment_id"
+    t.string   "sis_id"
     t.string   "workflow_state"
     t.float    "points_possible"
     t.datetime "due_at"
@@ -31,7 +32,9 @@ ActiveRecord::Schema.define(version: 20150107205413) do
     t.boolean  "published"
   end
 
-  add_index "coalescing_panda_assignments", ["coalescing_panda_course_id", "canvas_assignment_id"], name: "index_assignments_course", unique: true
+  add_index "coalescing_panda_assignments", ["canvas_assignment_id"], name: "index_coalescing_panda_assignments_on_canvas_assignment_id"
+  add_index "coalescing_panda_assignments", ["coalescing_panda_course_id"], name: "index_assignments_course"
+  add_index "coalescing_panda_assignments", ["sis_id"], name: "index_coalescing_panda_assignments_on_sis_id"
 
   create_table "coalescing_panda_canvas_api_auths", force: true do |t|
     t.string   "user_id"
@@ -47,13 +50,15 @@ ActiveRecord::Schema.define(version: 20150107205413) do
     t.text     "message"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "context_id"
+    t.string   "context_type"
   end
 
   create_table "coalescing_panda_courses", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
+    t.integer  "coalescing_panda_lti_account_id"
     t.integer  "coalescing_panda_term_id"
     t.string   "name"
-    t.string   "canvas_course_id",                null: false
+    t.string   "canvas_course_id"
     t.string   "sis_id"
     t.datetime "start_at"
     t.datetime "conclude_at"
@@ -63,24 +68,25 @@ ActiveRecord::Schema.define(version: 20150107205413) do
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_courses", ["coalescing_panda_lti_account_id", "canvas_course_id"], name: "index_courses_account", unique: true
-  add_index "coalescing_panda_courses", ["coalescing_panda_term_id", "canvas_course_id"], name: "index_courses_term", unique: true
+  add_index "coalescing_panda_courses", ["canvas_course_id"], name: "index_coalescing_panda_courses_on_canvas_course_id"
+  add_index "coalescing_panda_courses", ["coalescing_panda_lti_account_id"], name: "index_courses_account"
+  add_index "coalescing_panda_courses", ["coalescing_panda_term_id"], name: "index_courses_term"
   add_index "coalescing_panda_courses", ["sis_id"], name: "index_coalescing_panda_courses_on_sis_id"
 
   create_table "coalescing_panda_enrollments", force: true do |t|
-    t.integer  "coalescing_panda_user_id",    null: false
-    t.integer  "coalescing_panda_section_id", null: false
+    t.integer  "coalescing_panda_user_id"
+    t.integer  "coalescing_panda_section_id"
     t.string   "workflow_state"
     t.string   "sis_id"
-    t.string   "canvas_enrollment_id",        null: false
-    t.string   "enrollment_type"
+    t.string   "canvas_enrollment_id"
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_enrollments", ["coalescing_panda_user_id", "coalescing_panda_section_id", "enrollment_type"], name: "index_enrollments_user_and_section", unique: true
+  add_index "coalescing_panda_enrollments", ["canvas_enrollment_id"], name: "index_coalescing_panda_enrollments_on_canvas_enrollment_id"
+  add_index "coalescing_panda_enrollments", ["coalescing_panda_user_id", "coalescing_panda_section_id"], name: "index_enrollments_user_and_assignment"
   add_index "coalescing_panda_enrollments", ["sis_id"], name: "index_coalescing_panda_enrollments_on_sis_id"
 
   create_table "coalescing_panda_group_memberships", force: true do |t|
@@ -110,10 +116,10 @@ ActiveRecord::Schema.define(version: 20150107205413) do
     t.string   "secret"
     t.string   "oauth2_client_id"
     t.string   "oauth2_client_key"
-    t.string   "canvas_account_id"
-    t.text     "settings"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "settings"
+    t.string   "canvas_account_id"
   end
 
   create_table "coalescing_panda_lti_nonces", force: true do |t|
@@ -123,9 +129,9 @@ ActiveRecord::Schema.define(version: 20150107205413) do
   end
 
   create_table "coalescing_panda_sections", force: true do |t|
-    t.integer  "coalescing_panda_course_id", null: false
+    t.integer  "coalescing_panda_course_id"
     t.string   "name"
-    t.string   "canvas_section_id",          null: false
+    t.string   "canvas_section_id"
     t.string   "sis_id"
     t.string   "workflow_state"
     t.datetime "start_at"
@@ -134,7 +140,8 @@ ActiveRecord::Schema.define(version: 20150107205413) do
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_sections", ["coalescing_panda_course_id", "canvas_section_id"], name: "index_sections_course", unique: true
+  add_index "coalescing_panda_sections", ["canvas_section_id"], name: "index_coalescing_panda_sections_on_canvas_section_id"
+  add_index "coalescing_panda_sections", ["coalescing_panda_course_id"], name: "index_coalescing_panda_sections_on_coalescing_panda_course_id"
   add_index "coalescing_panda_sections", ["sis_id"], name: "index_coalescing_panda_sections_on_sis_id"
 
   create_table "coalescing_panda_sessions", force: true do |t|
@@ -145,27 +152,27 @@ ActiveRecord::Schema.define(version: 20150107205413) do
   end
 
   create_table "coalescing_panda_submissions", force: true do |t|
-    t.integer  "coalescing_panda_user_id",       null: false
-    t.integer  "coalescing_panda_assignment_id", null: false
+    t.integer  "coalescing_panda_user_id"
+    t.integer  "coalescing_panda_assignment_id"
     t.string   "url"
     t.string   "grade"
     t.string   "score"
     t.datetime "submitted_at"
     t.string   "workflow_state"
-    t.string   "canvas_submission_id",           null: false
+    t.string   "canvas_submission_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "coalescing_panda_submissions", ["canvas_submission_id"], name: "index_coalescing_panda_submissions_on_canvas_submission_id"
-  add_index "coalescing_panda_submissions", ["coalescing_panda_user_id", "coalescing_panda_assignment_id", "canvas_submission_id"], name: "index_submissions_user_and_assignment", unique: true
+  add_index "coalescing_panda_submissions", ["coalescing_panda_user_id", "coalescing_panda_assignment_id"], name: "index_submissions_user_and_assignment"
 
   create_table "coalescing_panda_terms", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
+    t.integer  "coalescing_panda_lti_account_id"
     t.string   "name"
     t.string   "code"
     t.string   "sis_id"
-    t.string   "canvas_term_id",                  null: false
+    t.string   "canvas_term_id"
     t.datetime "start_at"
     t.datetime "end_at"
     t.string   "workflow_state"
@@ -173,22 +180,23 @@ ActiveRecord::Schema.define(version: 20150107205413) do
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_terms", ["canvas_term_id", "coalescing_panda_lti_account_id"], name: "index_terms_account", unique: true
+  add_index "coalescing_panda_terms", ["canvas_term_id"], name: "index_coalescing_panda_terms_on_canvas_term_id"
   add_index "coalescing_panda_terms", ["sis_id"], name: "index_coalescing_panda_terms_on_sis_id"
 
   create_table "coalescing_panda_users", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
+    t.integer  "coalescing_panda_lti_account_id"
     t.string   "name"
     t.string   "email"
     t.string   "roles"
     t.string   "workflow_state"
     t.string   "sis_id"
-    t.string   "canvas_user_id",                  null: false
+    t.string   "canvas_user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_users", ["coalescing_panda_lti_account_id", "canvas_user_id"], name: "index_users_account", unique: true
+  add_index "coalescing_panda_users", ["canvas_user_id"], name: "index_coalescing_panda_users_on_canvas_user_id"
+  add_index "coalescing_panda_users", ["coalescing_panda_lti_account_id"], name: "index_users_account"
   add_index "coalescing_panda_users", ["sis_id"], name: "index_coalescing_panda_users_on_sis_id"
 
   create_table "delayed_jobs", force: true do |t|

data/spec/dummy/log/development.log

@@ -180,3 +180,11 @@ Migrating to CreateCoalescingPandaGroupMemberships (20150107205413)
   SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150107205413"]]
    (0.9ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddContextToCanvasBatch (20150210180516)
+   (0.1ms)  begin transaction
+   (0.6ms)  ALTER TABLE "coalescing_panda_canvas_batches" ADD "context_id" varchar(255)
+   (0.1ms)  ALTER TABLE "coalescing_panda_canvas_batches" ADD "context_type" varchar(255)
+  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150210180516"]]
+   (0.8ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 3.1.14
+  version: 3.2.0
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -364,6 +364,7 @@ files:
 - db/migrate/20150106180131_add_published_to_assignments.rb
 - db/migrate/20150107205405_create_coalescing_panda_groups.rb
 - db/migrate/20150107205413_create_coalescing_panda_group_memberships.rb
+- db/migrate/20150210180516_add_context_to_canvas_batch.rb
 - lib/coalescing_panda.rb
 - lib/coalescing_panda/controller_helpers.rb
 - lib/coalescing_panda/engine.rb