ludo-roart 0.1.17 → 0.1.18

data/.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
+.rvmrc
 announcement.txt
 coverage
 doc
 pkg
 *.gem
-**/.DS_Store
+**/.DS_Store

data/Gemfile

@@ -2,6 +2,8 @@ source :rubygems
 
 gemspec
 
+gem 'rake', '0.9.2.2'
+
 gem 'rspec', '2.8.0'
 
 gem 'activesupport', '3.0.12'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ludo-roart (0.1.16)
+    ludo-roart (0.1.17)
       activesupport (>= 2.0.0)
       mechanize (>= 1.0.0)
 
@@ -26,6 +26,7 @@ GEM
     net-http-persistent (2.6)
     nokogiri (1.5.2)
     ntlm-http (0.1.1)
+    rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -46,4 +47,5 @@ DEPENDENCIES
   activesupport (= 3.0.12)
   i18n
   ludo-roart!
+  rake (= 0.9.2.2)
   rspec (= 2.8.0)

data/lib/roart/attachment.rb

@@ -4,13 +4,20 @@ module Roart
     def to_payload
       hash = Hash.new
       self.each_with_index do |attach, index|
-        hash["attachment_#{index+1}"] = attach.file
+        hash["attachment_#{index+1}"] = attach
       end
       hash
     end
   end
 
-  class Attachment < Struct.new(:name, :file)
+  class Attachment < File
+
+    attr_reader :name, :file
+
+    def initialize(name, file)
+      @name = name
+      @file = file
+    end
 
     def path
       name
@@ -20,6 +27,10 @@ module Roart
       file.read
     end
 
+    def mime_type
+      file.content_type if file.respond_to?(:content_type)
+    end
+
     def self.detect(*args)
       AttachmentCollection.new Array(args.compact).flatten.map { |file|
         if file.is_a?(File)

data/lib/roart/connection_adapters/mechanize_adapter.rb

@@ -10,7 +10,7 @@ module Roart
 
       def login(config)
         @conf.merge!(config)
-        agent = Mechanize.new
+        agent = RoartMechanize.new
         page = agent.get(@conf[:server])
         form = page.form('login')
         form.user = @conf[:user]

data/lib/roart/core/hash.rb

@@ -11,18 +11,20 @@ class Hash
         elsif key.to_s.match(/^CF-.+/)
           key.to_s
         elsif key.to_s.match(/^[a|A]ttachments/)
-          values = values.join(",") if values.kind_of?(Array)
-          "Attachment"
+          nil
         else
           key.to_s.camelize
         end
 
+      next if key_name.nil?
+
       values = [values] unless values.is_a?(Array)
       values.each do |value|
         value = Roart::ContentFormatter.format_string(value.to_s)
         fields << "#{key_name}: #{value}"
       end
     end
+
     content = fields.compact.sort.join("\n")
   end
 

data/lib/roart/roart_mechanize.rb

@@ -0,0 +1,43 @@
+module Roart
+  class RoartMechanize < Mechanize
+    ##
+    # POST to the given +uri+ with the given +query+.  The query is specified by
+    # either a string, or a list of key-value pairs represented by a hash or an
+    # array of arrays.
+    #
+    # Examples:
+    #   agent.post 'http://example.com/', "foo" => "bar"
+    #
+    #   agent.post 'http://example.com/', [%w[foo bar]]
+    #
+    #   agent.post('http://example.com/', "<message>hello</message>",
+    #              'Content-Type' => 'application/xml')
+
+    def post(uri, query={}, headers={})
+      return request_with_entity(:post, uri, query, headers) if String === query
+
+      node = {}
+      # Create a fake form
+      class << node
+        def search(*args); []; end
+      end
+      node['method'] = 'POST'
+      node['enctype'] = 'application/x-www-form-urlencoded'
+
+      form = Form.new(node)
+
+      query.each { |k, v|
+        if v.is_a?(IO)
+          form.enctype = 'multipart/form-data'
+          ul = Form::FileUpload.new({'name' => k.to_s},::File.basename(v.path))
+          ul.file_data = v.read
+          ul.mime_type = v.mime_type if v.respond_to?(:mime_type)
+          form.file_uploads << ul
+        else
+          form.fields << Form::Field.new({'name' => k.to_s},v)
+        end
+      }
+      post_form(uri, form, headers)
+    end
+  end
+end

data/lib/roart/ticket.rb

@@ -86,10 +86,10 @@ module Roart
 
       comment.merge!(:attachment => attachments.map(&:name).join(",")) unless attachments.empty?
 
-      resp = self.class.connection.post(uri, {:content => comment.to_content_format}.merge(attachments.to_payload))
+      raw_resp = self.class.connection.post(uri, {:content => comment.to_content_format}.merge(attachments.to_payload))
 
-      resp = resp.split("\n")
-      raise TicketSystemError, "Ticket Comment Failed" unless resp.first.include?("200")
+      resp = raw_resp.split("\n")
+      raise TicketSystemError, "Ticket Comment Failed \n\n RT Response:\n#{raw_resp}" unless resp.first.include?("200")
       !!resp[2].match(/^# Message recorded/)
     end
 

data/ludo-roart.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "ludo-roart"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.17"
+  gem.version       = "0.1.18"
 
   gem.add_runtime_dependency "mechanize", ">= 1.0.0"
   gem.add_runtime_dependency "activesupport", ">= 2.0.0"

data/spec/roart/core/hash_spec.rb

@@ -25,11 +25,17 @@ describe 'hash extentions' do
       payload.to_content_format
     end
 
-    it "should include attachments into content" do
-      payload = {:subject => 'A new ticket', :queue => 'My queue', :text => "A text", :attachments => '/dev/null,/dev/zero'}
+    it "should include attachment as singular into content" do
+      payload = {:subject => 'A new ticket', :queue => 'My queue', :text => "A text", :attachment => 'just field'}
       payload.to_content_format.should include("Attachment")
     end
 
+    it "should NOT include attachments into content" do
+      payload = {:subject => 'A new ticket', :queue => 'My queue', :text => "A text", :attachments => '/dev/null,/dev/zero'}
+      payload.to_content_format.should_not include("Attachment")
+      payload.to_content_format.should_not include("Attachments")
+    end
+
   end
 
   it "should return sorted data with the same key multiple times when value is array" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ludo-roart
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - PJ Davis
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 +03:00
-default_executable: 
+date: 2012-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
@@ -79,6 +78,7 @@ files:
 - lib/roart/errors.rb
 - lib/roart/history.rb
 - lib/roart/roart.rb
+- lib/roart/roart_mechanize.rb
 - lib/roart/ticket.rb
 - lib/roart/ticket_page.rb
 - lib/roart/validations.rb
@@ -101,7 +101,6 @@ files:
 - spec/test_data/search_ticket.txt
 - spec/test_data/single_history.txt
 - spec/test_data/ticket.txt
-has_rdoc: true
 homepage: https://github.com/ludo/roart
 licenses: []
 
@@ -131,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord