test_linker 0.1.1 → 1.0.0

data/lib/test_linker/helpers.rb

@@ -1,4 +1,4 @@
-require_relative 'error'
+require File.expand_path(File.dirname(__FILE__) + '/error')
 
 # This module contains methods that aren't a part of the TestLink API.  They
 # intend to make accessing TestLink database info easier.
@@ -18,17 +18,14 @@ module TestLinker::Helpers
   #
   # @param [String] project_name Name of the project to search for.
   # @return [Fixnum] ID of project matching project_name.
-  # @raise [TestLinker::Error] When ID cannot be found for given
-  #   project_name.
-  def test_project_id project_name
+  def project_id project_name
     if @version < "1.0"
-      project = projects.find { |project| project["name"] == project_name }
+      project = projects.find { |project| project[:name] == project_name }
     else
-      project = test_project_by_name(project_name).first
-      raise TestLinker::Error, project['message'] if project['code']
+      project = project_by_name(project_name).first
     end
 
-    project.nil? ? nil : project['id'].to_i
+    project.nil? ? nil : project[:id].to_i
   end
 
   # Gets info about test plans within a project
@@ -37,21 +34,19 @@ module TestLinker::Helpers
   # @param [String] plan_name Name of the plan to search for.
   # @return [Fixnum] ID of plan matching project_name and plan_name. 0 if the
   #   test plan wasn't found.
-  # @raise [RuntimeError] When unable to find matching project and plan names.
   def test_plan_id(project_name, plan_name)
     if @version < "1.0"
-      project_id = test_project_id project_name
-      test_plans = project_test_plans(project_id)
+      project_id = project_id project_name
+      test_plans = test_plans(project_id)
 
       test_plan = test_plans.first.values.find do |project_test_plan|
-        project_test_plan["name"] == plan_name
+        project_test_plan[:name] == plan_name
       end
     else
       test_plan = test_plan_by_name(project_name, plan_name).first
-      raise TestLinker::Error, test_plan['message'] if test_plan['code']
     end
 
-    test_plan.nil? ? nil : test_plan['id'].to_i
+    test_plan.nil? ? nil : test_plan[:id].to_i
   end
 
   # Gets the ID for the given build name.
@@ -60,52 +55,57 @@ module TestLinker::Helpers
   # @param [String] plan_name Name of the plan to search for.
   # @param [String] build_name Name of the build to search for.
   # @return [Fixnum] ID of plan matching project_name and plan_name
-  # @raise [TestLinker::Error] When unable to find matching
-  #   project/plan/build names.
   def build_id(project_name, plan_name, build_name)
     plan_id = test_plan_id(project_name, plan_name)
     builds = builds_for_test_plan plan_id
 
-    builds.each do |build|
-      if build['name'] == build_name
-        return build['id'].to_i
-      end
+    build = builds.find do |build|
+      build[:name] == build_name
     end
 
-    raise TestLinker::Error,
-        "Unable to find build named #{build_name} for #{plan_name} in #{project_name}"
+    build.nil? ? nil : build[:id].to_i
+  end
+
+  # Finds a list of projects whose attribute (given via the +match_attribute+
+  # parameter) matches +regex+.
+  #
+  # @param [Regexp] regex The expression to match project names on.
+  # @param [Symbol] match_attribute Attribute of the projects to match on.
+  # @return [Array] An array of projects that match the Regexp.
+  def find_projects(regex, match_attribute=:name)
+    project_list = projects
+
+    project_list.find_all do |project|
+      project[match_attribute] =~ regex
+    end
   end
 
-  # @param [Fixnum,String] project_id
+  # Finds a list of test plans whose attribute (given via the +match_attribute+
+  # parameter) matches +regex+.
+  #
+  # @param [Fixnum,String] project_id ID of the project that the test plans
+  #   belong to.
   # @param [Regexp] regex The expression to match test plan names on.
   # @return [Array] An array of test plans that match the Regexp.
-  def find_test_plans(project_id, regex)
-    list = []
-    test_plan_list = project_test_plans(project_id).first
+  def find_test_plans(project_id, regex, match_attribute=:name)
+    test_plan_list = test_plans(project_id)
 
-    test_plan_list.each_value do |test_plan_info|
-      if test_plan_info["name"] =~ regex
-        list << test_plan_info
-      end
+    test_plan_list.first.values.find_all do |project_test_plan|
+      project_test_plan[match_attribute] =~ regex
     end
-
-    list
   end
-
+  
   # @param [String] project_name
   # @param [String] suite_name
-  # @return [Fixnum] ID of the requested test suite.
-  # @raise [TestLinker::Error] If no test suite was found by the given name.
+  # @return [Fixnum] ID of the requested test suite.  nil if not found.
   def first_level_test_suite_id(project_name, suite_name)
-    test_suites = first_level_test_suites_for_test_project(test_project_id(project_name))
+    test_suites = first_level_test_suites_for_project(project_id(project_name))
 
-    test_suites.each do |test_suite|
-      if test_suite['name'] == suite_name
-        return test_suite['id'].to_i
-      end
+    test_suite = test_suites.find do |test_suite|
+      test_suite[:name] == suite_name
     end
 
-    raise TestLinker::Error, "Suite #{suite_name} not found."
+    test_suite.nil? ? nil : test_suite[:id].to_i
   end
 
   # Gets info about test case within a test plan within a project.
