ticketmaster-basecamp 0.3.9 → 0.4.0

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "ticketmaster", "0.6.10"
+gem "ticketmaster", "~> 0.7.0"
 gem "xml-simple", "~> 1.1"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.0)
@@ -34,7 +34,7 @@ GEM
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    ticketmaster (0.6.10)
+    ticketmaster (0.7.0)
       activeresource (~> 3.0)
       activesupport (~> 3.0)
       hashie (~> 1.2)
@@ -48,5 +48,5 @@ DEPENDENCIES
   rcov (~> 1.0)
   rspec (~> 2.3)
   simplecov (~> 0.5)
-  ticketmaster (= 0.6.10)
+  ticketmaster (~> 0.7.0)
   xml-simple (~> 1.1)

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.4.0

data/lib/basecamp/basecamp.rb

@@ -191,10 +191,11 @@ class BasecampAPI
         end
       end
     end
-
-    def prefix_options
-      id ? {} : super
-    end
+    
+    # Commented because it was causing a Missing prefix error when updating a TodoItem
+    #def prefix_options
+    #  id ? {} : super
+    #end
   end
 
   class Account < Resource

data/lib/provider/project.rb

@@ -59,11 +59,10 @@ module TicketMaster::Provider
         last_changed_on = updated
       end
       
-      def ticket!(*options)
-        options[0].merge!(:project_id => id) if options.first.is_a?(Hash)
-        self.class.parent::Ticket.create(*options)
+      def ticket!(attributes_hash)
+        provider_parent(self.class)::Ticket.create attributes_hash.merge :project_id => id
       end
-
+      
       def self.find_by_id(id)
         self.new API.find(id)
       end

data/lib/provider/ticket.rb

@@ -13,78 +13,115 @@ module TicketMaster::Provider
     # * requestor => creator_name (read-only)
     # * project_id
     class Ticket < TicketMaster::Provider::Base::Ticket
-      attr_accessor :list
-
-      def self.find_by_id(project_id, id)
-        self.search(project_id, {'id' => id}).first
-      end
-      
-      def self.find_by_attributes(project_id, attributes = {})
-        self.search(project_id, attributes)
+      def initialize(*options)
+        @system_data ||= {}
+        @cache ||= {}
+        first = options.first
+        case first
+          when Hash
+            super(first.to_hash)
+          else
+            @system_data[:client] = first
+            super(first.attributes)
+        end
       end
 
