flammarion_rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f678ee45aa83dc6f693ddecaf234234bd8b88b
-  data.tar.gz: 4f9cc9687450d7a2b97e4385e3f4915926b959a5
+  metadata.gz: 71625fc08d749a8dfe8dfc6f7b5ef770e5700f23
+  data.tar.gz: d6208f1d93881a2ceb3622abede691f9a9380ef9
 SHA512:
-  metadata.gz: 2ce96110cd29735488158aed429a3a69bb6fab4374f0dd84c7746591ffd9d2aed5786b22c69202e2c358f110a7c51fc148cdfde16fa984ff19dd17b2d42e5c4c
-  data.tar.gz: c8a5537202c493f4e09a261dd081b3787e32d19e9680eecee18c108c80c679cabb7e872de216f5bed5c4a8ef11a5339bddca38719f05e101e539408b760ffbcc
+  metadata.gz: d6cdb11f7de83f5b5770854eac952a2bc2a6670c3e474e2e25947910782d2be9a67465d08ab5236a7c22d309c1617113864eeab68b773f5282ce1bfdeba5a130
+  data.tar.gz: 79321714b0fca0ebf85470889d5b77609affb4de5bb6636e4f5d1b72e91aa8b0614eee8d9b98520c3d0de8d625096833faa10696be61dfdb98b98bb6060259f3

data/README.md

@@ -14,14 +14,12 @@
 
 * TODO: disable refresh / reload (disable left click)
 
-* TODO: rack integration --> railties-5.0.0.1/lib/rails/engine.rb
+* TODO: all 'action_dispatch.request....' or rack integration --> railties-5.0.0.1/lib/rails/engine.rb
 
 * TODO: 404 and errors (rotate log files)
 
 * TODO: settings/preferences
 
-* TODO: try if 'action_dispatch.request.path_parameters' filled could prevent rails_admin to crash in index_path
-
 * TODO: non-blocking download
 
 * TODO: use pjax layout instead of full layout

data/app/assets/javascripts/flammarion_rails/actions.coffee

@@ -34,7 +34,7 @@ if $.pjax?
 
   ws.onmessage_actions.pjax = (event) ->
     new_page = $("<div>")
-    new_page.html(ws_data.html)
+    new_page.html(ws_data.body)
     container = new_page.find('[data-pjax-container]')
     $('[data-pjax-container]').html(container.html())
     $(document).trigger('rails_admin.dom_ready')

data/lib/flammarion/engraving.rb

@@ -12,10 +12,7 @@ module Flammarion
     #  disconnected (i.e., closed)
     # @option options [Boolean] :exit_on_disconnect (false) Will call +exit+
     #  when the widow is closed if this option is true.
-    # @option options [Boolean] :close_on_exit (false) Will close the window
-    #  when the process exits if this is true. Otherwise, it will just stay
-    #  around, but not actually be interactive.
-    # @raise {SetupError} if neither chrome is set up correctly and
+    # @raise {SetupError} if chrome is not set up correctly and
     #  and Flammarion is unable to display the engraving.
     def initialize(**options)
       @chrome = OpenStruct.new
@@ -28,8 +25,6 @@ module Flammarion
       @window_id = @@server.register_window(self)
       open_a_window(options) unless options[:no_window]
       wait_for_a_connection unless options[:no_wait]
-
-      at_exit {close if window_open?} if options.fetch(:close_on_exit, true)
     end
 
     # Blocks the current thread until the window has been closed. All user
@@ -38,11 +33,6 @@ module Flammarion
       sleep 1 until @sockets.empty?
     end
 
-    # Is this Engraving displayed on the screen.
-    def window_open?
-      !@sockets.empty?
-    end
-
     def disconnect(ws)
       @sockets.delete ws
       exit 0 if @exit_on_disconnect
@@ -55,18 +45,14 @@ module Flammarion
       dispatch(params)
 
       if status == 302
-        params = {
-          url: headers['Location'].sub(/^.*:\/{2}(:\d{0,4})?/i, ''),
-          session: response.request.session
-        }.with_indifferent_access
-        dispatch(params)
-        render(action: 'page', html: response.body)
+        dispatch(url: headers['Location'].sub(/^.*:\/{2}(:\d{0,4})?/i, ''), session: response.request.session)
+        render(action: 'page', body: response.body)
       elsif headers['Content-Transfer-Encoding'] == 'binary'
         filename = headers['Content-Disposition'].sub(/.*filename=/, '').gsub(/(^"|"$)/, '')
         render(action: 'file', name: filename)
         render(response.body)
       else
-        render(action: action, html: response.body)
+        render(action: action, body: response.body)
       end
 
     rescue => e
@@ -90,11 +76,11 @@ module Flammarion
       if params.key?(:_method)
         params[:method] = params[:_method]
       end
-      params[:method] ||= :get
+      http_method = (params[:method] ||= :get).to_s.upcase!
 
-      path_params = recognize_path(url, params)
+      path_params = recognize_path(uri.path, params.merge!(query_params))
       unless path_params.key?(:controller)
-        raise ActionController::RoutingError, "No route matches [#{url}]#{params.inspect}"
+        raise ActionController::RoutingError, "No route matches [#{http_method}] #{url}"
       end
 
       controller_name = "#{path_params[:controller].underscore.camelize}Controller"
@@ -102,8 +88,9 @@ module Flammarion
       action          = path_params[:action] || 'index'
       request_env     = {
         'rack.input' => '',
-        'REQUEST_METHOD' => params[:method].to_s.upcase,
-        'action_dispatch.request.parameters' => path_params.merge!(params).merge!(query_params),
+        'REQUEST_METHOD' => http_method,
+        'action_dispatch.request.parameters' => params.merge!(path_params),
+        'action_dispatch.request.path_parameters' => path_params,
       }
       request_env['rack.session'] = session if session
       self.request    = ActionDispatch::Request.new(request_env)

data/lib/flammarion_rails/version.rb

@@ -1,3 +1,3 @@
 module FlammarionRails
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/public/index.js

@@ -81,7 +81,7 @@ ws.onmessage_skip_action = false;
 ws.onmessage_actions = {
   page: function (event) {
     var page = document.open("text/html", "replace");
-    page.write(ws_data.html);
+    page.write(ws_data.body);
     page.close();
   },
   error: function (event) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flammarion_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Patrice Lebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails