lard 0.0.6 → 0.0.8.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f99cc882f8a69da2bb153deaf6562413ffaf1ef30d6629891a759923e14cbcb
-  data.tar.gz: ddd7735acd5db8b72210fe6cc479dfee474682f46f23eb0b1b4f9e91f2bc6096
+  metadata.gz: 9baa80628bf009726fbb8d62d56c85d86390609311fe42789c087862408631c1
+  data.tar.gz: f65898d7ba1842f8a3ba64ee4ebf96d018832470d7ce462a3042282d26032f90
 SHA512:
-  metadata.gz: 374516a4d37c0b9a94a28ae94f7f42bbfb39db3a659018c26898119b6698a046b2b63e52446410973c3ae8c55bdc8addcfd71295dc0dfda53dab69f8dda2a852
-  data.tar.gz: 3ba7229ed910834cdf4f7cf39cf5c925c76ef45d300be9010ef3225e88f0416c9ab3e7fc2337a6a2dffb85024bf58678512fc49b1c2b911ab3d3f53e5fa05ab4
+  metadata.gz: ddfbb8bb02065e7380acb453598b3e7bbdfd911ad0625495565d0708e1e87b0144f7612ba01f8bb13fbe806642ae1dd882c6a76c3a6d76d4e99be88a85ecf7fd
+  data.tar.gz: 52ce87ac6cee76ed629681331a50a0c1a4ab854884dcab12a89638ace3f7fbe2a0d304291868592d5b86571cb82ac0691a44c0323bb238bc7b9311a66500002a

data/bin/lard

@@ -1,186 +1,70 @@
 #!/usr/bin/env ruby
-require 'httparty'
+
+require 'date'
 require 'paint'
 require 'thor'
 require 'yaml'
-
-# Try to authenticate with ~/.lard.yml
-begin
-  config = YAML.load_file File.expand_path('~/.lard.yml')
-rescue StandardError
-  config = {}
-end
-begin
-  token = config['token']
-rescue StandardError
-  token = nil
-end
-$options = {
-  headers: {
-    'Authorization' => "Token #{token}"
-  }
-}
-$folders = []
-
-# A set of utility functions for working with the Larder HTTP API
-module LardHTTP
-  def authorized
-    # Assume Auth header longer than "Token " is authorized
-    $options[:headers]['Authorization'].length > 6
-  end
-
-  def get(endpoint, params = nil)
-    raise "You're not logged in! Run 'lard login' first." unless authorized
-
-    query = { query: params }
-    opts = $options.merge query
-    res = self.class.get "#{prefix}#{endpoint}", opts
-    parse_response res
-  end
-
-  def post(endpoint, args = {})
-    raise "You're not logged in! Run 'lard login' first." unless authorized
-
-    opts = {
-      body: args.to_json,
-      headers: {
-        'Content-Type' => 'application/json'
-      }
-    }
-    opts[:headers].merge! $options[:headers]
-    res = self.class.post "#{prefix}#{endpoint}", opts
-    parse_response res
-  end
-
-  def parse_response(res)
-    JSON.parse res.body, symbolize_names: true
-  end
-
-  def raw_get(url)
-    raise "You're not logged in! Run 'lard login' first." unless authorized
-
-    JSON.parse self.class.get(url, $options).body, symbolize_names: true
-  end
-
-  def prefix
-    'https://larder.io/api/1/@me/'
-  end
-
-  def get_folder_by_name(name)
-    fetch_folders if $folders.empty?
-    $folders.find do |folder|
-      folder[:name] == name
+require 'lard'
+
+# rubocop: disable ClassLength
+class LardCLI < Thor
+  def initialize(*args)
+    super
+
+    # Try to authenticate with ~/.lard.yml
+    begin
+      config = YAML.load_file File.expand_path('~/.lard.yml')
+      token = config['token']
+    rescue StandardError
+      # Catch any file error here because the user can run `lard login`
+      # to generate this config file, so we may be OK!
+      token = nil
     end
-  end
 
-  def print_folder_name(folder)
-    print Paint[folder[:name], folder[:color]]
-    puts ":\t#{folder[:links]} links"
+    @lard = Lard.new token
   end
 
-  def fetch_tags
-    res = get 'tags', limit: 200
-    tags = res[:results] || []
-
-    until res[:next].nil?
-      res = raw_get res[:next]
-      tags.push(*res[:results])
-    end
-
-    tags
-  end
-
-  def fetch_bookmarks(folder_id)
-    res = get "folders/#{folder_id}", limit: 200
-    bookmarks = res[:results] || []
-
-    until res[:next].nil?
-      res = raw_get res[:next]
-      bookmarks.push(*res[:results])
-    end
-
-    bookmarks
-  end
-
-  def fetch_folders
-    res = get 'folders', limit: 200
-    $folders = res[:results]
-
-    until res[:next].nil?
-      res = raw_get res[:next]
-      $folders.push(*res[:results])
-    end
-
-    # TODO: Cache these folders
-  end
-
-  # TODO: How can we reduce the AbcSize here further?
-  # rubocop:disable AbcSize
-  def print_bookmark(bookmark)
-    puts Paint[(bookmark[:title]).to_s, :bright]
-    puts "  #{bookmark[:description]}" if bookmark[:description]
-    puts "  #{bookmark[:url]}"
-
-    return if bookmark[:tags].nil? || bookmark[:tags].empty?
-
-    print '  '
-    bookmark[:tags].each do |tag|
-      print Paint["##{tag[:name]}", tag[:color]]
-      print ' '
-    end
-    puts ''
-  end
-  # rubocop:enable AbcSize
-
-  def print_tag(tag)
-    puts Paint["##{tag[:name]}", tag[:color]]
-  end
-end
-
-class Lard < Thor
-  include LardHTTP
-  include HTTParty
-  maintain_method_across_redirects
-
   desc 'user', 'Prints information about the logged-in user'
+
   def user
-    puts get('user')
+    print_user @lard.get 'user'
   end
 
   desc 'folders', 'Lists all bookmark folders'
-  def folders
-    fetch_folders if $folders == []
 
-    $folders.each do |folder|
+  def folders
+    @lard.folders.each do |folder|
       print_folder_name folder
     end
   end
 
   desc 'folder <NAME>', 'Lists all bookmarks in a given folder'
+
   def folder(name)
-    folder = get_folder_by_name name
+    folder = @lard.get_folder_by_name name
     raise "Could not find a folder named #{name}!" unless folder
 
     print_folder_name folder
 
-    bookmarks = fetch_bookmarks folder[:id]
+    bookmarks = @lard.bookmarks folder[:id]
     bookmarks.each do |bookmark|
       print_bookmark bookmark
     end
   end
 
   desc 'tags', 'Lists all tags'
+
   def tags
-    tags = fetch_tags
-    tags.each do |tag|
+    @lard.tags.each do |tag|
       print_tag tag
     end
   end
 
   desc 'search <QUERY>', 'Search for bookmarks'
+
   def search(*args)
     query = args.join ' '
-    res = get 'search', q: query
+    res = @lard.get 'search', q: query
     raise "No booknarks found match #{query}!" if res[:results].empty?
 
     bookmarks = res[:results]
@@ -189,8 +73,9 @@ class Lard < Thor
     end
   end
 
-  # rubocop: disable MethodLength
   desc 'login [TOKEN]', 'Log in to larder with your API token'
+
+  # rubocop: disable MethodLength
   def login(token = nil)
     unless token
       puts 'Enter your Larder API token to save to ~/.lard.yml.'
@@ -205,29 +90,70 @@ class Lard < Thor
     end
 
     puts 'Saved token to ~/.lard.yml'
+    # rubocop: enable MethodLength
   end
-  # rubocop: enable MethodLength
 
   desc 'bookmark <FOLDER> <TITLE> <LINK> [tags...]',
        'Creates or edits a bookmark'
   option :description, aliases: :d
+
   def bookmark(folder, title, link, *tags)
-    f = get_folder_by_name folder
+    f = @lard.get_folder_by_name folder
     raise "Could not find a folder named #{folder}!" unless f
 
-    res = post 'links/add',
-               'title' => title, 'url' => link, 'tags' => tags,
-               'parent' => f[:id],
-               'description' => options[:description]
+    res = @lard.post 'links/add',
+                     'title' => title, 'url' => link, 'tags' => tags,
+                     'parent' => f[:id],
+                     'description' => options[:description]
 
     raise 'Unable to add bookmark!' if res[:error]
 
     print_bookmark res
   end
+
+  private
+
+  def print_folder_name(folder)
+    print Paint[folder[:name], folder[:color]]
+    puts ":\t#{folder[:links]} links"
+  end
+
+  # TODO: How can we reduce the AbcSize here further?
+  # rubocop: disable AbcSize
+  def print_bookmark(bookmark)
+    puts Paint[(bookmark[:title]).to_s, :bright]
+    puts "  #{bookmark[:description]}" if bookmark[:description]
+    puts "  #{bookmark[:url]}"
+
+    return if bookmark[:tags].nil? || bookmark[:tags].empty?
+
+    print '  '
+    bookmark[:tags].each do |tag|
+      print Paint["##{tag[:name]}", tag[:color]]
+      print ' '
+    end
+    puts ''
+  end
+
+  # rubocop: enable AbcSize
+
+  def print_tag(tag)
+    puts Paint["##{tag[:name]}", tag[:color]]
+  end
+
+  def print_user(user)
+    date = Date.strptime user[:date_joined]
+
+    print Paint[user[:username], :bright]
+    puts "  (#{user[:first_name]} #{user[:last_name]})"
+    puts "  Links: #{user[:links]}"
+    puts "  Joined on: #{date.strftime('%F')}"
+    puts '  Trial membership active' if user[:is_trial]
+  end
 end
 
 begin
-  Lard.start(ARGV)
+  LardCLI.start(ARGV)
 rescue StandardError => e
   STDERR.puts "Error: #{e.message}"
 
@@ -235,3 +161,4 @@ rescue StandardError => e
 
   exit 1
 end
+# rubocop: enable ClassLength

data/lib/lard.rb

@@ -0,0 +1,119 @@
+require 'net/http'
+require 'json'
+
+# A set of utility functions for working with the Larder HTTP API
+class Lard
+  VERSION = '0.0.8.alpha1'.freeze
+
+  def initialize(token = nil)
+    @token = token
+    @folders = []
+  end
+
+  def authorized
+    !@token.nil?
+  end
+
+  def api_url_prefix
+    'https://larder.io/api/1/@me/'
+  end
+
+  def get_folder_by_name(name)
+    folders if @folders.empty?
+    @folders.find do |folder|
+      folder[:name] == name
+    end
+  end
+
+  def tags
+    res = get 'tags', limit: 200
+    tags = res[:results] || []
+
+    until res[:next].nil?
+      res = get res[:next]
+      tags.push(*res[:results])
+    end
+
+    tags
+  end
+
+  def bookmarks(folder_id)
+    res = get "folders/#{folder_id}", limit: 200
+    bookmarks = res[:results] || []
+
+    until res[:next].nil?
+      res = get res[:next]
+      bookmarks.push(*res[:results])
+    end
+
+    bookmarks
+  end
+
+  def folders
+    res = get 'folders', limit: 200
+    @folders = res[:results] || @folders
+
+    until res[:next].nil?
+      res = get res[:next]
+      @folders.push(*res[:results])
+    end
+
+    @folders
+  end
+
+  # Perform a GET request to an endpoint in the Larder API
+  def get(url, params = nil)
+    raise "You're not logged in! Run 'lard login' first." unless authorized
+
+    # Make a URI based on whether we received a full URL or just endpoint
+    uri = prepare_uri url
+    uri.query = URI.encode_www_form params unless params.nil?
+
+    res = Net::HTTP.start uri.host, uri.port, use_ssl: true do |http|
+      http.request prepare_request 'get', uri
+    end
+    parse_response res
+  end
+
+  # Perform a POST request to an endpoint in the Larder API
+  # Posts args as JSON in the post body, where args is a hash
+  def post(endpoint, args = {})
+    raise "You're not logged in! Run 'lard login' first." unless authorized
+
+    uri = prepare_uri endpoint
+    request = prepare_request 'post', uri
+    request.set_form_data args
+    res = Net::HTTP.start uri.host, uri.port, use_ssl: true do |http|
+      http.request request
+    end
+    parse_response res
+  end
+
+  private
+
+  def prepare_uri(url)
+    if url.start_with?('http://', 'https://')
+      URI url
+    else
+      URI "#{api_url_prefix}#{url}/"
+    end
+  end
+
+  def prepare_request(method, uri)
+    case method
+    when 'get'
+      request = Net::HTTP::Get.new uri
+    when 'post'
+      request = Net::HTTP::Post.new uri
+      request.add_field 'Content-Type', 'application/json'
+    end
+    request.add_field 'Authorization', "Token #{@token}"
+    # TODO: How can we ensure this gets updated with every new version?
+    request.add_field 'User-Agent', "Lard/#{VERSION}"
+    request
+  end
+
+  def parse_response(res)
+    JSON.parse res.body, symbolize_names: true
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lard
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8.alpha1
 platform: ruby
 authors:
 - hawkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -60,8 +46,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/lard
-homepage: 
-licenses: []
+- lib/lard.rb
+homepage: https://github.com/hawkins/lard
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -74,9 +62,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7