todoist-ruby 0.1.3 → 0.2.1

data/lib/todoist/util/network_helper.rb

@@ -1,6 +1,6 @@
 require "net/http"
 require "json"
-require "todoist/util/config"
+require "todoist/config"
 require 'net/http/post/multipart'
 require 'mimemagic'
 
@@ -8,16 +8,25 @@ module Todoist
   module Util
     class NetworkHelper
 
-      @@last_request_time = 0.0
       
-      def self.configureHTTP(command)
+
+      def initialize(client)
+        @client = client
+        @command_cache = Concurrent::Array.new([])
+        @command_mutex = Mutex.new
+        @temp_id_callback_cache = Concurrent::Array.new([])
+        @last_request_time = 0.0
+        
+      end
+      
+      def configure_http(command)
         http = Net::HTTP.new(Config.getURI()[command].host, Config.getURI()[command].port)
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         return http
       end
 
-      def self.configureRequest(command, params)
+      def configure_request(command, params)
         request = Net::HTTP::Post.new(Config.getURI()[command].request_uri)
         request.set_form_data(params)
         return request
@@ -25,9 +34,9 @@ module Todoist
       
       # Files need to be of class UploadIO
       
-      def self.getMultipartResponse(command, params={})
-        token = {token: Todoist::Util::Config.token}
-        http = configureHTTP(command)
+      def get_multipart_response(command, params={})
+        token = {token: @client.token}
+        http = configure_http(command)
         url = Config.getURI()[command]
         http.start do
           req = Net::HTTP::Post::Multipart.new(url, token.merge(params))
@@ -40,11 +49,11 @@ module Todoist
         end
       end
     
-      def self.getResponse(command, params ={}, token = true)
-        token = token ? {token: Todoist::Util::Config.token} : {}
-        http = configureHTTP(command)
-        request = configureRequest(command, token.merge(params))
-        retry_after_secs = Todoist::Util::Config.retry_time
+      def get_response(command, params ={}, token = true)
+        token = token ? {token: @client.token} : {}
+        http = configure_http(command)
+        request = configure_request(command, token.merge(params))
+        retry_after_secs = Todoist::Config.retry_time
         # Hack to fix encoding issues with Net:HTTP for login case
         request.body = request.body.gsub '%40', '@' unless token
         while true
@@ -67,7 +76,7 @@ module Todoist
           when 429
             puts("Encountered 429 - retry after #{retry_after_secs}")
             sleep(retry_after_secs)
-            retry_after_secs *= Todoist::Util::Config.retry_time
+            retry_after_secs *= Todoist::Config.retry_time
           when 500
             raise StandardError, "HTTP 500 Error - The request failed due to a server error."
           when 503
@@ -77,24 +86,50 @@ module Todoist
         
       end
       
-      def self.throttle_request(http, request)
-        time_since_last_request = Time.now.to_f - @@last_request_time
+      def throttle_request(http, request)
+        time_since_last_request = Time.now.to_f - @last_request_time
         
-        if (time_since_last_request < Todoist::Util::Config.delay_between_requests)
-          wait = Todoist::Util::Config.delay_between_requests - time_since_last_request
+        if (time_since_last_request < Todoist::Config.delay_between_requests)
+          wait = Todoist::Config.delay_between_requests - time_since_last_request
           puts("Throttling request by: #{wait}")
           sleep(wait)
         end
-        @@last_request_time = Time.now.to_f
+        @last_request_time = Time.now.to_f
         http.request(request)
       end
       
       # Prepares a file for multipart upload
-      def self.multipart_file(file)
+      def multipart_file(file)
           filename = File.basename(file)
           mime_type = MimeMagic.by_path(filename).type
           return UploadIO.new(file, mime_type, filename)
       end
+        
+      def queue(command, callback = nil) 
+        @command_mutex.synchronize do
+          @command_cache.push(command)
+          @temp_id_callback_cache.push(callback) if callback
+        end
+        
+      end
+      
+      def sync
+        @command_mutex.synchronize do    
+          response = get_sync_response({commands: @command_cache.to_json})
+          @command_cache.clear
+          # Process callbacks here
+          temp_id_mappings = response["temp_id_mapping"]
+          @temp_id_callback_cache.each do |callback| 
+              callback.(temp_id_mappings)
+          end
+          @temp_id_callback_cache.clear
+        end
+      end
+
+      def get_sync_response(params)
+        get_response(Config::TODOIST_SYNC_COMMAND, params)
+      end
+
     end
   end
 end

data/lib/todoist/util/parse_helper.rb

@@ -4,11 +4,11 @@ module Todoist
   module Util
     class ParseHelper
 
-      def self.utcOffsetHours
+      def self.utc_offset_hours
         return Time.now.utc_offset/60/60
       end
 
-      def self.parseTodoistDate(item, key)
+      def self.parse_todoist_date(item, key)
         if item[key]
           time = Time.parse(item[key])
           return time.to_datetime
@@ -18,17 +18,17 @@ module Todoist
       end
 
 
-      def self.filterToday(item, key)
+      def self.filter_today(item, key)
 
         now = DateTime.now
-        if parseTodoistDate(item, key) && parseTodoistDate(item, key) <= DateTime.new(now.year, now.month, now.day, -utcOffsetHours) + 1
+        if parse_todoist_date(item, key) && parse_todoist_date(item, key) <= DateTime.new(now.year, now.month, now.day, -utc_offset_hours) + 1
           return true
         else 
           return false
         end
       end
       
-      def self.formatTime(datetime)
+      def self.format_time(datetime)
         datetime.strftime("%Y-%m-%dT%H:%M")
       end
 

data/lib/todoist/version.rb

@@ -1,3 +1,3 @@
 module Todoist
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

data/todoist.gemspec

@@ -33,12 +33,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-  spec.add_development_dependency "simplecov"
-  spec.add_dependency "concurrent-ruby"
-  spec.add_dependency "multipart-post"
-  spec.add_dependency "mimemagic"
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency "vcr", "~> 3.0"
+  spec.add_development_dependency "webmock", "~> 3.0"
+  spec.add_development_dependency "simplecov", "~> 0.10"
+  spec.add_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_dependency "multipart-post", "~> 2.0"
+  spec.add_dependency "mimemagic", "~> 0.3"
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todoist-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Han Yuan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,100 +56,100 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 description: This gem provides access to the latest Todoist API.  It is designed to
   be as lightweight as possible.  While the gem provides interfaces for the sync API
   calls, no support is provided for persisting the result of these calls.  Collaboration
@@ -174,6 +174,8 @@ files:
 - fixtures/uuid/.gitignore
 - fixtures/vcr_cassettes/.gitignore
 - lib/todoist.rb
+- lib/todoist/client.rb
+- lib/todoist/config.rb
 - lib/todoist/misc/activity.rb
 - lib/todoist/misc/backups.rb
 - lib/todoist/misc/completed.rb
@@ -183,7 +185,7 @@ files:
 - lib/todoist/misc/quick.rb
 - lib/todoist/misc/templates.rb
 - lib/todoist/misc/uploads.rb
-- lib/todoist/misc/user.rb
+- lib/todoist/service.rb
 - lib/todoist/sync/filters.rb
 - lib/todoist/sync/items.rb
 - lib/todoist/sync/labels.rb
@@ -191,8 +193,6 @@ files:
 - lib/todoist/sync/projects.rb
 - lib/todoist/sync/reminders.rb
 - lib/todoist/util/api_helper.rb
-- lib/todoist/util/command_synchronizer.rb
-- lib/todoist/util/config.rb
 - lib/todoist/util/network_helper.rb
 - lib/todoist/util/parse_helper.rb
 - lib/todoist/util/uuid.rb

data/lib/todoist/misc/user.rb

@@ -1,16 +0,0 @@
-module Todoist
-  module Misc
-    class User
-        include Todoist::Util 
-
-        # Logs the user in and grabs a token for the login session.
-        def login(email, password)
-          result = NetworkHelper.getResponse(Config::TODOIST_USER_LOGIN_COMMAND, {email: email, password: password}, false)
-          user = ParseHelper.make_object(result)
-          Config.token = user.token
-          return user
-        end
-
-    end
-  end
-end

data/lib/todoist/util/command_synchronizer.rb

