zensana 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d157593d5d791cb3d34056174ec0e4a5b988a4
-  data.tar.gz: 4714d4d78693dc7767bb575616cc678e6c3152dc
+  metadata.gz: b94c9bb7aedae5805ed90054a3a565bb872d4c73
+  data.tar.gz: bfc11506fedbc028540e80e809dcd6ff58b2def4
 SHA512:
-  metadata.gz: d5d8fa90f895486c9a4c4bb07f4de2d2728889a020304fcec11d66e1a06c35df71faa778841be21e4b3c6b974e989c403908e3d07ae263f39f3c8362e7ced95d
-  data.tar.gz: a6a5709d63a02a81ae08dd85904b4b6db2d0f8a3caa31ac7199ae7043e7b36e16388fc4cd6d8ec6567c115b5c4268c3d3d61821893cfe331f2e2c932e50c72fd
+  metadata.gz: 4e9f316b42b0ab2bfca14c28d8b31fdf88ad6cf3273cc6dbb06dd62e39bd6e9551ad3878a4465dea6b6ef536839fc68d8719a81b3b9251e1c8a5b70c7228ecd3
+  data.tar.gz: 9c9dba2fd5d2f4bab8b28c36f60adabdf29cc655932802791ab8c122e378e27a0921147cf40c507c0ec534398ecc76f45b77b7507af7df2a38969dbbc3663266

data/lib/zensana/commands/project.rb

@@ -157,15 +157,6 @@ using options #{options}
             end
           end
 
-          # if assignee is not an agent then leave unassigned
-          if (assignee_key = options[:default_user] || task.attributes['assignee'])
-            if (assignee = asana_to_zendesk_user(assignee_key, false))
-              unless assignee.attributes && assignee.attributes['role'] != 'end-user'
-                assignee = nil
-              end
-            end
-          end
-
           # ready to import the ticket now!
           ticket = Zensana::Zendesk::Ticket.new(
             :requester_id => requester.id,
@@ -180,7 +171,7 @@ using options #{options}
 
             Task attributes:  #{task.attributes}
             EOF
-            :assignee_id  => assignee ? assignee.id : nil,
+            :assignee_id  => zendesk_assignee_id(task),
             :created_at   => task.created_at,
             :tags         => flatten_tags(project_tags, section_tags),
             :comments     => comments
@@ -226,6 +217,21 @@ using options #{options}
       zendesk
     end
 
+    # lookup the asana task assignee in zendesk and
+    # return their id if they are an agent or admin
+    #
+    def zendesk_assignee_id(task)
+      assignee_id = nil
+      if (assignee_key = options[:default_user] || task.attributes['assignee'])
+        if (assignee = asana_to_zendesk_user(assignee_key, false))
+          if assignee.attributes && assignee.attributes['role'] != 'end-user'
+            assignee_id = assignee.attributes['id']
+          end
+        end
+      end
+      assignee_id
+    end
+
     # download the attachments to the local file system
     # and retry a few times because internet
     # the download process is restartable (idempotent)
@@ -292,7 +298,7 @@ using options #{options}
     end
 
     def normalize_it(thing)
-      thing.gsub(/(\/| |-)+/,'_').downcase
+      thing.downcase.gsub(/([^a-z0-9])+/,'_')
     end
   end
 end

data/lib/zensana/models/asana/attachment.rb

@@ -13,11 +13,6 @@ module Zensana
         download_file unless downloaded?
       end
 
-      def download!
-        File.delete full_path if downloaded?
-        download_file
-      end
-
       def downloaded?
         File.exist? full_path
       end

data/lib/zensana/models/zendesk/comment.rb

@@ -15,8 +15,6 @@ module Zensana
 
       def initialize(attributes)
         validate_keys attributes
-        #id = attributes['author_id']
-        #raise NotFound, "Author #{id} does not exist" unless author_exists?(id)
         @attributes = attributes
       end
 

data/lib/zensana/version.rb

@@ -1,3 +1,3 @@
 module Zensana
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zensana
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty