zendesk-api 0.2.2 → 0.2.3

data/Manifest

@@ -1,6 +1,7 @@
 Manifest
 README.markdown
 Rakefile
+geminstaller.yml
 lib/console.rb
 lib/zendesk-api.rb
 lib/zendesk.rb
@@ -9,9 +10,11 @@ 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

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('zendesk-api', '0.2.2') do |p|
+Echoe.new('zendesk-api', '0.2.3') 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/geminstaller.yml

@@ -0,0 +1,11 @@
+defaults:
+  install_options: --source http://gems.github.com --source http://gems.rubyforge.org --no-ri --no-rdoc
+
+gems:
+  - name: rspec
+    version: '=1.3.0'
+  - name: rspec-rails
+    version: '=1.3.2'
+  - name: curb
+    version: '=0.6.7'
+ 

data/lib/zendesk/main.rb

@@ -8,13 +8,13 @@ module Zendesk
       @username = username
       @password = password
       @options = options
-      if options[:format] && ['xml','json'].any?{|f| f == options[:format]}
+      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/"
@@ -26,32 +26,40 @@ module Zendesk
         input
       else
         input.to_xml({:root => function_name})
-      end 
+      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.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)
-        elsif body[:list]
-          params = "?" + body[:list].to_a.map do |p|
-            "#{p[0]}=#{p[1]}"
+        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
@@ -61,20 +69,22 @@ module Zendesk
       end
       Response.new(curl)
     end
-    
+
     class Response
-      
-      attr_reader :status, :body, :headers_raw, :headers
-      
+
+      attr_reader :status, :body, :headers_raw, :headers, :curl
+
       def initialize(curl)
+        @curl = curl
         @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?(.*)/)
@@ -84,7 +94,7 @@ module Zendesk
         end
         @headers=hs
       end
-      
+
     end
 
     include Zendesk::User

data/lib/zendesk/main.rb.orig

@@ -0,0 +1,118 @@
+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

data/spec/zendesk/main_spec.rb

@@ -0,0 +1,47 @@
+require "spec"
+require 'lib/zendesk-api'
+
+describe Zendesk::Main, "basic" do
+  before(:each) do
+    @account = "this_account"
+    @username = "this_username"
+    @password = "this_password"
+    @zendesk = Zendesk::Main.new(@account, @username, @password)
+  end
+
+  it "should have the correct mail_url with no ssl options" do
+    @zendesk.main_url.should == "http://#{@account}.zendesk.com/"
+  end
+
+  it "should have the correct mail_url with ssl options" do
+    @zendesk = Zendesk::Main.new(@account, @username, @password, :ssl => true)
+    @zendesk.main_url.should == "https://#{@account}.zendesk.com/"
+  end
+end
+
+describe Zendesk::Main, 'make_request' do
+  before 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) { "adsf\r\ndsaf"}
+      curl
+    end
+  end
+
+  it "should construct array url for search" do
+    zendesk = Zendesk::Main.new('my_company', "some_login", "some_password")
+    params = {
+            :foo => "bar",
+            :foo_list => [1, 2, 3]
+    }
+
+    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/
+
+  end
+end

data/zendesk-api.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zendesk-api}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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-09}
+  s.date = %q{2010-04-12}
   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/organization.rb", "lib/zendesk/search.rb", "lib/zendesk/tag.rb", "lib/zendesk/ticket.rb", "lib/zendesk/user.rb"]
-  s.files = ["Manifest", "README.markdown", "Rakefile", "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", "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/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.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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Peter Ericson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +02:00
+date: 2010-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ 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
@@ -43,6 +44,7 @@ files:
 - Manifest
 - README.markdown
 - Rakefile
+- geminstaller.yml
 - lib/console.rb
 - lib/zendesk-api.rb
 - lib/zendesk.rb
@@ -51,11 +53,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
 - zendesk-api.gemspec
 has_rdoc: true
 homepage: http://github.com/pgericson/zendesk-api