obeya 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b1e139ffc2d08751922cfa5e1b0e6109f40ca5
-  data.tar.gz: 1fea464b707b6589b01d4e84d78d7fe846ee61df
+  metadata.gz: 7adf220c51ab91d183c62813d1f3216403d01617
+  data.tar.gz: 9c0be6e00be9d76b5bda6b58f598485f06430d3b
 SHA512:
-  metadata.gz: bbf64ea647f26fe67b1c31165317c7041006c465f00d985aaa15993f1c4af854375685343a29aff9bdba3f6f14db7396bef9e544aaf7805871ac4e1fdc8c66c1
-  data.tar.gz: 51b8cc2d62462e2c050a8020f0d40e9d909f33e15014c42090b45e133c041c87fa9eaee244442f0c9b8421544a628fff346ce3689232ce84d0df029a581ee13c
+  metadata.gz: 02e81e3735dc745d00a23751994c457be0fbe5f45598b624c1e6db03a91ce8b8d959a1e40eedcb699133f108ee425072da6dc4fc63cdf8dbdb6df7fd8da8e182
+  data.tar.gz: c25e312da1575753610a282f46ca1f6eb0ddae3617ecbc0c8d41949f6baa2619dd9c82d9935ccb3d60310e2433247fd3bada0ac13d1e4379217cd2b900984942

data/.gitignore

@@ -10,3 +10,7 @@
 .ruby-version
 .ruby-gemset
 /_ignore
+.idea/
+
+# Ignore company specific test config
+test/integration/obeya_config.rb

data/CHANGELOG.md

@@ -3,3 +3,10 @@
 ## 0.1.0 (not yet released)
 
  * initial copy from the `investapp`
+
+## 0.2.0
+
+ * Support the ability to retrieve all tickets for a bin, and to run a matcher through this
+ * Support custom fields on ticket
+ * Add an integration test (site configured)
+ 

data/lib/obeya.rb

@@ -1,8 +1,8 @@
-require "obeya/version"
-require "obeya/bin"
-require "obeya/ticket_type"
-require "obeya/ticket"
-require "obeya/client"
+require_relative "obeya/version"
+require_relative "obeya/bin"
+require_relative "obeya/ticket_type"
+require_relative "obeya/ticket"
+require_relative "obeya/client"
 
 module Obeya
   # Your code goes here...

data/lib/obeya/client.rb

@@ -1,37 +1,58 @@
 require 'faraday'
 require 'faraday_middleware'
+require 'date'
 
 module Obeya
   class Client
 
     OBEYA_ROOT_URL = "https://beta.getobeya.com"
+    CUSTOM_FIELD_TYPES = [::NilClass, ::String, ::Float, ::Integer, ::Array, ::Date]
 
-    def initialize(company_id, username, password)
+    def initialize(company_id, username, password, logger=nil)
       @company_id = company_id
       @username = username
       @password = password
+      @logger = logger
+
+      @bin_tickets = {}
     end
 
-    def create_ticket(title, description, format: 'text', ticket_type_name: 'Bug', bin_name: /please panic/i)
-      ticket = Ticket.new(
-        title,
-        description,
-        format,
-        ticket_type(ticket_type_name),
-        bin(bin_name)
+    def create_ticket(title, description, format: 'text', ticket_type_name: 'bug', bin_name: /please panic/i, **others)
+      ticket = Ticket.new({
+        title: title,
+        description: description,
+        format: format,
+        ticket_type: ticket_type(ticket_type_name),
+        bin: bin(bin_name) }.
+        merge(others)
       )
 
-      response = post("/tickets/#{next_ticket_id}", ticket.to_json)
+      ticket_to_json = ticket.to_json(custom_field_name_map)
+      response = post("/tickets/#{next_ticket_id}", ticket_to_json)
       case response.status
       when 200..299
         true
       else
-        puts "status: #{response.status}"
-        puts "        #{response.inspect}"
+        log_warn "status: #{response.status}"
+        log_warn "        #{response.inspect}"
         false
       end
     end
 
+    def update_ticket(id, other_fields)
+      ticket = Ticket.new(other_fields)
+
+      response = put("/tickets/#{id}", ticket.to_json(custom_field_name_map, true))
+      case response.status
+        when 200..299
+          true
+        else
+          log_warn "status: #{response.status}"
+          log_warn "        #{response.inspect}"
+          false
+      end
+    end
+
     def bin(name_or_regex)
       case name_or_regex
       when String
@@ -66,8 +87,54 @@ module Obeya
       end
     end
 
+    def tickets_in_named_bin(bin_name)
+      named_bin = bin(bin_name)
+      raise "Bin #{bin_name} not found" unless named_bin
+      tickets_in_bin(named_bin.id)
+    end
+
+    def tickets_in_bin(bin_id)
+      ticket_type_map = Hash[ticket_types.map { |t| [t.id, t] }]
+      bin_map = Hash[bins.map { |b| [b.id, b] }]
+
+      @bin_tickets[bin_id] ||= begin
+        get("/tickets?bin_id=#{bin_id}").map do |ticket_data|
+          Ticket.from_obeya(ticket_data, ticket_type_map, bin_map, custom_fields)
+        end
+      end
+    end
+
+    def matching_tickets_in_named_bin(bin_name, title_matcher)
+      named_bin = bin(bin_name)
+      raise "Bin #{bin_name} not found" unless named_bin
+      matching_tickets_in_bin(named_bin.id, title_matcher)
+    end
+
+    def matching_tickets_in_bin(bin_id, title_matcher)
+      tickets = tickets_in_bin(bin_id)
+      case title_matcher
+      when String
+        tickets.select { |t| t.title == title_matcher }
+      when Regexp
+        tickets.select { |t| t.title =~ title_matcher }
+      end
+    end
+
+    # Get custom fields as a hash of id => {id, name, type}
+    def custom_fields
+      @custom_fields ||= begin
+        Hash[get('/custom-fields').map do |cf|
+          [cf['_id'], { id: cf['_id'], name: cf['name'], type: CUSTOM_FIELD_TYPES[cf['type'].to_i] }]
+        end]
+      end
+    end
+
     private
 
+    def custom_field_name_map
+      @custom_field_name_map ||= Hash[custom_fields.values.map {|v| [v[:name], v] }]
+    end
+
     def next_ticket_id
       get('/ids?amount=1')[0]
     end
@@ -77,7 +144,7 @@ module Obeya
         request.headers.update({ accept: 'application/json', content_type: 'application/json' })
       end
       unless response.success?
-        raise("Obeya #{api_path} call failsed")
+        raise("Obeya #{api_path} call failed")
       end
       JSON.parse(response.body)
     end
@@ -88,6 +155,12 @@ module Obeya
       end
     end
 
+    def put(api_path, json)
+      faraday.put("/rest/1/#{@company_id}#{api_path}", json) do |request|
+        request.headers.update({ accept: 'application/json', content_type: 'application/json' })
+      end
+    end
+
     def faraday
       @faraday ||= Faraday.new(OBEYA_ROOT_URL).tap do |connection|
         connection.basic_auth(@username, @password)
@@ -95,5 +168,9 @@ module Obeya
       end
     end
 
+    def log_warn(s)
+      @logger.warn(s) if @logger
+    end
+
   end
 end

data/lib/obeya/ticket.rb

@@ -1,22 +1,111 @@
 module Obeya
   class Ticket
 
-    def initialize(title, description, format, ticket_type, bin)
-      @title = title
-      @description = description
-      @format = format
-      @ticket_type = ticket_type
-      @bin = bin
-    end
-
-    def to_json
-      {
-        "name":           @title,
-        "rtformat":       @format,
-        "description":    normalise(@description),
-        "bin_id":         @bin.id,
-        "ticketType_id":  @ticket_type.id
-      }.to_json
+    # title, description, format, ticket_type, bin, id=nil
+    def initialize(*params)
+      if params.first.is_a?(Hash)
+        @ticket_fields = params.first
+      else
+        @ticket_fields = {}
+        [:title, :description, :format, :ticket_type, :bin, :id].each_with_index do |param_key, idx|
+          break if idx>=params.size
+          @ticket_fields[param_key] = params[idx]
+        end
+      end
+    end
+
+    def self.from_obeya(src_hash, ticket_types, bins, custom_fields)
+      ticket_fields = Hash[
+        src_hash.map do |obeya_name, field_value|
+          case(obeya_name)
+            when 'rtformat'
+              [:format, field_value]
+            when 'name'
+              [:title, field_value]
+            when 'ticketType_id'
+              [:ticket_type, ticket_types[field_value.to_i]]
+            when 'bin_id'
+              [:bin, bins[field_value.to_i]]
+            when 'customFields'
+              nil
+            else
+              [obeya_name.to_sym, field_value]
+          end
+        end.compact
+      ]
+
+      (src_hash['customFields'] || []).each do |custom_field_id, value|
+        ticket_fields[custom_fields[custom_field_id][:name]] = value
+      end
+
+      Obeya::Ticket::new(ticket_fields)
+    end
+
+    def to_obeya(custom_field_name_map, for_update=false)
+      obeya_fields = Hash[@ticket_fields.map do |field_name, field_value|
+        case(field_name)
+          when :format
+            ['rtformat', field_value]
+          when :title
+            ['name', field_value]
+          when :description
+            ['description', normalise(field_value)]
+          when :ticket_type
+            ['ticketType_id', field_value.id]
+          when :bin
+            ['bin_id', field_value.id]
+          else
+            if for_update
+              fdef = custom_field_name_map[field_name.to_s]
+              ["customFields.#{fdef[:id]}", cast_to_obeya(field_value, fdef[:type])]
+            else
+              nil
+            end
+        end
+      end.compact
+      ]
+
+      unless for_update
+        custom_fields = @ticket_fields.select {|fn, _v| ![:format, :title, :description, :ticket_type, :bin].include?(fn) }
+        if custom_fields && !custom_fields.empty?
+          obeya_fields['customFields'] =
+            Hash[custom_fields.map do |field_name, field_value|
+              fdef = custom_field_name_map[field_name.to_s]
+              [fdef[:id], cast_to_obeya(field_value, fdef[:type])]
+            end]
+        end
+      end
+
+      obeya_fields
+    end
+
+    def cast_to_obeya(value, type)
+      case type.to_s
+        when 'String'
+          value.to_s
+        when 'Float'
+          value.to_f
+        when 'Integer'
+          value.to_i
+        when 'Array'
+          value
+        when 'Date'
+          Date.parse(value.to_s).strftime('%Y-%m-%dT%H:%M:%S.%LZ')
+      end
+    end
+
+    def to_json(custom_field_name_map, for_update=false)
+      to_obeya(custom_field_name_map, for_update).to_json
+    end
+
+    def [](name)
+      @ticket_fields[name]
+    end
+
+    def method_missing(name)
+      return @ticket_fields[name] if @ticket_fields.key?(name)
+
+      super
     end
 
     private

data/lib/obeya/version.rb

@@ -1,3 +1,3 @@
 module Obeya
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obeya
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thorsten Boettger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday