logan 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e39f8bb1bebade7a2d6d7b2ef6f8149e02cee606
-  data.tar.gz: d0c5e113b5db76d6b8cf8f9a03a64f27d562539a
+  metadata.gz: 9c18f6281d3d287226289bbd59f7f1bdf5a3d8e8
+  data.tar.gz: 0d1e7bab238f796dbe1225ec36c035dc9afd6279
 SHA512:
-  metadata.gz: 584042077954e3131935bc73b96a95a28dc0875bb29b635036780ba1bf2accbeb3cd7943bc62347dec472f0db8985f98d28de0b9fc27c38b68a6df36c48bf866
-  data.tar.gz: f71fc834f95e02da617cd974c78daf932a8d90f0a5f6c24ea6a5f6b17ead66cbf0ea922b047dbd6cb90ee10bfce9c237032de6e70228ba61896e85ba5918ea6c
+  metadata.gz: 6bd3ecf2deb865c21f9cfd9be97a13fc9ab62318ca31680dac5f0364cff4d163b2ee0778cd250fc937612c4fa970679c1ca09b461b5597ce723ebf253b18c4ba
+  data.tar.gz: 8feb5a487550687310efc5862d33e398580949faef8ea18d24322a825161c676b3db27298bdae795c0ff5d64a64a87f4c191e450e5db6263ab8567d89bf573be

data/lib/logan/client.rb

@@ -7,13 +7,38 @@ module Logan
     # Initializes the Logan shared client with information required to communicate with Basecamp
     #
     # @param basecamp_id [String] the Basecamp company ID
-    # @param username [String] the username to use for requests
-    # @param password [String] the password to use for the passed username
+    # @param auth_hash [Hash] authorization hash consisting of a username and password combination (:username, :password) or an access_token (:access_token)
     # @param user_agent [String] the user-agent string to include in header of requests
-    def initialize(basecamp_id, username, password, user_agent)
+    def initialize(basecamp_id, auth_hash, user_agent)
       self.class.base_uri "https://basecamp.com/#{basecamp_id}/api/v1"
-      self.class.basic_auth username, password
       self.class.headers 'User-Agent' => user_agent
+      self.auth = auth_hash
+    end
+    
+    # Updates authorization information for Logan shared client
+    # 
+    # @param auth_hash [Hash] authorization hash consisting of a username and password combination (:username, :password) or an access_token (:access_token)
+    def auth=(auth_hash)
+      # symbolize the keys
+      auth_hash = auth_hash.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      
+      if auth_hash.has_key? :access_token
+        # clear the basic_auth, if it's set
+        self.class.default_options.reject!{ |k| k == :basic_auth }
+                
+        # set the Authorization headers
+        self.class.headers.merge!("Authorization" => "Bearer #{auth_hash[:access_token]}")
+      elsif auth_hash.has_key?(:username) && auth_hash.has_key?(:password)
+        self.class.basic_auth auth_hash[:username], auth_hash[:password]
+        
+        # remove the access_token from the headers, if it exists
+        self.class.headers.reject!{ |k| k == "Authorization" }
+      else
+        raise """
+        Incomplete authorization information passed in authorization hash. 
+        You must have either an :access_token or a username password combination (:username, :password).
+        """
+      end
     end
     
     # get projects from Basecamp API
@@ -40,5 +65,10 @@ module Logan
         list
       end
     end
+    
+    def events(since_time, page = 1)
+      response = self.class.get "/events.json?since=#{since_time.to_s}&page=#{page}"
+      response.map { |h| e = Logan::Event.new(h) }
+    end
   end
 end

data/lib/logan/event.rb

@@ -0,0 +1,11 @@
+require 'logan/HashConstructed'
+
+module Logan
+  class Event
+    include HashConstructed
+    
+    attr_accessor :id
+    attr_accessor :summary
+    attr_accessor :url
+  end  
+end

data/lib/logan/todo.rb

@@ -22,8 +22,8 @@ module Logan
     def put_json
       { 
         :content => @content, 
-        :assignee => @assignee.to_hash,
         :due_at => @due_at,
+        :assignee => @assignee.to_hash,
         :completed => @completed
       }.to_json
     end

data/lib/logan.rb

@@ -2,4 +2,8 @@ require 'httparty'
 require 'json'
 
 require 'logan/client'
-require 'logan/project'
+require 'logan/event'
+require 'logan/person'
+require 'logan/project'
+require 'logan/todo'
+require 'logan/todolist'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stephen Birarda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: logan@birarda.com
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - lib/logan.rb
 - lib/logan/client.rb
+- lib/logan/event.rb
 - lib/logan/HashConstructed.rb
 - lib/logan/person.rb
 - lib/logan/project.rb