breezy 0.3.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea53dc349e8ee6d517f346bdeba127b78c48bf0
-  data.tar.gz: a2d3295aa80f7ac22326bc8393e6526525e4912e
+  metadata.gz: 021670ec6a383d8c41d2741352fe413b36073511
+  data.tar.gz: f5df7c82b777a64399e7c41a973cf36c47af3aa3
 SHA512:
-  metadata.gz: 3d6bb3718396524334eba6c258ef8dba0a8df8c03b18c6c41d1e7672780177d0b87b21ede803d890a83f79b931a28f126ef195320e3bd98db34694513091f9e0
-  data.tar.gz: 58b0a9a4ccb8335e951bb96aacdf9208eb1d9118ae64cb523f2a002fb12c65ab4f0c0c874d03bc4b3450077064f88036fb43744c13df7c27224cc99614382fe2
+  metadata.gz: 10f8dd453d698269699cea287e151e36939e1eb63444e437336fecb038f27d8c0e4b1e2dfd00aa45c1ddf7731002c42d81e4774c2eb33f28cc59c079d5e8ed98
+  data.tar.gz: 1542aa4578bd435e4e9efb47599fd2a58207172d7a5381c4c50be6cb871e4bf2dbe11545f00b7688a3fbd04cd2f2597f9b9cb84afb7843e48577b00cbed9c828

data/lib/breezy/configuration.rb

@@ -4,12 +4,20 @@ module Breezy
       BreezyTemplate.configuration = nil
     end
 
-    def track_assets=(assets)
-      BreezyTemplate.configuration.track_assets = assets
+    def track_sprockets_assets=(assets)
+      BreezyTemplate.configuration.track_sprockets_assets = assets
     end
 
-    def track_assets
-      BreezyTemplate.configuration.track_assets
+    def track_sprockets_assets
+      BreezyTemplate.configuration.track_sprockets_assets
+    end
+
+    def track_pack_assets=(assets)
+      BreezyTemplate.configuration.track_pack_assets = assets
+    end
+
+    def track_pack_assets
+      BreezyTemplate.configuration.track_pack_assets
     end
   end
 

data/lib/breezy/render.rb

@@ -22,7 +22,7 @@ module Breezy
 
       if breezy
         view_parts = _prefixes.reverse.push(action_name)[1..-1]
-        view_name = view_parts.map(&:camelize).join
+        view_name = view_parts.map(&:camelize).join.gsub('::', '')
 
         breezy[:screen] ||= view_name
         render_options[:locals] ||= {}

data/lib/breezy/version.rb

@@ -1,3 +1,3 @@
 module Breezy
-  VERSION = '0.3.4'
+  VERSION = '0.5.0'
 end

data/lib/breezy/xhr_headers.rb

@@ -1,23 +1,19 @@
 module Breezy
   module XHRHeaders
-    if Rails.version >= '5.0'
-      def redirect_back(fallback_location:, **args)
-        if referer = request.headers["X-XHR-Referer"]
-          redirect_to referer, **args
-        else
-          super
-        end
+    def redirect_back(fallback_location:, **args)
+      if referer = request.headers["X-XHR-Referer"]
+        redirect_to referer, **args
+      else
+        super
       end
     end
 
-    def _compute_redirect_to_location(*args)
-      options, request = _normalize_redirect_params(args)
-
+    def _compute_redirect_to_location(request, options)
       url = begin
         if options == :back && request.headers["X-XHR-Referer"]
-          super(*[(request if args.length == 2), request.headers["X-XHR-Referer"]].compact)
+          super(request, request.headers["X-XHR-Referer"])
         else
-          super(*args)
+          super
         end
       end
 
@@ -31,13 +27,5 @@ module Breezy
       def set_response_url
         response.headers['X-RESPONSE-URL'] = request.fullpath
       end
-
-      # Ensure backwards compatibility
-      # Rails < 4.2:  _compute_redirect_to_location(options)
-      # Rails >= 4.2: _compute_redirect_to_location(request, options)
-      def _normalize_redirect_params(args)
-        options, req = args.reverse
-        [options, req || request]
-      end
   end
 end

data/lib/breezy.rb

@@ -1,7 +1,6 @@
 require 'breezy/version'
 require 'breezy/xhr_headers'
 require 'breezy/xhr_url_for'
-require 'breezy/cookies'
 require 'breezy/x_domain_blocker'
 require 'breezy/render'
 require 'breezy/helpers'
@@ -10,14 +9,14 @@ require 'breezy_template'
 
 module Breezy
   module Controller
-    include XHRHeaders, Cookies, XDomainBlocker, Render, Helpers
+    include XHRHeaders, XDomainBlocker, Render, Helpers
 
     def self.included(base)
       if base.respond_to?(:before_action)
-        base.before_action :set_response_url, :set_request_method_cookie
+        base.before_action :set_response_url
         base.after_action :abort_xdomain_redirect
       else
-        base.before_filter :set_response_url, :set_request_method_cookie
+        base.before_filter :set_response_url
         base.after_filter :abort_xdomain_redirect
       end
 

data/lib/generators/rails/templates/mobile/edit.jsx

@@ -23,7 +23,7 @@ class <%= plural_table_name.camelize %>Edit extends React.Component {
       contentType: 'application/json'
     }
 
-    this.props.delInPage({pathQuery: this.props.pathQuery, keypath: 'errors'})
+    this.props.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
     return this.props.visit('/<%= plural_table_name %>/' + this.props.id, options).then((rsp) => {
       if (this.props.errors) {
         throw new SubmissionError({

data/lib/generators/rails/templates/mobile/index.jsx

@@ -39,7 +39,7 @@ class <%= plural_table_name.camelize %>Index extends React.Component {
     const nav = this.props.navigation
     this.props.visit(path, {method}).then((rsp)=>{
       if (rsp.canNavigate) {
-        return nav.navigate(rsp.screen, {pathQuery: rsp.pathQuery})
+        return nav.navigate(rsp.screen, {pageKey: rsp.pageKey})
       } else {
         // There can only be one visit at a time, if `canNavigate`
         // is false, then this request is being ignored for a more

data/lib/generators/rails/templates/mobile/new.jsx

@@ -23,7 +23,7 @@ class <%= plural_table_name.camelize %>New extends React.Component {
       contentType: 'application/json'
     }
 
-    this.props.delInPage({pathQuery: this.props.pathQuery, keypath: 'errors'})
+    this.props.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
     return this.props.visit('/<%= plural_table_name %>', options).then((rsp) => {
       if (this.props.errors) {
         throw new SubmissionError({

data/lib/generators/rails/templates/web/base.jsx

@@ -16,7 +16,7 @@ export default class extends React.Component {
       }
 
       if (rsp.canNavigate) {
-        return this.props.navigateTo(rsp.screen, rsp.pathQuery)
+        return this.props.navigateTo(rsp.screen, rsp.pageKey)
       } else {
         // There can only be one visit at a time, if `canNavigate`
         // is false, then this request is being ignored for a more
@@ -49,7 +49,7 @@ export default class extends React.Component {
         //Uncomment this if you want full-page reloads
         // window.location = rsp.url
 
-        return this.props.navigateTo(rsp.screen, rsp.pathQuery)
+        return this.props.navigateTo(rsp.screen, rsp.pageKey)
       } else {
         // There can only ve one visit at a time, if `canNavigate`
         // is false, then this request is being ignored for a more

data/lib/generators/rails/templates/web/edit.jsx

@@ -7,7 +7,7 @@ import <%= plural_table_name.camelize %>Form from 'components/<%= plural_table_n
 
 class <%= plural_table_name.camelize %>Edit extends BaseScreen {
   handleSubmit (body) {
-    this.props.delInPage({pathQuery: this.props.pathQuery, keypath: 'errors'})
+    this.props.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
     return super.handleSubmit('/<%= plural_table_name %>/' + this.props.id, body, 'PATCH')
   }
 

data/lib/generators/rails/templates/web/new.jsx

@@ -7,7 +7,7 @@ import <%= plural_table_name.camelize %>Form from 'components/<%= plural_table_n
 
 class <%= plural_table_name.camelize %>New extends BaseScreen {
   handleSubmit(body) {
-    this.props.delInPage({pathQuery: this.props.pathQuery, keypath: 'errors'})
+    this.props.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
     return super.handleSubmit('/<%= plural_table_name %>', body, 'POST')
   }
 

data/lib/install/templates/mobile/app.js

@@ -63,14 +63,14 @@ store.dispatch({type: 'BREEZY_SET_BASE_URL', baseUrl})
 window.store = store
 const Nav = StackNavigator(navMapping, {
   initialRouteName: initialPage.screen,
-  initialRouteParams: {pathQuery: initialPath},
+  initialRouteParams: {pageKey: initialPath},
   headerMode: 'none',
 })
 
 export default class extends React.Component {
   render() {
     return <Provider store={store}>
-      <Nav pathQuery={initialPath}/>
+      <Nav pageKey={initialPath}/>
     </Provider>
   }
 }

data/lib/install/templates/web/initializer.rb

@@ -0,0 +1,4 @@
+  Breezy.configure do |config|
+    config.track_sprockets_assets = ['application.js', 'application.css']
+    config.track_pack_assets = ['application.js']
+  end

data/lib/install/web.rb

@@ -60,6 +60,9 @@ end
 say "Copying application.js file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/templates/web/application.js", "#{Webpacker.config.source_entry_path}/application.js"
 
+say "Copying Breezy initializer"
+copy_file "#{__dir__}/templates/web/initializer.rb", "config/initializers/breezy.rb"
+
 say "Appending js tags to your application.html.erb"
 append_js_tags
 

data/lib/tasks/install.rake

@@ -25,21 +25,13 @@ namespace :breezy do
     desc "Install everything needed for breezy web"
     task 'web' => ["breezy:verify_webpacker", "webpacker:verify_install"] do
       template = File.expand_path("../install/web.rb", __dir__)
-      if Rails::VERSION::MAJOR >= 5
-        exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{template}"
-      else
-        exec "#{RbConfig.ruby} ./bin/rake rails:template LOCATION=#{template}"
-      end
+      exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{template}"
     end
 
     desc "Install everything needed for breezy mobile"
     task 'mobile' => ["breezy:verify_yarn"] do
       template = File.expand_path("../install/mobile.rb", __dir__)
-      if Rails::VERSION::MAJOR >= 5
-        exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{template}"
-      else
-        exec "#{RbConfig.ruby} ./bin/rake rails:template LOCATION=#{template}"
-      end
+      exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{template}"
     end
   end
 end

data/test/breezy_test.rb

@@ -54,49 +54,46 @@ class BreezyTest < ActionController::TestCase
   end
 
   test "redirect to back uses xhr referer when available" do
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+    @request.headers['X-BREEZY-REQUEST'] = 't'
+
     @request.env['HTTP_REFERER'] = 'http://test.host/referer'
     get :redirect_to_back
-    assert_redirected_to 'http://test.host/referer'
+    assert_response :ok
+    assert_equal @response.headers['X-BREEZY-LOCATION'], 'http://test.host/referer'
 
-    @request.env['HTTP_X_XHR_REFERER'] = 'http://test.host/xhr-referer'
+    @request.env['HTTP_X_XHR_REFERER'] = 'http://test.host/referer'
     get :redirect_to_back
-    assert_redirected_to 'http://test.host/xhr-referer'
+    assert_response :ok
+    assert_equal @response.headers['X-BREEZY-LOCATION'], 'http://test.host/referer'
   end
 
-  test "sets request method cookie on non get requests" do
-    post :simple_action
-    assert_equal 'POST', cookies[:request_method]
-    put :simple_action
-    assert_equal 'PUT', cookies[:request_method]
-  end
+  test "sets X-BREEZY-LOCATION header on redirect requests coming from breezy" do
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+    @request.headers['X-BREEZY-REQUEST'] = 't'
 
-  test "pops request method cookie on get request" do
-    cookies[:request_method] = 'TEST'
-    get :simple_action
-    assert_nil cookies[:request_method]
-  end
-
-  test "sets xhr redirected to header on redirect requests coming from breezy" do
     get :redirect_to_same_origin
     get :simple_action
-    assert_nil @response.headers['X-XHR-Redirected-To']
+    assert_nil @response.headers['X-BREEZY-LOCATION']
 
     @request.env['HTTP_X_XHR_REFERER'] = 'http://test.host/'
     get :redirect_to_same_origin
-    @request.env['HTTP_X_XHR_REFERER'] = nil
-    get :simple_action
-    assert_equal 'http://test.host/path', @response.headers['X-XHR-Redirected-To']
+    assert_equal 'http://test.host/path', @response.headers['X-BREEZY-LOCATION']
   end
 
   test "changes status to 403 on breezy requests redirecting to different origin" do
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+    @request.headers['X-BREEZY-REQUEST'] = 't'
+
     get :redirect_to_different_host
-    assert_response :redirect
+    assert_response :ok
+    assert @response.headers['X-BREEZY-LOCATION']
 
     get :redirect_to_different_protocol
-    assert_response :redirect
+    assert_response :ok
+    assert @response.headers['X-BREEZY-LOCATION']
 
     @request.env['HTTP_X_XHR_REFERER'] = 'http://test.host'
-
     get :redirect_to_different_host
     assert_response :forbidden
 
@@ -104,68 +101,25 @@ class BreezyTest < ActionController::TestCase
     assert_response :forbidden
 
     get :redirect_to_same_origin
-    assert_response :redirect
+    assert_response :ok
+    assert @response.headers['X-BREEZY-LOCATION']
   end
 
   test "handles invalid xhr referer on redirection" do
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+    @request.headers['X-BREEZY-REQUEST'] = 't'
     @request.env['HTTP_X_XHR_REFERER'] = ':'
     get :redirect_to_same_origin
-    assert_response :redirect
+    assert_response :ok
+    assert @response.headers['X-BREEZY-LOCATION']
   end
 
   test "handles unescaped same origin location on redirection" do
+    @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+    @request.headers['X-BREEZY-REQUEST'] = 't'
     @request.env['HTTP_X_XHR_REFERER'] = 'http://test.host/'
     get :redirect_to_unescaped_path
-    assert_response :redirect
-  end
-
-  test "handles unescaped different origin location on redirection" do
-    @request.env['HTTP_X_XHR_REFERER'] = 'https://test.host/'
-    get :redirect_to_unescaped_path
-    assert_response :forbidden
-  end
-end
-
-class BreezyIntegrationTest < ActionDispatch::IntegrationTest
-  setup do
-    @session = open_session
-  end
-
-  test "sets xhr redirected to header on redirect requests coming from breezy" do
-    get '/redirect_hash'
-    get response.location
-    assert_nil response.headers['X-XHR-Redirected-To']
-
-    if Rails.version >= '5.0'
-      get '/redirect_hash', headers: { 'HTTP_X_XHR_REFERER' => 'http://www.example.com/' }
-    else
-      get '/redirect_hash', nil, { 'HTTP_X_XHR_REFERER' => 'http://www.example.com/' }
-    end
-    assert_response :redirect
-    assert_nil response.headers['X-XHR-Redirected-To']
-
-    if Rails.version >= '5.0'
-      get response.location, headers: { 'HTTP_X_XHR_REFERER' => nil }
-    else
-      get response.location, nil, { 'HTTP_X_XHR_REFERER' => nil }
-    end
-    assert_equal 'http://www.example.com/breezy/simple_action', response.headers['X-XHR-Redirected-To']
-    assert_response :ok
-
-    if Rails.version >= '5.0'
-      get '/redirect_path', headers: { 'HTTP_X_XHR_REFERER' => 'http://www.example.com/' }
-    else
-      get '/redirect_path', nil, { 'HTTP_X_XHR_REFERER' => 'http://www.example.com/' }
-    end
-    assert_response :redirect
-    assert_nil response.headers['X-XHR-Redirected-To']
-
-    if Rails.version >= '5.0'
-      get response.location, headers: { 'HTTP_X_XHR_REFERER' => nil }
-    else
-      get response.location, nil, { 'HTTP_X_XHR_REFERER' => nil }
-    end
-    assert_equal 'http://www.example.com/breezy/simple_action', response.headers['X-XHR-Redirected-To']
     assert_response :ok
+    assert @response.headers['X-BREEZY-LOCATION']
   end
 end

data/test/configuration_test.rb

@@ -14,16 +14,23 @@ class ConfigurationTest < ActiveSupport::TestCase
     Breezy.configure do |config|
     end
 
-    track_assets = ['application.js', 'application.css']
-    assert_equal track_assets, Breezy.configuration.track_assets
+    track_sprockets_assets = ['application.js', 'application.css']
+    track_pack_assets = ['application.js']
+
+    assert_equal track_sprockets_assets, Breezy.configuration.track_sprockets_assets
+    assert_equal track_pack_assets, Breezy.configuration.track_pack_assets
   end
 
   test 'configuration with track_assets specified' do
     Breezy.configure do |config|
-      config.track_assets = ['app.js']
+      config.track_sprockets_assets = ['app.js']
+      config.track_pack_assets = ['pack.js']
     end
 
-    default_track_assets = ['app.js']
-    assert_equal default_track_assets, Breezy.configuration.track_assets
+    track_sprockets_assets = ['app.js']
+    track_pack_assets = ['pack.js']
+
+    assert_equal track_sprockets_assets, Breezy.configuration.track_sprockets_assets
+    assert_equal track_pack_assets, Breezy.configuration.track_pack_assets
   end
 end

data/test/render_test.rb

@@ -44,11 +44,13 @@ class RenderTest < ActionController::TestCase
 
 
   setup do
-    Breezy.configuration.track_assets = ['app.js']
+    Breezy.configuration.track_sprockets_assets = ['app.js']
+    Breezy.configuration.track_pack_assets = ['app.js']
   end
 
   teardown do
-    Breezy.configuration.track_assets = []
+    Breezy.configuration.track_sprockets_assets = []
+    Breezy.configuration.track_pack_assets = []
   end
 
   test "render action via get" do

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: breezy
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: breezy_template
   requirement: !ruby/object:Gem::Requirement
@@ -62,44 +56,86 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.11'
 description: Rails integration for BreezyJS
 email: jho406@gmail.com
 executables: []
@@ -109,7 +145,6 @@ files:
 - app/views/breezy/response.html.erb
 - lib/breezy.rb
 - lib/breezy/configuration.rb
-- lib/breezy/cookies.rb
 - lib/breezy/helpers.rb
 - lib/breezy/render.rb
 - lib/breezy/version.rb
@@ -147,6 +182,7 @@ files:
 - lib/install/templates/mobile/rn-cli.config.js
 - lib/install/templates/web/application.js
 - lib/install/templates/web/babelrc
+- lib/install/templates/web/initializer.rb
 - lib/install/web.rb
 - lib/tasks/install.rake
 - test/breezy_test.rb

data/lib/breezy/cookies.rb

@@ -1,15 +0,0 @@
-module Breezy
-  # For non-GET requests, sets a request_method cookie containing
-  # the request method of the current request. The Breezy script
-  # will not initialize if this cookie is set.
-  module Cookies
-    private
-      def set_request_method_cookie
-        if request.get?
-          cookies.delete(:request_method)
-        else
-          cookies[:request_method] = request.request_method
-        end
-      end
-  end
-end