zendesk-api 0.2.4 → 0.3.0

data/Manifest

@@ -10,11 +10,10 @@ lib/zendesk/entry.rb
 lib/zendesk/forum.rb
 lib/zendesk/group.rb
 lib/zendesk/main.rb
-lib/zendesk/main.rb.orig
 lib/zendesk/organization.rb
 lib/zendesk/search.rb
 lib/zendesk/tag.rb
 lib/zendesk/ticket.rb
 lib/zendesk/user.rb
 spec/zendesk/main_spec.rb
-zendesk-api.gemspec
+spec/zendesk/user_spec.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('zendesk-api', '0.2.4') do |p|
+Echoe.new('zendesk-api', '0.3.0') do |p|
   p.description     = "RubyGem wrapper for REST API to http://zendesk.com"
   p.author          = "Peter Ericson"
   p.url             = "http://github.com/pgericson/zendesk-api"

data/lib/zendesk/main.rb

@@ -29,40 +29,45 @@ module Zendesk
       end
     end
 
-    def make_request(end_url, body = {})
-      curl = Curl::Easy.new(main_url + end_url + ".#{@format}")
-      curl.userpwd = "#{@username}:#{@password}"
-      unless body.empty?
-        if body[:list]
-          params = "?" + body[:list].map do |k, v|
-            if v.is_a?(Array)
-              v.map do |val|
-                "#{k}[]=#{val}"
-              end.join("&")
-            else
-              "#{k}=#{v}"
-            end
+
+    def params_list(list)
+      params = "?" + list.map do |k, v|
+        if v.is_a?(Array)
+          v.map do |val|
+            "#{k}[]=#{val}"
           end.join("&")
-          curl.url = curl.url + params
         else
-          if body.values.first.is_a?(Hash)
-            final_body = body.values.first.to_xml
-          elsif body.values.first.is_a?(String)
-            final_body = body.values.first
-          end
-
-          if body[:create]
-            curl.headers = "Content-Type: application/xml"
-            curl.http_post(final_body)
-          elsif body[:update]
-            curl.headers = "Content-Type: application/xml"
-            curl.http_put(final_body)
-          elsif body[:destroy]
-            curl.http_delete
-          end
+          "#{k}=#{v}"
         end
+      end.join("&")
+    end
+    
+    def string_body(body)
+      if body.values.first.is_a?(Hash)
+        body.values.first.to_xml.strip
+      elsif body.values.first.is_a?(String)
+        body.values.first
+      end
+    end
+
+    def make_request(end_url, body = {})
+      curl = Curl::Easy.new(main_url + end_url + ".#{@format}")
+      curl.userpwd = "#{@username}:#{@password}"
+      if body.empty? or body[:list]
+        curl.url = curl.url + params_list(body[:list]) if body[:list]
+        curl.perform
+      elsif body[:create]
+        curl.headers = "Content-Type: application/xml"
+        curl.http_post(string_body(body))
+      elsif body[:update]
+        # PUT seems badly broken, at least I can't get it to work without always
+        # raising an exception about rewinding the data stream
+        # curl.http_put(final_body)
+        curl.headers = { "Content-Type" => "application/xml", "X-Http-Method-Override" => "put" }    
+        curl.http_post(string_body(body))
+      elsif body[:destroy]
+        curl.http_delete
       end
-      curl.perform
 
       if curl.body_str == "<error>Couldn't authenticate you</error>"
         return "string" #raise CouldNotAuthenticateYou 
@@ -72,13 +77,14 @@ module Zendesk
 
     class Response
 
-      attr_reader :status, :body, :headers_raw, :headers, :curl
+      attr_reader :status, :body, :headers_raw, :headers, :curl, :url
 
       def initialize(curl)
         @curl = curl
-        @status=curl.response_code
-        @body=curl.body_str
-        @headers_raw=curl.header_str
+        @url = curl.url
+        @status = curl.response_code
+        @body = curl.body_str
+        @headers_raw = curl.header_str
         parse_headers
       end
 

data/lib/zendesk/user.rb

@@ -17,8 +17,8 @@ module Zendesk
       make_request("users", :create => Zendesk::Main.to_xml('user', input))
     end
 