@@ -1,54 +0,0 @@
-require 'concurrent'
-require "todoist/util/api_helper"
-
-module Todoist
-
-  module Util
-    class CommandSynchronizer
-      
-      @@command_cache = Concurrent::Array.new([])
-      @@command_mutex = Mutex.new
-      @@temp_id_callback_cache = Concurrent::Array.new([])
-      
-      def self.start
-        @@sync_thread = Thread.new do
-          while(true) do
-            process()
-            sleep(3)
-          end          
-        end unless @@sync_thread
-      end
-      
-      def self.stop
-        Thread.kill(@@sync_thread) if @@sync_thread
-        @@sync_thread = nil
-      end
-        
-      def self.queue(command, callback = nil) 
-        @@command_mutex.synchronize do
-          @@command_cache.push(command)
-          @@temp_id_callback_cache.push(callback) if callback
-        end
-      end
-      
-      def self.sync
-        @@command_mutex.synchronize do    
-          response = ApiHelper.getSyncResponse({commands: @@command_cache.to_json})
-          @@command_cache.clear
-          # Process callbacks here
-          temp_id_mappings = response["temp_id_mapping"]
-          @@temp_id_callback_cache.each do |callback| 
-              callback.(temp_id_mappings)
-          end
-          @@temp_id_callback_cache.clear
-        end
-      end
-
-      
-      protected
-        
-    end
-
-  end
-
-end

data/lib/todoist/util/config.rb

@@ -1,78 +0,0 @@
-module Todoist
-  module Util
-    class Config
-      TODOIST_API_URL = "https://todoist.com/API/v7"
-      
-      # List of commands supported
-      @@command_list = [
-        TODOIST_SYNC_COMMAND = "/sync",
-        TODOIST_QUERY_COMMAND = "/query",
-        TODOIST_TEMPLATES_IMPORT_INTO_PROJECT_COMMAND = "/templates/import_into_project",
-        TODOIST_TEMPLATES_EXPORT_AS_FILE_COMMAND = "/templates/export_as_file",
-        TODOIST_TEMPLATES_EXPORT_AS_URL_COMMAND = "/templates/export_as_url",
-        TODOIST_UPLOADS_ADD_COMMAND = "/uploads/add",
-        TODOIST_UPLOADS_GET_COMMAND = "/uploads/get",
-        TODOIST_UPLOADS_DELETE_COMMAND = "/uploads/delete",
-        TODOIST_COMPLETED_GET_STATS_COMMAND = "/completed/get_stats",
-        TODOIST_COMPLETED_GET_ALL_COMMAND = "/completed/get_all",
-        TODOIST_PROJECTS_GET_ARCHIVED_COMMAND = "/projects/get_archived",
-        TODOIST_PROJECTS_GET_COMMAND = "/projects/get",
-        TODOIST_PROJECTS_GET_DATA_COMMAND = "/projects/get_data",
-        TODOIST_ITEMS_ADD_COMMAND = "/items/add",
-        TODOIST_ITEMS_GET_COMMAND = "/items/get",
-        TODOIST_QUICK_ADD_COMMAND = "/quick/add",
-        TODOIST_ACTIVITY_GET_COMMAND = "/activity/get",
-        TODOIST_BACKUPS_GET_COMMAND = "/backups/get",
-        TODOIST_USER_LOGIN_COMMAND = "/user/login"
-      ]
-      
-      # Map of commands to URIs
-      @@uri = nil
-      
-      # User token
-      @@token = nil
-      
-      # Artificial delay between requests to avoid API throttling
-      @@delay_between_requests = 0
-      
-      # Should API throttling happen (HTTP Error 429), retry_time between requests
-      # with exponential backoff
-      @@retry_time = 20
-      
-      def self.token=(token)
-        @@token = token
-      end
-      
-      def self.token
-        @@token
-      end
-
-      def self.retry_time=(retry_time)
-        @@retry_time = retry_time
-      end
-
-      def self.retry_time
-        @@retry_time
-      end
-      
-      def self.delay_between_requests=(delay_between_requests)
-        @@delay_between_requests = delay_between_requests
-      end
-      
-      def self.delay_between_requests
-        @@delay_between_requests
-      end
-
-      def self.getURI
-        if @@uri == nil
-          @@uri = {}
-          @@command_list.each do |command|
-            @@uri[command] =  URI.parse(TODOIST_API_URL + command)
-          end
-        end
-        return @@uri
-      end
-
-    end
-  end
-end