coalescing_panda 4.0.4 → 4.0.5

data/spec/factories/assignment_groups.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :assignment_group, class: CoalescingPanda::AssignmentGroup do
+    name "test assignment group"
+    course
+    context_id '1'
+    context_type 'Course'
+    position '1'
+    group_weight 50.5
+    workflow_state 'active'
+    sequence :canvas_assignment_group_id do |n|
+      "#{n}"
+    end
+  end
+end

data/spec/models/coalescing_panda/assignment_group_spec.rb

@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+RSpec.describe CoalescingPanda::AssignmentGroup, :type => :model do
+  let(:assignment_group) { FactoryGirl.create(:assignment_group) }
+
+  context "associations" do
+    it 'should belong_to a course' do
+      expect(CoalescingPanda::AssignmentGroup.reflect_on_association(:course)).to_not be_nil
+      expect(CoalescingPanda::AssignmentGroup.reflect_on_association(:course).macro).to eql(:belongs_to)
+    end
+
+    it 'should have many assignments' do
+      expect(CoalescingPanda::AssignmentGroup.reflect_on_association(:assignments)).to_not be_nil
+      expect(CoalescingPanda::AssignmentGroup.reflect_on_association(:assignments).macro).to eql(:has_many)
+    end
+  end
+
+  context "validations" do
+    it "should require a canvas id" do
+      expect(FactoryGirl.build(:assignment_group, canvas_assignment_group_id: "")).to_not be_valid
+    end
+
+    it "should require a course" do
+      expect(FactoryGirl.build(:assignment_group, coalescing_panda_course_id: "")).to_not be_valid
+    end
+
+    it "should be valid with valid data" do
+      expect(FactoryGirl.build(:assignment_group)).to be_valid
+    end
+  end
+
+end

data/spec/models/coalescing_panda/assignment_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe CoalescingPanda::Assignment, :type => :model do
     it 'should belong_to a course' do
       expect(CoalescingPanda::Assignment.reflect_on_association(:course)).to_not be_nil
       expect(CoalescingPanda::Assignment.reflect_on_association(:course).macro).to eql(:belongs_to)
+      expect(CoalescingPanda::Assignment.reflect_on_association(:assignment_group).macro).to eql(:belongs_to)
     end
 
     it 'should have many submisssions' do

data/spec/models/coalescing_panda/course_spec.rb

@@ -43,6 +43,11 @@ RSpec.describe CoalescingPanda::Course, :type => :model do
       expect(CoalescingPanda::Course.reflect_on_association(:users)).to_not be_nil
       expect(CoalescingPanda::Course.reflect_on_association(:users).macro).to eql(:has_many)
     end
+
+    it 'should have many assignment groups' do
+      expect(CoalescingPanda::Course.reflect_on_association(:assignment_groups)).to_not be_nil
+      expect(CoalescingPanda::Course.reflect_on_association(:assignment_groups).macro).to eql(:has_many)
+    end
   end
 
   context "validations" do

data/spec/models/coalescing_panda/workers/course_miner_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
   let(:course) { FactoryGirl.create(:course) }
-  let(:worker) { CoalescingPanda::Workers::CourseMiner.new(course, [:sections, :users, :enrollments, :assignments, :submissions, :groups, :group_memberships]) }
+  let(:worker) { CoalescingPanda::Workers::CourseMiner.new(course, [:sections, :users, :enrollments, :assignments, :assignment_groups, :submissions, :groups, :group_memberships]) }
   let(:users_response) {[
     {"id"=>1, "name"=>"teacher@test.com", "sortable_name"=>"teacher@test.com", "short_name"=>"teacher@test.com", "login_id"=>"teacher@test.com"},
     {"id"=>2, "name"=>"student1@test.com", "sortable_name"=>"student1@test.com", "short_name"=>"student1@test.com", "login_id"=>"student1@test.com"},
@@ -17,7 +17,7 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     {"associated_user_id"=>nil, "course_id"=>1, "course_section_id"=>1, "created_at"=>"2014-11-07T21:18:17Z", "end_at"=>nil, "id"=>3, "limit_privileges_to_course_section"=>false, "root_account_id"=>1, "start_at"=>nil, "type"=>"StudentEnrollment", "updated_at"=>"2014-11-20T23:18:21Z", "user_id"=>3, "enrollment_state"=>"active", "role"=>"StudentEnrollment", "role_id"=>3, "last_activity_at"=>"2014-11-10T22:10:15Z", "total_activity_time"=>921, "sis_import_id"=>nil, "grades"=>{"html_url"=>"http://localhost:3000/courses/1/grades/3", "current_score"=>80, "final_score"=>80, "current_grade"=>nil, "final_grade"=>nil}, "sis_course_id"=>"DOCSTUCOMM", "course_integration_id"=>nil, "sis_section_id"=>nil, "section_integration_id"=>nil, "html_url"=>"http://localhost:3000/courses/1/users/3", "user"=>{"id"=>3, "name"=>"student2@test.com", "sortable_name"=>"student2@test.com", "short_name"=>"student2@test.com", "login_id"=>"student2@test.com"}},
   ]}
   let(:assignments_response) {[
-    {"assignment_group_id"=>1, "automatic_peer_reviews"=>false, "created_at"=>"2014-11-18T18:04:38Z", "description"=>"<p>What is your name?</p>", "due_at"=>nil, "grade_group_students_individually"=>false, "grading_standard_id"=>nil, "grading_type"=>"points", "group_category_id"=>nil, "id"=>1, "lock_at"=>nil, "peer_reviews"=>false, "points_possible"=>100, "position"=>1, "post_to_sis"=>true, "unlock_at"=>nil, "updated_at"=>"2014-11-18T18:04:42Z", "course_id"=>1, "name"=>"Gimme your name", "submission_types"=>["online_text_entry"], "has_submitted_submissions"=>false, "muted"=>false, "html_url"=>"http://localhost:3000/courses/1/assignments/1", "needs_grading_count"=>0, "integration_id"=>nil, "integration_data"=>{}, "published"=>true, "unpublishable"=>true, "locked_for_user"=>false},
+    {"assignment_group_id"=>1, "automatic_peer_reviews"=>false, "created_at"=>"2014-11-18T18:04:38Z", "description"=>"<p>What is your name?</p>", "due_at"=>nil, "grade_group_students_individually"=>false, "grading_standard_id"=>nil, "grading_type"=>"points", "group_category_id"=>1, "id"=>1, "lock_at"=>nil, "peer_reviews"=>false, "points_possible"=>100, "position"=>1, "post_to_sis"=>true, "unlock_at"=>nil, "updated_at"=>"2014-11-18T18:04:42Z", "course_id"=>1, "name"=>"Gimme your name", "submission_types"=>["online_text_entry"], "has_submitted_submissions"=>false, "muted"=>false, "html_url"=>"http://localhost:3000/courses/1/assignments/1", "needs_grading_count"=>0, "integration_id"=>nil, "integration_data"=>{}, "published"=>true, "unpublishable"=>true, "locked_for_user"=>false},
     {"assignment_group_id"=>1, "automatic_peer_reviews"=>false, "created_at"=>"2014-11-18T19:10:28Z", "description"=>"<p>What is your Favorite Color?</p>", "due_at"=>nil, "grade_group_students_individually"=>false, "grading_standard_id"=>nil, "grading_type"=>"points", "group_category_id"=>nil, "id"=>2, "lock_at"=>nil, "peer_reviews"=>false, "points_possible"=>100, "position"=>2, "post_to_sis"=>true, "unlock_at"=>nil, "updated_at"=>"2014-11-18T19:10:30Z", "course_id"=>1, "name"=>"Favorite Color", "submission_types"=>["online_text_entry"], "has_submitted_submissions"=>false, "muted"=>false, "html_url"=>"http://localhost:3000/courses/1/assignments/2", "needs_grading_count"=>0, "integration_id"=>nil, "integration_data"=>{}, "published"=>true, "unpublishable"=>true, "locked_for_user"=>false}
   ]}
   let(:submissions_response1) {[
@@ -28,13 +28,19 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     {"assignment_id"=>2, "attempt"=>nil, "body"=>nil, "grade"=>"90", "grade_matches_current_submission"=>true, "graded_at"=>"2014-11-20T23:18:21Z", "grader_id"=>1, "id"=>4, "score"=>90, "submission_type"=>nil, "submitted_at"=>nil, "url"=>nil, "user_id"=>3, "workflow_state"=>"graded", "late"=>false, "preview_url"=>"http://localhost:3000/courses/1/assignments/2/submissions/3?preview=1"},
     {"assignment_id"=>2, "attempt"=>nil, "body"=>nil, "grade"=>"80", "grade_matches_current_submission"=>true, "graded_at"=>"2014-11-20T23:18:17Z", "grader_id"=>1, "id"=>2, "score"=>80, "submission_type"=>nil, "submitted_at"=>nil, "url"=>nil, "user_id"=>2, "workflow_state"=>"graded", "late"=>false, "preview_url"=>"http://localhost:3000/courses/1/assignments/2/submissions/2?preview=1"}
   ]}
+  let(:group_categories_response){[
+    {"auto_leader" => "first", "group_limit" => nil, "id" => 1, "name" => "mark red", "role" => nil, "self_signup" => nil, "context_type" => "Course", "course_id" => 1, "protected" => false, "allows_multiple_memberships" => false, "is_member" => false}
+  ]}
   let(:groups_response){[
-    {"description"=> nil, "group_category_id"=> 3, "id"=> 4, "is_public"=> false, "join_level"=> "invitation_only", "max_membership"=> 5, "name"=> "Student Group 1", "members_count"=> 2, "storage_quota_mb"=> 50, "context_type"=> "CoalescingPanda::Course", "course_id"=> 1, "avatar_url"=> nil, "role"=> nil, "leader"=> nil},
-    {"description"=> nil, "group_category_id"=> 3, "id"=> 5, "is_public"=> false, "join_level"=> "invitation_only", "max_membership"=> 5, "name"=> "Student Group 2", "members_count"=> 2, "storage_quota_mb"=> 50, "context_type"=> "CoalescingPanda::Course", "course_id"=> 1, "avatar_url"=> nil, "role"=> nil, "leader"=> nil}
+    {"description"=> nil, "group_category_id"=> 1, "id"=> 4, "is_public"=> false, "join_level"=> "invitation_only", "max_membership"=> 5, "name"=> "Student Group 1", "members_count"=> 2, "storage_quota_mb"=> 50, "context_type"=> "CoalescingPanda::Course", "course_id"=> 1, "avatar_url"=> nil, "role"=> nil, "leader"=> {"id"=>2}},
+    {"description"=> nil, "group_category_id"=> nil, "id"=> 5, "is_public"=> false, "join_level"=> "invitation_only", "max_membership"=> 5, "name"=> "Student Group 2", "members_count"=> 2, "storage_quota_mb"=> 50, "context_type"=> "CoalescingPanda::Course", "course_id"=> 1, "avatar_url"=> nil, "role"=> nil, "leader"=> nil}
   ]}
   let(:membership_response){[
-    {"group_id"=> 4, "id"=> 13, "moderator"=> false, "user_id"=> 2, "workflow_state"=> "accepted"},
-    {"group_id"=> 4, "id"=> 14, "moderator"=> false, "user_id"=> 3, "workflow_state"=> "accepted"}
+    {"group_id"=> 4, "id"=> 13, "moderator"=> "true", "user_id"=> 2, "workflow_state"=> "accepted"},
+    {"group_id"=> 4, "id"=> 14, "moderator"=> "false", "user_id"=> 3, "workflow_state"=> "accepted"}
+  ]}
+  let(:assignment_groups_response) {[
+    {"group_weight" => 500, "id" => 3, "name" => "Assignments", "position" => 3, "rules" => {} }
   ]}
 
   before do
@@ -47,13 +53,14 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     Bearcat::Client.any_instance.stub(:get_course_submissions).with("1", "2") { double(Bearcat::ApiArray, :all_pages! => submissions_response2) }
     Bearcat::Client.any_instance.stub(:course_groups) { double(Bearcat::ApiArray, :all_pages! => groups_response) }
     Bearcat::Client.any_instance.stub(:list_group_memberships) { double(Bearcat::ApiArray, :all_pages! => membership_response) }
+    Bearcat::Client.any_instance.stub(:list_assignment_groups) { double(Bearcat::ApiArray, :all_pages! => assignment_groups_response) }
   end
 
   describe '#initialize' do
     it 'should set instance variables a user' do
       expect(worker.course).to eq course
       expect(worker.account).to eq course.account
-      expect(worker.options).to eq [:sections, :users, :enrollments, :assignments, :submissions, :groups, :group_memberships]
+      expect(worker.options).to eq [:sections, :users, :enrollments, :assignments, :assignment_groups, :submissions, :groups, :group_memberships]
       expect(worker.batch).to eq CoalescingPanda::CanvasBatch.last
     end
   end
@@ -93,10 +100,24 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
       expect(CoalescingPanda::Enrollment.last.workflow_state).to eq "active"
     end
 
+    it 'creates group categories' do
+      worker.sync_group_categories(group_categories_response)
+      expect(CoalescingPanda::GroupCategory.count).to eq 1
+    end
+
     it 'creates assignments' do
       CoalescingPanda::Assignment.destroy_all
+      worker.sync_group_categories(group_categories_response)
       worker.sync_assignments(assignments_response)
       expect(CoalescingPanda::Assignment.count).to eq 2
+      expect(CoalescingPanda::Assignment.find_by(canvas_assignment_id: 1).group_category).to_not be_nil
+    end
+
+    it 'creates assignment groups' do
+      CoalescingPanda::AssignmentGroup.destroy_all
+      expect(CoalescingPanda::AssignmentGroup.count).to eq 0
+      worker.sync_assignment_groups(assignment_groups_response)
+       expect(CoalescingPanda::AssignmentGroup.count).to eq 1
     end
 
     it 'creates submissions' do
@@ -112,8 +133,20 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
 
     it 'creates groups' do
       CoalescingPanda::Group.destroy_all
+      worker.sync_group_categories(group_categories_response)
       worker.sync_groups(groups_response)
       expect(CoalescingPanda::Group.count).to eq 2
+      expect(CoalescingPanda::Group.find_by(canvas_group_id: 4)).to_not be_nil
+    end
+
+    it 'creates groups with leaders' do
+      CoalescingPanda::Group.destroy_all
+      worker.sync_sections(sections_response)
+      worker.sync_users(users_response)
+      worker.sync_enrollments(enrollments_response)
+      worker.sync_groups(groups_response)
+      expect(CoalescingPanda::Group.count).to eq 2
+      expect(CoalescingPanda::Group.where(canvas_group_id: "4").first.leader).to_not be_nil
     end
 
     it 'creates group memberships' do
@@ -164,9 +197,23 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     end
 
     it 'returns group membership attributes' do
-      attributes = {"group_id"=> 4,"id"=> 13,"moderator"=> false,"user_id"=> 2,"workflow_state"=> "accepted"}
+      attributes = {"group_id"=> 4,"id"=> 13,"moderator"=> "false","user_id"=> 2,"workflow_state"=> "accepted"}
       record = CoalescingPanda::GroupMembership.new
-      expect(worker.standard_attributes(record, attributes)).to eq({"workflow_state" => "accepted"})
+      expect(worker.standard_attributes(record, attributes)).to eq({"moderator"=> "false", "workflow_state" => "accepted"})
+    end
+  end
+
+  describe "#setup_batch" do
+    it 'should return a new batch if none are in progress' do
+      batch = worker.setup_batch
+      expect(batch.status).to eq 'Queued'
+    end
+
+    it 'should return a started batch if one exists' do
+      batch = worker.setup_batch
+      batch.update_attributes(status: 'Started')
+      batch = worker.setup_batch
+      expect(batch.status).to eq 'Started'
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,16 +30,16 @@ dependencies:
   name: bearcat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.21
 - !ruby/object:Gem::Dependency
   name: macaddr
   requirement: !ruby/object:Gem::Requirement
@@ -330,17 +330,20 @@ files:
 - app/assets/stylesheets/coalescing_panda/application.css
 - app/assets/stylesheets/coalescing_panda/launch.css.scss
 - app/assets/stylesheets/coalescing_panda/oauth2.css
+- app/assets/stylesheets/coalescing_panda/progress.css.scss
 - app/controllers/coalescing_panda/application_controller.rb
 - app/controllers/coalescing_panda/canvas_batches_controller.rb
 - app/controllers/coalescing_panda/lti_controller.rb
 - app/controllers/coalescing_panda/oauth2_controller.rb
 - app/helpers/coalescing_panda/canvas_batches_helper.rb
 - app/models/coalescing_panda/assignment.rb
+- app/models/coalescing_panda/assignment_group.rb
 - app/models/coalescing_panda/canvas_api_auth.rb
 - app/models/coalescing_panda/canvas_batch.rb
 - app/models/coalescing_panda/course.rb
 - app/models/coalescing_panda/enrollment.rb
 - app/models/coalescing_panda/group.rb
+- app/models/coalescing_panda/group_category.rb
 - app/models/coalescing_panda/group_membership.rb
 - app/models/coalescing_panda/lti_account.rb
 - app/models/coalescing_panda/lti_nonce.rb
@@ -379,7 +382,15 @@ files:
 - 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
+- db/migrate/20150506183335_create_coalescing_panda_assignment_groups.rb
+- db/migrate/20150506192717_add_assignment_group_id_to_assignments.rb
+- db/migrate/20150526144713_add_account_to_canvas_batches.rb
+- db/migrate/20150602205257_add_option_to_canvas_batches.rb
+- db/migrate/20150708192717_add_group_moderator_to_group_memberships.rb
+- db/migrate/20150709192717_add_leader_id_to_groups.rb
+- db/migrate/20150714205405_create_coalescing_panda_group_categories.rb
 - lib/coalescing_panda.rb
+- lib/coalescing_panda/bearcat_uri.rb
 - lib/coalescing_panda/controller_helpers.rb
 - lib/coalescing_panda/engine.rb
 - lib/coalescing_panda/route_helpers.rb
@@ -416,14 +427,17 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/factories/accounts.rb
+- spec/factories/assignment_groups.rb
 - spec/factories/assignments.rb
 - spec/factories/canvas_batches.rb
 - spec/factories/courses.rb
@@ -432,6 +446,7 @@ files:
 - spec/factories/submissions.rb
 - spec/factories/terms.rb
 - spec/factories/users.rb
+- spec/models/coalescing_panda/assignment_group_spec.rb
 - spec/models/coalescing_panda/assignment_spec.rb
 - spec/models/coalescing_panda/canvas_api_auth_spec.rb
 - spec/models/coalescing_panda/canvas_batch_spec.rb
@@ -501,8 +516,10 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -511,6 +528,7 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/factories/accounts.rb
+- spec/factories/assignment_groups.rb
 - spec/factories/assignments.rb
 - spec/factories/canvas_batches.rb
 - spec/factories/courses.rb
@@ -519,6 +537,7 @@ test_files:
 - spec/factories/submissions.rb
 - spec/factories/terms.rb
 - spec/factories/users.rb
+- spec/models/coalescing_panda/assignment_group_spec.rb
 - spec/models/coalescing_panda/assignment_spec.rb
 - spec/models/coalescing_panda/canvas_api_auth_spec.rb
 - spec/models/coalescing_panda/canvas_batch_spec.rb