OpenAuth2 0.0.3 → 0.0.4

data/Readme.markdown

@@ -19,16 +19,16 @@ client_id     = 'enter in your own value'
 client_secret = 'enter in your own value'
 redirect_uri  = 'enter in your own value'
 
-config = OpenAuth2::Config.new do
+config = OpenAuth2::Config.new do |c|
   # indicate what kind of provider you want to use
   # Accepts: :google, :facebook or :default
 
-  provider       = :facebook
+  c.provider       = :facebook
 
-  client_id      = client_id
-  client_secret  = client_secret
-  redirect_uri   = redirect_uri
-  scope          = ['publish_stream']
+  c.client_id      = client_id
+  c.client_secret  = client_secret
+  c.redirect_uri   = redirect_uri
+  c.scope          = ['publish_stream']
 end
 ```
 
@@ -37,16 +37,16 @@ end
 Next, initialize a `client` object, which we'll use to make requests and pass in the `config` object we created earlier.
 
 ```ruby
-client = OpenAuth2::Client.new do
-  config = config
+client = OpenAuth2::Client.new do |c|
+  c.config = config
 end
 ```
 
 `Client#configure_connection` takes a block, which can be used to setup middleware like any other Faraday client, i.e:
 
 ```ruby
-client.configure_connection do
-  response :logger
+client.configure_connection do |c|
+  c.response :logger
 end
 ```
 
@@ -198,17 +198,17 @@ require 'json'
 access_token  = 'enter in your own value'
 refresh_token = 'enter in your own value'
 
-config = OpenAuth2::Config.new do
-  provider       = :google
-  access_token   = access_token
-  refresh_token  = refresh_token
-  scope          = ['https://www.googleapis.com/auth/calendar']
-  redirect_uri   = 'http://localhost:9393/google/callback'
-  path_prefix    = '/calendar/v3'
+config = OpenAuth2::Config.new do |c|
+  c.provider       = :google
+  c.access_token   = access_token
+  c.refresh_token  = refresh_token
+  c.scope          = ['https://www.googleapis.com/auth/calendar']
+  c.redirect_uri   = 'http://localhost:9393/google/callback'
+  c.path_prefix    = '/calendar/v3'
 end
 
-client = OpenAuth2::Client.new do
-  config = config
+client = OpenAuth2::Client.new do |c|
+  c.config = config
 end
 
 # get request

data/examples/fb.rb

@@ -1,7 +1,7 @@
 require_relative '../lib/open_auth2'
 
-@config = OpenAuth2::Config.new do
-  provider = :facebook
+@config = OpenAuth2::Config.new do |c|
+  c.provider = :facebook
 end
 
 @client = OpenAuth2::Client.new(@config)

data/examples/google.rb

@@ -8,18 +8,18 @@ AccessToken  = nil
 RefreshToken = nil
 PostEmail    = nil
 
-@config = OpenAuth2::Config.new do
-  provider       = :google
-  code           = Code
-  client_id      = ClientId
-  client_secret  = ClientSecret
-  scope          = ['https://www.googleapis.com/auth/calendar']
-  redirect_uri   = 'http://localhost:9393/google/callback'
-  path_prefix    = '/calendar/v3'
+@config = OpenAuth2::Config.new do |c|
+  c.provider       = :google
+  c.code           = Code
+  c.client_id      = ClientId
+  c.client_secret  = ClientSecret
+  c.scope          = ['https://www.googleapis.com/auth/calendar']
+  c.redirect_uri   = 'http://localhost:9393/google/callback'
+  c.path_prefix    = '/calendar/v3'
 end
 
-@client = OpenAuth2::Client.new do
-  config = @config
+@client = OpenAuth2::Client.new do |c|
+  c.config = @config
 end
 
 @token = @client.token

data/lib/open_auth2/client.rb

@@ -16,16 +16,16 @@ module OpenAuth2
     #   end
     #
     #   # set via block
-    #   OpenAuth2::Client.new do
-    #     config = config
+    #   OpenAuth2::Client.new do |c|
+    #     c.config = config
     #   end
     #
     #   # or pass it as an argument
     #   OpenAuth2::Client.new(config)
     #
-    def initialize(config=nil, &blk)
+    def initialize(config=nil)
       @config = config
-      instance_eval(&blk) if block_given?
+      yield self if block_given?
       @faraday_url = endpoint
     end
 
@@ -34,15 +34,15 @@ module OpenAuth2
     # Examples:
     #   client = OpenAuth2::Client.new
     #
-    #   client.configure do
-    #     access_token  = :access_token
-    #     refresh_token = :refresh_token
+    #   client.configure do |c|
+    #     c.access_token  = :access_token
+    #     c.refresh_token = :refresh_token
     #   end
     #
     # Returns: self.
     #
-    def configure(&blk)
-      instance_eval(&blk) if block_given?
+    def configure
+      yield self if block_given?
     end
 
     # We use this to get & refresh access/refresh tokens.

data/lib/open_auth2/config.rb

@@ -8,13 +8,13 @@ module OpenAuth2
     # Use to set config info.
     #
     # Examples:
-    #   OpenAuth2::Config.new do
-    #     provider = :default
+    #   OpenAuth2::Config.new do |c|
+    #     c.provider = :default
     #   end
     #
-    def initialize(&blk)
+    def initialize
       set_default_as_provider
-      instance_eval(&blk) if block_given?
+      yield self if block_given?
     end
 
     # Use to set config info.
@@ -22,14 +22,14 @@ module OpenAuth2
     # Examples:
     #   config = OpenAuth2::Config.new
     #
-    #   config.configure do
-    #     provider = :google
+    #   config.configure do |c|
+    #     c.provider = :google
     #   end
     #
     # Returns: self.
     #
-    def configure(&blk)
-      instance_eval(&blk) if block_given?
+    def configure
+      yield self if block_given?
     end
 
     # Finds provider's module & copies its Options key/value pairs.

data/lib/open_auth2/version.rb

@@ -1,3 +1,3 @@
 module OpenAuth2
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/client_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 
 describe OpenAuth2::Client do
   let(:config) do
-    OpenAuth2::Config.new do
-      self.provider     = :facebook
-      self.access_token = :access_token
+    OpenAuth2::Config.new do |c|
+      c.provider     = :facebook
+      c.access_token = :access_token
     end
   end
 
@@ -19,9 +19,8 @@ describe OpenAuth2::Client do
     end
 
     it 'accepts config via block' do
-      rspec = self
-      subject = described_class.new do
-        self.config = rspec.config
+      subject = described_class.new do |c|
+        c.config = config
       end
 
       subject.config.should == config
@@ -34,9 +33,9 @@ describe OpenAuth2::Client do
 
   context '#configure' do
     it 'accepts a block to set/overwrite config' do
-      subject.configure do
-        self.access_token  = :access_token
-        self.refresh_token = :refresh_token
+      subject.configure do |c|
+        c.access_token  = :access_token
+        c.refresh_token = :refresh_token
       end
 
       subject.access_token.should  == :access_token

data/spec/config_spec.rb

@@ -11,8 +11,8 @@ describe OpenAuth2::Config do
 
   context '#initialize' do
     subject do
-      described_class.new do
-        self.client_id = :set_in_new
+      described_class.new do |c|
+        c.client_id = :set_in_new
       end
     end
 
@@ -27,8 +27,8 @@ describe OpenAuth2::Config do
 
   context '#configure' do
     it 'accepts a block to set/overwrite config' do
-      subject.configure do
-        self.client_id = :set_in_configure
+      subject.configure do |c|
+        c.client_id = :set_in_configure
       end
 
       subject.client_id.should == :set_in_configure
@@ -85,8 +85,8 @@ describe OpenAuth2::Config do
   end
 
   let(:overwrite_response_type) do
-    subject.configure do
-      self.response_type = :overwritten
+    subject.configure do |c|
+      c.response_type = :overwritten
     end
   end
 

data/spec/google/client_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 
 describe 'Google Client' do
   let(:config) do
-    OpenAuth2::Config.new do
-      self.provider       = :google
-      self.access_token   = Creds::Google::AccessToken
-      self.refresh_token  = Creds::Google::RefreshToken
-      self.redirect_uri   = 'http://localhost:9393/google/callback'
-      self.path_prefix    = '/calendar/v3'
+    OpenAuth2::Config.new do |c|
+      c.provider       = :google
+      c.access_token   = Creds::Google::AccessToken
+      c.refresh_token  = Creds::Google::RefreshToken
+      c.redirect_uri   = 'http://localhost:9393/google/callback'
+      c.path_prefix    = '/calendar/v3'
     end
   end
 

data/spec/google/token_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 
 describe 'Google Token' do
   let(:config) do
-    OpenAuth2::Config.new do
-      self.provider       = :google
-      self.client_id      = Creds::Google::ClientId
-      self.client_secret  = Creds::Google::ClientSecret
-      self.code           = Creds::Google::Code
-      self.redirect_uri   = 'http://localhost:9393/google/callback'
-      self.scope          = ['https://www.googleapis.com/auth/calendar']
+    OpenAuth2::Config.new do |c|
+      c.provider       = :google
+      c.client_id      = Creds::Google::ClientId
+      c.client_secret  = Creds::Google::ClientSecret
+      c.code           = Creds::Google::Code
+      c.redirect_uri   = 'http://localhost:9393/google/callback'
+      c.scope          = ['https://www.googleapis.com/auth/calendar']
     end
   end
 

data/spec/token_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 
 describe OpenAuth2::Token do
   let(:config) do
-    OpenAuth2::Config.new do
-      self.provider = :facebook
+    OpenAuth2::Config.new do |c|
+      c.provider = :facebook
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: OpenAuth2
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70097461613900 !ruby/object:Gem::Requirement
+  requirement: &70354480374180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70097461613900
+  version_requirements: *70354480374180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70097461612320 !ruby/object:Gem::Requirement
+  requirement: &70354480372100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70097461612320
+  version_requirements: *70354480372100
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70097461607360 !ruby/object:Gem::Requirement
+  requirement: &70354480364500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097461607360
+  version_requirements: *70354480364500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70097461606500 !ruby/object:Gem::Requirement
+  requirement: &70354480363640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70097461606500
+  version_requirements: *70354480363640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097461605800 !ruby/object:Gem::Requirement
+  requirement: &70354480363000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70097461605800
+  version_requirements: *70354480363000
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70097461605280 !ruby/object:Gem::Requirement
+  requirement: &70354480362360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.11.3
   type: :development
   prerelease: false
-  version_requirements: *70097461605280
+  version_requirements: *70354480362360
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70097461603840 !ruby/object:Gem::Requirement
+  requirement: &70354480361000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70097461603840
+  version_requirements: *70354480361000
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70097461602600 !ruby/object:Gem::Requirement
+  requirement: &70354480359720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70097461602600
+  version_requirements: *70354480359720
 description: OpenAuth2 is a thin OAuth2 wrapper written on top of Faraday in Ruby.
 email:
 - senthil196@gmail.com