edmodo-api 0.1.0 → 0.1.1

data/lib/edmodo-api/client.rb

@@ -190,9 +190,13 @@ module Edmodo
       #
       # => user_token: The user token for the user sending the post.
       # => content: The text of the message.
-      # => recipients: Array of objects specifying the recipients of the post. These can be either users (specified by a user_token) or groups (specified by a group_id).
+      # => user_recipients: array of user_tokens that will receive the event.
+      # => group_recipients: array of group_ids that will receive the event.
       # => attachments (Optional): array of objects specifying links/embed codes to include in the post message.
-      def user_post user_token, content, recipients, attachments = nil
+      def user_post user_token, content, user_recipients, group_recipients, attachments = nil
+
+        recipients = generate_user_groups_array user_recipients, group_recipients
+
         request(:post, resource_uri("userPost"), {:user_token => user_token, :content => content, :recipients => recipients, :attachments => attachments}.delete_if{ |k,v| v.nil? })
       end
 
@@ -271,11 +275,17 @@ module Edmodo
       #
       # => user_token: The user_token of the user to set the event on behalf for.
       # => description: The description of the event.
-      # => start_date: The start date of the event (specified in the format YYYY-MM-DD).
-      # => end_date: The end date of the event (specified in the format YYYY-MM-DD). If this is a single day event, the end date should simply be the same as the start date.
-      # => recipients: array of objects specifying the recipients of the post. These can be either users (specified by a user_token) or groups (specified by a group_id).
-      def new_event user_token, description, start_date, end_date, recipients
-        request(:post, resource_uri("newEvent"), {:user_token => user_token, :description => description, :start_date => start_date, :end_date => end_date, :recipients => recipients})
+      # => start_date: The start date of the event.
+      # => end_date: The end date of the event. If this is a single day event, the end date should simply be the same as the start date.
+      # => user_recipients: array of user_tokens that will receive the event.
+      # => groups_recipients: array of group_ids that will receive the event.
+      def new_event user_token, description, start_date, end_date, user_recipients, group_recipients
+
+        raise EdmodoApiError.new("Invalid object type for start or end date") unless start_date.is_a?(Date) && end_date.is_a?(Date)
+
+        recipients = generate_user_groups_array user_recipients, group_recipients
+
+        request(:post, resource_uri("newEvent"), {:user_token => user_token, :description => description, :start_date => start_date.to_s, :end_date => end_date.to_s, :recipients => recipients})
       end
 
       # Adds a resource (url or embed code) to a user's Library
@@ -308,6 +318,23 @@ module Edmodo
         }
       end
 
+      # Generates an array of hashes from an array of user ids and group ids
+      # Params:
+      #
+      # => user: array of user_tokens.
+      # => groups: array of group_ids.
+      def generate_user_groups_array users, groups
+        users = Array(users)
+
+        user_array = users.map{|token| {:user_token => token}} 
+
+        groups = Array(groups)
+
+        group_array = groups.map{|id| {:group_id => id}}
+
+        (user_array | group_array).flatten
+      end
+
       # Checks for all required variables to be set when an instance is created and throws errors if they haven't
       def raise_init_errors
         raise EdmodoApiError.new("Edmodo API Error: Api key was not set") if @api_key.empty?

data/lib/edmodo-api/version.rb

@@ -2,6 +2,6 @@
 
 module Edmodo
 	module API
-		VERSION = "0.1.0"
+		VERSION = "0.1.1"
 	end
 end

data/spec/edmodo-api_spec.rb

@@ -203,8 +203,11 @@ describe Edmodo::API::Client do
     end
 
     it 'should get the correct response back from the userPost request' do
-      
-      response = @client.user_post("b020c42d1", "This is my test message", [{:user_token => "b020c42d1"}, {:user_token => "693d5c765"}, {:group_id => 379557}], [{:type => "link", :title => "A link", :url => "http://www.edmodo.com"}, {:type => "embed", :title => "An embed with an optional thumbnail url", :thumb_url => "http://images.edmodo.com/images/logos/edmodo_134x43.png"}])
+      users = ["b020c42d1", "693d5c765"]
+
+      groups = 379557
+
+      response = @client.user_post("b020c42d1", "This is my test message", users, groups, [{:type => "link", :title => "A link", :url => "http://www.edmodo.com"}, {:type => "embed", :title => "An embed with an optional thumbnail url", :thumb_url => "http://images.edmodo.com/images/logos/edmodo_134x43.png"}])
 
       response.should == {"status" => "success"}
     end
@@ -254,9 +257,11 @@ describe Edmodo::API::Client do
 
     it 'should get the correct hash response from the newEvent request' do
 
-      recipients = [{:user_token => "b020c42d1"},{:group_id => 379557}]
+      users = "b020c42d1"
+
+      groups = 379557
 
-      response = @client.new_event("b020c42d1", "Pizza party tomorrow", "2011-12-07", "2011-12-07", recipients)
+      response = @client.new_event("b020c42d1", "Pizza party tomorrow", Date.today, Date.today, users, groups)
       
       response.should == {"event_id" => 621119}
     end

data/spec/requests/post_requests.rb

@@ -41,7 +41,7 @@ uri = "#{Edmodo::API::Config.endpoints[:sandbox]}/setGrade?api_key=#{@api_key}&g
 FakeWeb.register_uri(:post, uri, :body => '{"user_token":"83a8e614d", "score":"3", "total":"10"}')
 
 # newEvent request uri
-uri = "#{Edmodo::API::Config.endpoints[:sandbox]}/newEvent?api_key=#{@api_key}&user_token=b020c42d1&description=Pizza%20party%20tomorrow&start_date=2011-12-07&end_date=2011-12-07&recipients=%5B%7B%22user_token%22%3A%22b020c42d1%22%7D%2C%7B%22group_id%22%3A379557%7D%5D"
+uri = "#{Edmodo::API::Config.endpoints[:sandbox]}/newEvent?api_key=#{@api_key}&user_token=b020c42d1&description=Pizza%20party%20tomorrow&start_date=#{Date.today.to_s}&end_date=#{Date.today.to_s}&recipients=%5B%7B%22user_token%22%3A%22b020c42d1%22%7D%2C%7B%22group_id%22%3A379557%7D%5D"
 
 FakeWeb.register_uri(:post, uri, :body => '{"event_id":621119}')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edmodo-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: