desmos 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/desmos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{desmos}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ryan Moran}]
-  s.date = %q{2011-09-08}
+  s.date = %q{2011-09-13}
   s.description = %q{Desmos API Wrapper}
   s.email = %q{ryan.moran@gmail.com}
   s.extra_rdoc_files = [

data/lib/desmos/whiteboard.rb

@@ -35,14 +35,14 @@ module Desmos
       else
         self.hash = parsed_response.fetch(:hash)
       end
-      add_tutor
+      set_tutor
       add_students
       self
     end
 
-    def add_tutor
+    def set_tutor
       if tutor
-        parsed_response = request!(:whiteboard, :add_user, tutor.request_options.merge(:whiteboard_hash => hash))
+        parsed_response = request!(:whiteboard, :set_tutor, tutor.request_options.reject { |k,v| k == :user_type }.merge(:whiteboard_hash => hash))
       end
     end
 
@@ -55,7 +55,7 @@ module Desmos
     end
 
     def add_student(student)
-      parsed_response = request!(:whiteboard, :add_user, student.request_options.merge(:whiteboard_hash => hash))
+      parsed_response = request!(:whiteboard, :add_student, student.request_options.reject { |k,v| k == :user_type }.merge(:whiteboard_hash => hash))
     end
 
     def get

data/spec/desmos/whiteboard_spec.rb

@@ -55,7 +55,10 @@ describe Desmos::Whiteboard, '#save' do
       stub_request(:get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/create/).
         to_return(:status => 200, :body => "{\"success\": \"true\", \"hash\": \"abcde\"}")
     
-      stub_request(:get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/add_user/).
+      stub_request(:get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/set_tutor/).
+        to_return(:status => 200, :body => "{\"success\": \"true\", \"hash\": \"abcde\"}")
+      
+      stub_request(:get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/add_student/).
         to_return(:status => 200, :body => "{\"success\": \"true\", \"hash\": \"abcde\"}")
     end
 
@@ -67,7 +70,8 @@ describe Desmos::Whiteboard, '#save' do
       whiteboard.save
     
       assert_requested :get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/create/, :times => 1
-      assert_requested :get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/add_user/, :times => 2
+      assert_requested :get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/set_tutor/, :times => 1
+      assert_requested :get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/add_student/, :times => 1
     end
 
   end
@@ -78,9 +82,6 @@ describe Desmos::Whiteboard, '#save' do
       stub_request(:get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/create/).
         to_return(:status => 200, :body => "{\"success\": \"true\", \"hash\": \"abcde\"}").
         to_return(:status => 200, :body => "{\"success\":\"false\",\"error_code\":1,\"error_message\":\"whiteboard already exists\"}")
-    
-      stub_request(:get, /https\:\/\/api\.tutortrove\.com\/api_v1\/whiteboard\/add_user/).
-        to_return(:status => 200, :body => "{\"success\": \"true\", \"hash\": \"abcde\"}")
     end
 
     it 'calls out to the Desmos API to save the whiteboard, tutor, and students' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: desmos
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ryan Moran
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement