vimaly 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14adbbb6cfb6bcd28a369de71608726014a378b
-  data.tar.gz: bcc970b7e562eed22ae9b180a1e9737aa2bf103d
+  metadata.gz: 956fd4a26b6f2eba08ed381f2742879e1e95067c
+  data.tar.gz: 501b0918f52ac4a7a039163cc0a15600982cf0b7
 SHA512:
-  metadata.gz: 6b422a4e99ebb3dc15fc35bf4ef43c90c85582d951ee335cfd1069c35a184c0c741801e9b211125caedcc855fb3bb794343dda60dae0bf9d0780cdee727c9a51
-  data.tar.gz: d2c65390339e2c1791865126c9951d484cedfe6a4bae5c5bfb55acaaa65020a90a1b02628e9bcf0cd5c11e9bafae2b24b9fa4a7b8729e6206c35c29f4bee1b60
+  metadata.gz: 35e629bd3feb3ff0f584e3211f01a570b06fe96d93e83f87f73eca4ea0892658f5cc7534c52f8af4a133cc8e7242fabbca23b3c7e28b908ef06f1e16401c9634
+  data.tar.gz: a213d402482328b805eafef6c6454c6d1a3b5646df734dc2e614c931ff2c24dd97fbbf6f95ea62e620d72f403d5b81312a515547d22fd559e5b5ad67c90b2526

data/lib/vimaly/client.rb

@@ -30,8 +30,8 @@ module Vimaly
       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
+        when 200..299
+          true
       else
         log_warn "status: #{response.status}"
         log_warn "        #{response.inspect}"
@@ -40,7 +40,7 @@ module Vimaly
     end
 
     def update_ticket(id, other_fields)
-      ticket = Ticket.new(other_fields)
+        ticket = Ticket.new(other_fields)
 
       response = put("/tickets/#{id}", ticket.to_json(custom_field_name_map, true))
       case response.status
@@ -97,11 +97,10 @@ module Vimaly
       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_vimaly(ticket_data, ticket_type_map, bin_map, custom_fields)
-        end
+      get("/tickets?bin_id=#{bin_id}").map do |ticket_data|
+        Ticket.from_vimaly(ticket_data, ticket_type_map, bin_map, custom_fields)
       end
+
     end
 
     def matching_tickets_in_named_bin(bin_name, title_matcher)
@@ -144,7 +143,7 @@ module Vimaly
         request.headers.update({ accept: 'application/json', content_type: 'application/json' })
       end
       unless response.success?
-        raise("Vimaly #{api_path} call failed")
+        raise("Vimaly #{api_path} call failed with response #{response.status}")
       end
       JSON.parse(response.body)
     end

data/lib/vimaly/ticket.rb

@@ -1,12 +1,14 @@
+require "active_support/core_ext/hash/indifferent_access"
+
 module Vimaly
   class Ticket
 
     # title, description, format, ticket_type, bin, id=nil
     def initialize(*params)
       if params.first.is_a?(Hash)
-        @ticket_fields = params.first
+        @ticket_fields = HashWithIndifferentAccess.new(params.first)
       else
-        @ticket_fields = {}
+        @ticket_fields = HashWithIndifferentAccess.new
         [: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]
@@ -44,19 +46,22 @@ module Vimaly
     def to_vimaly(custom_field_name_map, for_update=false)
       vimaly_fields = Hash[@ticket_fields.map do |field_name, field_value|
         case(field_name)
-          when :format
+          when 'id'
+            nil   # id should not be in ticket body
+          when 'format'
             ['rtformat', field_value]
-          when :title
+          when 'title'
             ['name', field_value]
-          when :description
+          when 'description'
             ['description', normalise(field_value)]
-          when :ticket_type
+          when 'ticket_type'
             ['ticketType_id', field_value.id]
-          when :bin
+          when 'bin'
             ['bin_id', field_value.id]
           else
             if for_update
-              fdef = custom_field_name_map[field_name.to_s]
+              fdef = custom_field_name_map[field_name]
+              raise "Field type #{field_name} is not a defined custom or standard field in Vimaly" unless fdef
               ["customFields.#{fdef[:id]}", cast_to_vimaly(field_value, fdef[:type])]
             else
               nil
@@ -66,7 +71,7 @@ module Vimaly
       ]
 
       unless for_update
-        custom_fields = @ticket_fields.select {|fn, _v| ![:format, :title, :description, :ticket_type, :bin].include?(fn) }
+        custom_fields = @ticket_fields.select {|fn, _v| ![:format, :title, :description, :ticket_type, :bin].include?(fn.to_sym) }
         if custom_fields && !custom_fields.empty?
           vimaly_fields['customFields'] =
             Hash[custom_fields.map do |field_name, field_value|
@@ -98,6 +103,11 @@ module Vimaly
       to_vimaly(custom_field_name_map, for_update).to_json
     end
 
+    def add_id(id)
+      raise "Ticket already has id #{@ticket_fields[:'_id']} and we try and add #{id}" if @ticket_fields[:'_id']
+      @ticket_fields['_id'] = id
+    end
+
     def [](name)
       @ticket_fields[name]
     end
@@ -108,6 +118,10 @@ module Vimaly
       super
     end
 
+    def update_fields(fields)
+      @ticket_fields.merge!(fields)
+    end
+
     private
 
     def normalise(text)

data/lib/vimaly/version.rb

@@ -1,3 +1,3 @@
 module Vimaly
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/vimaly.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday"
   spec.add_dependency "faraday_middleware"
+  spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "maxitest", '~> 1'
   spec.add_development_dependency "shoulda-context"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimaly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Thorsten Boettger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,34 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Wrapper for the Vimaly API