ticketmaster-trac 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/provider/comment.rb

@@ -69,10 +69,9 @@ module TicketMaster::Provider
 
       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 }
+        comments.select { |comment| !comment.nil? }.collect do |comment| 
+          TicketMaster::Provider::Trac::Comment.new comment 
         end
-        comments
       end
 
     end

data/lib/provider/project.rb

@@ -51,7 +51,7 @@ module TicketMaster::Provider
           options = options.first
           trac = TicketMaster::Provider::Trac.api
           if options.is_a? Hash
-            TicketMaster::Provider::Trac::Ticket.find_by_id(trac[:trac].tickets.query(options).first, self[:name])
+            Ticket.find_by_id(trac[:trac].tickets.query(options).first, self[:name])
           end
         else
           TicketMaster::Provider::Trac::Ticket
@@ -60,26 +60,11 @@ module TicketMaster::Provider
 
       def ticket!(*options)
         options = options.first
-        TicketMaster::Provider::Trac::Ticket.create options
+        Ticket.create options
       end
 
       def tickets(*options)
-        mode = options.first
-        trac = TicketMaster::Provider::Trac.api
-        if options.empty?
-          collect_tickets(trac[:trac].tickets.list)
-        elsif mode.is_a? Array
-          collect_tickets(mode)
-        elsif mode.is_a? Hash
-          collect_tickets(trac[:trac].tickets.query(mode))
-        end
-      end
-
-      private
-      def collect_tickets(tickets)
-        tickets.collect do |ticket_id| 
-          TicketMaster::Provider::Trac::Ticket.find_by_id(ticket_id, self[:name]) 
-        end
+        Ticket.find(self.name, options)
       end
 
     end

data/lib/provider/ticket.rb

@@ -54,6 +54,24 @@ module TicketMaster::Provider
         end
       end
 
+      def self.find(project_id, *options)
+        mode = options[0].first
+        trac = TicketMaster::Provider::Trac.api
+        if options[0].empty?
+          self.find_all(project_id, trac[:trac].tickets.list)
+        elsif mode.is_a? Array
+          self.find_all(project_id, mode)
+        elsif mode.is_a? Hash
+          self.find_all(project_id, trac[:trac].tickets.query(mode))
+        end
+      end
+
+      def self.find_all(project_id, tickets)
+        tickets.collect do |ticket_id| 
+          self.find_by_id(ticket_id, project_id) 
+        end
+      end
+
       def self.create(*options)
         mandatory = options.shift
         attributes = {}

data/ticketmaster-trac.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ticketmaster-trac}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael George"]
-  s.date = %q{2011-04-20}
+  s.date = %q{2011-05-24}
   s.description = %q{Allows ticketmaster to interact with Your System.}
   s.email = %q{rafael@hybridgroup.com}
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/hybridgroup/ticketmaster-trac}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Ticketmaster Provider for Trac}
   s.test_files = [
     "spec/comments_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-trac
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Rafael George
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-05-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Ticketmaster Provider for Trac