timetree 0.2.0 → 1.0.0

data/lib/timetree/configuration.rb

@@ -5,15 +5,21 @@ require 'logger'
 module TimeTree
   # TimeTree apis client configuration.
   class Configuration
-    # @return [String]
-    attr_accessor :token
+    # @return [String] OAuthApp's access token
+    attr_accessor :oauth_app_token
+
+    # @return [String] CalendarApp's app id
+    attr_accessor :calendar_app_application_id
+    # @return [String] CalendarApp's private key content#
+    # e.g. File.read('<YOUR_PATH_TO_PEM_FILE>')
+    attr_accessor :calendar_app_private_key
+
     # @return [Logger]
     attr_accessor :logger
 
     def initialize
-      logger = Logger.new(STDOUT)
-      logger.level = :warn
-      @logger = logger
+      @logger = Logger.new $stdout
+      @logger.level = :warn
     end
   end
 end

data/lib/timetree/http_command.rb

@@ -15,22 +15,22 @@ module TimeTree
     # @param path [String] String or URI to access.
     # @param params [Hash] Hash of URI query unencoded key/value pairs.
     def get(path, params = {})
-      logger.info "GET #{connection.build_url("#{@host}#{path}", params)}"
+      @logger.info "GET #{connection.build_url("#{@host}#{path}", params)}"
       res = connection.get path, params
       @client.update_ratelimit(res)
-      logger.debug "Response status:#{res.status}, body:#{res.body}"
+      @logger.debug "Response status:#{res.status}, body:#{res.body}"
       res
     end
 
     # @param path [String] String or URI to access.
     # @param body_params [Hash]
     # The request bodythat will eventually be converted to JSON.
-    def post(path, body_params = {})
+    def post(path, body_params = {}, &block)
       @logger.debug "POST #{@host}#{path} body:#{body_params}"
-      headers = { 'Content-Type' => 'application/json' }
-      res = connection.run_request :post, path, body_params.to_json, headers
+      headers = {'Content-Type' => 'application/json'}
+      res = connection.run_request :post, path, body_params.to_json, headers, &block
       @client.update_ratelimit(res)
-      logger.debug "Response status:#{res.status}, body:#{res.body}"
+      @logger.debug "Response status:#{res.status}, body:#{res.body}"
       res
     end
 
@@ -38,11 +38,11 @@ module TimeTree
     # @param body_params [Hash]
     # The request bodythat will eventually be converted to JSON.
     def put(path, body_params = {})
-      logger.debug "PUT #{@host}#{path} body:#{body_params}"
-      headers = { 'Content-Type' => 'application/json' }
+      @logger.debug "PUT #{@host}#{path} body:#{body_params}"
+      headers = {'Content-Type' => 'application/json'}
       res = connection.run_request :put, path, body_params.to_json, headers
       @client.update_ratelimit(res)
-      logger.debug "Response status:#{res.status}, body:#{res.body}"
+      @logger.debug "Response status:#{res.status}, body:#{res.body}"
       res
     end
 
@@ -52,20 +52,18 @@ module TimeTree
       @logger.debug "DELETE #{@host}#{path} params:#{params}"
       res = connection.delete path, params
       @client.update_ratelimit(res)
-      logger.debug "Response status:#{res.status}, body:#{res.body}"
+      @logger.debug "Response status:#{res.status}, body:#{res.body}"
       res
     end
 
-    private
-
-    attr_reader :logger
+  private
 
     def connection
       Faraday.new(
         url: @host,
         headers: base_request_headers
       ) do |builder|
-        builder.response :json, parser_options: { symbolize_names: true }, content_type: /\bjson$/
+        builder.response :json, parser_options: {symbolize_names: true}, content_type: /\bjson$/
       end
     end
 

data/lib/timetree/models/activity.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'timetree/models/base_model'
+
 module TimeTree
   # Model for TimeTree comment.
   class Activity < BaseModel
@@ -29,7 +31,7 @@ module TimeTree
     # @since 0.0.1
     def create
       check_client
-      @client.create_activity calendar_id, event_id, data_params
+      _create
     end
 
     #
@@ -39,8 +41,18 @@ module TimeTree
     # @since 0.0.1
     def data_params
       {
-        data: { attributes: { content: content } }
+        data: {attributes: {content: content}}
       }
     end
+
+  private
+
+    def _create
+      if @client.is_a?(CalendarApp::Client)
+        @client.create_activity(event_id, data_params)
+      else
+        @client.create_activity(calendar_id, event_id, data_params)
+      end
+    end
   end
 end

data/lib/timetree/models/application.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'timetree/models/base_model'
+
+module TimeTree
+  # Model for TimeTree application.
+  class Application < BaseModel
+    # @return [String]
+    attr_accessor :name
+    # @return [String]
+    attr_accessor :description
+    # @return [String]
+    attr_accessor :image_url
+  end
+end

