breezy 0.18.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5407b99c417dc88944a8c1bf68fe6bda73a072ee43f25c1a45995d9545f97b2
-  data.tar.gz: 91354f50156543100d7f3add14668b9d1b8d324fa01c4207f6f0c87c863e7dfa
+  metadata.gz: fcc4cf35ca92806333f48649d4b91ee05fe5a83a78196495c7be8092082c0b90
+  data.tar.gz: 232a74c14a615a93e226b277823d1f53fe4bb68460b21585b6685dd9cf78e998
 SHA512:
-  metadata.gz: 449612b076ee7c7226ea368156901725f2736383054c3bef5b8bc103457e6aec4d2921013281d908ea49fa8ffc5d35226789aac47fb9c3e4ac8439ca98791ecb
-  data.tar.gz: 9d4e775dd2f41a0008bd3a5a8dd0f66032c68f4bc1e3321b3377fe8ae3c7bbcccb3c9a47449b3ec164fc2bab8687a8291a5bf568367847e9325ee3db89329d76
+  metadata.gz: edcc8bbd2087fd0e9c9520c3e7fe466786ca8d901b97eacbcc167ae5773bd34067917029c101c0300c6c986c9c0375d30f34725e210d23af4640b6b62809c345
+  data.tar.gz: c54a93e9bbe4e0bffa490fa219a0ba2dff705f9424d63b13ff6731b5f0353f011e057b38c53e5061ef8257c5076f2377fb2980223484fe9d2dcb7041325bbc7c

data/lib/breezy.rb

@@ -1,21 +1,12 @@
-require 'breezy/xhr_headers'
-require 'breezy/xhr_url_for'
-require 'breezy/x_domain_blocker'
 require 'breezy/helpers'
 require 'breezy/redirection'
 require 'props_template'
 
 module Breezy
   module Controller
-    include XHRHeaders, XDomainBlocker, Helpers, Redirection
+    include Helpers, Redirection
 
     def self.included(base)
-      if base.respond_to?(:before_action)
-        base.after_action :abort_xdomain_redirect
-      else
-        base.after_filter :abort_xdomain_redirect
-      end
-
       if base.respond_to?(:helper_method)
         base.helper_method :param_to_search_path
         base.helper_method :props_from_form_with
@@ -41,19 +32,6 @@ module Breezy
         if app.config.breezy.auto_include
           include Controller
         end
-
-        ActionDispatch::Request.class_eval do
-          def referer
-            self.headers['X-XHR-Referer'] || super
-          end
-          alias referrer referer
-        end
-
-        require 'action_dispatch/routing/redirection'
-
-        (ActionView::RoutingUrlFor rescue ActionView::Helpers::UrlHelper).module_eval do
-          prepend XHRUrlFor
-        end
       end
     end
   end

data/lib/generators/rails/breezy_generator.rb

@@ -25,7 +25,7 @@ module Rails
 
         %w(index show new edit).each do |view|
           @action_name = view
-          filename = filename_with_jsx_extensions(view)
+          filename = filename_with_js_extensions(view)
           template 'web/' + filename, File.join('app/views', controller_file_path, filename)
         end
 
@@ -68,8 +68,8 @@ module Rails
           [name, :json, :props] * '.'
         end
 
-        def filename_with_jsx_extensions(name)
-          [name, :jsx] * '.'
+        def filename_with_js_extensions(name)
+          [name, :js] * '.'
         end
 
         def filename_with_html_extensions(name)

data/lib/generators/rails/templates/web/edit.html.erb

@@ -4,4 +4,9 @@
   window.BREEZY_INITIAL_PAGE_STATE=<%%= initial_state.html_safe %>;
 </script>
 
-<div id="app"></div>
+<div id="app">
+  <%%# If you need SSR follow instructions at %>
+  <%%# https://github.com/thoughtbot/breezy/blob/main/docs/recipes/server-side-rendering.md %>
+  <%%# and uncomment the following line %>
+  <%%#= Humid.render(initial_state).html_safe %>
+</div>

data/lib/install/templates/web/reducer.js

@@ -5,7 +5,7 @@
 // } from './actions'
 // import produce from "immer"
 //
-// export default function (state = {}, action) {
+// export const applicationPagesReducer = (state = {}, action) => {
 //   switch(action.type) {
 //   case CLEAR_FORM_ERRORS: {
 //     const {pageKey} = action.payload

data/lib/install/web.rb

@@ -56,10 +56,8 @@ say "Adding required member methods to ApplicationRecord"
 add_member_methods
 
 say "Installing React, Redux, and Breezy"
-run "yarn add babel-plugin-module-resolver history@\"^4\" html-react-parser@\"^0.13\" react-redux redux-thunk redux redux-persist reduce-reducers immer @jho406/breezy --save"
+run "yarn add babel-plugin-module-resolver history@\"^4\" html-react-parser react-redux redux-thunk redux redux-persist reduce-reducers immer @jho406/breezy --save"
 
-say "Updating webpack config to include .jsx file extension and resolved_paths"
-insert_into_file Webpacker.config.config_path, "    - .jsx\n", after: /\bextensions:\n/
 # For newer webpacker
 insert_into_file Webpacker.config.config_path, "'app/views', 'app/components'", after: /additional_paths: \[/
 # For older webpacker

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breezy
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Johny Ho
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -159,9 +159,6 @@ files:
 - lib/breezy.rb
 - lib/breezy/helpers.rb
 - lib/breezy/redirection.rb
-- lib/breezy/x_domain_blocker.rb
-- lib/breezy/xhr_headers.rb
-- lib/breezy/xhr_url_for.rb
 - lib/generators/rails/breezy_generator.rb
 - lib/generators/rails/scaffold_controller_generator.rb
 - lib/generators/rails/templates/_form.json.props
@@ -171,13 +168,13 @@ files:
 - lib/generators/rails/templates/new.json.props
 - lib/generators/rails/templates/show.json.props
 - lib/generators/rails/templates/web/edit.html.erb
-- lib/generators/rails/templates/web/edit.jsx
+- lib/generators/rails/templates/web/edit.js
 - lib/generators/rails/templates/web/index.html.erb
-- lib/generators/rails/templates/web/index.jsx
+- lib/generators/rails/templates/web/index.js
 - lib/generators/rails/templates/web/new.html.erb
-- lib/generators/rails/templates/web/new.jsx
+- lib/generators/rails/templates/web/new.js
 - lib/generators/rails/templates/web/show.html.erb
-- lib/generators/rails/templates/web/show.jsx
+- lib/generators/rails/templates/web/show.js
 - lib/install/templates/web/action_creators.js
 - lib/install/templates/web/actions.js
 - lib/install/templates/web/application.js
@@ -210,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Rails integration for BreezyJS

data/lib/breezy/x_domain_blocker.rb

@@ -1,22 +0,0 @@
-module Breezy
-  # Changes the response status to 403 Forbidden if all of these conditions are true:
-  # - The current request originated from Breezy
-  # - The request is being redirected to a different domain
-  module XDomainBlocker
-    private
-      def same_origin?(a, b)
-        a = URI.parse URI.escape(a)
-        b = URI.parse URI.escape(b)
-        [a.scheme, a.host, a.port] == [b.scheme, b.host, b.port]
-      end
-
-      def abort_xdomain_redirect
-        to_uri = response.headers['Location']
-        current = request.headers['X-XHR-Referer']
-        unless to_uri.blank? || current.blank? || same_origin?(current, to_uri)
-          self.status = 403
-        end
-      rescue URI::InvalidURIError
-      end
-  end
-end

data/lib/breezy/xhr_headers.rb

@@ -1,23 +0,0 @@
-module Breezy
-  module XHRHeaders
-    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(request, options)
-      url = begin
-        if options == :back && request.headers["X-XHR-Referer"]
-          super(request, request.headers["X-XHR-Referer"])
-        else
-          super
-        end
-      end
-
-      url
-    end
-  end
-end

data/lib/breezy/xhr_url_for.rb

@@ -1,11 +0,0 @@
-module Breezy
-  # Corrects the behavior of url_for (and link_to, which uses url_for) with the :back
-  # option by using the X-XHR-Referer request header instead of the standard Referer
-  # request header.
-  module XHRUrlFor
-    def url_for(options = {})
-      options = (controller.request.headers["X-XHR-Referer"] || options) if options == :back
-      super
-    end
-  end
-end