singly 0.1.0 → 0.1.1

data/lib/singly.rb

@@ -13,7 +13,7 @@ Dir["#{File.dirname(__FILE__)}/**/*.rb"].each {|f| require(f)}
 
 module Singly
   @version = "v0"
-  @timeout = 2000
+  @timeout = 2 # Typheous timeouts are in seconds, not like the docs say
 
   class << self
     attr_accessor :client_id
@@ -22,6 +22,10 @@ module Singly
     attr_accessor :version
     attr_accessor :timeout
 
+    def services
+      Singly::Services.new
+    end
+
     def account(access_token, account=nil)
       Singly::Account.new(access_token, account)
     end

data/lib/singly/account.rb

@@ -42,7 +42,9 @@ module Singly
     # Alternative to calling #profiles.<service>.delete.
     # Useful if you don't know the exact service at runtime.
     def delete(service, id=nil)
-      Singly::Profiles::Service.new(access_token: access_token, service: service.to_s).delete(id)
+      endpoint = Singly::Profiles::Service.new(access_token: access_token)
+      endpoint.service = service
+      endpoint.delete(id)
     end
 
     # Shortcut to Singly.auth.merge(source: <source>, dest: <dest>)
@@ -55,9 +57,7 @@ module Singly
     # where <account_id> is always this account's account_id.
     # If the account_id is not present, it is fetched from the api.
     def apply(service, params)
-      is_oauth1 = !params[:token_secret].nil?
-      service = Singly::Auth::Service.new(service, is_oauth1)
-      service.apply(params.merge(account: account_id))
+      Singly.auth.send(service).apply(params.merge(account: account_id))
     end
   end
 end

data/lib/singly/api/profiles.rb

@@ -15,7 +15,8 @@ module Singly
     # required parameters, it sends a GET.
     # Otherwise it sends a POST.
     def self(params=nil)
-      if params.nil? || (params.keys - required_params).empty?
+      params ||= {}
+      if (params.keys - self.class.required_params).empty?
         Singly::Profiles::Self.new(creds)
       else
         Singly::Profiles::SelfUpdate.new(creds.merge(params))
@@ -172,7 +173,9 @@ module Singly
 
     def service(service, params)
       params ||= {}
-      Singly::Profiles::Service.new(creds.merge(params.merge(service: service.to_s)))
+      endpoint = Singly::Profiles::Service.new(creds.merge(params.merge(service: service.to_s)))
+      endpoint.service = service.to_s
+      endpoint
     end
   end
 end

data/lib/singly/api/profiles/service.rb

@@ -6,13 +6,16 @@ module Singly
       endpoint :get, "/profiles/:service", required: [:access_token], optional: [:auth]
 
       def delete(id=nil)
-        service = route_params[:service]
         if id
-          Singly::Profiles::DeleteProfile.new(creds.merge({service: service, id: id.to_s}))
+          Singly::Profiles::DeleteProfile.new(creds.merge({service: @service, id: id.to_s}))
         else
-          Singly::Profiles::DeleteService.new(creds.merge({service: service}))
+          Singly::Profiles::DeleteService.new(creds.merge({service: @service}))
         end
       end
+
+      def service=(service)
+        @service = service
+      end
     end
   end
 end

data/lib/singly/api/services.rb

@@ -2,7 +2,7 @@ module Singly
   class Services
     include Singly::Endpoint
 
-    endpoint :get, "/services", required: [:access_token]
+    endpoint :get, "/services"
 
     def thirtysevensignals(params={})
       service(Singly::Services::ThirtySevenSignals, "37signals", params)
@@ -152,7 +152,9 @@ module Singly
 
     def service(endpoint_type, service, params)
       params ||= {}
-      endpoint_type.new(creds.merge(params.merge(service: service.to_s)))
+      endpoint = endpoint_type.new(creds.merge(params.merge(service: service.to_s)))
+      endpoint.service = service.to_s
+      endpoint
     end
   end
 end

data/lib/singly/api/services/37signals.rb

@@ -4,7 +4,6 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service "37signals"
 
       def self(params={})
         service_endpoint(__method__, params)

data/lib/singly/api/services/bodymedia.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :bodymedia
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/dropbox.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :dropbox
- 
+       
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/dwolla.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :dwolla
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/endpoint.rb

@@ -5,7 +5,7 @@ module Singly
 
       endpoint :get, "/services/:service/:endpoint", {
         required: [:access_token],
-        optional: [:id, :fields, :limit, :since, :until, :near, :within, :q, :participants, :map]
+        optional: [:fields, :limit, :since, :until, :near, :within, :q, :participants, :map]
       }
     end
   end

data/lib/singly/api/services/facebook.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :facebook
-
+      
       def albums(params={})
         service_endpoint(__method__, params)
       end  

data/lib/singly/api/services/fitbit.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :fitbit
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/flickr.rb

@@ -1,11 +1,8 @@
 module Singly
   class Services
     class Flickr
-      include Singly::Endpoint
       include Singly::Services::Service
-
-      service :flickr 
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/foursquare.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :foursquare
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/gcal.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :gcal
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/gcontacts.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :gcontacts
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/gdocs.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :gdocs
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/github.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :github
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/gmail.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :gmail
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/google.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :google
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/gplus.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :gplus
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/imgur.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :imgur
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/instagram.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :instagram
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/klout.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :klout
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/linkedin.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :linkedin
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/meetup.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :meetup
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/paypal.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :paypal
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/picasa.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :picasa
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/rdio.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :rdio
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/reddit.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :reddit
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/runkeeper.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :runkeeper
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end

data/lib/singly/api/services/service.rb

@@ -2,46 +2,24 @@ module Singly
   class Services
     module Service
 
-      private
+      def self.included(base)
+        base.class_eval do
+          include Singly::Endpoint
+          endpoint :get, "/services/:service", required: [:access_token]
+        end
+      end
 
       def service_endpoint(endpoint_name, params)
         params ||= {}
         endpoint_type = params.has_key?(:id) ? Singly::Services::IdEndpoint : Singly::Services::Endpoint
         endpoint_type.new(creds.merge(params.merge({
-          service: self.class.service_name,
+          service: @service,
           endpoint: endpoint_name.to_s
         })))
       end
 
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-      # service :facebook, [:albums, :photos]
-      module ClassMethods
-        def type
-          :get
-        end
-
-        def path
-          "/services/:service"
-        end
-
-        def required_params
-          [:access_token]
-        end
-
-        def optional_params
-          []
-        end
-
-        def service_name
-          @service || ":service"
-        end
-
-        def service(service)
-          @service = service
-        end
+      def service=(service)
+        @service = service
       end
     end
   end

data/lib/singly/api/services/shutterfly.rb

@@ -4,8 +4,7 @@ module Singly
       include Singly::Endpoint
       include Singly::Services::Service
 
-      service :shutterfly
-
+      
       def self(params={})
         service_endpoint(__method__, params)
       end