timesheet-toggl 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7144dce52c6d9a109b3e9d095540359aeecd6cae
-  data.tar.gz: 4e37f892a05b06dd46798c96eaf7cc22db88f6f8
+  metadata.gz: 5abbba2899768c7931df772a3807f6e2707861c6
+  data.tar.gz: 1bdf674dc5fa703fd0f0b4fdd441b828dc48ebd6
 SHA512:
-  metadata.gz: c9ba21d9910947f6c2278e83a302b0f77f67fbf158d125fdf2ef4502a96e887ab6139fa0634d411efc3ee53d889b137f38d4cd6192e806b6e688875902434e72
-  data.tar.gz: 133104f772bcf93c091ffa1da79cfc4ceecd8fbb99ad8f2dca488ae8abc74a63587d279b454660a9ad83de0ff7a37262a8befa980949f89ef480030113853002
+  metadata.gz: 0a870ed228f2c8dda4bc835063d7f4d0ae843f7c2732a213f833df4743da7901700bfd714e28213e345a35ee86fbfbd3fb9489855051bfb4810b30577d890682
+  data.tar.gz: c216d7566349691f264df6427299de3e1137766025552311dc0e2aeec6eec323d715d5bef657c1f6a4da5964163f40e8ee245d23b1c8fd507c522a90e6cdb930

data/lib/timesheet/toggl/clients.rb

@@ -0,0 +1,29 @@
+module Timesheet
+  module Clients
+    CLIENTS_URI = 'https://www.toggl.com/api/v8/clients'
+
+    def create_client(name, workspace_id)
+      params = {
+        client: {
+          name: name,
+          wid: workspace_id,
+        }
+      }
+      headers = {}
+      headers['Content-Type']='application/json'
+      headers['X-Requested-With']='XMLHttpRequest'
+      headers['Accept']='application/json'
+      response = Curl::Easy.http_post(CLIENTS_URI, params.to_json) do |request|
+        request.http_auth_types = :basic
+        request.username = config[:api_token]
+        request.password = 'api_token'
+        request.headers = headers
+      end
+      if response.response_code == 200
+        JSON.parse(response.body, symbolize_names: true)[:data][:id]
+      else
+        Rails.logger.error "Client creation failed: #{response.body}"
+      end
+    end
+  end
+end

data/lib/timesheet/toggl/parser.rb

