backlog 0.35.1 → 0.35.2

data/test/functional/works_controller_test.rb

@@ -78,7 +78,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create
     num_works = Work.count
     
-    post :create, :work => {:task_id => 1, :started_on => Date.today.to_s, :start_time => Time.now.time_of_day.to_s, :work_account_id => '1'}
+    post :create, :work => {:task_id => '1', :started_on => Date.today.to_s, :start_time => Time.now.time_of_day.to_s, :work_account_id => '1'}
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
@@ -89,7 +89,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create_without_start_date
     num_works = Work.count
     
-    post :create, :work => {:task_id => 1, :start_time => Time.now.time_of_day.to_s, :work_account_id => '1'}
+    post :create, :work => {:task_id => '1', :start_time => Time.now.time_of_day.to_s, :work_account_id => '1'}
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
@@ -100,7 +100,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create_with_old_start_date
     num_works = Work.count
     
-    post :create, :work => {:task_id => 1, :started_on => '2007-07-31', :work_account_id => '1', 
+    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :work_account_id => '1', 
         :start_time => '12:00', :completed_at => '2007-07-31 12:20'}
     
     assert_response :redirect
@@ -113,7 +113,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create_with_old_start_date_and_completed_at_time
     num_works = Work.count
     
-    post :create, :work => {:task_id => 1, :started_on => '2007-07-31', :work_account_id => '1', 
+    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :work_account_id => '1', 
         :start_time => '12:00', :completed_at_time => '12:20'}
     
     assert_response :redirect

data/vendor/plugins/backlog_jira/init.rb

@@ -1,58 +1,61 @@
 require 'sidebar'
 require 'mechanize'
+require 'hpricot'
 
 class ::Sidebar
   def blocks_with_jira_issues(*args)
     blocks = blocks_without_jira_issues(*args)
     
-    app_conf = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result) || {}
-    if jira_conf = app_conf['jira']
-      jira_url = jira_conf['url'].chomp('/')
-      jira_user = jira_conf['user']
-      jira_password = jira_conf['password']
-      jira_pids = jira_conf['pids'].to_s.split(',').map{|p| "&pid=#{p.strip}"}
-      fix_version = jira_conf['fix_version'].to_s
-      limit = 20
-      assignee = '' # "&assigneeSelect=specificuser&assignee=#{jira_user}"
-      sorting = '&sorter/field=priority&sorter/order=DESC'
-      resolution = 'resolution=-1'
-      
-      agent = WWW::Mechanize.new { |a| a.log = Logger.new("jira.log") }
-      agent.user_agent_alias = 'Mechanize'
-
-      login_url = "#{jira_url}/login.jsp?os_username=#{jira_user}&os_password=#{jira_password}"
-      login_page = agent.get(login_url)
-      login_form = login_page.forms.name("loginform").first
-      login_form.fields.name("os_username").value = jira_user
-      login_form.fields.name("os_username").value = jira_user
-      agent.submit(login_form)
-
-      search_path = 'sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml'
-      url = "#{jira_url}/#{search_path}?#{resolution}#{jira_pids}#{assignee}#{sorting}&tempMax=#{limit}&fixfor=#{fix_version}"
-      search_results = agent.get(url)
-      
-      xml_search_doc = Hpricot.XML(search_results.body)
-      items = (xml_search_doc/"item")
-      issues = items.map do |item|
-        title = (item/'title').inner_html
-        link = (item/'link').first.inner_html
-        [title, link]
-      end
-      
-      list = "<ul>\n"
-      issues.each do |issue|
-        list << "<li>\n"
-        list << link_to(issue[0], issue[1])
-        list << " [" + link_to('Add', :controller => :tasks, :action => :new, :task => {:backlog_id => 1, :period_id => @period, :description => issue[0]})
-        list << "]</li>\n"
+    if File.exists?(APP_CONFIG_FILE)
+      app_conf = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result) || {}
+      if jira_conf = app_conf['jira']
+        jira_url = jira_conf['url'].chomp('/')
+        jira_user = jira_conf['user']
+        jira_password = jira_conf['password']
+        jira_pids = jira_conf['pids'].to_s.split(',').map{|p| "&pid=#{p.strip}"}
+        fix_version = jira_conf['fix_version'].to_s
+        limit = 20
+        assignee = '' # "&assigneeSelect=specificuser&assignee=#{jira_user}"
+        sorting = '&sorter/field=priority&sorter/order=DESC'
+        resolution = 'resolution=-1'
+        
+        agent = WWW::Mechanize.new { |a| a.log = Logger.new("jira.log") }
+        agent.user_agent_alias = 'Mechanize'
+        
+        login_url = "#{jira_url}/login.jsp?os_username=#{jira_user}&os_password=#{jira_password}"
+        login_page = agent.get(login_url)
+        login_form = login_page.form_with(:name => 'loginform')
+        login_form["os_username"] = jira_user
+        login_form["os_username"] = jira_user
+        agent.submit(login_form)
+        
+        search_path = 'sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml'
+        url = "#{jira_url}/#{search_path}?#{resolution}#{jira_pids}#{assignee}#{sorting}&tempMax=#{limit}&fixfor=#{fix_version}"
+        search_results = agent.get(url)
+        
+        xml_search_doc = Hpricot.XML(search_results.body)
+        items = (xml_search_doc/"item")
+        issues = items.map do |item|
+          title = (item/'title').inner_html
+          link = (item/'link').first.inner_html
+          [title, link]
+        end
+        
+        list = "<ul>\n"
+        issues.each do |issue|
+          list << "<li>\n"
+          list << link_to(issue[0], issue[1])
+          list << " [" + link_to('Add', :controller => :tasks, :action => :new, :task => {:backlog_id => 1, :period_id => @period, :description => issue[0]})
+          list << "]</li>\n"
+        end
+        list << "</ul>\n"
+        blocks << {
+          :id => 1,
+          :title => "JIRA Issues",
+          :options => jira_url,
+          :content => list
+        }
       end
-      list << "</ul>\n"
-      blocks << {
-        :id => 1,
-        :title => "JIRA Issues",
-        :options => jira_url,
-        :content => list
-      }
     end
   end
   alias_method_chain :blocks, :jira_issues

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.35.1
+  version: 0.35.2
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-24 00:00:00 +01:00
+date: 2009-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency