fyodor 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +3 -3
- data/lib/fyodor/entry.rb +3 -3
- data/lib/fyodor/entry_parser.rb +5 -5
- data/lib/fyodor/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c2d5a22d1e2db7a45ae943c4711998385f67bf0472a137adb8209f4961ef1dfa
|
|
4
|
+
data.tar.gz: f3d57204708180e4bde2762e8f3072f1089f5a9e1c5eb17a875f86386d0287d5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3ce56479c3e79e24b06afe6a9093f101e468930da4c2c31b48b8d74d4bc2d670171f552bda04f88c42a46a333bc438c2c66a0efd4942cbaa7dede873772ab2b4
|
|
7
|
+
data.tar.gz: 4fc7a99b80c57dd0e8b36c54f589e758209aae1618c61aa632471e3d75ea80ce8675207bb9a2d12ce9cc734362f7e075022fea7fb0f85feb78c63da51a6d111d
|
data/README.md
CHANGED
|
@@ -74,8 +74,8 @@ Where:
|
|
|
74
74
|
- `CLIPPINGS_FILE` is the path for `My Clippings.txt`.
|
|
75
75
|
- `OUTPUT_DIR` is the directory to write the markdown files. If none is supplied, this will be `fyodor_output` under the current directory.
|
|
76
76
|
|
|
77
|
-
##
|
|
77
|
+
## License
|
|
78
78
|
|
|
79
|
-
|
|
79
|
+
Licensed under [GPLv3](LICENSE)
|
|
80
80
|
|
|
81
|
-
Copyright 2019 Rafael Cavalcanti
|
|
81
|
+
Copyright (C) 2019-2020 [Rafael Cavalcanti](https://rafaelc.org/)
|
data/lib/fyodor/entry.rb
CHANGED
|
@@ -31,7 +31,7 @@ module Fyodor
|
|
|
31
31
|
end
|
|
32
32
|
|
|
33
33
|
def desc_parsed?
|
|
34
|
-
@
|
|
34
|
+
! @type.nil? && (! @loc_start.nil? || ! @page.nil?)
|
|
35
35
|
end
|
|
36
36
|
|
|
37
37
|
# Override this method to use a SortedSet.
|
|
@@ -44,7 +44,7 @@ module Fyodor
|
|
|
44
44
|
return false if @type != other.type || @text != other.text
|
|
45
45
|
|
|
46
46
|
if desc_parsed? && other.desc_parsed?
|
|
47
|
-
@loc == other.loc
|
|
47
|
+
@loc == other.loc && @page == other.page
|
|
48
48
|
else
|
|
49
49
|
@desc == other.desc
|
|
50
50
|
end
|
|
@@ -54,7 +54,7 @@ module Fyodor
|
|
|
54
54
|
|
|
55
55
|
def hash
|
|
56
56
|
if desc_parsed?
|
|
57
|
-
@text.hash ^ @type.hash ^ @loc.hash
|
|
57
|
+
@text.hash ^ @type.hash ^ @loc.hash ^ @page.hash
|
|
58
58
|
else
|
|
59
59
|
@text.hash ^ @desc.hash
|
|
60
60
|
end
|
data/lib/fyodor/entry_parser.rb
CHANGED
|
@@ -61,7 +61,7 @@ module Fyodor
|
|
|
61
61
|
|
|
62
62
|
def regex_type(type)
|
|
63
63
|
s = Regexp.quote(@config[type])
|
|
64
|
-
/^- #{s}/
|
|
64
|
+
/^- #{s}/i
|
|
65
65
|
end
|
|
66
66
|
|
|
67
67
|
def regex_cap(item)
|
|
@@ -70,16 +70,16 @@ module Fyodor
|
|
|
70
70
|
/^(.*) \((.*)\)\r?\n$/
|
|
71
71
|
when :loc
|
|
72
72
|
s = Regexp.quote(@config["loc"])
|
|
73
|
-
/#{s} (\S+)/
|
|
73
|
+
/#{s} (\S+)/i
|
|
74
74
|
when :loc_start
|
|
75
75
|
s = Regexp.quote(@config["loc"])
|
|
76
|
-
/#{s} (\d+)(-\d+)?/
|
|
76
|
+
/#{s} (\d+)(-\d+)?/i
|
|
77
77
|
when :page
|
|
78
78
|
s = Regexp.quote(@config["page"])
|
|
79
|
-
/#{s} (\S+)/
|
|
79
|
+
/#{s} (\S+)/i
|
|
80
80
|
when :time
|
|
81
81
|
s = Regexp.quote(@config["time"])
|
|
82
|
-
/#{s} (.*)\r?\n$/
|
|
82
|
+
/#{s} (.*)\r?\n$/i
|
|
83
83
|
end
|
|
84
84
|
end
|
|
85
85
|
|
data/lib/fyodor/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fyodor
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Rafael Cavalcanti
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-05-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: toml
|
|
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
69
|
version: '0'
|
|
70
70
|
requirements: []
|
|
71
|
-
rubygems_version: 3.
|
|
71
|
+
rubygems_version: 3.1.2
|
|
72
72
|
signing_key:
|
|
73
73
|
specification_version: 4
|
|
74
74
|
summary: Kindle clippings parser
|