ticketmaster-lighthouse 0.4.0 → 0.5.0

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.rvmrc

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.add_dependency "ticketmaster", ">= 0.3.0"
     gem.add_dependency "activesupport", ">= 2.3.2"
     gem.add_dependency "activeresource", ">= 2.3.2"
+    gem.add_dependency "lighthouse-api", "~> 2.0"
     gem.add_dependency "addressable", ">= 2.1.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/provider/comment.rb

@@ -13,13 +13,13 @@ module TicketMaster::Provider
     # * ticket_id => number (read-only)
     # * project_id => (set by the initializer)
     class Comment < TicketMaster::Provider::Base::Comment
-      API = LighthouseAPI::Ticket
+      API = ::Lighthouse::Ticket
       
       # A custom find_by_id
       # The "comment" id is it's index in the versions array. An id of 0 therefore exists and
       # should be the first ticket (original)
       def self.find_by_id(project_id, ticket_id, id)
-        self.new LighthouseAPI::Ticket.find(ticket_id, :params => {:project_id => project_id}), id
+        self.new API.find(ticket_id, :params => {:project_id => project_id}), id
       end
       
       # A custom find_by_attributes
@@ -49,7 +49,9 @@ module TicketMaster::Provider
         attributes.each do |k, v|
           ticket.send("#{k}=", v)
         end
+        versions = ticket.attributes.delete('versions')
         ticket.save
+        ticket.attributes['versions'] = versions
         self.find_by_id project_id, ticket_id, ticket.versions.length
       end
       
@@ -66,7 +68,7 @@ module TicketMaster::Provider
       #
       # It returns a custom result because we need the original ticket to make a comment.
       def self.search(project_id, ticket_id, options = {}, limit = 1000)
-        ticket = LighthouseAPI::Ticket.find(ticket_id, :params => {:project_id => project_id})
+        ticket = API.find(ticket_id, :params => {:project_id => project_id})
         comments = ticket.versions
         [search_by_attribute(comments, options, limit), ticket]
       end

data/lib/provider/lighthouse.rb

@@ -2,8 +2,8 @@ module TicketMaster::Provider
   # This is the Lighthouse Provider for ticketmaster
   module Lighthouse
     include TicketMaster::Provider::Base
-    PROJECT_API = LighthouseAPI::Project
-    TICKET_API = LighthouseAPI::Ticket
+    PROJECT_API = ::Lighthouse::Project
+    TICKET_API = ::Lighthouse::Ticket
     
     # This is for cases when you want to instantiate using TicketMaster::Provider::Lighthouse.new(auth)
     def self.new(auth = {})
@@ -17,11 +17,11 @@ module TicketMaster::Provider
       if auth.account.nil? or (auth.token.nil? and (auth.username.nil? and auth.password.nil?))
         raise "Please provide at least an account (subdomain) and token or username and password)"
       end
-      LighthouseAPI.account = auth.account || auth.subdomain
+      ::Lighthouse.account = auth.account || auth.subdomain
       if auth.token
-        LighthouseAPI.token = auth.token
+        ::Lighthouse.token = auth.token
       elsif auth.username && auth.password
-        LighthouseAPI.authenticate(auth.username, auth.password)
+        ::Lighthouse.authenticate(auth.username, auth.password)
       end
     end
     

data/lib/provider/project.rb

@@ -5,7 +5,7 @@ module TicketMaster::Provider
     # 
     class Project < TicketMaster::Provider::Base::Project
       attr_accessor :prefix_options
-      API = LighthouseAPI::Project  
+      API = ::Lighthouse::Project  
       # Delete this project
       def destroy
         result = super

data/lib/provider/ticket.rb

@@ -29,7 +29,7 @@ module TicketMaster::Provider
     class Ticket < TicketMaster::Provider::Base::Ticket
       @@allowed_states = ['new', 'open', 'resolved', 'hold', 'invalid']
       attr_accessor :prefix_options
-      API = LighthouseAPI::Ticket
+      API = ::Lighthouse::Ticket
       
       # This is to get the ticket id
       # We can't set ids, so there's no 'id=' method.
@@ -105,6 +105,7 @@ module TicketMaster::Provider
 #          t = "\"#{t}\"" if t.include?(' ')
 #          mem << t
 #        end.join(' ') if @tags
+        @system_data[:client].attributes.delete('versions')
         result = super
         body = nil
         @system_data[:client].body = nil
@@ -114,7 +115,7 @@ module TicketMaster::Provider
       # The closer
       def close(resolution = 'resolved')
         resolution = 'resolved' unless @@allowed_states.include?(resolution)
-        ticket = LighthouseAPI::Ticket.find(self.id, :params => {:project_id => self.prefix_options[:project_id]})
+        ticket = ::Lighthouse::Ticket.find(self.id, :params => {:project_id => self.prefix_options[:project_id]})
         ticket.state = resolution
         ticket.save
       end

data/lib/ticketmaster-lighthouse.rb

@@ -1,4 +1,30 @@
-require File.dirname(__FILE__) + '/lighthouse/lighthouse-api'
+require 'lighthouse-api'
+
+# Monkey Patch - remove when the lighthouse gem gets updated.
+# texel's changes got merged, but looks like a new gem didn't get released. ugh!
+module Lighthouse
+  class Ticket
+    protected
+      def cleanup_tags(tags)
+        tags.tap do |tag|
+          tag.collect! do |t|
+            unless tag.blank?
+              t = Tag.new(t,prefix_options[:project_id])
+              t.downcase!
+              t.gsub! /(^')|('$)/, ''
+              t.gsub! /[^a-z0-9 \-_@\!']/, ''
+              t.strip!
+              t.prefix_options = prefix_options
+              t
+            end
+          end
+          tag.compact!
+          tag.uniq!
+        end
+      end
+    
+  end
+end
 
 %w{ lighthouse ticket project comment }.each do |f|
   require File.dirname(__FILE__) + '/provider/' + f + '.rb';

data/spec/tickets_spec.rb

@@ -59,11 +59,7 @@ describe "Ticketmaster::Provider::Lighthouse::Ticket" do
     @ticket = @project.ticket(5)
     @ticket.save.should == nil
     @ticket.description = 'hello'
-    begin
-    @ticket.save.should == true
-    rescue Exception => e
-      raise e.backtrace.join("\n")
-    end
+    @ticket.save.should be_true
   end
   
   it "should be able to create a ticket" do

data/ticketmaster-lighthouse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ticketmaster-lighthouse}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hong"]
-  s.date = %q{2010-10-18}
+  s.date = %q{2010-10-22}
   s.description = %q{Allows ticketmaster to interact with Lighthouse's issue tracking system.}
   s.email = %q{hong.quach@abigfisch.com}
   s.extra_rdoc_files = [
@@ -23,9 +23,6 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
-     "lib/lighthouse/LICENSE",
-     "lib/lighthouse/README.markdown",
-     "lib/lighthouse/lighthouse-api.rb",
      "lib/provider/comment.rb",
      "lib/provider/lighthouse.rb",
      "lib/provider/project.rb",
@@ -68,12 +65,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ticketmaster>, [">= 0.3.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
       s.add_runtime_dependency(%q<activeresource>, [">= 2.3.2"])
+      s.add_runtime_dependency(%q<lighthouse-api>, ["~> 2.0"])
       s.add_runtime_dependency(%q<addressable>, [">= 2.1.2"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<ticketmaster>, [">= 0.3.0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.2"])
       s.add_dependency(%q<activeresource>, [">= 2.3.2"])
+      s.add_dependency(%q<lighthouse-api>, ["~> 2.0"])
       s.add_dependency(%q<addressable>, [">= 2.1.2"])
     end
   else
@@ -81,6 +80,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ticketmaster>, [">= 0.3.0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.2"])
     s.add_dependency(%q<activeresource>, [">= 2.3.2"])
+    s.add_dependency(%q<lighthouse-api>, ["~> 2.0"])
     s.add_dependency(%q<addressable>, [">= 2.1.2"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-lighthouse
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Hong
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,9 +83,24 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: lighthouse-api
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,7 +112,7 @@ dependencies:
         - 2
         version: 2.1.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 description: Allows ticketmaster to interact with Lighthouse's issue tracking system.
 email: hong.quach@abigfisch.com
 executables: []
@@ -114,9 +129,6 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- lib/lighthouse/LICENSE
-- lib/lighthouse/README.markdown
-- lib/lighthouse/lighthouse-api.rb
 - lib/provider/comment.rb
 - lib/provider/lighthouse.rb
 - lib/provider/project.rb

data/lib/lighthouse/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 HybridGroup
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/lighthouse/README.markdown

@@ -1,5 +0,0 @@
-Lighthouse API
---------------
-
-This is a modified branch/fork of the official Ruby library for interacting with the [Lighthouse REST API](http://lighthouseapp.com/api) modified specifically for interaction with the ticketmaster-lighthouse gem
-

data/lib/lighthouse/lighthouse-api.rb

@@ -1,359 +0,0 @@
-require 'rubygems'
-
-begin
-  require 'uri'
-  require 'addressable/uri'
-
-  module URI
-    def decode(*args)
-      Addressable::URI.decode(*args)
-    end
-
-    def escape(*args)
-      Addressable::URI.escape(*args)
-    end
-
-    def parse(*args)
-      Addressable::URI.parse(*args)
-    end
-  end
-rescue LoadError => e
-  puts "Install the Addressable gem (with dependencies) to support accounts with subdomains."
-  puts "# sudo gem install addressable --development"
-  puts e.message
-end
-
-require 'active_support'
-require 'active_resource'
-
-# Ruby lib for working with the Lighthouse API's XML interface.  
-# The first thing you need to set is the account name.  This is the same
-# as the web address for your account.
-#
-#   LighthouseAPI.account = 'activereload'
-#
-# Then, you should set the authentication.  You can either use your login
-# credentials with HTTP Basic Authentication or with an API Tokens.  You can
-# find more info on tokens at http://lighthouseapp.com/help/using-beacons.
-#
-#   # with basic authentication
-#   LighthouseAPI.authenticate('rick@techno-weenie.net', 'spacemonkey')
-#
-#   # or, use a token
-#   LighthouseAPI.token = 'abcdefg'
-#
-# If no token or authentication info is given, you'll only be granted public access.
-#
-# This library is a small wrapper around the REST interface.  You should read the docs at
-# http://lighthouseapp.com/api.
-#
-module LighthouseAPI
-  class Error < StandardError; end
-  class << self
-    attr_accessor :email, :password, :host_format, :domain_format, :protocol, :port
-    attr_reader :account, :token
-
-    # Sets the account name, and updates all the resources with the new domain.
-    def account=(name)
-      resources.each do |klass|
-        klass.site = klass.site_format % (host_format % [protocol, domain_format % name, ":#{port}"])
-      end
-      @account = name
-    end
-
-    # Sets up basic authentication credentials for all the resources.
-    def authenticate(email, password)
-      @email    = email
-      @password = password
-      self::Base.user = email
-      self::Base.password = password
-    end
-
-    # Sets the API token for all the resources.
-    def token=(value)
-      resources.each do |klass|
-        klass.headers['X-LighthouseToken'] = value
-      end
-      @token = value
-    end
-
-    def resources
-      @resources ||= []
-    end
-  end
-  
-  self.host_format   = '%s://%s%s'
-  self.domain_format = '%s.lighthouseapp.com'
-  self.protocol      = 'https'
-  self.port          = ''
-
-  class Base < ActiveResource::Base
-    def self.inherited(base)
-      LighthouseAPI.resources << base
-      class << base
-        attr_accessor :site_format
-      end
-      base.site_format = '%s'
-      super
-    end
-  end
-  
-  # Find projects
-  #
-  #   LighthouseAPI::Project.find(:all) # find all projects for the current account.
-  #   LighthouseAPI::Project.find(44)   # find individual project by ID
-  #
-  # Creating a Project
-  #
-  #   project = LighthouseAPI::Project.new(:name => 'Ninja Whammy Jammy')
-  #   project.save
-  #   # => true
-  #
-  # Creating an OSS project
-  # 
-  #   project = LighthouseAPI::Project.new(:name => 'OSS Project')
-  #   project.access = 'oss'
-  #   project.license = 'mit'
-  #   project.save
-  # 
-  # OSS License Mappings
-  # 
-  #   'mit' => "MIT License",
-  #   'apache-2-0' => "Apache License 2.0",
-  #   'artistic-gpl-2' => "Artistic License/GPLv2",
-  #   'gpl-2' => "GNU General Public License v2",
-  #   'gpl-3' => "GNU General Public License v3",
-  #   'lgpl' => "GNU Lesser General Public License"
-  #   'mozilla-1-1' => "Mozilla Public License 1.1"
-  #   'new-bsd' => "New BSD License",
-  #   'afl-3' => "Academic Free License v. 3.0"
-  
-  #
-  # Updating a Project
-  #
-  #   project = LighthouseAPI::Project.find(44)
-  #   project.name = "Lighthouse Issues"
-  #   project.public = false
-  #   project.save
-  #
-  # Finding tickets
-  # 
-  #   project = LighthouseAPI::Project.find(44)
-  #   project.tickets
-  #
-  class Project < Base
-    def tickets(options = {})
-      Ticket.find(:all, :params => options.update(:project_id => id))
-    end
-  
-    def messages(options = {})
-      Message.find(:all, :params => options.update(:project_id => id))
-    end
-  
-    def milestones(options = {})
-      Milestone.find(:all, :params => options.update(:project_id => id))
-    end
-  
-    def bins(options = {})
-      Bin.find(:all, :params => options.update(:project_id => id))
-    end
-    
-    def changesets(options = {})
-      Changeset.find(:all, :params => options.update(:project_id => id))
-    end
-
-    def memberships(options = {})
-      ProjectMembership.find(:all, :params => options.update(:project_id => id))
-    end
-
-    def tags(options = {})
-      TagResource.find(:all, :params => options.update(:project_id => id))
-    end
-  end
-
-  class User < Base
-    def memberships(options = {})
-      Membership.find(:all, :params => {:user_id => id})
-    end
-  end
-  
-  class Membership < Base
-    site_format << '/users/:user_id'
-    def save
-      raise Error, "Cannot modify memberships from the API"
-    end
-  end
-  
-  class ProjectMembership < Base
-    self.element_name = 'membership'
-    site_format << '/projects/:project_id'
-
-    def url
-      respond_to?(:account) ? account : project
-    end
-
-    def save
-      raise Error, "Cannot modify memberships from the API"
-    end
-  end
-  
-  class Token < Base
-    def save
-      raise Error, "Cannot modify Tokens from the API"
-    end
-  end
-
-  # Find tickets
-  #
-  #  LighthouseAPI::Ticket.find(:all, :params => { :project_id => 44 })
-  #  LighthouseAPI::Ticket.find(:all, :params => { :project_id => 44, :q => "state:closed tagged:committed" })
-  #
-  #  project = LighthouseAPI::Project.find(44)
-  #  project.tickets
-  #  project.tickets(:q => "state:closed tagged:committed")
-  #
-  # Creating a Ticket
-  #
-  #  ticket = LighthouseAPI::Ticket.new(:project_id => 44)
-  #  ticket.title = 'asdf'
-  #  ...
-  #  ticket.tags << 'ruby' << 'rails' << '@high'
-  #  ticket.save
-  #
-  # Updating a Ticket
-  #
-  #  ticket = LighthouseAPI::Ticket.find(20, :params => { :project_id => 44 })
-  #  ticket.state = 'resolved'
-  #  ticket.tags.delete '@high'
-  #  ticket.save
-  #
-  class Ticket < Base
-    attr_writer :tags
-    site_format << '/projects/:project_id'
-
-    def id
-      attributes['number'] ||= nil
-      number
-    end
-
-    def tags
-      attributes['tag'] ||= nil
-      @tags ||= tag.blank? ? [] : parse_with_spaces(tag)
-    end
-
-    def body
-      attributes['body'] ||= ''
-    end
-
-    def body=(value)
-      attributes['body'] = value
-    end
-
-    def body_html
-      attributes['body_html'] ||= ''
-    end
-
-    def body_html=(value)
-      attributes['body_html'] = value
-    end
-
-#    def save_with_tags
-#      self.tag = @tags.collect do |tag|
-#        tag.include?(' ') ? tag.inspect : tag
-#      end.join(" ") if @tags.is_a?(Array)
-#      @tags = nil ; save_without_tags
-#    end
-#    
-#    alias_method_chain :save, :tags
-
-    private
-      # taken from Lighthouse Tag code
-      def parse_with_spaces(list)
-        tags = []
-
-        # first, pull out the quoted tags
-        list.gsub!(/\"(.*?)\"\s*/ ) { tags << $1; "" }
-        
-        # then, get whatever's left
-        tags.concat list.split(/\s/)
-
-        cleanup_tags(tags)
-      end
-    
-      def cleanup_tags(tags)
-        returning tags do |tag|
-          tag.collect! do |t|
-            unless tag.blank?
-              t = Tag.new(t,prefix_options[:project_id])
-              t.downcase!
-              t.gsub! /(^')|('$)/, ''
-              t.gsub! /[^a-z0-9 \-_@\!']/, ''
-              t.strip!
-              t.prefix_options = prefix_options
-              t
-            end
-          end
-          tag.compact!
-          tag.uniq!
-        end
-      end
-  end
-  
-  class Message < Base
-    site_format << '/projects/:project_id'
-  end
-  
-  class Milestone < Base
-    site_format << '/projects/:project_id'
-
-    def tickets(options = {})
-      Ticket.find(:all, :params => options.merge(prefix_options).update(:q => %{milestone:"#{title}"}))
-    end
-  end
-  
-  class Bin < Base
-    site_format << '/projects/:project_id'
-
-    def tickets(options = {})
-      Ticket.find(:all, :params => options.merge(prefix_options).update(:q => query))
-    end
-  end
-  
-  class Changeset < Base
-    site_format << '/projects/:project_id'
-  end
-  
-  class Change < Array; end
-
-  class TagResource < Base
-    self.element_name = 'tag'
-    site_format << '/projects/:project_id'
-
-    def name
-      @name ||= Tag.new(attributes['name'], prefix_options[:project_id])
-    end
-
-    def tickets(options = {})
-      name.tickets(options)
-    end
-  end
-  
-  class Tag < String
-    attr_writer :prefix_options
-    attr_accessor :project_id
-
-    def initialize(s, project_id)
-      @project_id = project_id
-      super(s)
-    end
-
-    def prefix_options
-      @prefix_options || {}
-    end
-
-    def tickets(options = {})
-      options[:project_id] ||= @project_id
-      Ticket.find(:all, :params => options.merge(prefix_options).update(:q => %{tagged:"#{self}"}))
-    end
-  end
-end