ticketmaster-zendesk 0.0.2 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.2

data/lib/provider/comment.rb

@@ -9,6 +9,7 @@ module TicketMaster::Provider
       # declare needed overloaded methods here
       
       def initialize(*object)
+        return super(object.first) if object.first.is_a? Hash 
         if object.first
           object = object.first
           ticket_id = object.shift
@@ -39,9 +40,20 @@ module TicketMaster::Provider
         Time.parse(self[:updated_at])
       end
 
-      def self.find_all(*options)
-        project_id = options.shift
-        ticket_id = options.shift
+      def self.find(project_id, ticket_id, *options)
+        ticket_comments = self.find_all(project_id, ticket_id)
+        if options[0].first.is_a? Array
+          ticket_comments.select do |comment|
+            comment if options[0].first.any? { |comment_id| comment_id == comment.id }
+          end
+        elsif options[0].first.is_a? Hash
+          self.find_by_attributes(project_id, ticket_id, options[0].first)
+        else
+          ticket_comments
+        end
+      end
+
+      def self.find_all(project_id, ticket_id)
         comment_id = 0
         ZendeskAPI::Ticket.find(ticket_id).comments.collect do |comment|
           comment_id += 1
@@ -50,18 +62,7 @@ module TicketMaster::Provider
       end
 
       def self.find_by_attributes(project_id, ticket_id, attributes = {})
-        self.find_all(project_id, ticket_id).select do |comment|
-          attributes.inject(true) do |memo, kv|
-            break unless memo
-            key, value = kv
-            begin
-              memo &= comment.send(key) == value
-            rescue NoMethodError
-              memo = false
-            end
-            memo
-          end
-        end
+       search_by_attribute(self.find_all(project_id, ticket_id), attributes)
       end
 
     end

data/lib/provider/project.rb

@@ -35,13 +35,7 @@ module TicketMaster::Provider
       end
 
       def tickets(*options)
-        if options.empty?
-          Ticket.find_all(self.name)
-        elsif options.first.is_a? Array
-          Ticket.find_all(self.name).select { |ticket| ticket if options.first.any? { |ticket_id| ticket_id == ticket.id }}
-        elsif options.first.is_a? Hash
-          Ticket.find_by_attributes(self.name, options.first)
-        end
+        Ticket.find(self.name, options)
       end
 
       def ticket(*options)

data/lib/provider/ticket.rb

@@ -41,6 +41,17 @@ module TicketMaster::Provider
         Time.parse(self[:updated_at])
       end
 
+      def self.find(project_id, *options)
+        tickets = self.find_all(project_id)
+        if options[0].first.is_a? Array
+          Ticket.find_all(self.name).select { |ticket| ticket if options[0].first.any? { |ticket_id| ticket_id == ticket.id }}
+        elsif options[0].first.is_a? Hash
+          Ticket.find_by_attributes(self.name, options[0].first)
+        else
+          tickets
+        end
+      end
+
       def self.find_all(*options)
         project_id = options.first
         SEARCH_API.find(:all, :params => {:query => "status:open"}).collect { |ticket| self.new([ticket, project_id])}
@@ -51,49 +62,21 @@ module TicketMaster::Provider
       end
 
       def self.find_by_attributes(project_id, attributes = {})
-        self.find_all(project_id).select do |ticket|
-          attributes.inject(true) do |memo, kv|
-            break unless memo
-            key, value = kv
-            begin
-              memo &= ticket.send(key) == value
-            rescue NoMethodError
-              memo = false
-            end
-            memo
-          end
-        end
+        search_by_attribute(self.find_all(project_id), attributes)
       end
 
       def comments(*options)
-        if options.first.is_a? Array
-          ticket_comments.select do |comment|
-            comment if options.first.any? { |comment_id| comment_id == comment.id }
-          end
-        elsif options.first.is_a? Hash
-          comments_find_by_attributes(options.first)
-        else
-          ticket_comments
-        end
+        Comment.find(project_id, id, options)
       end
 
       def comment(*options)
-        unless options.first.is_a? Hash
-          ticket_comments.select { |comment| comment.id == options.first }.first
-        else
-          comments_find_by_attributes(options.first).first
+        if options.first.is_a? Fixnum
+          Comment.find(project_id, id, [options.first]).first
+        elsif options.first.is_a? Hash
+          Comment.find_by_attributes(project_id, id, options.first).first
         end
       end
 
-      private 
-      def ticket_comments
-        Comment.find_all(self[:project_id], self[:id])
-      end
-
-      def comments_find_by_attributes(attributes)
-        Comment.find_by_attributes(self[:project_id], self[:id], attributes)
-      end
-
     end
 
   end

data/ticketmaster-zendesk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ticketmaster-zendesk}
-  s.version = "0.0.2"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael George"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-04-27}
   s.description = %q{Allows ticketmaster to interact with Your System.}
   s.email = %q{george.rafael@gmail.com}
   s.extra_rdoc_files = [
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://bandw.tumblr.com}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Ticketmaster Provider for Zendesk}
   s.test_files = [
     "spec/comments_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-zendesk
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
-  - 0
+  - 1
   - 2
-  version: 0.0.2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Rafael George
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -04:00
+date: 2011-04-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -180,7 +180,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 Zendesk