@@ -114,21 +114,14 @@ module TestLinker::Helpers
   # @param [String] plan_name Name of the plan to search for.
   # @param [String] test_case_name Name of the test case to search for.
   # @return [Hash] Info on the first matching test case.
-  # @raise [TestLinker::Error] When unable to find matching
-  #   project/plan/test case names.
   # @todo Need to update for having more than one of same test name inside test plan.
   def test_info(project_name, plan_name, test_case_name)
     test_plan_id = test_plan_id(project_name, plan_name)
     test_cases = test_cases_for_test_plan(test_plan_id)
 
-    test_cases.each_value do |test_case_info|
-      if test_case_info['name'] == test_case_name
-        return test_case_info
-      end
+    test_cases.values.find do |test_case|
+      test_case[:name] == test_case_name
     end
-
-    raise TestLinker::Error,
-        "Unable to find test named #{test_case_name} for #{plan_name} in #{project_name}"
   end
 
   # Gets info about test suite within a test plan within a project.
@@ -136,26 +129,19 @@ module TestLinker::Helpers
   # @param [String] project_name
   # @param [String] plan_name
   # @param [String] suite_name
-  # @return [Fixnum,String] SuiteID
-  # @raise [TestLinker::Error] When unable to find matching
-  #   project/plan/test case names.
+  # @return [Hash] The name and ID of the test suite.
   # @todo Need to update for having more than one of same test name inside test plan.
   def suite_info(project_name, plan_name, suite_name)
     test_plan_id = test_plan_id(project_name, plan_name)
     test_suites = test_suites_for_test_plan(test_plan_id)
 
     if test_suites.empty?
-      return "Unable to find test suites in test plan #{plan_name} in #{project_name}"
+      return nil
     end
 
-    test_suites.each do |suite|
-      if suite["name"].include? suite_name
-        return suite
-      end
+    test_suites.find do |test_suite|
+      test_suite[:name].include? suite_name
     end
-
-    raise TestLinker::Error,
-        "Unable to find suite named #{suite_name} for #{plan_name} in #{project_name}"
   end
 
   # Get the ID of a first level suite, creating it if it does not exist.
@@ -168,9 +154,9 @@ module TestLinker::Helpers
   rescue RuntimeError
 
     # Create suite if it doesn't exist.
-    project_id = test_project_id(project_name)
+    project_id = project_id(project_name)
 
-    create_test_suite(project_id, suite_name).first['id']
+    create_test_suite(project_id, suite_name).first[:id]
   end
 
   # Get the ID of a suite with the given parent, creating it if it does not
@@ -182,50 +168,51 @@ module TestLinker::Helpers
   # @raise [TestLinker::Error] When unable to find matching
   #   project/plan/test case names.
   def create_suite(suite_name, project_name, parent_id)
-    project_id = test_project_id(project_name)
+    project_id = project_id(project_name)
     response = test_suites_for_test_suite(parent_id)
 
     if response.class == Array
-      raise TestLinker::Error, response.first['message']
+      raise TestLinker::Error, response.first[:message]
     elsif response.class == Hash
-      return response['id'] if response['name'] == suite_name
+      return response[:id] if response[:name] == suite_name
 
       response.each_value do |suite|
-        return suite['id'] if suite['name'] == suite_name
+        return suite[:id] if suite[:name] == suite_name
       end
     end
 
-    create_test_suite(project_id, suite_name, parent_id).first['id']
+    create_test_suite(project_id, suite_name, parent_id).first[:id]
   end
 
   # Creates test in test suite within a test plan within a project.
   #
-  # @param [String] test_case_name
-  # @param [String] suite_name
   # @param [String] project_name
+  # @param [String] plan_name
+  # @param [String] suite_name
+  # @param [String] test_case_name
   # @param [String] login
   # @param [String] summary
   # @param [String] steps
   # @param [String] expected_results
   # @return [Array] array->  array[0]=test case id, array[1]=test case version
   # @todo Need to update for having more than one of same test name inside test plan.
-  def create_test_case_by_name(test_case_name, suite_name, project_name, login,
-      summary, steps, expected_results)
+  def create_test_case_by_name(project_name, plan_name, suite_name,
+      test_case_name, login, summary, steps, expected_results)
 
-    test_project_id = self.test_project_id(project_name)
+    test_project_id = self.project_id(project_name)
     test_suite_id = self.suite_info(project_name, plan_name, suite_name)
 
-    result = create_test_case(login, test_project_id, test_suite_id, test_case_name,
-      summary, steps, expected_results)
+    result = create_test_case(test_project_id, test_suite_id, test_case_name,
+      summary, steps, expected_results, login)
 
     if result.any?
       result.each do |result_ptr|
-        if result_ptr["message"].eql? "Success!"
+        if result_ptr[:message].eql? "Success!"
           if result_ptr.has_key? "additionalInfo"
             result_info = result_ptr.fetch("additionalInfo")
-            if result_info["msg"].eql? "ok"
-              test_case_id = result_info["id"]
-              test_case_version = result_info["version_number"]
+            if result_info[:msg].eql? "ok"
+              test_case_id = result_info[:id]
+              test_case_version = result_info[:version_number]
               return [test_case_id, test_case_version]
             else
               return -1
@@ -247,7 +234,7 @@ module TestLinker::Helpers
   # @todo Need to update for having more than one of same test name inside testplan
   def add_test_case_to_test_plan_by_name(project_name, plan_name, test_case_id,
       test_case_version)
-    test_project_id = test_project_id(project_name)
+    test_project_id = project_id(project_name)
     test_plan_id =  test_plan_id(project_name, plan_name)
 
     result = add_test_case_to_test_plan(test_project_id, test_plan_id,
@@ -255,7 +242,7 @@ module TestLinker::Helpers
 
     if result.any?
       #Only way to tell if success if with the key "feature_id"
-      return result.has_key?("feature_id") ? true : false
+      return result.has_key?(:feature_id) ? true : false
     end
   end
 end

data/lib/test_linker/version.rb

@@ -1,4 +1,4 @@
 class TestLinker
   # test_linker version
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

data/lib/test_linker/wrapper.rb

@@ -1,4 +1,4 @@
-require_relative 'error'
+require File.expand_path(File.dirname(__FILE__) + '/error')
 
 class TestLinker
 
@@ -8,85 +8,83 @@ class TestLinker
 
     # Gets a test case by it's internal or external ID.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [Hash] options
     # @option options [Fixnum,String] testcaseid
     # @option options [Fixnum,String] testcaseexternalid
     # @option options [Fixnum,String] version The test case version. Default is most recent.
     # @return
     def test_case(options)
-      args = { "devKey" => @dev_key }
-      args.merge! options
-      make_call("tl.getTestCase", args, "1.0")
+      make_call("tl.getTestCase", options, "1.0")
     end
     alias_method :getTestCase, :test_case
 
     # Gets full path from the given node till the top using nodes_hierarchy_table.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [Fixnum,String] node_id
     # @return
     def full_path node_id
-      args = { "devKey" => @dev_key, "nodeID" => node_id }
+      args = { :nodeID => node_id }
       make_call("tl.getFullPath", args, "1.0")
     end
     alias_method :getFullPath, :full_path
 
     # Gets a test suite by the given ID.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [Fixnum,String] suite_id
     # @return
     def test_suite_by_id suite_id
-      args = { "devKey" => @dev_key, "testsuiteid" => suite_id }
+      args = { :testsuiteid => suite_id }
       make_call("tl.getTestSuiteByID", args, "1.0")
     end
     alias_method :getTestSuiteByID, :test_suite_by_id
 
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [Fixnum,String] execution_id
     # @return [Hash] "status", "id", "message"
     def delete_execution execution_id
-      args = { "devKey" => @dev_key, "executionid" => execution_id }
+      args = { :executionid => execution_id }
       make_call("tl.deleteExecution", args, "1.0")
     end
     alias_method :deleteExecution, :delete_execution
 
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [String] user_name
     # @return [Boolean,Hash] true if user exists, otherwise an error structure.
     def does_user_exist user_name
-      args = { "devKey" => @dev_key, "user" => user_name }
+      args = { :user => user_name }
       make_call("tl.doesUserExist", args, "1.0")
     end
     alias_method :doesUserExist, :does_user_exist
 
     # Checks if the given Developer Key exist.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [String] dev_key
     # @return [Hash] "true" if it exists, otherwise error structure.
     def check_dev_key dev_key
-      args = { "devKey" => dev_key }
+      args = { :devKey => dev_key }
       make_call("tl.checkDevKey", args, "1.0")
     end
     alias_method :checkDevKey, :check_dev_key
 
     # Uploads an attachment for a test case execution.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
+    # @param [Fixnum,String] execution_id
     # @param [String] file_name
     # @param [String] mime_type
     # @param [String] content The Base64 encoded content of the attachment.
-    # @param [Fixnum,String] execution_id
     # @param [Hash] options
     # @option options [String] title
     # @option options [String] description
     # @return
-    def upload_execution_attachment(file_name, mime_type, content, execution_id,
+    def upload_execution_attachment(execution_id, file_name, mime_type, content,
       options={})
-      args = { "devKey" => @dev_key, "executionid" => execution_id,
-        "filename" => file_name, "filetype" => mime_type, "content" => content }
+      args = { :executionid => execution_id, :filename => file_name,
+          :filetype => mime_type, :content => content }
       args.merge! options
       make_call("tl.uploadExecutionAttachment", args, "1.0")
     end
@@ -95,7 +93,7 @@ class TestLinker
     # Uploads an attachment for a Requirement. The attachment content must be
     # Base64 encoded by the client before sending it.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [Fixnum,String] requirement_id
     # @param [String] file_name
     # @param [String] mime_type
@@ -104,10 +102,10 @@ class TestLinker
     # @option options [String] title
     # @option options [String] description
     # @return
-    def upload_requirement_attachment(file_name, mime_type, content,
-        requirement_id, options={})
-      args = { "devKey" => @dev_key, "requirementid" => requirement_id,
-          "filename" => file_name, "filetype" => mime_type, "content" => content }
+    def upload_requirement_attachment(requirement_id, file_name, mime_type,
+        content, options={})
+      args = { :requirementid => requirement_id, :filename => file_name,
+          :filetype => mime_type, :content => content }
       args.merge! options
       make_call("tl.uploadRequirementAttachment", args, "1.0")
     end
@@ -116,19 +114,19 @@ class TestLinker
     # Uploads an attachment for a Requirement Specification. The attachment
     # content must be Base64 encoded by the client before sending it.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
+    # @param [Fixnum,String] requirement_specification_id
     # @param [String] file_name
     # @param [String] mime_type
     # @param [String] content The Base64 encoded content of the attachment.
-    # @param [Fixnum,String] requirement_id
     # @param [Hash] options
     # @option options [String] title
     # @option options [String] description
     # @return
-    def upload_requirement_specification_attachment(file_name, mime_type, content,
-        requirement_specification_id, options={})
-      args = { "devKey" => @dev_key, "reqspecid" => requirement_specification_id,
-          "filename" => file_name, "filetype" => mime_type, "content" => content }
+    def upload_requirement_specification_attachment(requirement_specification_id,
+        file_name, mime_type, content, options={})
+      args = { :reqspecid => requirement_specification_id, :filename => file_name,
+          :filetype => mime_type, :content => content }
       args.merge! options
       make_call("tl.uploadRequirementSpecificationAttachment", args, "1.0")
     end
@@ -138,13 +136,13 @@ class TestLinker
     # Assign Requirements to a test case.  Capable of assigning multiple
     # requirements. Requirements can belong to different Requirement Specs.
     #
-    # @param [String] requirements
-    # @param [Fixnum,String] test_case_external_id
     # @param [Fixnum,String] project_id
+    # @param [Fixnum,String] test_case_external_id
+    # @param [String] requirements
     # @return
-    def assign_requirements(requirements, test_case_external_id, project_id)
-      args = { "devKey" => @dev_key, "testcaseexternalid" => test_case_external_id,
-          "testprojectid" => project_id, "requirements" => requirements }
+    def assign_requirements(project_id, test_case_external_id, requirements)
+      args = { :testcaseexternalid => test_case_external_id,
+          :testprojectid => project_id, :requirements => requirements }
       make_call("tl.assignRequirements", args, "1.0b5")
     end
     alias_method :assignRequirements, :assign_requirements
@@ -152,40 +150,40 @@ class TestLinker
     # Uploads an attachment for a Test Project. The attachment must be Base64
     # encoded by the client before sending it.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
+    # @param [Fixnum,String] project_id
     # @param [String] file_name
     # @param [String] mime_type
     # @param [String] content The Base64 encoded content of the attachment.
-    # @param [Fixnum,String] project_id
     # @param [Hash] options
     # @option options [String] title
     # @option options [String] description
     # @return
-    def upload_test_project_attachment(file_name, mime_type, content, project_id,
+    def upload_project_attachment(project_id, file_name, mime_type, content,
         options={})
-      args = { "devKey" => @dev_key, "testprojectid" => project_id,
-          "filename" => file_name, "filetype" => mime_type, "content" => content }
+      args = { :testprojectid => project_id, :filename => file_name,
+          :filetype => mime_type, :content => content }
       args.merge! options
       make_call("tl.uploadTestProjectAttachment", args, "1.0")
     end
-    alias_method :uploadTestProjectAttachment, :upload_test_project_attachment
+    alias_method :uploadTestProjectAttachment, :upload_project_attachment
 
     # Uploads an attachment for a Test Suite. The attachment must be Base64
     # encoded by the client before sending it.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
+    # @param [Fixnum,String] suite_id
     # @param [String] file_name
     # @param [String] mime_type
     # @param [String] content The Base64 encoded content of the attachment.
-    # @param [Fixnum,String] suite_id
     # @param [Hash] options
     # @option options [String] title
     # @option options [String] description
     # @return
-    def upload_test_suite_attachment(file_name, mime_type, content, suite_id,
+    def upload_test_suite_attachment(suite_id, file_name, mime_type, content,
         options={})
-      args = { "devKey" => @dev_key, "testsuiteid" => suite_id,
-          "filename" => file_name, "filetype" => mime_type, "content" => content }
+      args = { :testsuiteid => suite_id, :filename => file_name,
+          :filetype => mime_type, :content => content }
       args.merge! options
       make_call("tl.uploadTestSuiteAttachment", args, "1.0")
     end
@@ -194,19 +192,19 @@ class TestLinker
     # Uploads an attachment for a Test Case. The attachment must be Base64
     # encoded by the client before sending it.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
+    # @param [Fixnum,String] test_case_id
     # @param [String] file_name
     # @param [String] mime_type
     # @param [String] content The Base64 encoded content of the attachment.
-    # @param [Fixnum,String] test_case_id
     # @param [Hash] options
     # @option options [String] title
     # @option options [String] description
     # @return
-    def upload_test_case_attachment(file_name, mime_type, content, test_case_id,
+    def upload_test_case_attachment(test_case_id, file_name, mime_type, content,
         options={})
-      args = { "devKey" => @dev_key, "testcaseid" => test_case_id,
-          "filename" => file_name, "filetype" => mime_type, "content" => content }
+      args = { :testcaseid => test_case_id, :filename => file_name,
+          :filetype => mime_type, :content => content }
       args.merge! options
       make_call("tl.uploadTestCaseAttachment", args, "1.0")
     end
@@ -217,21 +215,20 @@ class TestLinker
     # key id in this table The attachment must be Base64 encoded by the client
     # before sending it.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
+    # @param [Fixnum,String] foreign_key_id
+    # @param [String] foreign_key_table
     # @param [String] file_name
     # @param [String] mime_type
     # @param [String] content The Base64 encoded content of the attachment.
-    # @param [Fixnum,String] foreign_key_id
-    # @param [String] foreign_key_table
     # @param [Hash] options
     # @option options [String] title
     # @option options [String] description
     # @return
-    def upload_attachment(file_name, mime_type, content, foreign_key_id,
-         foreign_key_table, options={})
-      args = { "devKey" => @dev_key, "fkid" => foreign_key_id,
-          "fktable" => foreign_key_table, "filename" => file_name,
-          "filetype" => mime_type, "content" => content }
+    def upload_attachment(foreign_key_id, foreign_key_table, file_name,
+        mime_type, content, options={})
+      args = { :fkid => foreign_key_id, :fktable => foreign_key_table,
+          :filename => file_name, :filetype => mime_type, :content => content }
       args.merge! options
       make_call("tl.uploadAttachment", args, "1.0")
     end
@@ -241,7 +238,7 @@ class TestLinker
     #
     # @return [String] "Hello!"
     def say_hello
-      make_call("tl.sayHello", "", "1.0b5")
+      make_call("tl.sayHello", {}, "1.0b5")
     end
     alias_method :sayHello, :say_hello
     alias_method :ping, :say_hello
@@ -251,14 +248,14 @@ class TestLinker
     # @param [String] message The message to get the server to repeat back.
     # @return [String] The message sent to the server.
     def repeat message
-      make_call("tl.repeat", { str: message }, "1.0b5")
+      make_call("tl.repeat", { :str => message }, "1.0b5")
     end
 
     # Returns info about the server's TestLink API.
     #
     # @return [String] Info about TestLink API version
     def about
-      make_call("tl.about", "", "1.0b5")
+      make_call("tl.about", {}, "1.0b5")
     end
 
     # Gets a list of all projects.
@@ -266,7 +263,7 @@ class TestLinker
     # @return [Array<Hash>] List of all projects in TestLink and
     # their associated info.
     def projects
-      make_call("tl.getProjects", { devKey: @dev_key }, "1.0b5" )
+      make_call("tl.getProjects", {}, "1.0b5" )
     end
     alias_method :getProjects, :projects
 
@@ -276,33 +273,32 @@ class TestLinker
     # @return [Array<Hash>] Array of all plans in a project and their associated
     #   info.
     # @raise [TestLinker::Error] If a project by the given ID doesn't exist.
-    def project_test_plans project_id
-      args = { devKey: @dev_key, testprojectid: project_id }
+    def test_plans project_id
+      args = { :testprojectid => project_id }
       response = make_call("tl.getProjectTestPlans", args, "1.0b5")
       response == "" ? [{}] : response
     end
-    alias_method :getProjectTestPlans, :project_test_plans
+    alias_method :getProjectTestPlans, :test_plans
 
     # Info about a test project with a given name.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [String] project_name Name of the project to search for.
     # @return [Array<Hash>] Info on matching project.
-    def test_project_by_name project_name
-      args = { devKey: @dev_key, testprojectname: project_name }
+    def project_by_name project_name
+      args = { :testprojectname => project_name }
       make_call('tl.getTestProjectByName', args, "1.0")
     end
-    alias_method :getTestProjectByName, :test_project_by_name
+    alias_method :getTestProjectByName, :project_by_name
 
     # Gets the test plan with the given name.
     #
-    # @since TestLink API version 1.0
-    # @param [String] plan_name Name of the plan to search for.
+    # @api TestLink API version 1.0
     # @param [String] project_name Name of the project the plan is in.
+    # @param [String] plan_name Name of the plan to search for.
     # @return [Array<Hash>] Info on matching plan.
-    def test_plan_by_name(plan_name, project_name)
-      args = { devKey: @dev_key, testplanname: plan_name,
-          testprojectname: project_name }
+    def test_plan_by_name(project_name, plan_name)
+      args = { :testplanname => plan_name, :testprojectname => project_name }
       make_call('tl.getTestPlanByName', args, "1.0")
     end
     alias_method :getTestPlanByName, :test_plan_by_name
@@ -312,29 +308,29 @@ class TestLinker
     # @param [Fixnum,String] plan_id ID of the plan to get suites for.
     # @return [Array<Hash>] List of all suites in plan and their associated info.
     def test_suites_for_test_plan plan_id
-      args = { devKey: @dev_key, testplanid: plan_id }
+      args = { :testplanid => plan_id }
       make_call("tl.getTestSuitesForTestPlan", args, "1.0b5")
     end
     alias_method :getTestSuitesForTestPlan, :test_suites_for_test_plan
 
     # List test suites within a test plan alphabetically.
     #
-    # @since API version 1.0
+    # @api TestLink API version 1.0
     # @param [Fixnum,String] plan_id ID of the plan to get suites for.
     # @return [Array<Hash>] List of all suites in plan and their associated info.
     def test_plan_platforms plan_id
-      args = { devKey: @dev_key, testplanid: plan_id }
+      args = { :testplanid => plan_id }
       make_call("tl.getTestPlanPlatforms", args, "1.0")
     end
     alias_method :getTestPlanPlatforms, :test_plan_platforms
 
     # Gets a list of test suites that are direct children of the given test suite.
     #
-    # @since API version 1.0
+    # @api TestLink API version 1.0
     # @param [Fixnum,String] suite_id ID of the suite to get suites for.
     # @return [Array<Hash>] List of all suites in plan and their associated info.
     def test_suites_for_test_suite suite_id
-      args = { devKey: @dev_key, testsuiteid: suite_id }
+      args = { :testsuiteid => suite_id }
       make_call("tl.getTestSuitesForTestSuite", args, "1.0")
     end
     alias_method :getTestSuitesForTestSuite, :test_suites_for_test_suite
@@ -344,12 +340,12 @@ class TestLinker
     # @param [Fixnum,String] project_id ID of the project to get suites for.
     # @return [Array<Hash>] List of first level suites in project and their
     #   associated info.
-    def first_level_test_suites_for_test_project project_id
-      args = { devKey: @dev_key, testprojectid: project_id }
+    def first_level_test_suites_for_project project_id
+      args = { :testprojectid => project_id }
       make_call("tl.getFirstLevelTestSuitesForTestProject", args, "1.0b5")
     end
     alias_method :getFirstLevelTestSuitesForTestProject,
-        :first_level_test_suites_for_test_project
+        :first_level_test_suites_for_project
 
     # Info about test cases within a test plan.
     #
@@ -368,35 +364,34 @@ class TestLinker
     # @return [Hash] List of all test cases in the plan and their
     #   associated info.
     def test_cases_for_test_plan(plan_id, options={})
-      args = { devKey: @dev_key, testplanid: plan_id }
+      args = { :testplanid => plan_id }
       args.merge! options
       make_call("tl.getTestCasesForTestPlan", args, "1.0b5")
     end
     alias_method :getTestCasesForTestPlan, :test_cases_for_test_plan
 
-    # @param [Fixnum,String] suite_id ID of the suite to retrieve test cases for.
     # @param [Fixnum,String] project_id
-    # @param [Hash] options
-    # @option options [Boolean] deep
-    # @option options [String] details Default is "simple"; use "full" to get
+    # @param [Fixnum,String] suite_id ID of the suite to retrieve test cases for.
+    # @param [Boolean] deep
+    # @param [String] details Default is "simple"; use "full" to get
     #   summary, steps & expected results.
     # @return [Array<Hash>] List of test cases in the given suite and their
     #   associated info.
-    def test_cases_for_test_suite(suite_id, project_id, deep=true, details="")
-      args = { devKey: @dev_key, testsuiteid: suite_id,
-          projectid: project_id, deep: deep, details: details }
+    def test_cases_for_test_suite(project_id, suite_id, deep=true, details="")
+      args = { :testsuiteid => suite_id, :projectid => project_id,
+          :deep => deep, :details => details }
       make_call("tl.getTestCasesForTestSuite", args, "1.0b5")
     end
     alias_method :getTestCasesForTestSuite, :test_cases_for_test_suite
 
     # Gets the summarized results grouped by platform.
     #
-    # @since TestLink API version 1.0
+    # @api TestLink API version 1.0
     # @param [Fixnum,String] plan_id
     # @return [Hash] Contains "type" => platform, "total_tc" => X, "details =>
     #   Array of counts.
     def totals_for_test_plan plan_id
-      args = { devKey: @dev_key, testplanid: plan_id }
+      args = { :testplanid => plan_id }
       make_call("tl.getTotalsForTestPlan", args, "1.0")
     end
     alias_method :getTotalsForTestPlan, :totals_for_test_plan
@@ -408,14 +403,12 @@ class TestLinker
     # @param [Fixnum,String] testcaseexternalid If not present, testcaseid must be called.
     # @return [String]
     def test_case_attachments options
-      args = { devKey: @dev_key }
-      args.merge! options
-      make_call("tl.getTestCaseAttachments", args, "1.0b5")
+      make_call("tl.getTestCaseAttachments", options, "1.0b5")
     end
     alias_method :getTestCaseAttachments, :test_case_attachments
 
-    # @param [Fixnum,String] test_case_external_id
     # @param [Fixnum,String] project_id
+    # @param [Fixnum,String] test_case_external_id
     # @param [Fixnum] custom_field_name
     # @param [Hash] options
     # @option options [String] details Changes output information. If null or 'value',
@@ -423,11 +416,11 @@ class TestLinker
     #   plus value and internal test case id; if 'simple', returns value plus custom
     #   field name, label, and type (as code).
     # @return [Array<Hash>]
-    def test_case_custom_field_design_value(custom_field_name,
-        test_case_external_id, project_id, options={})
-      args = { devKey: @dev_key, testprojectid: project_id,
-          testcaseexternalid: test_case_external_id,
-          customfieldname: custom_field_name }
+    def test_case_custom_field_design_value(project_id, test_case_external_id,
+        custom_field_name, options={})
+      args = { :testprojectid => project_id,
+          :testcaseexternalid => test_case_external_id,
+          :customfieldname => custom_field_name }
       args.merge! options
       make_call("tl.getTestCaseCustomFieldDesignValue", args, "1.0b5")
     end
@@ -445,19 +438,18 @@ class TestLinker
     # @return [Array<Hash>] List of all test cases in the DB matching
     #   test_case_name and their associated info.
     def test_case_id_by_name(test_case_name, options={})
-      args   = { devKey: @dev_key, testcasename: test_case_name }
+      args   = { :testcasename => test_case_name }
       args.merge! options
       make_call("tl.getTestCaseIDByName", args, "1.0b5")
     end
     alias_method :getTestCaseIDByName, :test_case_id_by_name
 
-    # @param [Fixnum,String] test_case_id
-    # @param [Fixnum,String] build_id
     # @param [Fixnum,String] plan_id
+    # @param [Fixnum,String] build_id
+    # @param [Fixnum,String] test_case_id
     # @return [Array<Hash>] Single element Array containing the result Hash.
-    def last_execution_result(test_case_id, build_id, plan_id)
-      args = { devKey: @dev_key, testplanid: plan_id,
-          testcaseid: test_case_id, buildid: build_id }
+    def last_execution_result(plan_id, build_id, test_case_id)
+      args = { :testplanid => plan_id, :testcaseid => test_case_id, :buildid => build_id }
       make_call("tl.getLastExecutionResult", args, "1.0b5")
     end
     alias_method :getLastExecutionResult, :last_execution_result
@@ -468,7 +460,7 @@ class TestLinker
     # @return [Array<Hash>] List of all builds for the plan and their associated
     #   info.
     def builds_for_test_plan plan_id
-      args = { devKey: @dev_key, testplanid: plan_id }
+      args = { :testplanid => plan_id }
       make_call("tl.getBuildsForTestPlan", args, "1.0b5")
     end
     alias_method :getBuildsForTestPlan, :builds_for_test_plan
@@ -476,7 +468,7 @@ class TestLinker
     # @param [Fixnum,String] plan_id ID of the plan to get build for.
     # @return [Hash] Info for the latest build for the given test plan.
     def latest_build_for_test_plan plan_id
-      args = { devKey: @dev_key, testplanid: plan_id }
+      args = { :testplanid => plan_id }
       make_call("tl.getLatestBuildForTestPlan", args, "1.0b5")
     end
     alias_method :getLatestBuildForTestPlan, :latest_build_for_test_plan
@@ -491,33 +483,31 @@ class TestLinker
     # @option options [Fixnum] active
     # @option options [Fixnum] public
     # @return
-    def create_test_project(project_name, test_case_prefix, options={})
-      args = { devKey: @dev_key, testprojectname: project_name,
-          testcaseprefix: test_case_prefix }
+    def create_project(project_name, test_case_prefix, options={})
+      args = { :testprojectname => project_name, :testcaseprefix => test_case_prefix }
       args.merge! options
       make_call("tl.createTestProject", args, "1.0b5")
     end
-    alias_method :createTestProject, :create_test_project
+    alias_method :createTestProject, :create_project
 
-    # @since TestLink API version 1.0
-    # @param [String] plan_name
+    # @api TestLink API version 1.0
     # @param [String] project_name
+    # @param [String] plan_name
     # @param [Hash] options
     # @option options [String] notes
     # @option options [String] active Defaults to 1.
     # @option options [String] public Defaults to 1.
     # @return
-    def create_test_plan(plan_name, project_name, options={})
-      args = { devKey: @dev_key, testplanname: plan_name,
-          testprojectname: project_name }
+    def create_test_plan(project_name, plan_name, options={})
+      args = { :testplanname => plan_name, :testprojectname => project_name }
       args.merge! options
       make_call('tl.createTestPlan', args, "1.0")
     end
     alias_method :createTestPlan, :create_test_plan
 
+    # @param [Fixnum,String] project_id
     # @param [String] suite_name
     # @param [String] details
-    # @param [Fixnum,String] project_id
     # @param [Hash] options
     # @option options [Fixnum,String] parentid Defaults to top level.
     # @option options [Fixnum] order Order inside parent container.
@@ -526,9 +516,9 @@ class TestLinker
     # @option options [Boolean] actiononduplicatedname Applicable only if
     #   checkduplicatedname = true.
     # @return [Array<Hash>] Info about results of test suite creation.
-    def create_test_suite(suite_name, details, project_id, options={})
-      args = { devKey: @dev_key, testprojectid: project_id,
-          testsuitename: suite_name, details: details }
+    def create_test_suite(project_id, suite_name, details, options={})
+      args = { :testprojectid => project_id, :testsuitename => suite_name,
+          :details => details }
       args.merge! options
       make_call('tl.createTestSuite', args, "1.0b5")
     end
@@ -536,23 +526,23 @@ class TestLinker
 
     # Creates a new build for a specific test plan.
     #
+    # @param [Fixnum,String] plan_id
     # @param [String] build_name
     # @param [String] build_notes
-    # @param [Fixnum,String] plan_id
     # @return
-    def create_build(build_name, build_notes, plan_id)
-      args = { devKey: @dev_key, testplanid: plan_id,
-         buildname: build_name, buildnotes: build_notes }
+    def create_build(plan_id, build_name, build_notes)
+      args = { :testplanid => plan_id, :buildname => build_name,
+          :buildnotes => build_notes }
       make_call("tl.createBuild", args, "1.0b5")
     end
     alias_method :createBuild, :create_build
 
+    # @param [Fixnum,String] project_id
+    # @param [Fixnum,String] suite_id
     # @param [String] test_case_name
     # @param [String] test_case_summary
     # @param [String] test_case_steps
     # @param [String] test_case_expected_results
-    # @param [Fixnum,String] suite_id
-    # @param [Fixnum,String] project_id
     # @param [String] login
     # @param [Hash] options
     # @option options [String] preconditions
@@ -563,16 +553,15 @@ class TestLinker
     # @option options [String] actiononduplicatedname
     # @option options [String] executiontype
     # @return
-    def create_test_case(test_case_name, test_case_summary, test_case_steps,
-         test_case_expected_results, suite_id, project_id, login, options={})
-      args = { devKey: @dev_key,
-          testcasename: test_case_name,
-          testsuiteid: suite_id,
-          testprojectid: project_id,
-          authorlogin: login,
-          summary: test_case_summary,
-          steps: test_case_steps,
-          expectedresults: test_case_expected_results }
+    def create_test_case(project_id, suite_id, test_case_name, test_case_summary,
+        test_case_steps, test_case_expected_results, login, options={})
+      args = { :testcasename => test_case_name,
+          :testsuiteid => suite_id,
+          :testprojectid => project_id,
+          :authorlogin => login,
+          :summary => test_case_summary,
+          :steps => test_case_steps,
+          :expectedresults => test_case_expected_results }
       args.merge! options
       make_call("tl.createTestCase", args, "1.0b5")
     end
@@ -580,21 +569,21 @@ class TestLinker
 
     # Adds a test case version to a test plan.
     #
+    # @param [Fixnum,String] project_id
+    # @param [Fixnum,String] plan_id
     # @param [Fixnum,String] test_case_external_id
     # @param [Fixnum,String] test_case_version
-    # @param [Fixnum,String] plan_id
-    # @param [Fixnum,String] project_id
     # @param [Hash] options Optional parameters for the method.
     # @option options [String] urgency
     # @option options [Fixnum] executionorder
     # @option options [Fixnum] platformid Only if test plan has no platforms.
     #   (TestLink API >=1.0)
     # @return
-    def add_test_case_to_test_plan(test_case_external_id, test_case_version,
-         plan_id, project_id, options={})
-      args = { devKey: @dev_key, testprojectid: project_id,
-          testplanid: plan_id, testcaseexternalid: test_case_external_id,
-          version: test_case_version }
+    def add_test_case_to_test_plan(project_id, plan_id, test_case_external_id,
+        test_case_version, options={})
+      args = { :testprojectid => project_id, :testplanid => plan_id,
+          :testcaseexternalid => test_case_external_id,
+          :version => test_case_version }
       args.merge! options
       make_call("tl.addTestCaseToTestPlan", args, "1.0b5")
     end
@@ -606,9 +595,9 @@ class TestLinker
     #
     # @see #test_case_execution_result=
     # @version TestLink API version 1.0 Beta 5
-    # @param [Fixnum,String] test_case_id ID of the test case to post results to.
-    # @param [String] status 'p', 'f', 's', or 'b' for Pass/Fail/Skip/Block
     # @param [Fixnum,String] plan_id ID of the test plan to post results to.
+    # @param [Fixnum,String] test_case_id ID of the test case to post results to.
+    # @param [String] status 'p', 'f', or 'b' for Pass/Fail/Block
     # @param [Hash] options
     # @option options [Fixnum,String] buildid ID of the build to post results to.
     # @option options [Fixnum,String] buildname Name of the build to post results to.
@@ -623,15 +612,15 @@ class TestLinker
     # @return [Hash] "status" of posting, "id" of the execution, "message"
     #   giving success or failure info.
     # @raise [TestLinker::Error] If result fails to be posted for any reason.
-    def report_test_case_result(test_case_id, status, plan_id, options={})
+    def report_test_case_result(plan_id, test_case_id, status, options={})
       if @version >= "1.0"
         message = "Method not supported in version #{@version}. "
         message << "Use #test_case_execution_result="
         raise TestLinker::Error, message
       end
 
-      args = { devKey: @dev_key, testcaseid: test_case_id,
-          testplanid: plan_id, status: status, guess: true }
+      args = { :testcaseid => test_case_id, :testplanid => plan_id,
+          :status => status, :guess => true }
       args.merge! options
       result = @server.call("tl.reportTCResult", args).first
 
@@ -647,10 +636,10 @@ class TestLinker
     # NOTE: will guess at last build, needs to be set to guarantee accuracy.
     #
     # @see #report_test_case_result
-    # @since TestLink API version 1.0
-    # @param [String] test_case_id ID of the test case to post results to.
-    # @param [String] status 'p', 'f', 's', or 'b' for Pass/Fail/Skip/Block
+    # @api TestLink API version 1.0
     # @param [String] plan_id ID of the test plan to post results to.
+    # @param [String] test_case_id ID of the test case to post results to.
+    # @param [String] status 'p', 'f', or 'b' for Pass/Fail/Block
     # @param [Hash] options
     # @option options [Fixnum] buildid ID of the build to post results to.
     # @option options [String] buildname Name of the build to post results to.
@@ -664,15 +653,15 @@ class TestLinker
     # @return [Hash] "status" of posting, "id" of the execution, "message"
     #   giving success or failure info.
     # @raise [TestLinker::Error] If result fails to be posted for any reason.
-    def test_case_execution_result=(test_case_id, status, plan_id, options={})
+    def test_case_execution_result=(plan_id, test_case_id, status, options={})
       if @version < "1.0"
         message = "Method not supported in version #{@version}. "
         message << "Use #report_test_case_result"
         raise TestLinker::Error, message
       end
 
-      args = { devKey: @dev_key, testcaseid: test_case_id,
-          testplanid: plan_id, status: status, guess: true }
+      args = { :testcaseid => test_case_id, :testplanid => plan_id,
+          :status => status, :guess => true }
       args.merge! options
       result = @server.call("tl.setTestCaseExecutionResult", args).first