ticketmaster-trac 0.2.9 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/lib/provider/comment.rb

@@ -46,6 +46,35 @@ module TicketMaster::Provider
         self[:id]
       end
 
+      def self.find_by_attributes(project_id, ticket_id, attributes = {})
+        comments = self.find_all(ticket_id)
+        search_by_attribute(comments, attributes)
+      end
+
+      def self.find(project_id, ticket_id, *options)
+        if options[0].first.is_a? Array
+          self.find_all(ticket_id).select do |comment|
+            comment if options[0].first.any? { |id| id == comment.id }
+          end
+        elsif options[0].first.is_a? Hash
+          self.find_by_attributes(project_id, ticket_id, options[0].first)
+        else
+          self.find_all(ticket_id)
+        end
+      end
+
+      def self.find_by_id(project_id, ticket_id, id)
+        self.find_all(ticket_id).select { |comment| comment[:id] == id }.first
+      end
+
+      def self.find_all(ticket_id)
+        comments = CommentUtil.new(ticket_id,TicketMaster::Provider::Trac.api).comments
+        unless comments.empty?
+          comments = comments.collect { |comment| TicketMaster::Provider::Trac::Comment.new comment }
+        end
+        comments
+      end
+
     end
   end
 end

data/lib/provider/ticket.rb

@@ -75,39 +75,16 @@ module TicketMaster::Provider
       end
 
       def comments(*options)
-        comments = CommentUtil.new(self.id,TicketMaster::Provider::Trac.api).comments.collect { |comment| TicketMaster::Provider::Trac::Comment.new comment }
-        if options.first.is_a? Array
-          comments.select do |comment|
-            comment if options.first.any? { |id| id == comment.id }
-          end
-        elsif options.first.is_a? Hash
-          hash = options.first
-          comments.select do |comment|
-            hash.inject(true) do |memo, kv|
-              key, value = kv
-              begin
-                memo &= comment.send(key) == value
-              rescue
-                memo = false
-              end
-              memo
-            end
-          end
-        else
-          comments
-        end
+        Comment.find(self.project_id, self.id, options)
       end
 
       def comment(*options)
-        comments = CommentUtil.new(self.id,TicketMaster::Provider::Trac.api).comments.collect { |comment| TicketMaster::Provider::Trac::Comment.new comment }
         if options.empty?
           TicketMaster::Provider::Trac::Comment.new
         elsif options.first.is_a? Fixnum
-          comments.select { |comment| comment[:id] == options.first }.first
+          Comment.find_by_id(self.project_id, self.id, options.first)  
         elsif options.first.is_a? Hash
-          comments.select do |key, value| 
-            options.first[key] == value
-          end.first
+          Comment.find_by_attributes(self.project_id, self.id, options.first).first
         end
       end
 
@@ -123,7 +100,7 @@ module TicketMaster::Provider
 
       # Extracted this code from facet http://api.mackframework.com/mack-facets/classes/Kernel.html
       def self.retryable(options = {}, &block)
-        opts = { :tries => 1, :on => Exception }.merge(options)
+        opts = { :tries => 5, :on => Exception }.merge(options)
 
         retry_exception, retries = opts[:on], opts[:tries]
 

data/lib/trac/trac.rb

@@ -14,7 +14,7 @@ class CommentUtil
       authors = @doc.css('h3.change')
       comment_id += 1
       unless body[comment_id-1].nil? || authors[comment_id-1].nil?
-        Hashie::Mash.new build_comment_hash(value, comment_id, body[comment_id-1].text, authors[comment_id-1].content)
+        build_comment_hash(value, comment_id, body[comment_id-1].text, authors[comment_id-1].content)
       end
     end
   end

data/ticketmaster-trac.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ticketmaster-trac}
-  s.version = "0.2.9"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael George"]
-  s.date = %q{2011-04-12}
+  s.date = %q{2011-04-14}
   s.description = %q{Allows ticketmaster to interact with Your System.}
   s.email = %q{rafael@hybridgroup.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-trac
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rafael George
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -04:00
+date: 2011-04-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency