RubyGems - ruby_event_store-browser - Versions diffs - 1.3.0 → 2.0.2 - Mend

ruby_event_store-browser 1.3.0 → 2.0.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.

Files changed (11) hide show

checksums.yaml +4 -4
data/lib/ruby_event_store/browser/app.rb +28 -35
data/lib/ruby_event_store/browser/get_events_from_stream.rb +8 -4
data/lib/ruby_event_store/browser/json_api_event.rb +2 -10
data/lib/ruby_event_store/browser/routing.rb +28 -5
data/lib/ruby_event_store/browser/version.rb +1 -1
data/public/ruby_event_store_browser.css +1 -1
data/public/ruby_event_store_browser.css.map +1 -1
data/public/ruby_event_store_browser.js +2 -4
data/public/ruby_event_store_browser.js.map +1 -1
metadata +5 -5

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ee3b62119666fd63aa0b6090137e3ad086e1e68bebb89ff9ac253cfcc04d9bc
-  data.tar.gz: 151a9dd67a12d59dda7674a77bee84042f22cc627f6bb105c24da2daba0ce079
+  metadata.gz: 7f2279e04f4c9e2c8e2463367f7e0592f1e3b740aea73976931dfc094b7d44e9
+  data.tar.gz: 8a94bbd29bd5de2fdc6413ea20ab6a2ffb793edf0040744e57bf8833a2940d12
 SHA512:
-  metadata.gz: 8fdf001f6b443f8aea64889f048a5cf31e79ac691bb2bdb6d578c10fdc43a91c06357ef417642c1a30eeaee74eda3c3aefe6a861d8efc03145861e75031829e0
-  data.tar.gz: 8fee6c1f5e9a9f657feaa008467a077027a68ac05c30eb85a821ffde6abf6e96ea4eff515ad2b1caaf4bba986cd93500550d343ccc6fde856fe80dfa2647c532
+  metadata.gz: 8b32f390429c2806e01f35b64654d7c806ca33f497a93b1a526aa3f4275a9cbdf0938ebf5ad4e3e80484a5bc82a93f1ae94400d9383feb78c6b2d7849913f71b
+  data.tar.gz: 17576122e04932e78836c4d6ff5f1cf8488746b06a9efee690834fe22dfa163775d25f35d62c2c99237e12756a4feab60c17c6d9591ef162daab78c87e8b5ae6

data/lib/ruby_event_store/browser/app.rb CHANGED Viewed

@@ -6,13 +6,14 @@ require 'sinatra/base'
 module RubyEventStore
   module Browser
     class App < Sinatra::Base
-      def self.for(event_store_locator:, host: nil, path: nil, environment: :production, related_streams_query: DEFAULT_RELATED_STREAMS_QUERY)
+      def self.for(event_store_locator:, host: nil, path: nil, api_url: nil, environment: :production, related_streams_query: DEFAULT_RELATED_STREAMS_QUERY)
         self.tap do |app|
           app.settings.instance_exec do
             set :event_store_locator, event_store_locator
             set :related_streams_query, -> { related_streams_query }
             set :host, host
             set :root_path, path
+            set :api_url, api_url
             set :environment, environment
             set :public_folder, "#{__dir__}/../../../public"
           end
@@ -22,6 +23,7 @@ module RubyEventStore
       configure do
         set :host, nil
         set :root_path, nil
+        set :api_url, nil
         set :event_store_locator, -> {}
         set :related_streams_query, nil
         set :protection, except: :path_traversal
@@ -29,32 +31,7 @@ module RubyEventStore
         mime_type :json, 'application/vnd.api+json'
       end
-      get '/' do
-        erb %{
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>RubyEventStore::Browser</title>
-              <link type="text/css" rel="stylesheet" href="<%= path %>/ruby_event_store_browser.css">
-            </head>
-            <body>
-              <script type="text/javascript" src="<%= path %>/ruby_event_store_browser.js"></script>
-              <script type="text/javascript">
-                RubyEventStore.Browser.Elm.Main.init({
-                  flags: {
-                    rootUrl:    "<%= path %>",
-                    eventsUrl:  "<%= path %>/events",
-                    streamsUrl: "<%= path %>/streams",
-                    resVersion: "<%= RubyEventStore::VERSION %>"
-                  }
-                });
-              </script>
-            </body>
-          </html>
-        }, locals: { path: settings.root_path || request.script_name }
-      end
-      get '/events/:id' do
+      get '/api/events/:id' do
         begin
           json Event.new(
             event_store: settings.event_store_locator,
@@ -65,7 +42,7 @@ module RubyEventStore
         end
       end
-      get '/streams/:id' do
+      get '/api/streams/:id' do
         json GetStream.new(
           stream_name: params[:id],
           routing: routing,
@@ -73,7 +50,7 @@ module RubyEventStore
         )
       end
-      get '/streams/:id/relationships/events' do
+      get '/api/streams/:id/relationships/events' do
         json GetEventsFromStream.new(
           event_store: settings.event_store_locator,
           params: symbolized_params,
@@ -81,12 +58,28 @@ module RubyEventStore
         )
       end
-      get '/streams/:id/relationships/events/:position/:direction/:count' do
-        json GetEventsFromStream.new(
-          event_store: settings.event_store_locator,
-          params: symbolized_params,
-          routing: routing,
-        )
+      get %r{/(events/.*|streams/.*)?} do
+        erb %{
+          <!DOCTYPE html>
+          <html>
+            <head>
+              <title>RubyEventStore::Browser</title>
+              <link type="text/css" rel="stylesheet" href="<%= path %>/ruby_event_store_browser.css">
+            </head>
+            <body>
+              <script type="text/javascript" src="<%= path %>/ruby_event_store_browser.js"></script>
+              <script type="text/javascript">
+                RubyEventStore.Browser.Elm.Main.init({
+                  flags: {
+                    rootUrl:    "<%= routing.root_url %>",
+                    apiUrl:     "<%= api_url %>",
+                    resVersion: "<%= RubyEventStore::VERSION %>"
+                  }
+                });
+              </script>
+            </body>
+          </html>
+        }, locals: { path: settings.root_path || request.script_name, api_url: settings.api_url || routing.api_url }
       end
       helpers do

data/lib/ruby_event_store/browser/get_events_from_stream.rb CHANGED Viewed

@@ -84,11 +84,11 @@ module RubyEventStore
       end
       def count
-        Integer(params.fetch(:count, PAGE_SIZE))
+        Integer(pagination_param[:count] || PAGE_SIZE)
       end
       def direction
-        case params[:direction]
+        case pagination_param[:direction]
         when 'forward'
           :forward
         else
@@ -97,17 +97,21 @@ module RubyEventStore
       end
       def position
-        case params[:position]
+        case pagination_param[:position]
         when 'head', nil
           HEAD
         else
-          params.fetch(:position)
+          pagination_param.fetch(:position)
         end
       end
       def stream_name
         params.fetch(:id)
       end
+      def pagination_param
+        params[:page] || {}
+      end
     end
   end
 end

data/lib/ruby_event_store/browser/json_api_event.rb CHANGED Viewed

@@ -29,16 +29,8 @@ module RubyEventStore
       def metadata
         event.metadata.to_h.tap do |m|
-          m[:timestamp] = as_time(m.fetch(:timestamp)).iso8601(3)
-        end
-      end
-      def as_time(value)
-        case value
-        when String
-          Time.parse(value)
-        else
-          value
+          m[:timestamp] = event.metadata.fetch(:timestamp).iso8601(TIMESTAMP_PRECISION)
+          m[:valid_at]  = event.metadata.fetch(:valid_at).iso8601(TIMESTAMP_PRECISION)
         end
       end

data/lib/ruby_event_store/browser/routing.rb CHANGED Viewed

@@ -6,20 +6,43 @@ module RubyEventStore
         @root_path = root_path
       end
+      def root_url
+        base_url
+      end
+      def events_url
+        "#{api_url}/events"
+      end
+      def api_url
+        "#{base_url}/api"
+      end
+      def streams_url
+        "#{api_url}/streams"
+      end
       def paginated_events_from_stream_url(id:, position: nil, direction: nil, count: nil)
-        base = [host, root_path].join
-        args = [position, direction, count].compact
         stream_name = Rack::Utils.escape(id)
+        query_string = URI.encode_www_form({
+          "page[position]" => position,
+          "page[direction]" => direction,
+          "page[count]" => count,
+        }.compact)
-        if args.empty?
-          "#{base}/streams/#{stream_name}/relationships/events"
+        if query_string.empty?
+          "#{api_url}/streams/#{stream_name}/relationships/events"
         else
-          "#{base}/streams/#{stream_name}/relationships/events/#{args.join('/')}"
+          "#{api_url}/streams/#{stream_name}/relationships/events?#{query_string}"
         end
       end
       private
       attr_reader :host, :root_path
+      def base_url
+        [host, root_path].join
+      end
     end
   end
 end

data/lib/ruby_event_store/browser/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module RubyEventStore
   module Browser
-    VERSION = "1.3.0"
+    VERSION = "2.0.2"
   end
 end