ruby-trello 0.4.4.3 → 0.5.0

data/spec/oauth_policy_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
-include Trello::Authorization
 include Trello
+include Trello::Authorization
 
 describe OAuthPolicy do
   before do
@@ -9,19 +9,65 @@ describe OAuthPolicy do
     OAuthPolicy.token = nil
   end
 
+  describe "#consumer_credential" do
+    it "uses class setting if available" do
+      policy = OAuthPolicy.new
+      policy.consumer_credential.key.should eq('xxx')
+      policy.consumer_credential.secret.should eq('xxx')
+    end
+
+    it "is built from given consumer_key and consumer_secret" do
+      policy = OAuthPolicy.new(
+        :consumer_key => 'consumer_key',
+        :consumer_secret => 'consumer_secret'
+      )
+      policy.consumer_credential.key.should eq('consumer_key')
+      policy.consumer_credential.secret.should eq('consumer_secret')
+    end
+
+    it "is nil if none supplied to class" do
+      OAuthPolicy.consumer_credential = nil
+      policy = OAuthPolicy.new
+      policy.consumer_credential.should be_nil
+    end
+  end
+
+  describe "#token" do
+    it "uses class setting if available" do
+      OAuthPolicy.token = OAuthCredential.new "xxx", "xxx"
+      policy = OAuthPolicy.new
+      policy.token.key.should eq('xxx')
+      policy.token.secret.should eq('xxx')
+    end
+
+    it "is built from given oauth_token and oauth_token_secret" do
+      policy = OAuthPolicy.new(
+        :oauth_token => 'oauth_token',
+        :oauth_token_secret => 'oauth_token_secret'
+      )
+      policy.token.key.should eq('oauth_token')
+      policy.token.secret.should eq('oauth_token_secret')
+    end
+
+    it "is an empty token if no oauth credentials supplied" do
+      policy = OAuthPolicy.new
+      policy.token.should be_nil
+    end
+  end
+
   context "2-legged" do
-    it "adds an authorization header" do 
+    it "adds an authorization header" do
       uri = Addressable::URI.parse("https://xxx/")
 
       request = Request.new :get, uri
 
-      OAuthPolicy.token               = OAuthCredential.new "token", nil
+      OAuthPolicy.token = OAuthCredential.new "token", nil
 
       authorized_request = OAuthPolicy.authorize request
-      
+
       authorized_request.headers.keys.should include "Authorization"
     end
-    
+
     it "preserves query parameters" do
       uri = Addressable::URI.parse("https://xxx/?name=Riccardo")
       request = Request.new :get, uri
@@ -32,12 +78,12 @@ describe OAuthPolicy do
       OAuthPolicy.token               = OAuthCredential.new "token", nil
 
       authorized_request = OAuthPolicy.authorize request
-      
+
       the_query_parameters = Addressable::URI.parse(authorized_request.uri).query_values
       the_query_parameters.should == {"name" => "Riccardo"}
     end
 
-    it "adds the correct signature as part of authorization header" do 
+    it "adds the correct signature as part of authorization header" do
       Clock.stub(:timestamp).and_return "1327048592"
       Nonce.stub(:next).and_return "b94ff2bf7f0a5e87a326064ae1dbb18f"
 
@@ -47,7 +93,7 @@ describe OAuthPolicy do
       request = Request.new :get, Addressable::URI.parse("http://xxx/")
 
       authorized_request = OAuthPolicy.authorize request
-      
+
       authorized_request.headers["Authorization"].should =~ /oauth_signature="TVNk%2FCs03FHqutDUqn05%2FDkvVek%3D"/
     end
 
@@ -61,7 +107,7 @@ describe OAuthPolicy do
       request = Request.new :get, Addressable::URI.parse("http://xxx/?a=b")
 
       authorized_request = OAuthPolicy.authorize request
-      
+
       authorized_request.headers["Authorization"].should =~ /oauth_signature="DprU1bdbNdJQ40UhD4n7wRR9jts%3D"/
     end
 

data/spec/organization_spec.rb

@@ -5,22 +5,33 @@ module Trello
   describe Organization do
     include Helpers
 
+    let(:organization) { client.find(:organization, "4ee7e59ae582acdec8000291") }
+    let(:client) { Client.new }
+
     before(:each) do
-      Client.stub(:get).with("/organizations/4ee7e59ae582acdec8000291").
+      client.stub(:get).with("/organizations/4ee7e59ae582acdec8000291").
         and_return organization_payload
+    end
+
+    context "finding" do
+      let(:client) { Trello.client }
+
+      it "delegates to Trello.client#find" do
+        client.should_receive(:find).with(:organization, '4ee7e59ae582acdec8000291')
+        Organization.find('4ee7e59ae582acdec8000291')
+      end
 
-      @organization = Organization.find('4ee7e59ae582acdec8000291')
+      it "is equivalent to client#find" do
+        Organization.find('4ee7e59ae582acdec8000291').should eq(organization)
+      end
     end
 
     context "actions" do
       it "retrieves actions" do
-        Client.stub(:get).with("/organizations/4ee7e59ae582acdec8000291/actions", { :filter => :all }).and_return actions_payload
-        @organization.actions.count.should be > 0
+        client.stub(:get).with("/organizations/4ee7e59ae582acdec8000291/actions", { :filter => :all }).and_return actions_payload
+        organization.actions.count.should be > 0
       end
-
     end
-
   end
-
 end
 

data/spec/spec_helper.rb

@@ -26,6 +26,10 @@ Trello.logger = Logger.new($strio)
 
 RSpec.configure do |c|
   c.filter_run_excluding :broken => true
+
+  c.before :each do
+    Trello.reset!
+  end
 end
 
 module Helpers
@@ -67,6 +71,7 @@ module Helpers
       "closed"     => false,
       "url"        => "https://trello.com/blah/blah",
       "idBoard"    => "abcdef123456789123456789",
+      "idList"     => "abcdef123456789123456789",
       "idMembers"  => ["abcdef123456789123456789"],
       "checkItems" => {}
     }]

data/spec/token_spec.rb

@@ -4,30 +4,47 @@ module Trello
   describe Token do
     include Helpers
 
+    let(:token) { client.find(:token, "1234") }
+    let(:client) { Client.new }
+
     before(:each) do
-      Client.stub(:get).with("/tokens/1234").and_return token_payload
-      @token = Token.find("1234")
+      client.stub(:get).with("/tokens/1234").and_return token_payload
+    end
+
+    context "finding" do
+      let(:client) { Trello.client }
+
+      it "delegates to Trello.client#find" do
+        client.should_receive(:find).with(:token, '1234')
+        Token.find('1234')
+      end
+
+      it "is equivalent to client#find" do
+        Token.find('1234').should eq(token)
+      end
     end
 
     context "attributes" do
       it "has an id" do
-        @token.id.should == "4f2c10c7b3eb95a45b294cd5"
+        token.id.should == "4f2c10c7b3eb95a45b294cd5"
       end
 
       it "gets its created_at date" do
-        @token.created_at.should == Time.iso8601("2012-02-03T16:52:23.661Z")
+        token.created_at.should == Time.iso8601("2012-02-03T16:52:23.661Z")
       end
 
       it "has a permission grant" do
-        @token.permissions.count.should be 3
+        token.permissions.count.should be 3
       end
     end
 
     context "members" do
       it "retrieves the member who authorized the token" do
-        Client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
-        @token.member.should == Member.find("abcdef123456789123456789")
+        client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
+        Trello.client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
+        client.stub(:get).with("/tokens/1234").and_return token_payload
+        token.member.should == Member.find("abcdef123456789123456789")
       end
     end
   end
-end
+end

