lib/sched/client.rb in sched-0.1.6 vs lib/sched/client.rb in sched-0.1.7

@@ -1,60 +1,74 @@
 module Sched
   class Client
     attr_accessor :conference, :api_key
     def initialize(conference, api_key)
-      @conference, @api_key = conference, api_key
+      @conference = conference
+      @api_key = api_key
     end
 
     def event(session_key)
       event = Sched::Event.new(session_key, self)
-      if event.exists?
-        event = self.events.select{|e| e.session_key == session_key}.first
-      end
+      event = events.find { |e| e.session_key == session_key } if event.exists?
       event
     end
 
     def events
-      unless @events
-        results = FasterCSV.parse(request('session/list', nil, :get))
-
-        attributes = results.shift.map do |a|
-          a.strip.gsub(/[\u0080-\u00ff]/, "").gsub(/^event_/, "session_").to_sym
-        end
-
-        @events = results.map do |row|
-          row_hash = {}
-          attributes.each_with_index do |a, i|
-            row_hash[a] = row[i]
-          end
-          Sched::Event.new(row_hash[:session_key], self).configure(row_hash)
-        end
-      end
-      @events
+      @events ||= parse_sessions(CSV.parse(request("session/list", nil, :get)))
     end
 
     def api_url
       "http://#{@conference}.sched.org/api"
     end
 
-    def request(sub_url, data={}, method = :post)
+    def request(path, data = {}, method = :post)
       data ||= {}
-      data.merge!({:api_key => @api_key})
-      url = "#{api_url}/#{sub_url}"
-      output = nil
+      data[:api_key] = @api_key
       if method == :post
-        post_fields = data.map{|key, value| Curl::PostField.content(key.to_s, value)}
-        c = Curl::Easy.new(url)
-        c.headers["User-Agent"] = "sched-gem"
-        c.http_post(post_fields)
-        output = c.body_str
+        post_request(path, data)
       elsif method == :get
-        get_attributes = data.map{|key, value| "#{key}=#{value}" }.join("&")
-        c = Curl::Easy.new("#{url}?#{get_attributes}")
-        c.headers["User-Agent"] = "sched-gem"
-        c.perform
-        output = c.body_str
+        get_request(path, data)
       end
-      output
+    end
+
+    private
+
+    def curl_client(path)
+      c = Curl::Easy.new("#{api_url}/#{path}")
+      c.headers["User-Agent"] = "sched-gem"
+      c
+    end
+
+    def full_url(path)
+      "#{api_url}/#{path}"
+    end
+
+    def get_request(path, data)
+      get_attributes = data.map { |key, value| "#{key}=#{value}" }.join("&")
+      c = curl_client("#{path}?#{get_attributes}")
+      c.perform
+      c.body_str
+    end
+
+    def parse_sessions(results)
+      attributes = results.shift.map do |a|
+        a.strip.gsub(/[\u0080-\u00ff]/, "").gsub(/^event_/, "session_").to_sym
+      end
+      results.map do |row|
+        row_hash = {}
+        attributes.each_with_index do |a, i|
+          row_hash[a] = row[i]
+        end
+        Sched::Event.new(row_hash[:session_key], self).configure(row_hash)
+      end
+    end
+
+    def post_request(path, data)
+      post_fields = data.map do |key, value|
+        Curl::PostField.content(key.to_s, value)
+      end
+      c = curl_client(path)
+      c.http_post(post_fields)
+      c.body_str
     end
   end
 end