ticketmaster-redmine 0.2.8 → 0.3.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"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

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)
@@ -47,4 +47,4 @@ DEPENDENCIES
   rcov (~> 1.0)
   rspec (~> 2.8)
   simplecov (~> 0.5)
-  ticketmaster (= 0.6.10)
+  ticketmaster (~> 0.7.0)

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.3.0

data/lib/provider/api-extensions.rb

@@ -0,0 +1,22 @@
+#Reopening class to add ticket master espesific behavior without mixing it with RadmineAPI
+class RedmineAPI::Issue
+  def to_ticket_hash
+    return  :id => id.to_i,
+      :title => subject,
+      :created_at => created_on,
+      :updated_at => updated_on,
+      :project_id => project.id.to_i,
+      :status => status.name,
+      :priority => priority.name,
+      :priority_id => priority.id.to_i, 
+      :requestor => author.name,
+      :assignee => author.name
+  end
+
+  def update_with(ticket)
+    self.subject = ticket.title
+    self.project_id = ticket.project_id
+    self.description = ticket.description
+    self
+  end
+end

data/lib/provider/project.rb

@@ -43,19 +43,6 @@ module TicketMaster::Provider
       def identifier
         self[:identifier]
       end
-
-      def tickets(*options)
-        Ticket.find(self.id, options)
-      end
-
-      def ticket(*options)
-        unless options.empty?
-          Ticket.find(self.id, options)
-        else 
-          TicketMaster::Provider::Redmine::Ticket
-        end
-      end
-
     end
   end
 end

data/lib/provider/redmine.rb

@@ -4,20 +4,21 @@ module TicketMaster::Provider
     include TicketMaster::Provider::Base
     PROJECT_API = RedmineAPI::Project
     TICKET_API = RedmineAPI::Issue
-    
+
     # This is for cases when you want to instantiate using TicketMaster::Provider::Yoursystem.new(auth)
     def self.new(auth = {})
       TicketMaster.new(:redmine, auth)
     end
-    
+
     # declare needed overloaded methods here
     def authorize(auth = {})
       @authentication ||= TicketMaster::Authenticator.new(auth)
       auth = @authentication
-      if (auth.server.blank? and auth.username.blank? and auth.password.blank?)
-        raise "Please you should provide server, username and password"
+      if auth.server.blank? and auth.token.blank?
+        raise "Please you should provide server and token"
       end
-      RedmineAPI.authenticate(auth.server, auth.username, auth.password)
+
+      RedmineAPI.authenticate(auth.server, auth.token)
     end
 
     def valid?

data/lib/provider/ticket.rb

@@ -7,23 +7,11 @@ module TicketMaster::Provider
     class Ticket < TicketMaster::Provider::Base::Ticket
       # declare needed overloaded methods here
 
-      def initialize(*object) 
-        if object.first
-          object = object.first
-          unless object.is_a? Hash
-            hash = {:id => object.id.to_i,
-                    :title => object.subject,
-                    :created_at => object.created_on,
-                    :updated_at => object.updated_on,
-                    :project_id => object.project.id.to_i,
-                    :status => object.status.name,
-                    :priority => object.priority.name,
-                    :requestor => object.author.name,
-                    :assignee => object.author.name}
-          else
-            hash = object
-          end
-          super hash
+      def initialize(*args)
+        case args.first
+          when Hash then super args.first
+          when RedmineAPI::Issue then super args.first.to_ticket_hash
+          else raise ArgumentError.new
         end
       end
 
@@ -36,7 +24,7 @@ module TicketMaster::Provider
       end
 
       def project_id
-        self[:project].id.to_i
+        self[:project_id]
       end
 
       def status
@@ -46,7 +34,7 @@ module TicketMaster::Provider
       def priority
         self[:priority].name
       end
-
+      
       def requestor
         self[:author].name
       end
@@ -58,41 +46,33 @@ module TicketMaster::Provider
       def id
         self[:id].to_i
       end
+      
+      def description
+        self[:description]
+      end
 
-     def self.find(project_id, *options)
-         if options.first.is_a? Hash
-           options[0].merge!(:params => {:project_id => project_id})
-           super(*options)
-         elsif options.empty?
-           issues =  RedmineAPI::Issue.find(:all, :params => {:project_id => project_id}).collect { |issue| TicketMaster::Provider::Redmine::Ticket.new issue }
-         elsif options[0].first.is_a? Fixnum
-           self.find_by_id(project_id, options[0].first)
-         else
-           super(*options)
-         end
-     end
-
-     def self.find_by_id(project_id, ticket_id)
+      def self.find_by_id(project_id, ticket_id)
        self.new API.find(:first, :id => ticket_id)
-     end
+      end
 
-     def self.find_by_attributes(project_id, attributes = {})
-       issues = API.find(:all, build_attributes(project_id, attributes))
+      def self.find_by_attributes(project_id, attributes = {})
+       issues = API.find(:all, attributes_for_request(project_id, attributes))
        issues.collect { |issue| self.new issue }
-     end
-
-     def self.build_attributes(repo, options)
-       hash = {:repo => repo}.merge!(options)
-     end
-
+      end
 
-      def self.create(*options)
-        issue = API.new(options.first.merge!(:status => 'New', :priority => 'Normal'))
-        ticket = self.new issue
-        issue.save
-        ticket
+      def self.attributes_for_request(project_id, options)
+       hash = {:params => {:project_id => project_id}}.merge!(options)
       end
 
+      def self.create(attributes)
+        ticket = self.new(attributes)
+        ticket if ticket.save
+      end
+      
+      def save
+        to_issue.new? ? to_issue.save : update
+      end
+      
       def comments
         warn "Redmine doesn't support comments"
         []
@@ -107,6 +87,21 @@ module TicketMaster::Provider
         warn "Redmine doesn't support comments"
         []
       end
+      
+      private
+        def find_issue
+          issue = API.find id, :params => {:project_id => self.project_id}
+          raise TicketMaster::Exception.new "Ticket with #{id} was not found" unless issue
+          issue
+        end
+        
+        def update
+          find_issue.update_with(self).save
+        end
+        
+        def to_issue
+          API.new.update_with(self)
+        end
 
     end
   end

data/lib/redmine/redmine-api.rb

@@ -7,12 +7,10 @@ module RedmineAPI
   class Error < StandardError; end
 
   class << self
-    def authenticate(server, username, password)
-      @username = username
-      @password = password
+    attr_reader :token
+    def authenticate(server, token)
+      @token = token
       @server = server
-      self::Base.user = username
-      self::Base.password = password
       self::Base.site = server
     end
 
@@ -26,14 +24,13 @@ module RedmineAPI
     def self.inherited(base)
       RedmineAPI.resources << base
     end
+
+    def self.headers
+      {"X-Redmine-API-Key" => RedmineAPI.token}
+    end
   end
 
   class Issue < Base
-    attr_reader :project_id
-
-    def name
-      self.subject
-    end
   end
 
   class Project < Base

data/lib/ticketmaster-redmine.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/redmine/redmine-api'
 
-%w{ redmine ticket project comment }.each do |f|
+%w{ redmine ticket project comment api-extensions }.each do |f|
   require File.dirname(__FILE__) + '/provider/' + f + '.rb';
 end
 

data/spec/projects_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Ticketmaster::Provider::Redmine::Project" do
   before(:each) do 
-    headers = {'Authorization' => 'Basic Y29yZWQ6MTIzNDU2', 'Accept' => 'application/xml'}
+    headers = {'X-Redmine-API-Key' => 'abcdefghijk', 'Accept' => 'application/xml'}
     headers_post_put = {'Authorization' => 'Basic Y29yZWQ6MTIzNDU2', 'Content-Type' => 'application/xml'}
     @project_id = '1'
     ActiveResource::HttpMock.respond_to do |mock|
@@ -12,7 +12,7 @@ describe "Ticketmaster::Provider::Redmine::Project" do
       mock.post '/projects.xml', headers_post_put, '', 200
     end
   
-    @ticketmaster = TicketMaster.new(:redmine, {:server => 'http://demo.redmine.org/', :username => 'cored', :password => '123456'})
+    @ticketmaster = TicketMaster.new :redmine, :server => 'http://demo.redmine.org/', :token => 'abcdefghijk'
     @klass = TicketMaster::Provider::Redmine::Project
   end
 

data/spec/ticketmaster-redmine_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Ticketmaster::Provider::Redmine" do
 
-  before(:each) do 
+  before :each do 
     headers = {'Authorization' => 'Basic Y29yZWQ6YWZkZA==', 'Accept' => 'application/xml'}
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get '/projects.xml', headers, fixture_for('projects'), 200
@@ -10,14 +10,9 @@ describe "Ticketmaster::Provider::Redmine" do
   end
 
   it "should be able to instantiate a new instance" do
-    @ticketmaster = TicketMaster.new(:redmine, {:server => 'http://redmine.server', :username => 'cored', :password => 'afdd'})
-    @ticketmaster.should be_an_instance_of(TicketMaster)
-    @ticketmaster.should be_a_kind_of(TicketMaster::Provider::Redmine)
-  end
-
-  it "should implmement the valid method" do 
-    @ticketmaster = TicketMaster.new(:redmine, {:server => 'http://redmine.server', :username => 'cored', :password => 'afdd'})
-    @ticketmaster.valid?.should be_true
+    ticketmaster = TicketMaster.new(:redmine, :server => 'http://redmine.server', :token => 'kdkjkladkaldj')
+    ticketmaster.should be_an_instance_of(TicketMaster)
+    ticketmaster.should be_a_kind_of(TicketMaster::Provider::Redmine)
   end
 
 end

data/spec/tickets_spec.rb

@@ -2,8 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Ticketmaster::Provider::Redmine::Ticket" do
   before(:each) do 
-    headers = {'Authorization' => 'Basic Y29yZWQ6MTIzNDU2', 'Accept' => 'application/xml'}
-    headers_post_put = {'Authorization' => 'Basic Y29yZWQ6MTIzNDU2', 'Content-Type' => 'application/xml'}
+    headers = {'X-Redmine-API-Key' => 'abcdefghijk', 'Accept' => 'application/xml'}
+    headers_post_put = {'X-Redmine-API-Key' => 'abcdefghijk', 'Content-Type' => 'application/xml'}
     @project_id = 1
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get '/projects.xml', headers, fixture_for('projects'), 200
@@ -15,7 +15,7 @@ describe "Ticketmaster::Provider::Redmine::Ticket" do
       mock.post '/issues.xml', headers_post_put, '', 200
     end
   
-    @ticketmaster = TicketMaster.new(:redmine, {:server => 'http://demo.redmine.org/', :username => 'cored', :password => '123456'})
+    @ticketmaster = TicketMaster.new :redmine, :server => 'http://demo.redmine.org/', :token => 'abcdefghijk'
     @project = @ticketmaster.project(@project_id)
     @klass = TicketMaster::Provider::Redmine::Ticket
   end
@@ -49,17 +49,16 @@ describe "Ticketmaster::Provider::Redmine::Ticket" do
     @ticket.title.should == 'test-issue'
   end
 
-  it "should be able to update and save a ticket" do 
-    pending
+  it "should be able to update and save a ticket" do
     @ticket = @project.ticket(1)
     @ticket.description = 'hello'
     @ticket.save.should == true
   end
 
   it "should be able to create a ticket" do 
-    pending
-    @ticket = @project.ticket!(:subject => 'Ticket #12', :description => 'Body')
+    @ticket = @project.ticket!(:title => 'Ticket #12', :description => 'Body')
     @ticket.should be_an_instance_of(@klass)
+    @ticket.project_id.should_not be_nil
   end
 
 end

data/ticketmaster-redmine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ticketmaster-redmine"
-  s.version = "0.2.8"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael George"]
-  s.date = "2012-03-27"
+  s.date = "2012-04-19"
   s.description = "Allows ticketmaster to interact with Your System."
   s.email = "rafael@hybridgroup.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "lib/provider/api-extensions.rb",
     "lib/provider/comment.rb",
     "lib/provider/project.rb",
     "lib/provider/redmine.rb",
@@ -53,20 +54,20 @@ 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_development_dependency(%q<rspec>, ["~> 2.8"])
       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<rspec>, ["~> 2.8"])
       s.add_dependency(%q<jeweler>, ["~> 1.6"])
       s.add_dependency(%q<simplecov>, ["~> 0.5"])
       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<rspec>, ["~> 2.8"])
     s.add_dependency(%q<jeweler>, ["~> 1.6"])
     s.add_dependency(%q<simplecov>, ["~> 0.5"])

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ticketmaster-redmine
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.2.8
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rafael George
@@ -10,62 +15,83 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-27 00:00:00 Z
+date: 2012-04-19 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: rspec
+  prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 8
         version: "2.8"
-  type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  prerelease: false
+  type: :development
   requirement: &id003 !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: *id003
 - !ruby/object:Gem::Dependency 
   name: simplecov
+  prerelease: false
+  type: :development
   requirement: &id004 !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: *id004
 - !ruby/object:Gem::Dependency 
   name: rcov
+  prerelease: false
+  type: :development
   requirement: &id005 !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: *id005
 description: Allows ticketmaster to interact with Your System.
 email: rafael@hybridgroup.com
@@ -86,6 +112,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- lib/provider/api-extensions.rb
 - lib/provider/comment.rb
 - lib/provider/project.rb
 - lib/provider/redmine.rb
@@ -116,12 +143,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: []