lackac-rira 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 0

data/lib/rira/base.rb

@@ -40,11 +40,12 @@ module Rira
 
     def method_missing(method, *args)
       model, *methods = MAPPINGS[method]
-      
+
       super(method, *args) if methods.empty?
 
+      retried = false
       begin
-        case result = xmlrpc_client.call("jira1.#{methods.shift}", @token, *args)
+        case result = xmlrpc_client.call("jira1.#{methods.first}", @token, *args)
         when Hash
           model_or_struct(model, result)
         when Array
@@ -59,8 +60,15 @@ module Rira
           result
         end
       rescue XMLRPC::FaultException => e
-        retry unless methods.empty?
-        raise RPCError.new(e)
+        if e.faultString =~ /session timed out/ and not retried
+          @token = xmlrpc_client.call("jira1.login", @username, @password)
+          retried = true
+          retry
+        else
+          methods.shift
+          retry unless methods.empty?
+          raise RPCError.new(e)
+        end
       end
     end
 

data/lib/rira/model.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Rira
   class Model
     ASSOCIATIONS = {
@@ -16,14 +18,66 @@ module Rira
                           "update_issue"],
     }
 
+    # FIXME: DRY this up a little bit
+    CONVERTERS = {
+      'resolution' => lambda {|s,x| s.base.resolutions.detect {|r| r.id == x}},
+      'priority'   => lambda {|s,x| s.base.priorities.detect {|p| p.id == x}},
+      'status'     => lambda {|s,x| s.base.statuses.detect {|p| p.id == x}},
+      'project'    => lambda {|s,x| s.base.projects.detect {|p| p.key == x}},
+      'type'       => lambda { |s,x|
+        p = s.project
+        (p.issue_types + p.sub_task_issue_types).detect {|it| it.id == x}
+      },
+      'lead' => lambda {|s,x| s.base.user(x)},
+      'author' => lambda {|s,x| s.base.user(x)},
+      'reporter' => lambda {|s,x| s.base.user(x)},
+      'assignee' => lambda {|s,x| s.base.user(x)},
+      'components' => lambda {|s,x| x.map {|c| Model.new(s.base, 'component', c)}},
+      'affects_versions' => lambda {|s,x| x.map {|v| Model.new(s.base, 'version', v)}},
+      'fix_versions' => lambda {|s,x| x.map {|v| Model.new(s.base, 'version', v)}},
+      'created' => lambda {|s,x| Time.parse(x)},
+      'updated' => lambda {|s,x| Time.parse(x)},
+      'release_date' => lambda {|s,x| Date.parse(x)},
+      'build_date' => lambda {|s,x| Date.parse(x)},
+      'archived' => lambda {|s,x| x == 'true'},
+      'released' => lambda {|s,x| x == 'true'},
+      'sub_task' => lambda {|s,x| x == 'true'},
+    }
+
+    BOOLEANS = %w{archived released sub_task}
+
+    attr_reader :base, :model
+
     def initialize(base, model, hash)
       @base, @model, @attributes = base, model, hash
+      @attributes.keys.each do |key|
+        new_key = key.gsub(/[A-Z]/) {"_#{$&.downcase}"}
+        if key != new_key
+          @attributes[new_key] = @attributes.delete(key)
+        end
+      end
+    end
+
+    def id
+      @attributes['id']
+    end
+
+    def type
+      CONVERTERS['type'].call(self, @attributes['type'])
     end
 
     def method_missing(method, *args)
       method = method.to_s
+      if method[-1] == ?? and BOOLEANS.include?(method[0..-2])
+        method = method[0..-2]
+      end
       if args.empty? and @attributes.has_key?(method)
-        @attributes[method]
+        att = @attributes[method]
+        if converter = CONVERTERS[method]
+          converter.call(self, att)
+        else
+          att
+        end
       elsif map = ASSOCIATIONS[method] and map.first == @model
         _, att, rp = map
         scope = att[-1] == ?s ? Array(@attributes[att[0..-2]]) : @attributes[att]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lackac-rira
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - "L\xC3\xA1szl\xC3\xB3 B\xC3\xA1csi"