ruby_event_store-browser 0.33.0 → 0.34.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ruby_event_store/browser/app.rb +9 -9
  3. data/lib/ruby_event_store/browser/json_api_event.rb +10 -1
  4. data/lib/ruby_event_store/browser/stream.rb +7 -7
  5. data/lib/ruby_event_store/browser/version.rb +1 -1
  6. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ecad6ad78f9ba644d4c0e92d72e0c8d06517b1513804f19002762089de20de3d
4
- data.tar.gz: 8db1c4edb9c89a1781a3693ff5846b7575b8712befbfbbde290be9b3ab334cec
3
+ metadata.gz: 384313bc201e95c97b90d08660f5fb95834ce803ae30cadab92a011d356eb4ed
4
+ data.tar.gz: 3d33a7b0da9b52b4f75230fde573687cfb812ce2bb1777461ee86b64fd221a61
5
5
  SHA512:
6
- metadata.gz: 6d5b69c6c68c5e898a6623fd193c0c2743b112d7f4422e0d8bb8edffc2d7f031f078afe7c8704235f4fa1ca6b57080f44d1c1b962097b15d19b8bff607493508
7
- data.tar.gz: 91da4568f12d4004bdc1bcd80125c1bdc13e456c29b26de7bda101164375530a3ed7007e7794fc8fdd3fdc27cf49a415b07da61a48d39c2afb4a941040b7a227
6
+ metadata.gz: cad62e6ef086d68129c7ff7fe01eb7dfbb854605f82de9ac82589aaf0d2036219cba6efc6c2c437040a3864782f3362abf16054e6d2a1fcddfad9f8a0b5fd179
7
+ data.tar.gz: b1ebeb69fea96292af637f599ffd3963ca21bcd77b6aabdc39ffd5108cad7b7323da776bbe6c67a1d26a6843304836f80cdc6953b101d3c8a0fb8c28aa4d01d7
data/lib/ruby_event_store/browser/app.rb CHANGED
@@ -4,8 +4,7 @@ require 'sinatra'
4
4
  module RubyEventStore
5
5
  module Browser
6
6
  class App < Sinatra::Application
7
-
8
- def self.for(event_store_locator:, host:, path: nil)
7
+ def self.for(event_store_locator:, host: nil, path: nil)
9
8
  self.tap do |app|
10
9
  app.settings.instance_exec do
11
10
  set :event_store_locator, event_store_locator
@@ -33,18 +32,18 @@ module RubyEventStore
33
32
  <title>RubyEventStore::Browser</title>
34
33
  </head>
35
34
  <body>
36
- <script type="text/javascript" src="<%= settings.root_path %>/ruby_event_store_browser.js"></script>
35
+ <script type="text/javascript" src="<%= path %>/ruby_event_store_browser.js"></script>
37
36
  <script type="text/javascript">
38
37
  RubyEventStore.Browser.Main.fullscreen({
39
- rootUrl: "<%= settings.root_path %>",
40
- eventsUrl: "<%= settings.root_path %>/events",
41
- streamsUrl: "<%= settings.root_path %>/streams",
38
+ rootUrl: "<%= path %>",
39
+ eventsUrl: "<%= path %>/events",
40
+ streamsUrl: "<%= path %>/streams",
42
41
  resVersion: "<%= RubyEventStore::VERSION %>"
43
42
  });
44
43
  </script>
45
44
  </body>
46
45
  </html>
47
- }
46
+ }, locals: { path: settings.root_path || request.script_name }
48
47
  end
49
48
 
50
49
  get '/events/:id' do
@@ -76,7 +75,9 @@ module RubyEventStore
76
75
  end
77
76
 
78
77
  def streams_url_for(options)
79
- base = [ settings.host, settings.root_path ].compact.join
78
+ host = settings.host || request.base_url
79
+ path = settings.root_path || request.script_name
80
+ base = [host, path].compact.join
80
81
  args = options.values_at(:id, :position, :direction, :count).compact
81
82
  args.map! { |a| Rack::Utils.escape(a) }
82
83
 
@@ -88,7 +89,6 @@ module RubyEventStore
88
89
  JSON.dump data.as_json
89
90
  end
90
91
  end
91
-
92
92
  end
93
93
  end
94
94
  end
data/lib/ruby_event_store/browser/json_api_event.rb CHANGED
@@ -22,7 +22,16 @@ module RubyEventStore
22
22
 
23
23
  def metadata
24
24
  event.metadata.to_h.tap do |m|
25
- m[:timestamp] = m.fetch(:timestamp).iso8601(3) if m.key?(:timestamp)
25
+ m[:timestamp] = as_time(m.fetch(:timestamp)).iso8601(3) if m.key?(:timestamp)
26
+ end
27
+ end
28
+
29
+ def as_time(value)
30
+ case value
31
+ when String
32
+ Time.parse(value)
33
+ else
34
+ value
26
35
  end
27
36
  end
28
37
  end
data/lib/ruby_event_store/browser/stream.rb CHANGED
@@ -2,7 +2,7 @@ module RubyEventStore
2
2
  module Browser
3
3
  class Stream
4
4
  attr_reader :event_store, :params, :url_builder
5
-
5
+
6
6
  def initialize(event_store:, params:, url_builder:)
7
7
  @event_store = event_store
8
8
  @params = params
@@ -38,20 +38,20 @@ module RubyEventStore
38
38
  end
39
39
  end
40
40
  end
41
-
41
+
42
42
  def events_forward(start)
43
43
  if stream_name.eql?(SERIALIZED_GLOBAL_STREAM_NAME)
44
- event_store.read.limit(count).from(start).each.to_a
44
+ event_store.read.limit(count).from(start).to_a
45
45
  else
46
- event_store.read.limit(count).from(start).stream(stream_name).each.to_a
46
+ event_store.read.limit(count).from(start).stream(stream_name).to_a
47
47
  end
48
48
  end
49
49
 
50
50
  def events_backward(start)
51
51
  if stream_name.eql?(SERIALIZED_GLOBAL_STREAM_NAME)
52
- event_store.read.limit(count).from(start).backward.each.to_a
52
+ event_store.read.limit(count).from(start).backward.to_a
53
53
  else
54
- event_store.read.limit(count).from(start).stream(stream_name).backward.each.to_a
54
+ event_store.read.limit(count).from(start).stream(stream_name).backward.to_a
55
55
  end
56
56
  end
57
57
 
@@ -108,4 +108,4 @@ module RubyEventStore
108
108
  end
109
109
  end
110
110
  end
111
- end
111
+ end
data/lib/ruby_event_store/browser/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module RubyEventStore
2
2
  module Browser
3
- VERSION = "0.33.0"
3
+ VERSION = "0.34.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby_event_store-browser
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.33.0
4
+ version: 0.34.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arkency
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-10-12 00:00:00.000000000 Z
11
+ date: 2018-11-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ruby_event_store
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.33.0
19
+ version: 0.34.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.33.0
26
+ version: 0.34.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: sinatra
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
70
70
  name: mutant-rspec
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - '='
74
74
  - !ruby/object:Gem::Version
75
75
  version: 0.8.17
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - '='
81
81
  - !ruby/object:Gem::Version
82
82
  version: 0.8.17
83
83
  - !ruby/object:Gem::Dependency
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
162
162
  version: '0'
163
163
  requirements: []
164
164
  rubyforge_project:
165
- rubygems_version: 3.0.0.beta1
165
+ rubygems_version: 2.7.6
166
166
  signing_key:
167
167
  specification_version: 4
168
168
  summary: Web interface for RubyEventStore