jirarest2 0.0.14 → 0.0.15

data.tar.gz.sig

@@ -1,2 +1 @@
-4��$��Q�$E�B�5Ή5��M�`�K�K�i�{�^o�T���]@�a������f�0�8�bV�����Q���3��h^�9"HX��!&��r6���3���fߐk@}�p��4i�������p�Xg���=A
-g̾>�rs+Z뤘l�϶���S���[7���G1[�����Ui�-ť�bIP���뾶[���F����v�L
��okІ�lO�F�����S�o�[|��>��n^�8��X
+*s��!VQ񈫠�'�\3Y�'1ݼ�bXi�T%T��s4���ι��A��@h�������mhUO�

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.0.15 / 2012-09-21
+
+* 3 bug fixes:
+
+  * Changed the behaviour regarding custom fieldtypes with type "string". Those are now a TextField by default and only radiobuttons and select are named as exceptions
+  * Fixed a "bug" with jira versions that don't return the "issuetype" field in the createmeta statement
+  * Fixed the CascadingField type
+
 === 0.0.14 / 2012-09-19
 
 * 1 unknown:

data/lib/jirarest2.rb

@@ -18,7 +18,7 @@
 #
 
 # Version Parameter all CAPS
-VERSION = "0.0.14"
+VERSION = "0.0.15"
 # Version Parameter 
 Version = VERSION
 

data/lib/jirarest2/field.rb

@@ -418,6 +418,7 @@ protected
   end # class MultiField
 
   # The class to represent CascadingSelectFields
+  # @todo error message is more than just a bit misleading
   class CascadingField < Field
     # The key element for the answers - It should not be needed - but it's easer on the checks if it's exposed
     # @return [String] The key element for the way to Jira
@@ -434,6 +435,10 @@ protected
     # @return [Boolean] true if the value is allowed, false if not
     def value_allowed?(value)
       return true if @allowed_values == []  # If there is no list get out of here fast
+      # Special case to ensure that we can use the string "nil" if the is really an allowed value
+      if value[1] == "nil" && ( @allowed_values[0].has_key?(value[0]) && @allowed_values[0][value[0]] == [nil] ) then
+        value[1] = nil
+      end
       if @allowed_values[0].has_key?(value[0]) && @allowed_values[0][value[0]].include?(value[1]) then
         return true
       else
@@ -449,7 +454,7 @@ protected
       if ! content.instance_of?(Array) or content.size != 2 then
         raise Jirarest2::ValueNotAllowedException.new(@name,"Array"), "needs to be an Array with exactly 2 parameters. Was #{content.class}." 
       end
-      super
+      super(content)
     end
     
 
@@ -460,7 +465,11 @@ protected
       if @value.nil? then
         super(nil)
       else
-        super({"value" => @value[0], "child" => {"value" => @value[1]}})
+        if @value[1].nil? then
+          super({"value" => @value[0]}) # If there is no child the server prefers not to be bothered
+        else
+          super({"value" => @value[0], "child" => {"value" => @value[1]}})
+        end
       end
     end
 
@@ -473,18 +482,23 @@ protected
     
     #Interpret the result of createmeta for one field
     # @attr [Hash](structure)
-    # @note fills allowed_values with a straight list of allowed values
-    # @todo Nothing is done here yet!
+    # @note fills allowed_values with a straight list of allowed values. 
+    # @todo The implementation is awkward with only one element in the array and the fields as Hashes in element 0. See if this is should be rewritten.
     def createmeta(structure)
       @readonly = true if structure["operations"] == []
       @key = "value"
       if structure["allowedValues"] then
+        @allowed_values << Hash.new
         structure["allowedValues"].each{ |suggestion|
           subentries = Array.new
-          suggestion["children"].each{ |entry|
-            subentries << entry["value"]
-          }
-          @allowed_values << {suggestion[@key] => subentries}
+          if suggestion.has_key?("children") then
+            suggestion["children"].each{ |entry|
+              subentries << entry["value"]
+            }
+          else
+            subentries << nil
+          end
+          @allowed_values[0][suggestion[@key]] = subentries
         }
       end
     end

data/lib/jirarest2/issuetype.rb

@@ -29,6 +29,7 @@ class Issuetype
   attr_reader :required_fields
   
   #Get the correct Fieldtype based on the schema from createmeta
+  # Strings are a little bit strange as the representation differs - some just go as values others go as hashes
   # @attr [Hash] schema The type description we get
   # @return [String] Name of the Fieldtype to use
   # @todo timetracking will probably not work
@@ -83,36 +84,25 @@ class Issuetype
         when /.*:cascadingselect$/
           return "CascadingField"
         else
-          raise Jirarest2::CouldNotDetermineFieldtypeException schema
+          raise Jirarest2::CouldNotDetermineFieldtypeException, schema
         end
       else
-        raise Jirarest2::CouldNotDetermineFieldtypeException schema
+        raise Jirarest2::CouldNotDetermineFieldtypeException, schema
       end
     when "string"
+      # Strings should be easy but unfortunately there are some strings that result in hashes
       return "TextField" if schema["system"]
-      schema["custom"] =~ /.*:(\w*)$/
+      schema["custom"] =~ /.*:(\w*)$/ 
       case $1
-      when "url"
-        return "TextField"
-      when "textfield"
-        return "TextField"
-      when "textarea"
-        return "TextField"
       when "radiobuttons"
         return "HashField"
       when "select"
         return "HashField"
-      when "hiddenjobswitch"
-        return "TextField"
-      when "readonlyfield"
-        return "TextField"
-      when "jobcheckbox"
-        return "TextField"
       else 
-        raise Jirarest2::CouldNotDetermineFieldtypeException schema
+        return "TextField"
       end
     else
-      raise Jirarest2::CouldNotDetermineFieldtypeException schema
+      raise Jirarest2::CouldNotDetermineFieldtypeException, schema
     end
 
   end # def decipher_schema
@@ -157,7 +147,7 @@ class Issuetype
         createmeta(json["editmeta"])
       else
         # We need to know what to fill and how
-        raise Jirearesr2::FieldsUnknownError json["self"]
+        raise Jirearesr2::FieldsUnknownError, json["self"]
       end
     end
     @issuekey = json["key"]
@@ -210,6 +200,10 @@ class Issuetype
       @fields.each { |id,field| 
         fields = fields.merge!(field.to_j) if ! field.to_j.nil? #Sending empty fields with a new ticket will not work
       }
+      # Work out some difference between different versions of JIRA(tm). Sometimes the issuetype is there as a field sometimes it isn't.
+      if !fields.has_key?("issuetype") then
+        fields["issuetype"] = {"name" => @name}
+      end
       h = {"fields" => fields}
       return h
     else

data/test/test_fieldcreatemeta.rb

@@ -451,7 +451,7 @@ class TestFieldCreatemeta < MiniTest::Unit::TestCase
   def test_customfield_10000 # cascadingselect -> CascadingField
     fstruct = {"customfield_10000" => {"required"=>false, "schema"=>{"type"=>"array", "items"=>"string", "custom"=>"com.atlassian.jira.plugin.system.customfieldtypes:cascadingselect", "customId"=>10000}, "name"=>"Cascading Select Test", "operations"=>["set"], "allowedValues"=>[{"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10000", "value"=>"English", "id"=>"10000", "children"=>[{"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10003", "value"=>"One", "id"=>"10003"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10004", "value"=>"Two", "id"=>"10004"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10005", "value"=>"Three", "id"=>"10005"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10006", "value"=>"Four", "id"=>"10006"}]}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10001", "value"=>"German", "id"=>"10001", "children"=>[{"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10007", "value"=>"Eins", "id"=>"10007"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10008", "value"=>"zwei", "id"=>"10008"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10009", "value"=>"drEi", "id"=>"10009"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10010", "value"=>"vier", "id"=>"10010"}]}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10002", "value"=>"ISO", "id"=>"10002", "children"=>[{"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10011", "value"=>"Unaone", "id"=>"10011"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10012", "value"=>"Bissotwo", "id"=>"10012"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10013", "value"=>"Terrathree", "id"=>"10013"}, {"self"=>"http://localhost:2990/jira/rest/api/2/customFieldOption/10014", "value"=>"Kartefour", "id"=>"10014"}]}]}}
     field = Jirarest2Field::CascadingField.new("customfield_10000","Cascading Select Test",{:required => false, :createmeta => fstruct["customfield_10000"]})
-    allowed_v = [{"English"=>["One", "Two", "Three", "Four"]}, {"German"=>["Eins", "zwei", "drEi", "vier"]}, {"ISO"=>["Unaone", "Bissotwo", "Terrathree", "Kartefour"]}]
+    allowed_v = [{"English"=>["One", "Two", "Three", "Four"], "German"=>["Eins", "zwei", "drEi", "vier"], "ISO"=>["Unaone", "Bissotwo", "Terrathree", "Kartefour"]}]
     assert_equal "customfield_10000", field.id
     assert_equal "Cascading Select Test", field.name
     assert_equal false, field.readonly

data/test/test_fields.rb

@@ -346,14 +346,21 @@ module Jirarest2Field
     end
     
     def test_allowed 
-      @field.allowed_values= [{ "color" => ["red","green","yellow"],"car" => ["bmw","mini","mg","vw"], "lang" => ["ruby","Java","C","C#"]}]
+      @field.allowed_values= [{ "color" => ["red","green","yellow"],"car" => ["bmw","mini","mg","vw"],"lang" => ["ruby","Java","C","C#"]}]
       @field.value = ["color","red"]
+      assert_equal ["color","red"],@field.value
       @field.value = ["car","mg"]
+      assert_equal ["car","mg"],@field.value
       assert_raises(Jirarest2::ValueNotAllowedException) { @field.value = ["color","lang"] }
       assert_raises(Jirarest2::ValueNotAllowedException) { @field.value = ["color"] }
       assert_raises(Jirarest2::ValueNotAllowedException) { @field.value = ["music"] }
       assert_raises(Jirarest2::ValueNotAllowedException) { @field.value = ["music","Cello"] }
     end
+
+    def test_allowed_with_empties
+      @field.allowed_values = [{ "color" => ["red","green","yellow"],"car" => [nil],"lang" => ["ruby","Java","C","C#"]}]
+      @field.value = ["car","nil"]
+    end
     
   end # class TestCascadingField
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirarest2
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14796920 !ruby/object:Gem::Requirement
+  requirement: &14487300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *14796920
+  version_requirements: *14487300
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &14796100 !ruby/object:Gem::Requirement
+  requirement: &14482800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *14796100
+  version_requirements: *14482800
 - !ruby/object:Gem::Dependency
   name: hoe-yard
-  requirement: &14795620 !ruby/object:Gem::Requirement
+  requirement: &14481280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,10 +84,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *14795620
+  version_requirements: *14481280
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &14794880 !ruby/object:Gem::Requirement
+  requirement: &14479940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,10 +95,10 @@ dependencies:
         version: 1.7.0
   type: :development
   prerelease: false
-  version_requirements: *14794880
+  version_requirements: *14479940
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &14793720 !ruby/object:Gem::Requirement
+  requirement: &14478520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -106,7 +106,7 @@ dependencies:
         version: 2.9.4
   type: :development
   prerelease: false
-  version_requirements: *14793720
+  version_requirements: *14478520
 description: ! "jirarest2 is yet another implementation of the JIRA(tm) REST-API[https://developer.atlassian.com/display/JIRADEV/JIRA+Remote+API+Reference]
   .  This one for Ruby1.9.1\n\nIt is intended to be called within the shell to create
   and verify JIRA(tm) issues fast without a browser. There was no particular need