data/lib/timetree/models/base_model.rb

@@ -4,7 +4,7 @@ require 'time'
 
 module TimeTree
   # TimeTree base model object.
-  class BaseModel
+  class BaseModel # rubocop:disable Metrics/ClassLength
     # @return [Array<Hash<String,String>>]
     attr_accessor :relationships
     # @return [String]
@@ -15,15 +15,15 @@ module TimeTree
     # @param data [Hash]
     # TimeTree apis's response data.
     # @param included [Hash]
-    # @param client [TimeTree::Client]
-    # @return [TimeTree::User, TimeTree::Label, TimeTree::Calendar, TimeTree::Event, TimeTree::Activity]
+    # @param client [TimeTree::OAuthApp::Client, TimeTree::CalendarApp::Client]
+    # @return [TimeTree::User, TimeTree::Label, TimeTree::Calendar, TimeTree::Event, TimeTree::Activity, Hash]
     # A TimeTree model object that be based on the type.
-    # @raise [TimeTree::Error] if the type property is not set or unknown.
+    # @raise [TimeTree::Error] if the type property is not set.
     # @since 0.0.1
-    def self.to_model(data, included: nil, client: nil)
+    def self.to_model(data, included: nil, client: nil) # rubocop:disable all
       id = data[:id]
       type = data[:type]
-      raise Error, 'type is required.' if type.nil?
+      raise Error.new('type is required.') if type.nil?
 
       attributes = data[:attributes] || {}
       relationships = data[:relationships] || {}
@@ -37,22 +37,26 @@ module TimeTree
       }
 
       case type
-      when 'user'
-        User.new(**params)
-      when 'label'
-        Label.new(**params)
+      when 'activity'
+        Activity.new(**params)
+      when 'application'
+        Application.new(**params)
       when 'calendar'
         Calendar.new(**params)
       when 'event'
         Event.new(**params)
-      when 'activity'
-        Activity.new(**params)
+      when 'label'
+        Label.new(**params)
+      when 'user'
+        User.new(**params)
       else
-        raise Error, "type '#{type}' is unknown."
+        TimeTree.configuration.logger.warn("type '#{type}' is unknown. id:#{id}")
+        # when unexpected model type, return the 'data' argument.
+        data
       end
     end
 
-    def initialize(type:, id: nil, client: nil, attributes: nil, relationships: nil, included: nil)
+    def initialize(type:, id: nil, client: nil, attributes: nil, relationships: nil, included: nil) # rubocop:disable Metrics/ParameterLists
       @type = type
       @id = id
       @client = client
@@ -64,33 +68,29 @@ module TimeTree
       "\#<#{self.class}:#{object_id} id:#{id}>"
     end
 
-    private
+  private
 
     def check_client
-      raise Error, '@client is nil.' if @client.nil?
+      raise Error.new('@client is nil.') if @client.nil?
     end
 
     def to_model(data)
       self.class.to_model data, client: @client
     end
 
-    def set_attributes(attributes)
+    def set_attributes(attributes) # rubocop:disable Naming/AccessorMethodName
       return unless attributes.is_a? Hash
       return if attributes.empty?
 
-      setter_methods = self.class.instance_methods.select { |method| method.to_s.end_with? '=' }
       attributes.each do |key, value|
-        setter = "#{key.to_sym}=".to_sym
-        next unless setter_methods.include? setter
+        next unless respond_to?("#{key}=".to_sym)
 
-        if defined?(self.class::TIME_FIELDS) && self.class::TIME_FIELDS.include?(key)
-          value = Time.parse value
-        end
+        value = Time.parse value if defined?(self.class::TIME_FIELDS) && self.class::TIME_FIELDS.include?(key)
         instance_variable_set "@#{key}", value
       end
     end
 
-    def set_relationships(relationships, included)
+    def set_relationships(relationships, included) # rubocop:disable all
       return unless relationships.is_a? Hash
       return if relationships.empty?
       return unless defined? self.class::RELATIONSHIPS
@@ -112,21 +112,30 @@ module TimeTree
       set_relationship_data_if_included(included)
     end
 
-    def set_relationship_data_if_included(included)
+    def set_relationship_data_if_included(included) # rubocop:disable all
       @_relation_data_dic = {}
       included.each do |data|
         item = to_model(data)
         next unless item
 
-        @_relation_data_dic[item.type] ||= {}
-        @_relation_data_dic[item.type][item.id] = item
+        if item.is_a? Hash
+          item_id = item[:id]
+          item_type = item[:type]
+        else
+          item_id = item.id
+          item_type = item.type
+        end
+        next unless item_id && item_type
+
+        @_relation_data_dic[item_type] ||= {}
+        @_relation_data_dic[item_type][item_id] = item
       end
       detect_relation_data = lambda { |type, id|
         return unless @_relation_data_dic[type]
 
         @_relation_data_dic[type][id]
       }
-      @relationships.each do |key, id_data|
+      relationships.each do |key, id_data|
         relation_data = nil
         if id_data.is_a? Array
           relation_data = []

data/lib/timetree/models/calendar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'timetree/models/base_model'
+
 module TimeTree
   # Model for TimeTree calendar.
   class Calendar < BaseModel
@@ -30,7 +32,7 @@ module TimeTree
     # @since 0.0.1
     def event(event_id)
       check_client
-      @client.event id, event_id
+      get_event(event_id)
     end
 
     #
@@ -46,7 +48,7 @@ module TimeTree
     # @since 0.0.1
     def upcoming_events(days: 7, timezone: 'UTC')
       check_client
-      @client.upcoming_events id, days: days, timezone: timezone
+      get_upcoming_event(days, timezone)
     end
 
     #
@@ -60,7 +62,7 @@ module TimeTree
       return @members if defined? @members
 
       check_client
-      @members = @client.calendar_members id
+      @members = get_members
     end
 
     #
@@ -74,7 +76,41 @@ module TimeTree
       return @labels if defined? @labels
 
       check_client
-      @labels = @client.calendar_labels id
+      @labels = get_labels
+    end
+
+  private
+
+    def get_event(event_id)
+      if @client.is_a?(CalendarApp::Client)
+        @client.event(event_id)
+      else
+        @client.event(id, event_id)
+      end
+    end
+
+    def get_upcoming_event(days, timezone)
+      if @client.is_a?(CalendarApp::Client)
+        @client.upcoming_events(days: days, timezone: timezone)
+      else
+        @client.upcoming_events(id, days: days, timezone: timezone)
+      end
+    end
+
+    def get_members
+      if @client.is_a?(CalendarApp::Client)
+        @client.calendar_members
+      else
+        @client.calendar_members(id)
+      end
+    end
+
+    def get_labels
+      if @client.is_a?(CalendarApp::Client)
+        raise Error.new 'CalendarApp does not support label api'
+      else
+        @client.calendar_labels(id)
+      end
     end
   end
 end

data/lib/timetree/models/event.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'timetree/models/base_model'
+
 module TimeTree
   # Model for TimeTree event or keep.
   class Event < BaseModel
@@ -54,7 +56,7 @@ module TimeTree
     # @since 0.0.1
     def create
       check_client
-      @client.create_event calendar_id, data_params
+      _create_event
     end
 
     #
@@ -66,7 +68,7 @@ module TimeTree
     # @since 0.0.1
     def update
       check_client
-      @client.update_event calendar_id, id, data_params
+      _update_event
     end
 
     #
@@ -78,7 +80,7 @@ module TimeTree
     # @since 0.0.1
     def delete
       check_client
-      @client.delete_event calendar_id, id
+      _delete_event
     end
 
     #
@@ -90,7 +92,7 @@ module TimeTree
     # @since 0.0.1
     def create_comment(message)
       check_client
-      params = { type: 'activity', attributes: { calendar_id: calendar_id, event_id: id, content: message } }
+      params = {type: 'activity', attributes: {calendar_id: calendar_id, event_id: id, content: message}}
       activity = to_model params
       activity.create
     end
@@ -120,15 +122,39 @@ module TimeTree
       }
     end
 
-    private
+  private
 
     def relationships_params
-      current_label = label ? { type: 'label', id: label.id } : @relationships[:label]
-      current_attendees = attendees ? attendees.map { |u| { type: 'user', id: u.id } } : @relationships[:attendees]
+      current_label = label ? {type: 'label', id: label.id} : relationships[:label]
+      current_attendees = attendees ? attendees.map { |u| {type: 'user', id: u.id} } : relationships[:attendees]
       {
-        label: { data: current_label },
-        attendees: { data: current_attendees }
+        label: {data: current_label},
+        attendees: {data: current_attendees}
       }
     end
+
+    def _create_event
+      if @client.is_a?(CalendarApp::Client)
+        @client.create_event(data_params)
+      else
+        @client.create_event(calendar_id, data_params)
+      end
+    end
+
+    def _update_event
+      if @client.is_a?(CalendarApp::Client)
+        @client.update_event(id, data_params)
+      else
+        @client.update_event(calendar_id, id, data_params)
+      end
+    end
+
+    def _delete_event
+      if @client.is_a?(CalendarApp::Client)
+        @client.delete_event(id)
+      else
+        @client.delete_event(calendar_id, id)
+      end
+    end
   end
 end