lard 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3855d75d98f35843682b07d206f768e61ad2ee52f05e8e28114964a5b2ee23d
-  data.tar.gz: edbd5fe330e70a6448c256b644b611caac0d361d7302fd648466873ff6bd1e15
+  metadata.gz: bb8adc7d1714d35d1dbf4407d142a7344dc46d4be2d0f2cf5a6ea7c0b064b683
+  data.tar.gz: 0b68c1d08cc99264b70e77e2f087044e5a6459c4865fb28209eb915dbbd07b73
 SHA512:
-  metadata.gz: 7269f61649e1dc2cfcb4dc8198b94e4c91ae593b7c8fada93317ebcf3c6c04762395f1344b63dcb77d09cfc7ac59c4d44d1b591c3e9cec5a56c714d000a76e86
-  data.tar.gz: 45e4f94c9b3e6b390411a3320d962c34fe1c64f7965026b43b7582c6e6957e448036639a12c3bc9435721c83e52e931a8190c15c8aaec3da1099d49403afb489
+  metadata.gz: 34d871021eab9850c6c5c4a16e5c39e18367bd6674c7fa7faa413219044c088ce63f73ed68fbeb5567d33ea15bbd453f67928f025d6b905a2d250b8dae99af84
+  data.tar.gz: 325d73f06dfff40b8617cfbdbc71d3e55895e1c5f01800c8b9aaf070f56af462db7d59f325e678edd3a4c2afd8b89358f3e192267281ab325ef74d2020c516ce

data/bin/lard

@@ -29,53 +29,37 @@ $options = {
 }
 $folders = []
 
-class Lard < Thor
-  include HTTParty
-  base_uri 'https://larder.io'
-
-  desc 'user', 'Prints information about the logged-in user'
-  def user
-    puts get('user')
+module LardHTTP
+  def get(endpoint, params = nil)
+    query = { query: params }
+    opts = $options.merge query
+    res = self.class.get "#{prefix}#{endpoint}", opts
+    parse_response res
   end
 
-  desc 'folders', 'Lists all bookmark folders'
-  def folders
-    if $folders == []
-      fetch_folders
-    end
-
-    $folders.each do |folder|
-      print_folder_name folder
-    end
+  def post(endpoint, args = {})
+    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
 
-  desc 'folder <NAME>', 'Lists all bookmarks in a given folder'
-  def folder(name)
-    folder = get_folder_by_name name
-    raise "No such folder" unless folder
-
-    print_folder_name folder
-
-    bookmarks = fetch_bookmarks folder[:id]
-    bookmarks.each do |bookmark|
-      print_bookmark bookmark
-    end
+  def parse_response(res)
+    JSON.parse res.body, symbolize_names: true
   end
 
-  private
+  def raw_get(url)
+    JSON.parse self.class.get(url, $options).body, symbolize_names: true
+  end
 
-  def print_bookmark(bookmark)
-    puts Paint["#{bookmark[:title]}", :bright]
-    puts "  #{bookmark[:description]}"
-    puts "  #{bookmark[:url]}"
-      
-    unless bookmark[:tags].empty?
-      print "  "
-      bookmark[:tags].each do |tag|
-        print Paint["##{tag[:name]}", tag[:color]]
-        print " "
-      end
-      puts " "
+  def prefix
+    'https://larder.io/api/1/@me/'
+  end
+ 
+  def get_folder_by_name(name)
+    fetch_folders unless $folders.length > 0
+    $folders.find do |folder|
+      folder[:name] == name
     end
   end
 
@@ -84,8 +68,19 @@ class Lard < Thor
     puts ":\t#{folder[:links]} links"
   end
 
+  def fetch_tags
+    res = get 'tags', { limit: 100 }
+    tags = res[:results] || []
+
+    while res[:next] != nil
+      res = raw_get res[:next]
+      tags.push *res[:results]
+    end
+
+    tags
+  end
+
   def fetch_bookmarks(folder_id)
-    # TODO: Verify pagination logic
     res = get "folders/#{folder_id}", { limit: 100 }
     bookmarks = res[:results] || []
 
@@ -98,39 +93,146 @@ class Lard < Thor
   end
 
   def fetch_folders
-    # TODO: Verify pagination logic
-    res = get 'folders'
+    res = get 'folders', { limit: 100 }
     $folders = res[:results]
 
     while res[:next] != nil
-      params = { offset: res[:next] }
-      res = get 'folders', params
+      res = raw_get res[:next]
       $folders.push *res[:results]
     end
 
     # TODO: Cache these folders
   end
+  
+  def print_bookmark(bookmark)
+    puts Paint["#{bookmark[:title]}", :bright]
+    puts "  #{bookmark[:description]}" if bookmark[:description]
+    puts "  #{bookmark[:url]}"
+      
+    unless bookmark[:tags].empty?
+      print "  "
+      bookmark[:tags].each do |tag|
+        print Paint["##{tag[:name]}", tag[:color]]
+        print " "
+      end
+      puts " "
+    end
+  end
 
-  def get_folder_by_name(name)
-    fetch_folders unless $folders.length > 0
-    $folders.find do |folder|
-      folder[:name] == name
+  def print_tag(tag)
+    puts Paint["##{tag[:name]}", tag[:color]]
+  end
+end
+
+class Bookmark < Thor
+  include LardHTTP
+  include HTTParty
+  maintain_method_across_redirects
+
+  desc 'new <FOLDER> <TITLE> <LINK> [tags...]', 'Creates a new bookmark'
+  option :description, :aliases => :d
+  def new(folder, title, link, *tags)
+    f = get_folder_by_name folder
+    raise "No such folder" unless f
+    parent = f[:id]
+    
+    res = post 'links/add', {
+      "title" => title,
+      "url" => link,
+      "parent" => parent,
+      "description" => options[:description],
+      "tags" => tags
+    }
+    unless res[:error]
+      print_bookmark res
+    else
+      # TODO: Test this
+      raise "Unable to add bookmark"
     end
   end
 
-  def get(endpoint, params = nil)
-    query = { query: params }
-    opts = $options.merge query
-    res = self.class.get "#{prefix}#{endpoint}", opts
-    JSON.parse res.body, symbolize_names: true
+  # Note that this uses the same endpoint as 'new'
+  # simply for the purpose of looking up bookmarks
+  # by the link and not proprietary ID
+  #desc 'edit <LINK> [tags...]', 'Edits an existing bookmark'
+  #option :title, :aliases => :t
+  #option :folder, :aliases => :f
+  #option :description, :aliases => :d
+  #def edit(link, *tags)
+  #  f = get_folder_by_name options[:folder]
+  #  raise "No such folder" unless f
+  #  parent = f[:id]
+
+  #  res = post 'links/add', {
+  #    "title" => options[:title],
+  #    "url" => link,
+  #    "parent" => parent,
+  #    "description" => options[:description],
+  #    "tags" => tags
+  #  }
+  #  unless res[:error]
+  #    print_bookmark res
+  #  else
+  #    # TODO: Test this
+  #    raise "Unable to add bookmark"
+  #  end
+  #end
+end
+
+class Lard < Thor
+  include LardHTTP
+  include HTTParty
+  maintain_method_across_redirects
+
+  desc "bookmark <COMMAND>", "Manage individual bookmarks"
+  subcommand "bookmark", Bookmark
+
+  desc 'user', 'Prints information about the logged-in user'
+  def user
+    puts get('user')
   end
 
-  def raw_get(url)
-    JSON.parse self.class.get(url, $options).body, symbolize_names: true
+  desc 'folders', 'Lists all bookmark folders'
+  def folders
+    if $folders == []
+      fetch_folders
+    end
+
+    $folders.each do |folder|
+      print_folder_name folder
+    end
   end
 
-  def prefix
-    '/api/1/@me/'
+  desc 'folder <NAME>', 'Lists all bookmarks in a given folder'
+  def folder(name)
+    folder = get_folder_by_name name
+    raise "No such folder" unless folder
+
+    print_folder_name folder
+
+    bookmarks = fetch_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|
+      print_tag tag
+    end
+  end
+
+  desc 'search <QUERY>', 'Search for bookmarks'
+  def search(*args)
+    query = args.join ' '
+    res = get 'search', { q: query }
+    raise "No results for query #{query}" unless res[:results].length > 0
+    bookmarks = res[:results]
+    bookmarks.each do |b|
+      print_bookmark b
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lard
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - hawkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: