linkedin2 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bcc7473e7a7a37e92eb949a689bd760e1a29cf3
-  data.tar.gz: 088fdd4b565abba39546f1d892d75e70d6d2e317
+  metadata.gz: e81d1df72a3862c66ddcdbe4aeb921af88ca33cc
+  data.tar.gz: 410375f89b5f5891fe969abd489f7cd5a2b71b51
 SHA512:
-  metadata.gz: 92762c876e49c14e0142a2ba020979c7e0ac8f807de6a87136764f73a20e20d678937ffbfa11b560a17625a15161383c5f0332597a6531f86d9f6398e00dfd13
-  data.tar.gz: 32f65366fd11de5b6fffe9756dc059ccd47f9429f9f61378c67d065800aebf26f0ee59440a2183148feaf9047d561358e000d1f22aee86be1ba2db965eff5ff9
+  metadata.gz: 6900a7eb801c6cdd5488893c22526179a72a67e82347b5aa96e191b2bb0c9c01cde4cb6900e2744b26c0cd064df4e82e89df35731f651dae241462f946a0afe6
+  data.tar.gz: 9e111665cd4a373e3270dcb3961bdeee9aefcb1b73e8a3e4d6e953455c0b59282768fdad6c57c02c08da73d95b02ebda90e427c6a37193b5f0ba4648c38135e1

data/lib/linkedin/api/authentication.rb

@@ -3,15 +3,15 @@ module LinkedIn
     module Authentication
       attr_reader :state
 
-      def authorize_url(params={})
-        params.reverse_merge! defaults(:scope, :state, :redirect_uri)
+      def authorize_url(params = {})
+        params.reverse_merge! config.to_h.slice :scope, :state, :redirect_uri
         auth_code.authorize_url params
       end
 
-      def request_access_token(authorization_code, params={})
+      def request_access_token(authorization_code, params = {})
         raise Error::CSRF.new state, params[:state] if params[:state] && params[:state] != state
 
-        params.reverse_merge! defaults(:redirect_uri)
+        params.reverse_merge! redirect_uri: config.redirect_uri
         opts = { mode: :query, param_name: 'oauth2_access_token' }
 
         self.access_token = auth_code.get_token authorization_code, params, opts

data/lib/linkedin/api/permissions.rb

@@ -14,7 +14,6 @@ module LinkedIn
 
       RELATION = { 'relation-to-viewer' => [ 'num-related-connections', 'related-connections' => PROFILE_BASE ] }
 
-
       MEMBER_RESOURCES = { 'member-url-resources' => [ 'url', 'name' ] }
       FULL_BASE = [ 'last-modified-timestamp', 'proposal-comments', 'associations', 'interests', 'publications',
                     'patents', 'languages', 'skills', 'certifications', 'educations', 'courses', 'volunteer',
@@ -22,13 +21,19 @@ module LinkedIn
                     'mfeed-rss-url', 'following', 'job-bookmarks', 'suggestions', 'date-of-birth',
                     'member-url-resources', 'related-profile-views', 'honors-awards' ]
 
+
+      %i(company location positions profile_base relation member_resources full_base).each do |field|
+        private_constant field.upcase
+      end
+
       R_BASICPROFILE = PROFILE_BASE + [ RELATION ]
-      R_EMAIL = [ 'email-address' ]
+      R_EMAILADDRESS = [ 'email-address' ]
       R_FULLPROFILE = FULL_BASE + [ MEMBER_RESOURCES ]
       R_CONTACTINFO = [ 'phone-numbers', 'bound-account-types', 'im-accounts', 'main-address', 'twitter-accounts', 'primary-twitter-account']
       R_NETWORK = [ 'connections' ]
       RW_GROUPS = [ 'group-memberships' ]
       RW_NUS = [ 'network' ]
+      W_MESSAGES = []
 
       def self.render_permissions (*fields)
         fields = fields.first if fields.size == 1

data/lib/linkedin/api/profiles.rb

@@ -1,27 +1,47 @@
 module LinkedIn
   module API
     module Profiles
-      def profile(options={})
-        selector = options[:selector]
-        selector_string = '~' if selector.blank?
-        selector_string ||= selector.to_param
-
-        fields = options[:fields]
-        fields_string = fields.blank? ? '' : ":(#{Permissions.render_permissions fields})"
-
-        get "v1/people/#{selector_string}#{fields_string}"
+      def profile_api(selector)
+        profile selector, Permissions::PROFILE_REQ
       end
 
-      def connections(options={})
-        selector = options[:selector].to_param || '~'
-        selector_option = { selector: [ selector, 'connections' ].join('/') }
+      def profile(selector = '~', fields = nil, token = nil)
+        fields ||= profile_fields
+        query = "#{selector.to_param}:(#{Permissions.render_permissions fields})"
+        get "v1/people/#{query}" do |req|
+          req.headers.merge! 'x-li-auth-token' => token unless token.blank?
+        end
+      end
 
-        profile options.slice(:selector).merge(selector_option)
+      def connections(selector = '~')
+        profile [selector, 'connections'].join '/'
       end
 
-      def search(options={})
+      def search(options = {})
        get "v1/people-search?#{options.to_param}"
       end
+
+      def connect_with(selector, subject, message, type = :friend, auth_name = nil, auth_value = nil)
+        if auth_name.blank? || auth_value.blank?
+          profile = profile_api selector
+          token = profile.apiStandardProfileRequest_.headers_.values_.first.value
+          auth_name, auth_value = *token.split(':')
+        end
+
+        connection_request = { recipients: { values: [ { person: { _path: "/people/#{selector.to_param}" } } ] },
+                               subject: subject,
+                               body: message,
+                               'item-content' => {
+                                 'invitation-request' => {
+                                    'connect-type' => type,
+                                    authorization: { name: auth_name, value: auth_value } } } }
+
+        post 'v1/people/~/mailbox' do |req|
+          req.headers['Content-Type'] = 'application/json'
+          req.headers['x-li-format'] = 'json'
+          req.body = connection_request.to_json
+        end
+      end
     end
   end
 end

data/lib/linkedin/client.rb

@@ -3,7 +3,10 @@ module LinkedIn
     extend Forwardable
 
     include Configuration
-    include API
+    include LinkedIn::API::Authentication
+    include LinkedIn::API::Profiles
+    include LinkedIn::API::NetworkUpdates
+    include LinkedIn::API::Companies
 
     HTTP_METHODS = [:get, :post, :put, :patch, :delete, :headers].freeze
 
@@ -16,12 +19,17 @@ module LinkedIn
       self.access_token ||= self.config.access_token.to_s
     end
 
-    def connection 
-      @connection ||= OAuth2::Client.new(config.key, config.secret, oauth2_options) do |faraday|
+    def auth_code
+      connection.auth_code
+    end
+
+    def connection
+      @connection ||= OAuth2::Client.new config.key, config.secret, oauth2_options do |faraday|
         faraday.request :url_encoded
         faraday.request :json
-        faraday.request :linkedin_format, defaults(:request_format)
+        faraday.request :linkedin_format, config.request_format
 
+        faraday.response :mashify
         faraday.response :linkedin_errors
         faraday.response :logger, config.logger
         faraday.response :json, content_type: /\bjson$/
@@ -39,9 +47,11 @@ module LinkedIn
       @access_token = token
     end
 
-    def access_token_request(method, path, opts={}, &block)
-      response = access_token.send method, path, opts, &block
-      response.body
+    def profile_fields
+      scopes = config.scope unless config.scope.respond_to?(:values)
+      scopes ||= config.scope
+
+      scopes.reduce([]) { |fields, scope| fields + LinkedIn.send(scope) }
     end
 
     def method_missing(method, *args, &body)
