zendesk_api 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,13 +1,13 @@
 GIT
   remote: https://github.com/steved555/hashie.git
-  revision: d433d8b1574130f8f3752019ea4db3519c69e6df
+  revision: 2fa400b58956f3ae4c4eaaaa196084ffc659072f
   specs:
     hashie (2.0.0.beta)
 
 PATH
   remote: .
   specs:
-    zendesk_api (0.1.2)
+    zendesk_api (0.1.3)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie
@@ -37,15 +37,15 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    vcr (2.2.4)
-    webmock (1.8.9)
+    vcr (2.2.5)
+    webmock (1.8.10)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yard (0.8.2.1)

data/Readme.md

@@ -39,8 +39,11 @@ client = ZendeskAPI::Client.new do |config|
 
   config.url = "<- your-zendesk-url ->" # e.g. https://mydesk.zendesk.com/api/v2
 
-  config.username = "login.email@zendesk.com"  # use login.email@zendesk.com/token for token auth
-  config.password = "your zendesk password or token"
+  config.username = "login.email@zendesk.com"
+
+  # Choose one of the following depending on your authentication choice
+  config.token = "your zendesk token"
+  config.password = "your zendesk password"
 
   # Optional:
 

data/lib/zendesk_api/client.rb

@@ -77,6 +77,11 @@ module ZendeskAPI
 
       config.retry = !!config.retry # nil -> false
 
+      if config.token && !config.password
+        config.password = config.token
+        config.username += "/token" unless config.username.end_with?("/token")
+      end
+
       if config.logger.nil? || config.logger == true
         require 'logger'
         config.logger = Logger.new($stderr)

data/lib/zendesk_api/configuration.rb

@@ -6,6 +6,9 @@ module ZendeskAPI
     # @return [String] The basic auth password.
     attr_accessor :password
 
+    # @return [String] The basic auth token.
+    attr_accessor :token
+
     # @return [String] The API url. Must be https unless {#allow_http} is set.
     attr_accessor :url
 

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/live/request_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe ZendeskAPI::Request do
+  def valid_attributes
+    {
+      :subject => "This is a question!",
+      :comment => { :value => "Haha, no." }
+    }
+  end
+
+  it_should_be_creatable
+  it_should_be_updatable :subject
+  it_should_be_readable :requests
+  it_should_be_readable user, :requests
+end

data/live/ticket_spec.rb

@@ -17,11 +17,22 @@ describe ZendeskAPI::Ticket do
   it_should_be_updatable :subject
   it_should_be_deletable
   it_should_be_readable :tickets
-  it_should_be_readable :tickets, :recent
   it_should_be_readable user, :requested_tickets
   it_should_be_readable agent, :ccd_tickets
   it_should_be_readable organization, :tickets
 
+  context "recent tickets" do
+    before(:each) do
+      VCR.use_cassette("visit_recent_ticket") do
+        client.connection.get("/tickets/#{@object.id}") do |req|
+          req.headers[:Accept] = "*/*"
+        end
+      end
+    end
+
+    it_should_be_readable :tickets, :recent, :create => true
+  end
+
   describe ".incremental_export" do
     let(:results){ ZendeskAPI::Ticket.incremental_export(client, Time.at(1023059503)) } # ~ 10 years ago
 

data/spec/client_spec.rb

@@ -39,6 +39,40 @@ describe ZendeskAPI::Client do
       end
     end
 
+    context "#token" do
+      context "with a username with /token" do
+        subject do
+          ZendeskAPI::Client.new do |config|
+            config.url = "https://example.zendesk.com"
+            config.username = "hello/token"
+            config.token = "token"
+          end.config
+        end
+
+        it "should not add /token to the username" do
+          subject.username.should == "hello/token"
+        end
+      end
+
+      context "with no password" do
+        subject do
+          ZendeskAPI::Client.new do |config|
+            config.url = "https://example.zendesk.com"
+            config.username = "hello"
+            config.token = "token"
+          end.config
+        end
+
+        it "should copy token to password" do
+          subject.token.should == subject.password
+        end
+
+        it "should add /token to the username" do
+          subject.username.should == "hello/token"
+        end
+      end
+    end
+
     context "#logger" do
       before(:each) do
         @client = ZendeskAPI::Client.new do |config| 

data/spec/macros/resource_macros.rb

@@ -130,7 +130,7 @@ module ResourceMacros
         VCR.use_cassette("#{described_class.to_s}_#{context_name}_delete") do
           @object.destroy
         end
-      end if create 
+      end if create
 
       it "should be findable" do
         result = klass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -266,6 +266,7 @@ files:
 - live/macro_spec.rb
 - live/mobile_device_spec.rb
 - live/organization_spec.rb
+- live/request_spec.rb
 - live/satisfaction_rating_spec.rb
 - live/setting_spec.rb
 - live/suspended_ticket_spec.rb