3llo 1.0.0.pre.rc.0 → 1.0.0

data/lib/3llo/api/checklist.rb

@@ -4,20 +4,14 @@ module Tr3llo
       extend self
 
       def create(card_id, data)
-        params = data.merge(key: api_key, token: api_token)
+        req_path = Utils.build_req_path("/cards/#{card_id}/checklists")
 
-        client.post("/cards/#{card_id}/checklists", params)
+        client.post(req_path, {}, data)
       end
 
       def get(checklist_id)
-        payload =
-          JSON.parse(
-            client.get(
-              "/checklists/#{checklist_id}",
-              key: api_key,
-              token: api_token
-            )
-          )
+        req_path = Utils.build_req_path("/checklists/#{checklist_id}")
+        payload = client.get(req_path, {})
 
         checklist_id, checklist_name = payload.fetch_values("id", "name")
         checklist_shortcut = Entities.make_shortcut(:checklist, checklist_id)
@@ -31,24 +25,20 @@ module Tr3llo
       end
 
       def update(checklist_id, data)
-        params = data.merge(key: api_key, token: api_token)
+        req_path = Utils.build_req_path("/checklists/#{checklist_id}")
 
-        client.put("/checklists/#{checklist_id}", params)
+        client.put(req_path, {}, data)
       end
 
       def delete(checklist_id)
-        client.delete("/checklists/#{checklist_id}", token: api_token, key: api_key)
+        req_path = Utils.build_req_path("/checklists/#{checklist_id}")
+
+        client.delete(req_path, {}, {})
       end
 
       def list_by_card_id(card_id)
-        payload =
-          JSON.parse(
-            client.get(
-              "/cards/#{card_id}/checklists",
-              key: api_key,
-              token: api_token
-            )
-          )
+        req_path = Utils.build_req_path("/cards/#{card_id}/checklists")
+        payload = client.get(req_path, {})
 
         payload.map do |checklist_payload|
           checklist_id, checklist_name = checklist_payload.fetch_values("id", "name")
@@ -56,8 +46,8 @@ module Tr3llo
 
           items =
             checklist_payload
-            .fetch("checkItems", [])
-            .map do |item_payload|
+              .fetch("checkItems", [])
+              .map do |item_payload|
               item_id, item_name, item_state = item_payload.fetch_values("id", "name", "state")
               item_shortcut = Entities.make_shortcut(:check_item, item_id)
 
@@ -74,14 +64,8 @@ module Tr3llo
       end
 
       def get_item(card_id, item_id)
-        item_payload =
-          JSON.parse(
-            client.get(
-              "/cards/#{card_id}/checkItem/#{item_id}",
-              key: api_key,
-              token: api_token
-            )
-          )
+        req_path = Utils.build_req_path("/cards/#{card_id}/checkItem/#{item_id}")
+        item_payload = client.get(req_path, {})
 
         item_id, item_name, item_state = item_payload.fetch_values("id", "name", "state")
         item_shortcut = Entities.make_shortcut(:check_item, item_id)
@@ -90,35 +74,29 @@ module Tr3llo
       end
 
       def create_item(checklist_id, name)
-        client.post(
-          "/checklists/#{checklist_id}/checkItems",
-          key: api_key,
-          token: api_token,
+        req_path = Utils.build_req_path("/checklists/#{checklist_id}/checkItems")
+        payload = {
           name: name,
           pos: "bottom",
-          state: false
-        )
+          state: "false"
+        }
+
+        client.post(req_path, {}, payload)
       end
 
       def update_item(card_id, check_item_id, data)
-        params = data.merge(key: api_key, token: api_token)
+        req_path = Utils.build_req_path("/cards/#{card_id}/checkItem/#{check_item_id}")
 
-        client.put("/cards/#{card_id}/checkItem/#{check_item_id}", params)
+        client.put(req_path, {}, data)
       end
 
       def delete_item(card_id, item_id)
-        client.delete("/cards/#{card_id}/checkItem/#{item_id}", token: api_token, key: api_key)
-      end
-
-      private
+        req_path = Utils.build_req_path("/cards/#{card_id}/checkItem/#{item_id}")
 
-      def api_key
-        Application.fetch_configuration!().api_key
+        client.delete(req_path, {}, {})
       end
 
-      def api_token
-        Application.fetch_configuration!().api_token
-      end
+      private
 
       def client
         Application.fetch_client!()

data/lib/3llo/api/list.rb

@@ -4,26 +4,23 @@ module Tr3llo
       extend self
 
       def find_all_by_board(board_id)