-    def update_user(input)
-      make_request("users", :update => Zendesk::Main.to_xml('user', input))
+    def update_user(id, input)
+      make_request("users/#{id}", :update => Zendesk::Main.to_xml('user', input))
     end
 
     def delete_user(id)

data/spec/zendesk/main_spec.rb

@@ -24,7 +24,7 @@ describe Zendesk::Main, 'make_request' do
     curl_object = Curl::Easy.method(:new)
     Curl::Easy.stub!(:new).and_return do |*args|
       curl = curl_object.call(*args)
-      curl.stub!(:perform)
+      curl.should_receive(:perform)
       curl.stub!(:header_str) { "adsf\r\ndsaf"}
       curl
     end
@@ -38,10 +38,10 @@ describe Zendesk::Main, 'make_request' do
     }
 
     response = zendesk.make_request("search", :list => params)
-    response.curl.url.should =~ /foo=bar/
-    response.curl.url.should =~ /foo_list\[\]=1/
-    response.curl.url.should =~ /foo_list\[\]=2/
-    response.curl.url.should =~ /foo_list\[\]=3/
+    response.url.should =~ /foo=bar/
+    response.url.should =~ /foo_list\[\]=1/
+    response.url.should =~ /foo_list\[\]=2/
+    response.url.should =~ /foo_list\[\]=3/
 
   end
 end

data/spec/zendesk/user_spec.rb

@@ -0,0 +1,92 @@
+require "spec"
+require 'lib/zendesk-api'
+
+describe Zendesk::Main, 'user api' do
+  # before do
+  # end
+
+  it "should be able to create" do
+    data={"email" => "bob@aol.com", "name" => "Bob Jones", "roles" => 0, "restriction-id" => 4}
+    curl_object = Curl::Easy.method(:new)
+    Curl::Easy.stub!(:new).and_return do |*args|
+      curl = curl_object.call(*args)
+#      curl.stub!(:http_post)
+      body=Zendesk::Main.to_xml('user', data)
+      curl.should_receive(:http_post).with(body)
+      curl.stub!(:perform)
+      curl.stub!(:header_str) { "\r\nLocation: http://account.zendesk.com/users/23.xml\r\ndsaf: smoke"}
+      curl.stub!(:response_code).and_return(201)
+      curl
+    end
+    zendesk = Zendesk::Main.new('my_company', "some_login", "some_password")
+    response = zendesk.create_user(data)
+    response.url.should =~ %r{/users.xml}
+    response.headers["Location"].should =~ %r{/users/23.xml}
+    response.status.should == 201
+  end
+  
+  it "should be able to update" do
+    data={"email" => "bob@aol.com", "name" => "Bob Jones", "roles" => 0, "restriction-id" => 4}
+    curl_object = Curl::Easy.method(:new)
+    Curl::Easy.stub!(:new).and_return do |*args|
+      curl = curl_object.call(*args)
+      curl.stub!(:perform)
+      body=Zendesk::Main.to_xml('user', data)
+      curl.should_receive(:http_post).with(body)
+      curl.stub!(:header_str) { "\r\ntest: blah"}
+      curl.stub!(:response_code).and_return(200)      
+      curl
+    end    
+    zendesk = Zendesk::Main.new('my_company', "some_login", "some_password")
+    response = zendesk.update_user(39,data)
+    response.curl.headers["X-Http-Method-Override"].should == "put"
+    response.url.should =~ %r{/users/39.xml$}
+    response.status.should == 200
+  end
+  
+  it "should be able to get" do 
+    curl_object = Curl::Easy.method(:new)
+    Curl::Easy.stub!(:new).and_return do |*args|
+      curl = curl_object.call(*args)
+      curl.stub!(:perform)
+      curl.stub!(:header_str) { "\r\ntest: blah"}
+      curl.stub!(:response_code).and_return(200)      
+      curl
+    end    
+    zendesk = Zendesk::Main.new('my_company', "some_login", "some_password")
+    response = zendesk.get_user(13)
+    response.url.should =~ %r{/users/13.xml$}
+    response.status.should == 200
+  end
+  
+  it "should be able to list all" do
+    curl_object = Curl::Easy.method(:new)
+    Curl::Easy.stub!(:new).and_return do |*args|
+      curl = curl_object.call(*args)
+      curl.stub!(:perform)
+      curl.stub!(:header_str) { "\r\ntest: blah"}
+      curl.stub!(:response_code).and_return(200)      
+      curl
+    end    
+    zendesk = Zendesk::Main.new('my_company', "some_login", "some_password")
+    response = zendesk.get_users
+    response.url.should =~ %r{/users.xml$}
+    response.status.should == 200
+  end
+
+  it "should be able to delete" do
+    curl_object = Curl::Easy.method(:new)
+    Curl::Easy.stub!(:new).and_return do |*args|
+      curl = curl_object.call(*args)
+      curl.stub!(:http_delete)
+      curl.stub!(:perform)
+      curl.stub!(:response_code).and_return(200)      
+      curl.stub!(:header_str) { "\r\nadsf\r\ndsaf"}
+      curl
+    end    
+    zendesk = Zendesk::Main.new('my_company', "some_login", "some_password")
+    response = zendesk.delete_user(12)
+    response.url.should =~ %r{/users/12.xml}
+    response.status.should == 200
+  end
+end

data/zendesk-api.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zendesk-api}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Ericson"]
-  s.date = %q{2010-04-13}
+  s.date = %q{2010-05-06}
   s.description = %q{RubyGem wrapper for REST API to http://zendesk.com}
   s.email = %q{pg.ericson@gmail.com}
-  s.extra_rdoc_files = ["README.markdown", "lib/console.rb", "lib/zendesk-api.rb", "lib/zendesk.rb", "lib/zendesk/attachment.rb", "lib/zendesk/entry.rb", "lib/zendesk/forum.rb", "lib/zendesk/group.rb", "lib/zendesk/main.rb", "lib/zendesk/main.rb.orig", "lib/zendesk/organization.rb", "lib/zendesk/search.rb", "lib/zendesk/tag.rb", "lib/zendesk/ticket.rb", "lib/zendesk/user.rb"]
-  s.files = ["Manifest", "README.markdown", "Rakefile", "geminstaller.yml", "lib/console.rb", "lib/zendesk-api.rb", "lib/zendesk.rb", "lib/zendesk/attachment.rb", "lib/zendesk/entry.rb", "lib/zendesk/forum.rb", "lib/zendesk/group.rb", "lib/zendesk/main.rb", "lib/zendesk/main.rb.orig", "lib/zendesk/organization.rb", "lib/zendesk/search.rb", "lib/zendesk/tag.rb", "lib/zendesk/ticket.rb", "lib/zendesk/user.rb", "spec/zendesk/main_spec.rb", "zendesk-api.gemspec"]
+  s.extra_rdoc_files = ["README.markdown", "lib/console.rb", "lib/zendesk-api.rb", "lib/zendesk.rb", "lib/zendesk/attachment.rb", "lib/zendesk/entry.rb", "lib/zendesk/forum.rb", "lib/zendesk/group.rb", "lib/zendesk/main.rb", "lib/zendesk/organization.rb", "lib/zendesk/search.rb", "lib/zendesk/tag.rb", "lib/zendesk/ticket.rb", "lib/zendesk/user.rb"]
+  s.files = ["Manifest", "README.markdown", "Rakefile", "geminstaller.yml", "lib/console.rb", "lib/zendesk-api.rb", "lib/zendesk.rb", "lib/zendesk/attachment.rb", "lib/zendesk/entry.rb", "lib/zendesk/forum.rb", "lib/zendesk/group.rb", "lib/zendesk/main.rb", "lib/zendesk/organization.rb", "lib/zendesk/search.rb", "lib/zendesk/tag.rb", "lib/zendesk/ticket.rb", "lib/zendesk/user.rb", "spec/zendesk/main_spec.rb", "spec/zendesk/user_spec.rb", "zendesk-api.gemspec"]
   s.homepage = %q{http://github.com/pgericson/zendesk-api}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Zendesk-api", "--main", "README.markdown"]
   s.require_paths = ["lib"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Peter Ericson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +02:00
+date: 2010-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +34,6 @@ extra_rdoc_files:
 - lib/zendesk/forum.rb
 - lib/zendesk/group.rb
 - lib/zendesk/main.rb
-- lib/zendesk/main.rb.orig
 - lib/zendesk/organization.rb
 - lib/zendesk/search.rb
 - lib/zendesk/tag.rb
@@ -53,13 +52,13 @@ files:
 - lib/zendesk/forum.rb
 - lib/zendesk/group.rb
 - lib/zendesk/main.rb
-- lib/zendesk/main.rb.orig
 - lib/zendesk/organization.rb
 - lib/zendesk/search.rb
 - lib/zendesk/tag.rb
 - lib/zendesk/ticket.rb
 - lib/zendesk/user.rb
 - spec/zendesk/main_spec.rb
+- spec/zendesk/user_spec.rb
 - zendesk-api.gemspec
 has_rdoc: true
 homepage: http://github.com/pgericson/zendesk-api

data/lib/zendesk/main.rb.orig

@@ -1,118 +0,0 @@
-module Zendesk
-  class Main
-    attr_accessor :main_url, :format
-    attr_reader :response_raw, :response
-
-    def initialize(account, username, password, options = {})
-      @account = account
-      @username = username
-      @password = password
-      @options = options
-      if options[:format] && ['xml', 'json'].any?{|f| f == options[:format]}
-        @format = options[:format]
-      else
-        @format = 'xml'
-      end
-    end
-
-    def main_url
-      url_prefix    = @options[:ssl] ? "https://" : "http://"
-      url_postfix   = ".zendesk.com/"
-      url = url_prefix + @account + url_postfix
-    end
-
-    def self.to_xml(function_name, input)
-      if input.is_a?(String)
-        input
-      else
-        input.to_xml({:root => function_name})
-      end
-    end
-
-    def make_request(end_url, body = {})
-      curl = Curl::Easy.new(main_url + end_url + ".#{@format}")
-      curl.userpwd = "#{@username}:#{@password}"
-      unless body.empty?
-        if body[:list]
-          params = "?" + body[:list].map do |k, v|
-            if v.is_a?(Array)
-              v.map do |val|
-                "#{k}[]=#{val}"
-              end.join("&")
-            else
-              "#{k}=#{v}"
-            end
-          end.join("&")
-          curl.url = curl.url + params
-        else
-          if body.values.first.is_a?(Hash)
-            final_body = body.values.first.to_xml
-          elsif body.values.first.is_a?(String)
-            final_body = body.values.first
-          end
-
-          if body[:create]
-            curl.headers = "Content-Type: application/xml"
-            curl.http_post(final_body)
-          elsif body[:update]
-            curl.headers = "Content-Type: application/xml"
-            curl.http_put(final_body)
-          elsif body[:destroy]
-            curl.http_delete(final_body)
-          end
-        end
-      end
-      curl.perform
-
-      if curl.body_str == "<error>Couldn't authenticate you</error>"
-        return "string" #raise CouldNotAuthenticateYou 
-      end
-      Response.new(curl)
-    end
-
-    class Response
-<<<<<<< HEAD:lib/zendesk/main.rb
-      
-      attr_reader :status, :body, :headers_raw, :headers, :curl
-      
-      def initialize(curl)
-        @curl=curl
-=======
-
-      attr_reader :status, :body, :headers_raw, :headers, :curl
-
-      def initialize(curl)
-        @curl = curl
->>>>>>> ungulation/master:lib/zendesk/main.rb
-        @status=curl.response_code
-        @body=curl.body_str
-        @headers_raw=curl.header_str
-        parse_headers
-      end
-
-      def parse_headers
-        hs={}
-        return hs if headers_raw.nil? or headers_raw==""
-        headers_raw.split("\r\n")[1..-1].each do |h|
-#          Rails.logger.info h
-          m=h.match(/([^:]+):\s?(.*)/)
-          next if m.nil? or m[2].nil?
-#          Rails.logger.info m.inspect
-          hs[m[1]]=m[2]
-        end
-        @headers=hs
-      end
-
-    end
-
-    include Zendesk::User
-    include Zendesk::Organization
-    include Zendesk::Group
-    include Zendesk::Ticket
-    include Zendesk::Attachment
-    include Zendesk::Tag
-    include Zendesk::Forum
-    include Zendesk::Entry
-    include Zendesk::Search
-  end
-end