diff --git a/composer.json b/composer.json index ce0e278..24f4cc2 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "eole/sandstone", "license": "MIT", "type": "library", - "description": "Extends Silex to easily mount a RestApi working together with a Websocket server through a Push server.", + "description": "Silex RestApi with Websockets.", "homepage": "https://eole-io.github.io/sandstone/", "keywords": ["php", "symfony", "silex", "websocket", "push", "reactphp"], "authors": [ @@ -17,7 +17,7 @@ "ext-zmq": "*", "psr/log": "~1.0", "react/zmq": "0.2.*|0.3.*", - "cboden/ratchet": "~0.3", + "cboden/ratchet": "0.3.*", "league/oauth2-server": "4.1.x", "symfony/event-dispatcher": "~3.0", "symfony/security": "~2.8|~3.0", diff --git a/doc/.gitignore b/doc/.gitignore index 45c1505..666de10 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,3 +1,4 @@ _site .sass-cache .jekyll-metadata +Gemfile.lock diff --git a/doc/Gemfile.lock b/doc/Gemfile.lock deleted file mode 100644 index 593c330..0000000 --- a/doc/Gemfile.lock +++ /dev/null @@ -1,144 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (4.2.7) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.4.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorator (1.1.0) - ethon (0.9.0) - ffi (>= 1.3.0) - execjs (2.7.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - ffi (1.9.14) - forwardable-extended (2.6.0) - gemoji (2.1.0) - github-pages (96) - activesupport (= 4.2.7) - github-pages-health-check (= 1.2.0) - jekyll (= 3.2.1) - jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.5.1) - jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.0.2) - jekyll-mentions (= 1.2.0) - jekyll-paginate (= 1.1.0) - jekyll-redirect-from (= 0.11.0) - jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 2.0.0) - jekyll-sitemap (= 0.10.0) - jemoji (= 0.7.0) - kramdown (= 1.11.1) - liquid (= 3.0.6) - listen (= 3.0.6) - mercenary (~> 0.3) - minima (= 1.2.0) - rouge (= 1.11.1) - terminal-table (~> 1.4) - github-pages-health-check (1.2.0) - addressable (~> 2.3) - net-dns (~> 0.8) - octokit (~> 4.0) - public_suffix (~> 1.4) - typhoeus (~> 0.7) - html-pipeline (2.4.2) - activesupport (>= 2) - nokogiri (>= 1.4) - i18n (0.7.0) - jekyll (3.2.1) - colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (~> 1.7) - safe_yaml (~> 1.0) - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-feed (0.5.1) - jekyll-gist (1.4.0) - octokit (~> 4.2) - jekyll-github-metadata (2.0.2) - jekyll (~> 3.1) - octokit (~> 4.0) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) - html-pipeline (~> 2.3) - jekyll (~> 3.0) - jekyll-paginate (1.1.0) - jekyll-redirect-from (0.11.0) - jekyll (>= 2.0) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-seo-tag (2.0.0) - jekyll (~> 3.1) - jekyll-sitemap (0.10.0) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - jemoji (0.7.0) - activesupport (~> 4.0) - gemoji (~> 2.0) - html-pipeline (~> 2.2) - jekyll (>= 3.0) - json (1.8.3) - kramdown (1.11.1) - liquid (3.0.6) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) - mercenary (0.3.6) - mini_portile2 (2.1.0) - minima (1.2.0) - minitest (5.9.0) - multipart-post (2.0.0) - net-dns (0.8.0) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - pathutil (0.14.0) - forwardable-extended (~> 2.6) - pkg-config (1.1.7) - public_suffix (1.5.3) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.22) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - terminal-table (1.7.2) - unicode-display_width (~> 1.1.1) - thread_safe (0.3.5) - typhoeus (0.8.0) - ethon (>= 0.8.0) - tzinfo (1.2.2) - thread_safe (~> 0.1) - unicode-display_width (1.1.1) - -PLATFORMS - ruby - -DEPENDENCIES - github-pages - jekyll (= 3.2.1) - minima - -RUBY VERSION - ruby 2.3.1p112 - -BUNDLED WITH - 1.13.1 diff --git a/doc/_layouts/page.html b/doc/_layouts/page.html index 595d84f..6fd234f 100644 --- a/doc/_layouts/page.html +++ b/doc/_layouts/page.html @@ -5,7 +5,7 @@

Sandstone

-

Extends Silex PHP to easily mount a Websocket server working together with a RestApi.

+

Silex RestApi with Websockets.

Get started
diff --git a/src/Push/Debug/DataCollector/views/push-messages.html.twig b/src/Push/Debug/DataCollector/views/push-messages.html.twig index b3c4475..4bcdc29 100644 --- a/src/Push/Debug/DataCollector/views/push-messages.html.twig +++ b/src/Push/Debug/DataCollector/views/push-messages.html.twig @@ -1,7 +1,25 @@ {% extends '@WebProfiler/Profiler/layout.html.twig' %} {% block toolbar %} - yo + {% set icon %} + + {{ collector.data.messages_count }} + Push + + {% endset %} + {% set text %} + {% spaceless %} +
+ Push messages + {{ collector.data.messages_count }} +
+
+ Total size + {{ collector.data.messages_size }} bytes +
+ {% endspaceless %} + {% endset %} + {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %} {% endblock %} {% block menu %}