ticketmaster-trac 0.1.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.4

data/lib/provider/comment.rb

@@ -7,18 +7,18 @@ module TicketMaster::Provider
     #
     class Comment < TicketMaster::Provider::Base::Comment
       # declare needed overloaded methods here
-      
+
       def initialize(*object)
         if object.first
           object = object.first
           unless object.is_a? Hash
             @system_data = {:client => object}
             hash = {:id => object.id,
-                    :author => object.author,
-                    :body => object.body,
-                    :ticket_id => object.ticket_id,
-                    :created_at => object.created_at,
-                    :updated_at => object.updated_at}
+              :author => object.author,
+              :body => object.body,
+              :ticket_id => object.ticket_id,
+              :created_at => object.created_at,
+              :updated_at => object.updated_at}
           else
             hash = object
           end
@@ -41,6 +41,7 @@ module TicketMaster::Provider
           self[:updated_at]
         end
       end
+
     end
   end
 end

data/lib/provider/project.rb

@@ -5,7 +5,6 @@ module TicketMaster::Provider
     # 
     class Project < TicketMaster::Provider::Base::Project
       # declare needed overloaded methods here
-      API = TracAPI
       
       def initialize(*object)
         if object.first
@@ -36,16 +35,18 @@ module TicketMaster::Provider
 
       def self.find(*options)
         mode = options.first
+        trac = TicketMaster::Provider::Trac.api
         if mode.is_a? String
-          self.new({:url => API.url, :username => API.username, :name=> "#{API.username}-project"})
+          self.new({:url => trac[:url], :username => trac[:username], :name=> "#{trac[:username]}-project"})
         end
       end
 
       def ticket(*options)
         unless options.empty?
           options = options.first
+          trac = TicketMaster::Provider::Trac.api
           if options.is_a? Hash
-            TicketMaster::Provider::Trac::Ticket.find_by_id(API.api.tickets.query(options).first, self[:name])
+            TicketMaster::Provider::Trac::Ticket.find_by_id(trac[:trac].tickets.query(options).first, self[:name])
           end
         else
           TicketMaster::Provider::Trac::Ticket
@@ -59,12 +60,13 @@ module TicketMaster::Provider
 
       def tickets(*options)
         mode = options.first
+        trac = TicketMaster::Provider::Trac.api
         if options.empty?
-          collect_tickets(API.api.tickets.list)
+          collect_tickets(trac[:trac].tickets.list)
         elsif mode.is_a? Array
           collect_tickets(mode)
         elsif mode.is_a? Hash
-          collect_tickets(API.api.tickets.query(mode))
+          collect_tickets(trac[:trac].tickets.query(mode))
         end
       end
 

data/lib/provider/ticket.rb

@@ -6,7 +6,6 @@ module TicketMaster::Provider
     class Ticket < TicketMaster::Provider::Base::Ticket
       # declare needed overloaded methods here
 
-      API = TracAPI
       def initialize(*object)
         if object.first
           args = object
@@ -57,8 +56,9 @@ module TicketMaster::Provider
       end
 
       def self.find_by_id(id, project_id)
+        trac = TicketMaster::Provider::Trac.api
         retryable(:tries => 5) do 
-          self.new API.api.tickets.get(id), project_id
+          self.new trac[:trac].tickets.get(id), project_id
         end
       end
 
@@ -66,8 +66,9 @@ module TicketMaster::Provider
         mandatory = options.shift
         attributes = {}
         attributes ||= options.shift
+        trac = TicketMaster::Provider::Trac.api
         begin
-          self.find_by_id API.api.tickets.create(mandatory[:summary], mandatory[:description], attributes)
+          self.find_by_id trac[:trac].tickets.create(mandatory[:summary], mandatory[:description], attributes)
         rescue
           self
         end
@@ -81,8 +82,16 @@ module TicketMaster::Provider
           end
         elsif options.first.is_a? Hash
           hash = options.first
-          comments.select do |key, value|
-            hash[key] == value
+          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

data/lib/provider/trac.rb

@@ -12,7 +12,7 @@ module TicketMaster::Provider
       @authentication ||= TicketMaster::Authenticator.new(auth)
       auth = @authentication
       @trac = ::Trac.new(auth.url, auth.username, auth.password)
-      TracAPI.new @trac, auth.url, auth.username, auth.password
+      TicketMaster::Provider::Trac.api = {:trac => @trac, :url => auth.url, :username => auth.username, :password => auth.password}
     end
 
     # declare needed overloaded methods here
@@ -28,5 +28,13 @@ module TicketMaster::Provider
       end
     end
 
+    def self.api=(trac_instance)
+      @api = trac_instance
+    end
+
+    def self.api
+      @api
+    end
+
   end
 end

data/lib/trac/trac.rb

@@ -1,34 +1,10 @@
 # code to communicate with your backend goes here...
 
-class TracAPI
-  def initialize(trac, url, username, password)
-    @@api = trac
-    @@username = username
-    @@url = url
-    @@password = password
-  end
-
-  def self.api
-    @@api
-  end
-
-  def self.url
-    @@url
-  end
-
-  def self.username
-    @@username
-  end
-
-  def self.password
-    @@password
-  end
-end
-
 class CommentUtil
 
   def initialize(ticket_id)
-    @doc = Nokogiri::HTML(open("#{TracAPI.url}/ticket/#{ticket_id}", :http_basic_authentication=>[TracAPI.username, TracAPI.password]))
+    trac = TicketMaster::Provider::Trac.api
+    @doc = Nokogiri::HTML(open("#{trac[:url]}/ticket/#{ticket_id}", :http_basic_authentication=>[trac[:username], trac[:password]]))
     @ticket_id = ticket_id
   end
 

data/ticketmaster-trac.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-trac
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Rafael George
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -04:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency