xing 0.0.4 → 0.0.5

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :test => :spec
+task :default => :spec

data/lib/xing/client.rb

@@ -1,19 +1,36 @@
 module Xing
 
   class Client
-    include Helpers::Authorization
     include Helpers::Request
     include Api::Reader
     include Api::Writer
 
     attr_reader :consumer_token, :consumer_secret, :consumer_options
 
-    def initialize(ctoken=Xing.token, csecret=Xing.secret, options={})
-      @consumer_token   = ctoken
-      @consumer_secret  = csecret
-      @consumer_options = options
+    def initialize(options={})
+      @consumer_token   = options[:consumer_token]
+      @consumer_secret  = options[:consumer_secret]
+      @auth_token       = options[:oauth_token]
+      @auth_secret      = options[:oauth_token_secret]
     end
 
+    def consumer
+      @consumer ||= ::OAuth::Consumer.new(@consumer_token, @consumer_secret, DEFAULT_OAUTH_OPTIONS)
+    end
+
+    def access_token
+      @access_token ||= ::OAuth::AccessToken.new(consumer, @auth_token, @auth_secret)
+    end
+
+    protected
+      DEFAULT_OAUTH_OPTIONS = {
+        :site => "https://api.xing.com",
+        :request_token_path => "/v1/request_token",
+        :authorize_path => "/v1/authorize",
+        :access_token_path => "/v1/access_token"
+      }
+
+
   end
 
 end

data/lib/xing/helpers.rb

@@ -1,6 +1,5 @@
 module Xing
   module Helpers
-    autoload :Authorization, "xing/helpers/authorization"
     autoload :Request,       "xing/helpers/request"
   end
 end

data/lib/xing/version.rb

@@ -1,3 +1,3 @@
 module Xing
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/cases/client_spec.rb

@@ -3,10 +3,9 @@ require 'spec_helper'
 describe Xing::Client do
   before do
     client.stub(:consumer).and_return(consumer)
-    client.authorize_from_access('atoken', 'asecret')
   end
 
-  let(:client){Xing::Client.new('token', 'secret')}
+  let(:client) {Xing::Client.new(:consumer_key => "consumer_key", :consumer_secret => "consumer_secret", :oauth_token => "oauth_token", :oauth_token_secret => "oauth_token_secret")}
   let(:consumer){OAuth::Consumer.new('token', 'secret', {:site => 'https://api.xing.com'})}
 
   describe "User's network feed" do

data/spec/cases/comment_spec.rb

@@ -4,12 +4,12 @@ describe Xing::Comment do
 
   before do
     client.stub(:consumer).and_return(consumer)
-    client.authorize_from_access('atoken', 'asecret')
   end
 
-  let(:client){Xing::Client.new('token', 'secret')}
+  let(:client) {Xing::Client.new(:consumer_key => "consumer_key", :consumer_secret => "consumer_secret", :oauth_token => "oauth_token", :oauth_token_secret => "oauth_token_secret")}
   let(:consumer){OAuth::Consumer.new('token', 'secret', {:site => 'https://api.xing.com'})}
 
+
   before :each do
     @fixture = MultiJson.load(fixture "post.json")
     @post = Xing::Post.new(@fixture)

data/spec/cases/post_spec.rb

@@ -4,12 +4,11 @@ describe Xing::Post do
 
   before do
     client.stub(:consumer).and_return(consumer)
-    client.authorize_from_access('atoken', 'asecret')
     @fixture = MultiJson.load(fixture "post.json")
     @post = Xing::Post.new(@fixture)
   end
 
-  let(:client){Xing::Client.new('token', 'secret')}
+  let(:client) {Xing::Client.new(:consumer_key => "consumer_key", :consumer_secret => "consumer_secret", :oauth_token => "oauth_token", :oauth_token_secret => "oauth_token_secret")}
   let(:consumer){OAuth::Consumer.new('token', 'secret', {:site => 'https://api.xing.com'})}
 
   #before :each do

data/spec/cases/user_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe Xing::User do
 
   before do
-    client.stub(:consumer).and_return(consumer)
-    client.authorize_from_access('atoken', 'asecret')
-  end
+     client.stub(:consumer).and_return(consumer)
+   end
+
+   let(:client) {Xing::Client.new(:consumer_key => "consumer_key", :consumer_secret => "consumer_secret", :oauth_token => "oauth_token", :oauth_token_secret => "oauth_token_secret")}
+   let(:consumer){OAuth::Consumer.new('token', 'secret', {:site => 'https://api.xing.com'})}
 
-  let(:client){Xing::Client.new('token', 'secret')}
-  let(:consumer){OAuth::Consumer.new('token', 'secret', {:site => 'https://api.xing.com'})}
 
   before :each do
     @fixture = MultiJson.load(fixture "post.json")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xing
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &21402020 !ruby/object:Gem::Requirement
+  requirement: &21137580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21402020
+  version_requirements: *21137580
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &21400440 !ruby/object:Gem::Requirement
+  requirement: &21136960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *21400440
+  version_requirements: *21136960
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &21399000 !ruby/object:Gem::Requirement
+  requirement: &21136260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *21399000
+  version_requirements: *21136260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21398140 !ruby/object:Gem::Requirement
+  requirement: &21135520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *21398140
+  version_requirements: *21135520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21396480 !ruby/object:Gem::Requirement
+  requirement: &21134960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *21396480
+  version_requirements: *21134960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21395260 !ruby/object:Gem::Requirement
+  requirement: &21134440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.8'
   type: :development
   prerelease: false
-  version_requirements: *21395260
+  version_requirements: *21134440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21394360 !ruby/object:Gem::Requirement
+  requirement: &21133400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *21394360
+  version_requirements: *21133400
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &21393880 !ruby/object:Gem::Requirement
+  requirement: &21131540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 1.8.7
   type: :development
   prerelease: false
-  version_requirements: *21393880
+  version_requirements: *21131540
 description: Ruby wrapper for Xing API
 email:
 - madzia.sikorska@gmail.com
@@ -122,7 +122,6 @@ files:
 - lib/xing/event.rb
 - lib/xing/group.rb
 - lib/xing/helpers.rb
-- lib/xing/helpers/authorization.rb
 - lib/xing/helpers/request.rb
 - lib/xing/mash.rb
 - lib/xing/post.rb

data/lib/xing/helpers/authorization.rb

@@ -1,28 +0,0 @@
-module Xing
-  module Helpers
-
-    module Authorization
-
-      DEFAULT_OAUTH_OPTIONS = {
-        :site => "https://api.xing.com",
-        :request_token_path => "/v1/request_token",
-        :authorize_path => "/v1/authorize",
-        :access_token_path => "/v1/access_token"
-      }
-
-      def consumer
-        @consumer ||= ::OAuth::Consumer.new(@consumer_token, @consumer_secret, DEFAULT_OAUTH_OPTIONS)
-      end
-
-      def access_token
-        @access_token ||= ::OAuth::AccessToken.new(consumer, @auth_token, @auth_secret)
-      end
-
-      def authorize_from_access(atoken, asecret)
-        @auth_token, @auth_secret = atoken, asecret
-      end
-
-    end
-
-  end
-end