-        JSON.parse(
-          client.get(
+        req_path =
+          Utils.build_req_path(
             "/boards/#{board_id}/lists",
-            list: true,
-            key: api_key,
-            token: api_token
+            {"list" => "true"}
           )
-        ).map do |list_payload|
-          make_struct(list_payload)
-        end
+
+        client
+          .get(req_path, {})
+          .map do |list_payload|
+            make_struct(list_payload)
+          end
       end
 
       def archive_cards(list_id)
-        JSON.parse(
-          client.post(
-            "/lists/#{list_id}/archiveAllCards",
-            key: api_key,
-            token: api_token
-          )
-        )
+        req_path = Utils.build_req_path("/lists/#{list_id}/archiveAllCards")
+
+        client.post(req_path, {}, {})
       end
 
       private
@@ -38,14 +35,6 @@ module Tr3llo
       def client
         Application.fetch_client!()
       end
-
-      def api_key
-        Application.fetch_configuration!().api_key
-      end
-
-      def api_token
-        Application.fetch_configuration!().api_token
-      end
     end
   end
 end

data/lib/3llo/api/token.rb

@@ -4,10 +4,10 @@ module Tr3llo
       extend self
 
       def verify(key, token)
-        client.get("/tokens/#{token}", key: key)
+        client.get("/tokens/#{token}?key=#{key}", {})
 
         true
-      rescue HTTP::Client::RequestError
+      rescue RemoteServer::RequestError
         false
       end
 

data/lib/3llo/api/user.rb

@@ -4,31 +4,19 @@ module Tr3llo
       extend self
 
       def find(user_id)
-        url = "/members/#{user_id}"
+        client = Application.fetch_client!()
+        req_path = Utils.build_req_path("/members/#{user_id}")
 
-        make_struct(
-          JSON.parse(
-            client.get(
-              url,
-              key: key,
-              token: token
-            )
-          )
-        )
+        make_struct(client.get(req_path, {}))
       end
 
       def find_all_by_board(board_id)
-        url = "/board/#{board_id}/members"
+        client = Application.fetch_client!()
+        req_path = Utils.build_req_path("/board/#{board_id}/members")
 
-        JSON.parse(
-          client.get(
-            url,
-            key: key,
-            token: token
-          )
-        ).map do |user_payload|
-          make_struct(user_payload)
-        end
+        client
+          .get(req_path, {})
+          .map { |user_payload| make_struct(user_payload) }
       end
 
       private
@@ -39,18 +27,6 @@ module Tr3llo
 
         Entities::User.new(id, shortcut, username)
       end
-
-      def key
-        Application.fetch_configuration!().api_key
-      end
-
-      def token
-        Application.fetch_configuration!().api_token
-      end
-
-      def client
-        Application.fetch_client!()
-      end
     end
   end
 end

data/lib/3llo/application.rb

@@ -2,10 +2,10 @@ module Tr3llo
   module Application
     extend self
 
-    DEFAULT_CONFIG_FILE_PATH = "~/.3llo.config.json"
+    DEFAULT_CONFIG_FILE_PATH = "~/.3llo.config.json".freeze
 
     def start(args)
-      $container = Container.new()
+      $application = Container.new()
 
       interface = register_interface!()
       option_parser = build_option_parser()
@@ -13,12 +13,12 @@ module Tr3llo
 
       options = parse_cli_args!(option_parser, args)
 
-      if options.key?(:help)
+      if options.has_key?(:help)
         execute_help!(option_parser, interface)
         exit
       end
 
-      if options.key?(:configure)
+      if options.has_key?(:configure)
         execute_configure!(interface)
         exit
       end
@@ -28,7 +28,7 @@ module Tr3llo
 
       print_help!(interface)
 
-      load_configuration!(config_file, interface)
+      load_configuration!(config_file)
       register_registry!()
 
       load_user!(interface)
@@ -64,7 +64,7 @@ module Tr3llo
       parser.parse!(args, into: options)
 
       options
-    rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => exception
+    rescue OptionParser::InvalidArgument, OptionParser::InvalidOption
       {}
     end
 
@@ -85,19 +85,21 @@ module Tr3llo
     end
 
     def register_api_client!()
-      $container.register(:api_client, Tr3llo::HTTP::Client)
+      remote_server = Tr3llo::RemoteServer.new("https://api.trello.com/1")
+
+      $application.register(:api_client, remote_server)
     end
 
     def register_interface!()
       prompt = TTY::Prompt.new()
-      $container.register(:interface, Tr3llo::Interface.new(prompt, $stdout))
+      $application.register(:interface, Tr3llo::Interface.new(prompt, $stdout))
     end
 
-    def load_configuration!(config_file, interface)
+    def load_configuration!(config_file)
       config_path = File.expand_path(config_file)
 
       config =
-        if File.exists?(config_path)
+        if File.exist?(config_path)
           JSON.load(File.read(config_path))
         else
           {}
@@ -110,17 +112,25 @@ module Tr3llo
 
       configuration.finalize!()
 
-      $container.register(:configuration, configuration)
+      $application.register(:configuration, configuration)
     rescue KeyError => exception
       command_string = "3llo --configure"
-      abort(Utils.paint("#{exception.key.inspect} has not been configured. Please run #{command_string.inspect} to set up configuration.", "red"))
+
+      abort(
+        Utils.paint(
+          "#{exception.key.inspect} has not been configured. " \
+            "Please run #{command_string.inspect} to set up configuration.",
+          "red"
+        )
+      )
     end
 
     def get_config_entry(config, key, env_key)
       config.fetch(key) do
         if ENV.has_key?(env_key)
           Utils.deprecate!(
-            "Setting #{env_key.inspect} as an environment variable is deprecated. It will be removed in the future versions of 3llo. Please use config file instead."
+            "Setting #{env_key.inspect} as an environment variable is deprecated. " \
+              "It will be removed in the future versions of 3llo. Please use config file instead."
           )
 
           ENV.fetch(env_key)
@@ -131,37 +141,37 @@ module Tr3llo
     end
 
     def register_registry!()
-      $container.register(:registry, Tr3llo::Registry.new)
+      $application.register(:registry, Tr3llo::Registry.new)
     end
 
     def register_board!(board)
-      $container.register(:board, board)
+      $application.register(:board, board)
     end
 
     def fetch_board!()
-      $container.resolve(:board)
+      $application.resolve(:board)
     rescue ::Container::KeyNotFoundError
       raise BoardNotSelectedError
     end
 
     def fetch_user!()
-      $container.resolve(:user)
+      $application.resolve(:user)
     end
 
     def fetch_configuration!()
-      $container.resolve(:configuration)
+      $application.resolve(:configuration)
     end
 
     def fetch_interface!()
-      $container.resolve(:interface)
+      $application.resolve(:interface)
     end
 
     def fetch_client!()
-      $container.resolve(:api_client)
+      $application.resolve(:api_client)
     end
 
     def fetch_registry!()
-      $container.resolve(:registry)
+      $application.resolve(:registry)
     end
 
     def load_user!(interface)
@@ -172,7 +182,7 @@ module Tr3llo
         interface.puts("You're logged in as #{decorated_username}")
       end
 
-      $container.register(:user, user)
+      $application.register(:user, user)
     end
   end
 end

data/lib/3llo/command.rb

@@ -1,9 +1,9 @@
-require '3llo/command/board'
-require '3llo/command/card'
-require '3llo/command/list'
-require '3llo/command/help'
-require '3llo/command/exit'
-require '3llo/command/invalid'
+require "3llo/command/board"
+require "3llo/command/card"
+require "3llo/command/list"
+require "3llo/command/help"
+require "3llo/command/exit"
+require "3llo/command/invalid"
 
 module Tr3llo
   module Command
@@ -13,35 +13,64 @@ module Tr3llo
       build_command(command_buffer)
     end
 
+    def generate_suggestions(buffer, command_buffer)
+      commands = {
+        "board" => ["list", "select"],
+        "list" => %w[list cards archive-cards],
+        "card" => %w[
+          list show add edit archive list-mine move
+          comment comments self-assign assign
+          add-checklist edit-checklist remove-checklist
+          add-item edit-item remote-item check-item uncheck-item
+        ],
+        "help" => [],
+        "exit" => []
+      }
+
+      command, _subcommand, _args = parse_command(command_buffer)
+
+      if commands.has_key?(command)
+        subcommands = commands.fetch(command)
+
+        subcommands
+          .grep(/^#{Regexp.escape(buffer)}/)
+          .reject { |suggestion| suggestion == buffer }
+      else
+        commands.keys.grep(/^#{Regexp.escape(buffer)}/)
+      end
+    end
+
     private
 
     def build_command(command_string)
       command, subcommand, *args = parse_command(command_string)
 
       case command
-      when 'board'
+      when "board"
         Command::Board.execute(subcommand, args)
-      when 'card'
+      when "card"
         Command::Card.execute(subcommand, args)
-      when 'list'
+      when "list"
         Command::List.execute(subcommand, args)
-      when 'help'
+      when "help"
         Command::Help.execute()
-      when 'exit'
+      when "exit"
         Command::Exit.execute()
       else
         if command
-          raise InvalidCommandError.new("#{command.inspect} is not a valid command. Run #{"help".inspect} to display the document.")
+          raise InvalidCommandError.new(
+            "#{command.inspect} is not a valid command. Run #{"help".inspect} to display the document."
+          )
         else
           raise InvalidCommandError.new("command is missing")
         end
       end
-    rescue InvalidCommandError => exception
+    rescue InvalidCommandError, RemoteServer::RequestError => exception
       Command::Invalid.execute(exception.message)
     end
 
     def parse_command(command_string)
-      command_string.strip.split(' ')
+      command_string.strip.split(" ").map(&:strip)
     end
   end
 end