-      def self.search(project_id, options = {}, limit = 1000)
-        tickets = BasecampAPI::TodoList.find(:all, :params => {:project_id => project_id}).collect do |list|
-          list.todo_items.collect { |item|
-            item.attributes['list'] = list
-            item
+      class << self
+
+        def find_by_id(project_id, id)
+          find_by_attributes(project_id, {:id => id}).first
+        end
+
+        def find_by_attributes(project_id, attributes = {})
+          search(project_id, attributes)
+        end
+
+        def search(project_id, options = {}, limit = 1000)
+          tickets = BasecampAPI::TodoList.find(:all, :params => {:project_id => project_id}).collect do |list|
+            list.todo_items.collect { |item|
+              item.attributes['list'] = list
+              item
             }
           end.flatten.collect { |ticket| self.new(ticket.attributes.merge!(:project_id => project_id)) }
-        search_by_attribute(tickets, options, limit)
-      end
-      
-      # It expects a single hash
-      def self.create(*options)
-        if options.first.is_a?(Hash)
-          list_id = options[0].delete(:todo_list_id) || options[0].delete('todo_list_id')
-          project_id = options[0].delete(:project_id) || options[0].delete('project_id')
-          if list_id.nil? and project_id
-            list_id = BasecampAPI::TodoList.create(:project_id => project_id, :name => 'New List').id
-          end
-          options[0][:todo_list_id] = list_id
+          search_by_attribute(tickets, options, limit)
+        end
+
+        # It expects a single hash
+        def create(attributes_hash)
+          todo_item_hash = create_todo_item_hash attributes_hash
+          todo_item = create_todo_item todo_item_hash
+
+          return nil unless todo_item.save
+
+          todo_item.project_id = attributes_hash[:project_id]
+          todo_item.todo_list_id = todo_item_hash[:todo_list_id]
+          self.new(todo_item)
         end
-        something = BasecampAPI::TodoItem.new(options.first)
-        something.save
-        self.new something
+
+        private
+
+        def create_todo_item_hash(ticket_hash)
+          a = ticket_hash
+          validate_ticket_hash a
+          todo_item_hash = {
+            :content => a[:title],
+            :position => a[:priority] || 1,
+            :todo_list_id => a[:todo_list_id] || create_todo_list({
+                                                  :project_id => a[:project_id], 
+                                                  :name => "#{a[:title]} list"}).id
+          }
+        end
+
+        def create_todo_item(attributes_hash)
+          BasecampAPI::TodoItem.new(attributes_hash)
+        end
+
+        def validate_ticket_hash(attributes_hash)
+          title = attributes_hash[:title]
+          raise ArgumentError.new "Title is required" if title.nil? or title.empty?
+        end
+
+        def create_todo_list(attributes)
+          BasecampAPI::TodoList.create(attributes)
+        end
+      end
+
+      def copy_to(todo_item)
+        todo_item.completed = status
+        todo_item.position = priority
+        todo_item.name = title
+        todo_item.content = title
+        todo_item.completed = resolution
+        todo_item.responsible_party_name = assignee
+        todo_item.creator_name = requestor
+        todo_item
+      end
+
+      def save
+        todo_item = BasecampAPI::TodoItem.find id, :params => { :todo_list_id => todo_list_id }
+        copy_to(todo_item).save
       end
       
-      def initialize(*object)
-        if object.first 
-          object = object.first
-          unless object.is_a? Hash
-            hash = {:id => object.id,
-                    :completed => object.completed,
-                    :title => object.content,
-                    :content => object.content,
-                    :project_id => object.project_id,
-                    :priority => object.position, 
-                    :position => object.position,
-                    :description => object.description,
-                    :assignee => object.creator_name,
-                    :requestor => object.requestor}
-          else
-            hash = object
-          end
-          super hash
-        end
+      def todo_list_id
+        self['todo_list_id'].to_i
       end
       
       def status
         self.completed ? 'completed' : 'incomplete'
       end
-      
+
       def priority
         self.position
       end
-      
+
       def priority=(pri)
         self.position = pri
       end
-      
+
       def title
         self.content
       end
-      
+
       def title=(titl)
         self.content = titl
       end
@@ -92,28 +129,38 @@ module TicketMaster::Provider
       def updated_at=(comp)
         self.completed_on = comp
       end
-      
+
       def description
         self.content
       end
-      
+
       def description=(desc)
         self.content = desc
       end
-      
+
       def assignee
         self.responsible_party_name
       end
-      
+
       def requestor
         self.creator_name
       end
-      
+
       def comment!(*options)
         options[0].merge!(:todo_item_id => id) if options.first.is_a?(Hash)
         self.class.parent::Comment.create(*options)
       end
 
+      # FIXME: Remove this debug code
+      class Net::HTTP
+        def send(*args)
+          p "<<< Net::HTTP#send(#{args.inspect}) >>>"
+          resp = super
+          p "<<< Response = #{resp.inspect} >>>"
+          resp
+        end
+      end
+
     end
   end
 end

data/spec/fixtures/todo_items/62509330_todo_item.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<todo-item>
+  <comments-count type="integer">0</comments-count>
+  <completed type="boolean">false</completed>
+  <content>hudnthdau</content>
+  <created-at type="datetime">2010-07-21T01:14:34Z</created-at>
+  <updated-at type="datetime">2010-07-20T23:36:49Z</updated-at>
+  <creator-id type="integer">5654019</creator-id>
+  <due-at type="datetime" nil="true"></due-at>
+  <id type="integer">62509330</id>
+  <position type="integer">1</position>
+  <todo-list-id type="integer">9973518</todo-list-id>
+  <created-on type="datetime" deprecated="true">2010-07-21T01:14:34Z</created-on>
+  <creator-name>Kia Kroas</creator-name>
+</todo-item>

data/spec/fixtures/todo_list_9972756.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<todo-list>
+  <completed-count type="integer">0</completed-count>
+  <description>etauhnotehunoteh tnheontu honetuh osneh noe hosneuh toneuh</description>
+  <id type="integer">9972756</id>
+  <milestone-id type="integer" nil="true"></milestone-id>
+  <name>Cheese</name>
+  <position type="integer">2</position>
+  <private type="boolean">false</private>
+  <project-id type="integer">5220065</project-id>
+  <tracked type="boolean">false</tracked>
+  <uncompleted-count type="integer">6</uncompleted-count>
+  <complete>false</complete>
+</todo-list>

data/spec/fixtures/todo_lists/create.json

@@ -0,0 +1 @@
+{"response":{"id":62509330}

data/spec/fixtures/todo_lists/create.xml

@@ -0,0 +1,14 @@
+<todo-item>
+  <comments-count type="integer">0</comments-count>
+  <completed type="boolean">false</completed>
+  <content>oeoeuoeuoeuou</content>
+  <created-at type="datetime">2010-07-20T23:36:49Z</created-at>
+  <updated-at type="datetime">2010-07-20T23:36:49Z</updated-at>
+  <creator-id type="integer">5654019</creator-id>
+  <due-at type="datetime" nil="true"></due-at>
+  <id type="integer">62504112</id>
+  <position type="integer">1</position>
+  <todo-list-id type="integer">9972756</todo-list-id>
+  <created-on type="datetime" deprecated="true">2010-07-20T23:36:49Z</created-on>
+  <creator-name>Kia Kroas</creator-name>
+</todo-item>

data/spec/tickets_spec.rb

@@ -9,66 +9,76 @@ describe "Ticketmaster::Provider::Basecamp::Ticket" do
       mock.get '/projects/5220065/todo_lists.xml', headers, fixture_for('todo_lists'), 200
       mock.get '/todo_lists/9973518/todo_items.xml', headers, fixture_for('todo_lists/9973518_items'), 200
       mock.get '/todo_lists/9972756/todo_items.xml', headers, fixture_for('todo_lists/9972756_items'), 200
+      mock.get '/todo_lists/9973518/todo_items/62509330.xml', headers, fixture_for('todo_items/62509330_todo_item'), 200
+      mock.get '/todo_lists/0/todo_items/62509330.xml', headers, fixture_for('todo_items/62509330_todo_item'), 200
       mock.put '/todo_items/62509330.xml', wheaders, '', 200
-      mock.post '/todo_lists/9972756/todo_items.xml', wheaders, '', 200
+      mock.post '/projects/5220065/todo_lists.xml', wheaders, fixture_for('todo_list_9972756'), 201
+      mock.put '/todo_lists/9973518/todo_items/62509330.xml', wheaders, '', 200
+      mock.put '/todo_lists/0/todo_items/62509330.xml', wheaders, '', 200
+      mock.post '/todo_lists/9972756/todo_items.xml', wheaders, fixture_for('todo_lists/create'), 201
     end
     @project_id = 5220065
     @ticket_id = 62509330
   end
-  
+
   before(:each) do
     @ticketmaster = TicketMaster.new(:basecamp, :domain => 'ticketmaster.basecamphq.com', :token => '000000')
     @project = @ticketmaster.project(@project_id)
     @klass = TicketMaster::Provider::Basecamp::Ticket
   end
-  
+
   it "should be able to load all tickets" do
     @project.tickets.should be_an_instance_of(Array)
     @project.tickets.first.should be_an_instance_of(@klass)
   end
-  
+
   it "should be able to load all tickets based on an array of ids" do
     @tickets = @project.tickets([@ticket_id])
     @tickets.should be_an_instance_of(Array)
     @tickets.first.should be_an_instance_of(@klass)
     @tickets.first.id.should == @ticket_id
   end
-  
+
   it "should be able to load all tickets based on attributes" do
     @tickets = @project.tickets(:id => @ticket_id)
     @tickets.should be_an_instance_of(Array)
     @tickets.first.should be_an_instance_of(@klass)
     @tickets.first.id.should == @ticket_id
   end
-  
+
   it "should return the ticket class" do
     @project.ticket.should == @klass
   end
-  
+
   it "should be able to load a single ticket" do
     @ticket = @project.ticket(@ticket_id)
     @ticket.should be_an_instance_of(@klass)
     @ticket.id.should == @ticket_id
   end
-  
+
   it "should be able to load a single ticket based on attributes" do
     @ticket = @project.ticket(:id => @ticket_id)
     @ticket.should be_an_instance_of(@klass)
     @ticket.id.should == @ticket_id
   end
-  
+
   it "should be able to update and save a ticket" do
-    pending
     @ticket = @project.ticket(@ticket_id)
-    @ticket.save.should == nil
-    @ticket.description = 'hello'
-    @ticket.save.should == true
+    @ticket.save.should be_true
   end
 
   it "should be able to create a ticket" do
-    pending
     @ticket = @project.ticket!(:todo_list_id => 9972756, :title => 'Ticket #12', :description => 'Body')
     @ticket.should be_an_instance_of(@klass)
+    @ticket.project_id.should_not be_nil
+    @ticket.todo_list_id.should_not be_nil
+  end
+
+  it "should be able to create a ticket without passing a todo list id" do
+    @ticket = @project.ticket!(:title => 'Ticket #13', :description => 'Body')
+    @ticket.should be_an_instance_of(@klass)
+    @ticket.project_id.should_not be_nil
+    @ticket.todo_list_id.should_not be_nil
   end
-  
+
 end

data/ticketmaster-basecamp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ticketmaster-basecamp"
-  s.version = "0.3.9"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HybridGroup"]
-  s.date = "2012-03-16"
+  s.date = "2012-04-20"
   s.description = "This gem provides an interface to basecamp through the ticketmaster gem"
   s.email = "hong.quach@abigfisch.com"
   s.extra_rdoc_files = [
@@ -46,12 +46,16 @@ Gem::Specification.new do |s|
     "spec/fixtures/projects/5220065.xml",
     "spec/fixtures/projects/create.json",
     "spec/fixtures/projects/create.xml",
+    "spec/fixtures/todo_items/62509330_todo_item.xml",
+    "spec/fixtures/todo_list_9972756.xml",
     "spec/fixtures/todo_lists.json",
     "spec/fixtures/todo_lists.xml",
     "spec/fixtures/todo_lists/9972756_items.json",
     "spec/fixtures/todo_lists/9972756_items.xml",
     "spec/fixtures/todo_lists/9973518_items.json",
     "spec/fixtures/todo_lists/9973518_items.xml",
+    "spec/fixtures/todo_lists/create.json",
+    "spec/fixtures/todo_lists/create.xml",
     "spec/projects_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb",
@@ -68,14 +72,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ticketmaster>, ["= 0.6.10"])
+      s.add_runtime_dependency(%q<ticketmaster>, ["~> 0.7.0"])
       s.add_runtime_dependency(%q<xml-simple>, ["~> 1.1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.5"])
       s.add_development_dependency(%q<rcov>, ["~> 1.0"])
     else
-      s.add_dependency(%q<ticketmaster>, ["= 0.6.10"])
+      s.add_dependency(%q<ticketmaster>, ["~> 0.7.0"])
       s.add_dependency(%q<xml-simple>, ["~> 1.1"])
       s.add_dependency(%q<rspec>, ["~> 2.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.6"])
@@ -83,7 +87,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, ["~> 1.0"])
     end
   else
-    s.add_dependency(%q<ticketmaster>, ["= 0.6.10"])
+    s.add_dependency(%q<ticketmaster>, ["~> 0.7.0"])
     s.add_dependency(%q<xml-simple>, ["~> 1.1"])
     s.add_dependency(%q<rspec>, ["~> 2.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.6"])

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-basecamp
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 0.3.9
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - HybridGroup
@@ -10,73 +15,98 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 Z
+date: 2012-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ticketmaster
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.10
-  type: :runtime
-  prerelease: false
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: xml-simple
+  prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
-  type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-  type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
         version: "1.6"
-  type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: simplecov
+  prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-  type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rcov
+  prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-  type: :development
-  prerelease: false
   version_requirements: *id006
 description: This gem provides an interface to basecamp through the ticketmaster gem
 email: hong.quach@abigfisch.com
@@ -117,12 +147,16 @@ files:
 - spec/fixtures/projects/5220065.xml
 - spec/fixtures/projects/create.json
 - spec/fixtures/projects/create.xml
+- spec/fixtures/todo_items/62509330_todo_item.xml
+- spec/fixtures/todo_list_9972756.xml
 - spec/fixtures/todo_lists.json
 - spec/fixtures/todo_lists.xml
 - spec/fixtures/todo_lists/9972756_items.json
 - spec/fixtures/todo_lists/9972756_items.xml
 - spec/fixtures/todo_lists/9973518_items.json
 - spec/fixtures/todo_lists/9973518_items.xml
+- spec/fixtures/todo_lists/create.json
+- spec/fixtures/todo_lists/create.xml
 - spec/projects_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -142,12 +176,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []