flammarion_rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71625fc08d749a8dfe8dfc6f7b5ef770e5700f23
-  data.tar.gz: d6208f1d93881a2ceb3622abede691f9a9380ef9
+  metadata.gz: c0980270558683db4a166526a1f22304ce585888
+  data.tar.gz: 1cf80fb2374d31c489ec00e370a35d947d8bf5ee
 SHA512:
-  metadata.gz: d6cdb11f7de83f5b5770854eac952a2bc2a6670c3e474e2e25947910782d2be9a67465d08ab5236a7c22d309c1617113864eeab68b773f5282ce1bfdeba5a130
-  data.tar.gz: 79321714b0fca0ebf85470889d5b77609affb4de5bb6636e4f5d1b72e91aa8b0614eee8d9b98520c3d0de8d625096833faa10696be61dfdb98b98bb6060259f3
+  metadata.gz: 3993f0c63e101013adb0fe1503a7f484f147e102b769bc60385ad6325d5a873527d2cd8e16916375f69c6451ec7b36a28db7c87a0ad2220626c3f52142f07cf6
+  data.tar.gz: c77d8b947c93e5007a573de543bcaeb793bc3db56ae302afc09451f776ffbe231039cded82aa2f389351b47899d0c9ff89f5f904a2509500a65c8888df25367e

data/README.md

@@ -1,6 +1,8 @@
 # FlammarionRails
 
-* TODO: custom rake task actions
+* TODO: accept + mime + content_type + session + referer + pjax + csrf... or reuse middlewares?
+
+* TODO: change before actions for an array of hashes
 
 * TODO: app packaging / installation procedure
 

data/lib/flammarion/engraving.rb

@@ -5,13 +5,13 @@ module Flammarion
 
     attr_accessor :on_disconnect, :on_connect, :sockets, :request, :status, :headers, :response
 
+    PROTOCOL = /^.*:\/{2}(:\d{0,4})?/i
+
     # Creates a new Engraving (i.e., a new display window)
     # @option options [Proc] :on_connect Called when the display window is
     #  connected (i.e., displayed)
     # @option options [Proc] :on_disconnect Called when the display windows is
     #  disconnected (i.e., closed)
-    # @option options [Boolean] :exit_on_disconnect (false) Will call +exit+
-    #  when the widow is closed if this option is true.
     # @raise {SetupError} if chrome is not set up correctly and
     #  and Flammarion is unable to display the engraving.
     def initialize(**options)
@@ -19,7 +19,6 @@ module Flammarion
       @sockets = []
       @on_connect = options[:on_connect]
       @on_disconnect = options[:on_disconnect]
-      @exit_on_disconnect = options.fetch(:exit_on_disconnect, false)
 
       start_server
       @window_id = @@server.register_window(self)
@@ -35,7 +34,7 @@ module Flammarion
 
     def disconnect(ws)
       @sockets.delete ws
-      exit 0 if @exit_on_disconnect
+      exit 0
       @on_disconnect.call if @on_disconnect
     end
 
@@ -45,7 +44,7 @@ module Flammarion
       dispatch(params)
 
       if status == 302
-        dispatch(url: headers['Location'].sub(/^.*:\/{2}(:\d{0,4})?/i, ''), session: response.request.session)
+        dispatch(url: headers['Location'].sub(PROTOCOL, ''), session: response.request.session)
         render(action: 'page', body: response.body)
       elsif headers['Content-Transfer-Encoding'] == 'binary'
         filename = headers['Content-Disposition'].sub(/.*filename=/, '').gsub(/(^"|"$)/, '')
@@ -67,11 +66,12 @@ module Flammarion
       url = params.delete(:url)
       uri = URI.parse(url)
       query_params = Rack::Utils.parse_nested_query(uri.query)
+      request_params = {}
 
       if params.key?(:form)
         params[:method] = 'post'
-        params[params.delete(:button)] = ''
-        params.merge!(Rack::Utils.parse_nested_query(params.delete(:form)))
+        request_params = Rack::Utils.parse_nested_query(params.delete(:form))
+        request_params[params.delete(:button)] = ''
       end
       if params.key?(:_method)
         params[:method] = params[:_method]
@@ -88,9 +88,15 @@ module Flammarion
       action          = path_params[:action] || 'index'
       request_env     = {
         'rack.input' => '',
+        'QUERY_STRING' => uri.query,
         'REQUEST_METHOD' => http_method,
-        'action_dispatch.request.parameters' => params.merge!(path_params),
+        'REQUEST_PATH' => uri.path,
+        'REQUEST_URI' => url,
+        'PATH_INFO' => uri.path,
+        'action_dispatch.request.query_parameters' => query_params,
+        'action_dispatch.request.request_parameters' => request_params,
         'action_dispatch.request.path_parameters' => path_params,
+        'action_dispatch.request.parameters' => params.merge!(request_params).merge!(path_params),
       }
       request_env['rack.session'] = session if session
       self.request    = ActionDispatch::Request.new(request_env)

data/lib/flammarion/revelator.rb

@@ -2,12 +2,8 @@ module Flammarion
   class SetupError < StandardError; end
 
   module Revelator
-    CHROME_PATH = ENV["FLAMMARION_REVELATOR_PATH"] || 'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
-
     def open_a_window(**options)
       index_path = FlammarionRails::Engine.root.join('public', 'index.html')
-      index_path = `cygpath -w '#{index_path}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
-
       url = "file://#{index_path}?" + { port: server.port, path: @window_id, boot: FlammarionRails.config.boot_path }.to_query
       @browser_options = options.merge(url: url)
       @requested_browser = ENV["FLAMMARION_BROWSER"] || options[:browser]
@@ -47,14 +43,9 @@ module Flammarion
 
     browser :chrome_windows do |options|
       return false unless RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
-      file_path = File.absolute_path(File.join(File.dirname(__FILE__), ".."))
-      file_path = `cygpath -w '#{file_path}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
-      resource = %[file\://#{file_path}/html/build/index.html]
-      resource = "http://localhost:4567/" if options[:development_mode]
-      chrome_path = CHROME_PATH
-      chrome_path = `cygpath -u '#{CHROME_PATH}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
-      return false unless File.exist?(chrome_path)
-      Process.detach(spawn(chrome_path, %[--app=#{resource}?path=#{@window_id}&port=#{server.port}]))
+      executable = 'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
+      return false unless File.exist?(executable)
+      Process.detach(spawn(executable, %[--app=#{options[:url]}]))
     end
 
     browser :chrome do |options|

data/lib/flammarion_rails/version.rb

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

data/spec/dummy/bin/flammarion

@@ -4,5 +4,5 @@ APP_PATH = File.expand_path('../config/application', __dir__)
 require APP_PATH
 Rails.application.require_environment!
 
-f = Flammarion::Engraving.new(exit_on_disconnect:true)
+f = Flammarion::Engraving.new
 f.wait_until_closed

metadata

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