collegiatelink 0.0.4 → 0.0.5

data/lib/collegiatelink/client.rb

@@ -17,6 +17,7 @@ module CollegiateLink
       }
       @opts = {
         sharedkey: sharedkey,
+        debug: true,
       }
       @@proxy = Net::HTTP
     end
@@ -40,8 +41,7 @@ module CollegiateLink
     # See CollegiateLink::Request#initialize for a list of optional parameters
     #
     def organizations(params = {})
-      orgs = request('organization/list', params)
-      orgs.map{ |o| CollegiateLink::Organization.parse(o.to_s) }
+      orgs = request('organization/list', CollegiateLink::Organization, params)
     end
 
     ##
@@ -65,30 +65,29 @@ module CollegiateLink
       params[:startdate] = params[:startdate].to_i * 1000
       params[:enddate]   = params[:enddate].to_i * 1000
 
-      events = request('event/list', params)
-      events.map{ |o| CollegiateLink::Event.parse(o.to_s) }
+      events = request('event/list', CollegiateLink::Event, params)
     end
 
     def roster(id, params = {})
       params.merge!(:id => id)
 
-      members = request('organization/roster', params)
-      members.map{ |m| CollegiateLink::Member.parse(m.to_s) }
+      members = request('organization/roster', CollegiateLink::Member, params)
     end
 
     private
 
-    def request(action, params = {})
+    def request(action, model, params = {})
       cl_request = CollegiateLink::Request.new(action, params.merge(@params), @opts)
       cl_resp = cl_request.perform
 
-      all_items = cl_resp.items
+      all_items = cl_resp.items.map { |i| model.parse(i.to_s) }
 
       while cl_resp.has_next_page?
-        cl_resp = cl_request.request_for_next_page.perform
-        all_items += cl_resp.items
+        cl_request = cl_request.request_for_next_page
+        cl_resp = cl_request.perform
+        all_items += cl_resp.items.map { |i| model.parse(i.to_s) }
       end
-
+      
       all_items
     end
   end

data/lib/collegiatelink/organization.rb

@@ -112,6 +112,8 @@ module CollegiateLink
     element :startdate, Integer
     element :userstartdate, Integer
     element :userenddate, Integer
+    element :positionTemplate, String
+    element :positionType, String
 
     def current?
       use_startdate = (userstartdate > 0) ? userstartdate : startdate
@@ -148,5 +150,9 @@ module CollegiateLink
     def active_positions
       positions.keep_if { |p| p.current? }
     end
+
+    def ==(other)
+      self.id == other.id
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collegiatelink
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guid