@@ -0,0 +1,129 @@
+module Timesheet
+  # get issue id
+  #   issue-related params
+  # get project
+  # split by several issues
+  #   if one issue, then all good
+  #   if several:
+  #     delete time entries from timesheet
+  #     delete time entries from kibana
+  #     add new time entries to timesheet
+  # @time_part
+  class TogglRecord
+    attr_accessor :record, :config
+    Time.zone = 'UTC' # not to corrupt start_time and end_time
+
+    def initialize(hash, config)
+      @descriptions = parse_description hash[:description]
+      @record = hash
+      @config = config
+    end
+
+    def parse_description(description)
+      result = description.scan(/(#\s?\d+[^#]+)/).flatten
+      result.size < 2 ? [description] : result
+    end
+
+    def push
+      return unless params = descriptions_params
+      if params.size > 1
+        TimeEntry
+          .where(external_id: record[:id], data_source_id: config[:source_id])
+          .each { |x| x.delete_from_kibana; x.delete }
+        params.each { |x| return unless x[:user_id]; TimeEntry.create x }
+      else
+        params = params.first
+        return unless params[:user_id]
+        te = TimeEntry.find_or_create_by(
+          external_id: record[:id], data_source_id: config[:source_id])
+        te.update params
+      end
+    end
+
+    def descriptions_params
+      return unless params = derive_params
+      time_proc = proc { |x| x.scan(/@\s?(\d+)/).flatten.first.to_i }
+      times = @descriptions.map(&time_proc).reject(&:zero?)
+      one_part = (times.size / @descriptions.size.to_f) * params[:hours] / times.sum
+      @descriptions.map do |x|
+        time = time_proc.call(x)
+        hours = time.zero? ?
+          (params[:hours] / @descriptions.size) :
+          (one_part * time)
+        iid = issue_id(comment: x)
+        params.merge(comment: x, hours: hours).merge(issue_related_params(iid))
+      end
+    end
+
+    def derive_params
+      params = record.reduce({}) do |r, (k, v)|
+        next(r) unless params_map[k]
+        r.merge(params_map[k] => v)
+      end
+      params[:data_source_id] = config[:source_id]
+      params[:spent_on] = record[:start]
+      params[:user_id] = user_id
+      return unless params[:user_id]
+      params[:hours] /= 3_600_000.0 # turn milliseconds into hours
+      if iid = issue_id(params)
+        params.merge!(issue_related_params(iid))
+      end
+      params[:client_id] ||= client_id
+      params
+    end
+
+    def params_map
+      {
+        id: :external_id,
+        project: :project,
+        description: :comment,
+        dur: :hours,
+        start: :start_time,
+        end: :finish_time
+      }
+    end
+
+    def issue_id(params)
+      return unless config[:redmine_time_entry_class]
+      params[:comment].match(/#\s?(\d+)/).try(:[], 1)
+    end
+
+    def issue_related_params(issue_id)
+      time_entry_class = Kernel.const_get(config[:redmine_time_entry_class])
+      begin
+        project_id = time_entry_class.issue_class.find(issue_id).project_id
+      rescue
+        return {}
+      end
+      project_company = time_entry_class.project_company(project_id)
+      issue_company = time_entry_class.issue_company(issue_id)
+      company = issue_company.empty? ? project_company : issue_company
+      alert = time_entry_class.alert? project_company, issue_company
+      {
+        project: time_entry_class.project(project_id),
+        task: time_entry_class.task(issue_id),
+        client_id: time_entry_class.client_id(company),
+        project_company: project_company,
+        issue_company: issue_company,
+        alert: alert
+      }
+    end
+
+    def client_id
+      if client = Client.find_by(name: record[:client])
+        client_id = client.id
+      else
+        Rails.logger.error "No client match to toggl client #{record[:client]}"
+      end
+      client_id
+    end
+
+    def user_id
+      data_source_user = DataSourceUser.find_by(
+        data_source_id: config[:source_id], external_user_id: record[:uid])
+      error = "No user match to toggl user #{record[:user]} (id #{record[:uid]})"
+      (Rails.logger.error(error); return) unless data_source_user
+      data_source_user.user_id
+    end
+  end
+end

data/lib/timesheet/toggl/projects.rb

@@ -0,0 +1,28 @@
+module Timesheet
+  module Projects
+    PROJECTS_URI = 'https://www.toggl.com/api/v8/projects'
+
+    def create_project(name, workspace_id, client_id)
+      params = {
+        project: {
+          name: name,
+          wid: workspace_id,
+          cid: client_id
+        }
+      }
+      headers = {}
+      headers['Content-Type']='application/json'
+      headers['X-Requested-With']='XMLHttpRequest'
+      headers['Accept']='application/json'
+      response = Curl::Easy.http_post(PROJECTS_URI, params.to_json) do |request|
+        request.http_auth_types = :basic
+        request.username = config[:api_token]
+        request.password = 'api_token'
+        request.headers = headers
+      end
+      unless response.response_code == 200
+        Rails.logger.error "Project creation failed: #{response.body}"
+      end
+    end
+  end
+end

data/lib/timesheet/toggl/version.rb

@@ -1,5 +1,5 @@
 module Timesheet
-  module Toggl
-    VERSION = "0.0.2"
+  class Toggl
+    VERSION = "0.0.5"
   end
 end

data/lib/timesheet/toggl.rb

@@ -1,4 +1,7 @@
 require_relative 'toggl/version'
+require_relative 'toggl/clients'
+require_relative 'toggl/projects'
+require_relative 'toggl/parser'
 require 'curb'
 require 'active_support/core_ext/time'
 require 'active_support/core_ext/date'
@@ -13,6 +16,9 @@ module Timesheet
   #   Timesheet::Toggl.new(config).sync(from: (Date.today - 1.month), to: Date.today)
   #
   class Toggl
+    include Clients
+    include Projects
+
     attr_accessor :config
 
     BASE_URI = 'https://toggl.com/reports/api/v2/details'
@@ -44,18 +50,20 @@ module Timesheet
     #   until=2013-05-20&
     #   user_agent=api_test"
     #
+    # @return array of time entries' ids
+    #
     def synchronize(from, to, user_ids = [])
       params = {
         workspace_id: config[:workspace_id],
         since: from.to_s,
         until: to.to_s,
-        user_agent: 'export_to_timesheet',
-        user_ids: user_ids.join(',')
+        user_agent: 'export_to_timesheet'
       }
+      params[:user_ids] = user_ids.join(',') unless user_ids.empty?
       first_page = fetch(params, 1)
-      push(first_page)
+      te_ids = push(first_page)
       pages = first_page[:total_count] / first_page[:per_page]
-      pages.times { |page| sync(params, page + 2) }
+      pages.times.map { |page| sync(params, page + 2) }.flatten + te_ids
     end
 
     # Since toggl has per-page api, we will follow them.
@@ -78,7 +86,7 @@ module Timesheet
         request.password = 'api_token'
       end
       parsed = JSON.parse(response.body, symbolize_names: true)
-      fail "Request failed: #{parsed}" unless response.response_code == 200
+      fail "Request failed: #{parsed} with params #{params}" unless response.response_code == 200
       parsed
     end
 
@@ -87,7 +95,7 @@ module Timesheet
     #
     def push(parsed_response)
       TimeEntry.transaction do
-        parsed_response[:data].each { |x| push_record x }
+        parsed_response[:data].map { |x| push_record x }
       end
     end
 
@@ -95,56 +103,8 @@ module Timesheet
     # Don't push time entry if no user set.
     #
     def push_record(record)
-      params = derive_params(record)
-      return unless params[:user_id]
-      te = TimeEntry.find_or_create_by(
-        external_id: record[:id], data_source_id: config[:source_id])
-      te.update params
-    end
-
-    def derive_params(record)
-      params = record.reduce({}) do |r, (k, v)|
-        next(r) unless params_map[k]
-        r.merge(params_map[k] => v)
-      end
-      params[:data_source_id] = config[:source_id]
-      params[:spent_on] = record[:start].to_date
-      params[:hours] /= 3_600_000.0 # turn milliseconds into hours
-      if config[:redmine_time_entry_class]
-        if issue_id = params[:comment].match(/\#(\d+)/)[1]
-          params[:client_id] = Kernel.const_get(config[:redmine_time_entry_class])
-            .client_id(issue_id)
-        end
-      end
-      unless params[:client_id]
-        if client = Client.find_by(name: record[:client])
-          params[:client_id] = client.id
-        else
-          Rails.logger.error "No client match to toggl client #{record[:client]}"
-        end
-      end
-      data_source_user = DataSourceUser.find_by(
-        data_source_id: config[:source_id], external_user_id: record[:uid])
-      if data_source_user
-        params[:user_id] = data_source_user.user_id
-      else
-        Rails.logger.error "No user match to toggl user
-          #{record[:user]} (id #{record[:uid]})"
-      end
-      params
-    end
-
-    def params_map
-      {
-        id: :external_id,
-        project: :project,
-        description: :comment,
-        dur: :hours,
-        start: :start_time,
-        end: :finish_time
-      }
+      params = TogglRecord.new(record, config).push
+      record[:id]
     end
-
-    extend self
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timesheet-toggl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Sergey Smagin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,11 @@ files:
 - README.md
 - Rakefile
 - lib/timesheet/toggl.rb
+- lib/timesheet/toggl/clients.rb
+- lib/timesheet/toggl/parser.rb
+- lib/timesheet/toggl/projects.rb
 - lib/timesheet/toggl/version.rb
+- timesheet-toggl-0.0.2.gem
 - timesheet-toggl.gemspec
 homepage: https://github.com/s-mage/timesheet-toggl
 licenses:
@@ -101,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Toggl integration for timesheet
 test_files: []
-has_rdoc: