etherpad_canvas 1.1.1 → 1.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/etherpad_canvas/etherpad_collaboration.rb +6 -2
- data/lib/etherpad_canvas/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2c6b8579211d4567d2ba0ede2106b969bd658074
|
|
4
|
+
data.tar.gz: 00642bfd1d107ef14d44a6d4df0427b3f6de50d8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2e88dee7f7b095e6a6b6230ad5ec4f1fc4cacc356f9c89d8875895cb94eac9551281f43bd5656ddfa099ddba4b734c77f6cdf37079fb85d328d575bc95e16639
|
|
7
|
+
data.tar.gz: 4ef4199e8452bde7f7cbec6c962567ffd06f0c62fc4cdbdbac04c8453390a355297a95f15ecfb1e106573516144903b8df5774d254af0dc8afd3dd964d729fc3
|
|
@@ -19,17 +19,21 @@ require "base64"
|
|
|
19
19
|
|
|
20
20
|
class EtherpadCollaboration
|
|
21
21
|
|
|
22
|
+
def initialize_document
|
|
23
|
+
self.url ||= "http://#{EtherpadCollaboration.config[:domain]}/p/i-#{uuid}"
|
|
24
|
+
end
|
|
25
|
+
|
|
22
26
|
def self.sign_url(user, collaboration)
|
|
23
27
|
plugin = PluginSetting.find_by(name: "etherpad_canvas")
|
|
24
28
|
etherpad_plugin = PluginSetting.find_by(name: "etherpad")
|
|
25
|
-
domain = etherpad_plugin.split("/")
|
|
29
|
+
domain = etherpad_plugin.settings["domain"].split("/")[0]
|
|
26
30
|
|
|
27
31
|
if !plugin.disabled
|
|
28
32
|
key = plugin.settings[:key]
|
|
29
33
|
|
|
30
34
|
url = generate_url user, collaboration
|
|
31
35
|
|
|
32
|
-
url_sans_http = url.split(domain)[
|
|
36
|
+
url_sans_http = url.split(domain)[1]
|
|
33
37
|
|
|
34
38
|
digest = OpenSSL::Digest.new("sha1")
|
|
35
39
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: etherpad_canvas
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Eric Durr
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-03-
|
|
11
|
+
date: 2017-03-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|