joplin 0.3.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fada7c3ac2927ba5715b67437eac2fa1df0a33a24596e7a8619beadcabe27d2
-  data.tar.gz: 694472244aad50df5c84395b647b40840e8aff6eafe76903ccd667806aeed50e
+  metadata.gz: 25c5fb1c89e4e91404ff3551eab854d7d60d1233dae32089419fadca850c0fc6
+  data.tar.gz: 1b682ba27da2ef362b92f2d0810e3fedff7e18480f03d82810201bf4e787777e
 SHA512:
-  metadata.gz: 5d006b40cf72590d3c193cd71bf918044f06d4c379447d492c869b3c6533aaa0835196e7219d5ca9e483707206e7c739849d39a925d06542b2ced1dfdb742d77
-  data.tar.gz: ffd27223a512c4538bb5e9156ad1ef1825a5f0123afc45907c2eeba4be719cd7ae0a596b2c638147cec3e76fe1a7cba0390321bcaeb93e5da3b07bade3bdf2a3
+  metadata.gz: 349baaaacee32d7adb003a921b33a002a3e400980eca1778353777ffa6d2a7c5bb42d05d76b0b5dd9d41a38bab66cc16044cebf64da158784814aa7324c0b3e1
+  data.tar.gz: 95c59bca854fd21545bab1d3473afe1cb253c2a7d9a7e55463d3091ddc2514dec316e08fb3b9c8c9535652585e85f0eaa99b525614c14e5520783b3d7b146833

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    joplin (0.2.2)
+    joplin (0.5.2)
       faraday (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
+    thor (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.0)
   faraday (~> 1.0)
   joplin!
   rake (~> 13.0)
@@ -41,4 +41,4 @@ DEPENDENCIES
   thor (~> 1.0)
 
 BUNDLED WITH
-   1.17.2
+   2.0.1

data/Makefile

@@ -7,5 +7,8 @@ push: clean all
 clean:
 	rm -f *gem
 
+test:
+	rake
+
 install: clean all
 	gem install --local *gem

data/README.md

@@ -8,7 +8,7 @@ Creating a note
 Joplin::token = "your joplintoken here copied from the webclippper settings"
 
 begin
-  note = Joplin::Notes.new
+  note = Joplin::Note.new
   note.title = "a new note"
   note.body = "markdown content"
   note.save!
@@ -19,7 +19,7 @@ end
 
 updating a note
 ```ruby
-  note = Joplin::Notes.new "6e3811c7a73148a" # note id can be found in the information of any note
+  note = Joplin::Note.new "6e3811c7a73148a" # note id can be found in the information of any note
   note.title = "a new note title"
   note.save!
 ```
@@ -42,4 +42,4 @@ to get the token programatically. It reads from the sqlite database located in `
 
 Will take a notebook and concatenate all notes into one for easy export to PDF
 
-The token argument is optional and if you have it installed locally it will find the token
+The token argument is optional and if you have it installed locally it will find the token

data/bin/joplin

@@ -4,7 +4,6 @@ $:.unshift File.expand_path("../../lib", __FILE__)
 
 require "joplin"
 require 'thor'
-require "joplin/token"
 
 DIVIDER = %Q(
 
@@ -28,7 +27,7 @@ class MyCLI < Thor
   option :'dry-run', desc: "dry-run", aliases: '-n'
   desc :clean, "clean unused resources"
   def clean
-    Joplin::token = options[:token] || Joplin::Token.get
+    Joplin::token = Joplinl.get_token || options[:token]
     puts "Please wait, this can take while."
     Joplin::Resource.orphaned.map { |r|
       r.delete if not options['dry-run']
@@ -90,7 +89,7 @@ class MyCLI < Thor
 
   private
   def token()
-    Joplin::token = options[:token] || Joplin::Token.get
+    Joplin::token = Joplin.get_token || options[:token]
     raise "Couldn't find token in local database and it wasn't passed as an option. You better check yourself!" if not Joplin::token
   end
 end

data/joplin.gemspec

@@ -11,15 +11,15 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{joplin API}
   spec.description   = %q{joplin API}
-  spec.homepage      = "http://github.com/danielb2/joplin"
+  spec.homepage      = "http://github.com/danielb2/joplin-ruby"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "http://github.com/danielb2/joplin"
-    spec.metadata["changelog_uri"] = "http://github.com/danielb2/joplin"
+    spec.metadata["source_code_uri"] = "http://github.com/danielb2/joplin-ruby"
+    spec.metadata["changelog_uri"] = "http://github.com/danielb2/joplin-ruby"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "faraday", "~> 1.0"
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "thor", "~> 1.0.1"

data/lib/joplin/version.rb

@@ -1,3 +1,3 @@
 module Joplin
-  VERSION = "0.3.0"
+  VERSION = "0.5.2"
 end

data/lib/joplin.rb

@@ -5,6 +5,7 @@ require "json"
 module Joplin
   class Error < StandardError; end
   attr_accessor :token
+  @@token = nil
 
   def self.token= token
     @@token = token
@@ -17,8 +18,17 @@ module Joplin
     return parsed
   end
 
+  def self.get_token
+    begin
+      settings = JSON.parse File.read("#{ENV['HOME']}/.config/joplin-desktop/settings.json")
+      return settings['api.token']
+    rescue
+      return nil
+    end
+  end
+
   def self.token
-    @@token
+    @@token || get_token
   end
 
   def self.uri= uri

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joplin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Daniel Bretoi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,15 +102,14 @@ files:
 - bin/setup
 - joplin.gemspec
 - lib/joplin.rb
-- lib/joplin/token.rb
 - lib/joplin/version.rb
-homepage: http://github.com/danielb2/joplin
+homepage: http://github.com/danielb2/joplin-ruby
 licenses:
 - MIT
 metadata:
-  homepage_uri: http://github.com/danielb2/joplin
-  source_code_uri: http://github.com/danielb2/joplin
-  changelog_uri: http://github.com/danielb2/joplin
+  homepage_uri: http://github.com/danielb2/joplin-ruby
+  source_code_uri: http://github.com/danielb2/joplin-ruby
+  changelog_uri: http://github.com/danielb2/joplin-ruby
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/joplin/token.rb

@@ -1,14 +0,0 @@
-require "sqlite3"
-module Joplin
-  module Token
-    def self.get
-      begin
-        db = SQLite3::Database.new "#{ENV['HOME']}/.config/joplin-desktop/database.sqlite"
-        rows = db.execute("select value from settings where key='api.token';")
-        return rows.flatten.first
-      rescue
-        return nil
-      end
-    end
-  end
-end