data/spec/trello_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+include Trello
+include Trello::Authorization
+
+describe Trello do
+
+  describe "self.configure" do
+    it "builds auth policy client uses to make requests" do
+      Trello.configure do |config|
+        config.developer_public_key = 'developer_public_key'
+        config.member_token         = 'member_token'
+      end
+
+      TInternet.stub(:execute)
+      Trello.auth_policy.should_receive(:authorize)
+      Trello.client.get(:member, params = {})
+    end
+
+    it "configures basic auth policy" do
+      Trello.configure do |config|
+        config.developer_public_key = 'developer_public_key'
+        config.member_token         = 'member_token'
+      end
+
+      auth_policy = Trello.auth_policy
+      auth_policy.should be_a(BasicAuthPolicy)
+      auth_policy.developer_public_key.should eq('developer_public_key')
+      auth_policy.member_token.should eq('member_token')
+    end
+
+    context "oauth" do
+      before do
+        Trello.configure do |config|
+          config.consumer_key     = 'consumer_key'
+          config.consumer_secret  = 'consumer_secret'
+          config.oauth_token      = 'oauth_token'
+          config.oauth_token_secret     = 'oauth_token_secret'
+        end
+      end
+
+      it "configures oauth policy" do
+        auth_policy = Trello.auth_policy
+
+        auth_policy.should be_a(OAuthPolicy)
+        auth_policy.consumer_key.should eq('consumer_key')
+        auth_policy.consumer_secret.should eq('consumer_secret')
+        auth_policy.oauth_token.should eq('oauth_token')
+        auth_policy.oauth_token_secret.should eq('oauth_token_secret')
+      end
+
+      it "updates auth policy configuration" do
+        auth_policy = Trello.auth_policy
+        auth_policy.consumer_key.should eq('consumer_key')
+
+        Trello.configure do |config|
+          config.consumer_key     = 'new_consumer_key'
+          config.consumer_secret  = 'new_consumer_secret'
+          config.oauth_token      = 'new_oauth_token'
+          config.oauth_token_secret     = nil
+        end
+
+        auth_policy = Trello.auth_policy
+
+        auth_policy.should be_a(OAuthPolicy)
+        auth_policy.consumer_key.should eq('new_consumer_key')
+        auth_policy.consumer_secret.should eq('new_consumer_secret')
+        auth_policy.oauth_token.should eq('new_oauth_token')
+        auth_policy.oauth_token_secret.should be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-trello
 version: !ruby/object:Gem::Version 
-  hash: 121
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 4
-  - 3
-  version: 0.4.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeremy Tregunna
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-29 00:00:00 Z
+date: 2013-01-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -112,6 +111,7 @@ files:
 - lib/trello/card.rb
 - lib/trello/checklist.rb
 - lib/trello/client.rb
+- lib/trello/configuration.rb
 - lib/trello/has_actions.rb
 - lib/trello/item.rb
 - lib/trello/item_state.rb
@@ -132,6 +132,7 @@ files:
 - spec/card_spec.rb
 - spec/checklist_spec.rb
 - spec/client_spec.rb
+- spec/configuration_spec.rb
 - spec/integration/how_to_authorize_spec.rb
 - spec/integration/how_to_use_boards_spec.rb
 - spec/integration/integration_test.rb
@@ -145,6 +146,7 @@ files:
 - spec/spec_helper.rb
 - spec/string_spec.rb
 - spec/token_spec.rb
+- spec/trello_spec.rb
 homepage: https://github.com/jeremytregunna/ruby-trello
 licenses: []
 
@@ -187,6 +189,7 @@ test_files:
 - spec/card_spec.rb
 - spec/checklist_spec.rb
 - spec/client_spec.rb
+- spec/configuration_spec.rb
 - spec/integration/how_to_authorize_spec.rb
 - spec/integration/how_to_use_boards_spec.rb
 - spec/integration/integration_test.rb
@@ -200,3 +203,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/string_spec.rb
 - spec/token_spec.rb
+- spec/trello_spec.rb