@@ -51,10 +61,6 @@ module LinkedIn
 
     def self.default_config
       {
-        authorize_path: '/uas/oauth2/authorization',
-        access_token_path: '/uas/oauth2/accessToken',
-        api_host: 'https://api.linkedin.com',
-        auth_host: 'https://www.linkedin.com',
         request_format: :json,
 
         key: nil,
@@ -80,15 +86,9 @@ module LinkedIn
     end
 
     def oauth2_options
-      { site: config.api_host,
-        authorize_url: url_for(:authorize),
-        token_url: url_for(:access_token) }
-    end
-
-    def url_for(option_key)
-      host = config.auth_host
-      path = config.send("#{option_key}_path")
-      "#{host}#{path}"
+      { site:          'https://api.linkedin.com',
+        authorize_url: 'https://www.linkedin.com/uas/oauth2/authorization',
+        token_url:     'https://www.linkedin.com/uas/oauth2/accessToken' }
     end
   end
 end

data/lib/linkedin/configuration.rb

@@ -34,8 +34,8 @@ module LinkedIn
         configure config
       end
 
-      def defaults(*keys)
-        config.marshal_dump.slice *keys
+      def config(*keys)
+        config.marshal_dump.slice(*keys)
       end
     end
 

data/lib/linkedin/faraday_middleware/linkedin_format_request.rb

@@ -1,11 +1,10 @@
 module LinkedIn
   module FaradayMiddleware
     class LinkedinFormatRequest < Faraday::Middleware
-      def initialize(app=nil, options={})
+      def initialize(app = nil, format = :json)
         super app
 
-        @options = options
-        @request_format = options[:request_format]
+        @format = format
       end
 
       def call(env)
@@ -19,7 +18,7 @@ module LinkedIn
       end
 
       def set_request_format!(url)
-        ar = URI.decode_www_form(url.query || '') << ['format', @request_format]
+        ar = URI.decode_www_form(url.query || '') << ['format', @format]
         url.query = URI.encode_www_form(ar)
       end
     end

data/lib/linkedin/version.rb

@@ -1,3 +1,3 @@
 module LinkedIn
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/linkedin2.rb

@@ -17,43 +17,26 @@ require 'linkedin/profile'
 require 'linkedin/company'
 require 'linkedin/industry'
 require 'linkedin/faraday_middleware'
-require 'linkedin/api'
+
+require 'linkedin/api/authentication'
+require 'linkedin/api/profiles'
+require 'linkedin/api/network_updates'
+require 'linkedin/api/companies'
+require 'linkedin/api/groups'
+require 'linkedin/api/industries'
+require 'linkedin/api/jobs'
+require 'linkedin/api/permissions'
+
 require 'linkedin/client'
 
 module LinkedIn
-  def new(options={}, &block)
+  def self.new(options = {}, &block)
     Client.new options, &block
   end
 
-  def self.method_missing(method, *args, &block)
-    Client.send(method, *args, &block) if Client.respond_to?(method)
-  end
-
-  def self.r_basicprofile
-    @@r_basicprofile ||= API::Permissions::R_BASICPROFILE
-  end
-
-  def self.r_emailaddress
-    @@r_emailaddress ||= API::Permissions::R_EMAIL
-  end
-
-  def self.r_fullprofile
-    @@r_fullprofile ||= API::Permissions::R_FULLPROFILE
-  end
-
-  def self.r_contactinfo
-    @@r_contactinfo ||= API::Permissions::R_CONTACTINFO
-  end
-
-  def self.r_network
-    @@r_network ||= API::Permissions::R_NETWORK
-  end
-
-  def self.rw_groups
-    @@rw_groups ||= API::Permissions::RW_GROUPS
-  end
-
-  def self.rw_nus
-    @@rw_nus ||= API::Permissions::RW_NUS
+  %i(r_basicprofile r_emailaddress r_fullprofile r_contactinfo r_network rw_groups rw_nus w_messages).each do |field|
+    define_singleton_method field do
+        API::Permissions.const_get field.to_s.upcase
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkedin2
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Bob Breznak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -179,7 +179,6 @@ files:
 - README.md
 - Rakefile
 - example-linkedin.yml
-- lib/linkedin/api.rb
 - lib/linkedin/api/authentication.rb
 - lib/linkedin/api/companies.rb
 - lib/linkedin/api/groups.rb

data/lib/linkedin/api.rb

@@ -1,13 +0,0 @@
-require 'linkedin/api/authentication'
-require 'linkedin/api/profiles'
-require 'linkedin/api/network_updates'
-require 'linkedin/api/companies'
-require 'linkedin/api/groups'
-require 'linkedin/api/industries'
-require 'linkedin/api/jobs'
-require 'linkedin/api/permissions'
-
-include LinkedIn::API::Authentication
-include LinkedIn::API::Profiles
-include LinkedIn::API::NetworkUpdates
-include LinkedIn::API::Companies