breezy 0.13.0 → 0.17.1

data/lib/breezy/redirection.rb

@@ -0,0 +1,30 @@
+module Breezy
+  module Redirection
+    def _compute_redirect_to_location(request, options)
+      computed_location = URI.parse(super)
+      next_param = Rack::Utils
+          .parse_nested_query(computed_location.query)
+
+      if request.params[:__] == "0"
+        computed_location.query = next_param.merge({__: "0"}).to_query
+      end
+
+      computed_location.to_s
+    end
+
+    def redirect_back_with_bzq(opts)
+      if request.referrer && params[:bzq]
+        referrer_url = URI.parse(request.referrer)
+        referrer_url.query = Rack::Utils
+          .parse_nested_query(referrer_url.query)
+          .merge({bzq: params[:bzq]})
+          .to_query
+
+        redirect_to referrer_url.to_s, opts
+      else
+        redirect_back(opts)
+      end
+    end
+  end
+end
+

data/lib/breezy/xhr_headers.rb

@@ -17,17 +17,7 @@ module Breezy
         end
       end
 
-      if request.xhr? && request.headers["X-BREEZY-REQUEST"]
-        self.status = 200
-        response.headers["X-BREEZY-LOCATION"] = url
-      end
-
       url
     end
-
-    private
-      def set_response_url
-        response.headers['X-RESPONSE-URL'] = request.fullpath
-      end
   end
 end

data/lib/generators/rails/breezy_generator.rb

@@ -21,6 +21,7 @@ module Rails
           filename = filename_with_extensions(view)
           template filename, File.join('app/views', controller_file_path, filename)
         end
+        template '_form.json.props', File.join('app/views', controller_file_path, '_form.json.props')
 
         %w(index show new edit).each do |view|
           @action_name = view
@@ -28,9 +29,11 @@ module Rails
           template 'web/' + filename, File.join('app/views', controller_file_path, filename)
         end
 
-        js_filename = [plural_table_name, 'form.jsx'].map(&:camelcase).join
-        template 'web/form.jsx', File.join('app/components', js_filename)
-        template 'web/base.jsx', File.join('app/components', 'BaseScreen.jsx')
+        %w(index show new edit).each do |view|
+          @action_name = view
+          filename = filename_with_html_extensions(view)
+          template 'web/' + filename, File.join('app/views', controller_file_path, filename)
+        end
 
         %w(index show new edit).each do |view|
           append_mapping(view)
@@ -48,8 +51,8 @@ module Rails
             "\nimport #{component_name} from 'views/#{controller_file_path}/#{action}'"
           end
 
-          inject_into_file app_js, after: 'const identifierToComponentMapping = {' do
-            "\n  '#{[controller_file_path, action].join('/')}': #{component_name},"
+          inject_into_file app_js, after: 'identifierToComponentMapping = {' do
+            "\n      '#{[controller_file_path, action].join('/')}': #{component_name},"
           end
         end
 
@@ -69,6 +72,10 @@ module Rails
           [name, :jsx] * '.'
         end
 
+        def filename_with_html_extensions(name)
+          [name, :html, :erb] * '.'
+        end
+
         def attributes_list_with_timestamps
           attributes_list(attributes_names + %w(created_at updated_at))
         end

data/lib/generators/rails/templates/_form.json.props

@@ -0,0 +1,13 @@
+html = form_with(model: @<%= model_resource_name %>, local: true) do |form|
+  inner = "".html_safe
+
+<%- attributes.each do |attr| -%>
+  inner << form.label(:<%= attr.column_name %>)
+  inner << form.<%= attr.field_type %>(:<%= attr.column_name %>)
+<%- end -%>
+  inner << form.submit
+
+  inner
+end
+
+json.html html

data/lib/generators/rails/templates/controller.rb.tt

@@ -9,47 +9,19 @@ class <%= controller_class_name %>Controller < ApplicationController
   # GET <%= route_url %>
   def index
     @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
-    respond_to do |format|
-      format.html {
-        @initial_state = render_to_string(formats: [:json], layout: true)
-        render inline: '', layout: true
-      }
-      format.json { render layout: true }
-    end
   end
 
   # GET <%= route_url %>/1
   def show
-    respond_to do |format|
-      format.html {
-        @initial_state = render_to_string(formats: [:json], layout: true)
-        render inline: '', layout: true
-      }
-      format.json { render layout: true }
-    end
   end
 
   # GET <%= route_url %>/new
   def new
     @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
-    respond_to do |format|
-      format.html {
-        @initial_state = render_to_string(formats: [:json], layout: true)
-        render inline: '', layout: true
-      }
-      format.json { render layout: true }
-    end
   end
 
   # GET <%= route_url %>/1/edit
   def edit
-    respond_to do |format|
-      format.html {
-        @initial_state = render_to_string(formats: [:json], layout: true)
-        render inline: '', layout: true
-      }
-      format.json { render layout: true }
-    end
   end
 
   # POST <%= route_url %>

data/lib/generators/rails/templates/edit.json.props

@@ -1,18 +1,13 @@
-json.flash flash.to_h
+if @post.errors.any?
+  content = {
+    explanation: "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this post from being saved:",
+    messages: @<%= singular_table_name %>.errors.full_messages.map{|msg| {body: msg}}
+  }
 
-if @<%= singular_table_name %>.errors
-  json.errors @<%= singular_table_name %>.errors.to_h
+  flash.now[:form_error] = content
 end
 
-<%- attributes_list_with_timestamps.each do |attr| -%>
-json.<%=attr%> @<%= singular_table_name %>.<%=attr%>
-<%- end -%>
-
-
-json.attributes_for_form do
-<%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>
-  json.<%=attr%> @<%= singular_table_name %>.<%=attr%>
-<%- end -%>
+json.form(partial: 'form') do
 end
 
 json.<%= singular_table_name%>_path <%= singular_table_name%>_path(@<%=singular_table_name%>)

data/lib/generators/rails/templates/index.json.props

@@ -1,5 +1,3 @@
-json.flash flash.to_h
-
 json.<%= plural_table_name %> do
   json.array! @<%= plural_table_name %> do |<%= singular_table_name %>|
     <%- attributes_list_with_timestamps.each do |attr| -%>
@@ -7,6 +5,7 @@ json.<%= plural_table_name %> do
     <%- end -%>
     json.edit_<%=singular_table_name%>_path edit_<%=singular_table_name%>_path(<%=singular_table_name%>)
     json.<%=singular_table_name%>_path <%=singular_table_name%>_path(<%=singular_table_name%>)
+    json.delete_<%=singular_table_name%>_path <%=singular_table_name%>_path(<%=singular_table_name%>)
   end
 end
 

data/lib/generators/rails/templates/new.json.props

@@ -1,6 +1,15 @@
-json.flash flash.to_h
-if @<%= singular_table_name %>.errors
-  json.errors @<%= singular_table_name %>.errors.to_h
+if @post.errors.any?
+  content = {
+    explanation: "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this post from being saved:",
+    messages: @<%= singular_table_name %>.errors.full_messages.map{|msg| {body: msg}}
+  }
+
+  flash.now[:form_error] = content
+end
+
+json.form(partial: 'form') do
 end
 
 json.<%= plural_table_name %>_path <%= plural_table_name %>_path
+
+

data/lib/generators/rails/templates/show.json.props

@@ -1,5 +1,3 @@
-json.flash flash.to_h
-
 <%- attributes_list_with_timestamps.each do |attr|-%>
 json.<%=attr%> @<%= singular_table_name %>.<%=attr%>
 <%- end -%>

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

@@ -0,0 +1,7 @@
+<%% initial_state = controller.render_to_string(@virtual_path ,formats: [:json], locals: local_assigns, layout: true) %>
+
+<script type="text/javascript">
+  window.BREEZY_INITIAL_PAGE_STATE=<%%= initial_state.html_safe %>;
+</script>
+
+<div id="app"></div>

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

@@ -1,39 +1,32 @@
 import React from 'react'
 import {mapStateToProps, mapDispatchToProps} from '@jho406/breezy'
 import {connect} from 'react-redux'
-import BaseScreen from 'components/BaseScreen'
-import <%= plural_table_name.camelize %>Form from 'components/<%= plural_table_name.camelize %>Form'
+import RailsTag from '@jho406/breezy/components/RailsTag'
 import * as applicationActionCreators from 'javascript/packs/action_creators'
 
-class <%= plural_table_name.camelize %>Edit extends BaseScreen {
-  formRef = React.createRef()
-
-  handleSubmit = (values, {setSubmitting}) => {
-    this.props.clearFormErrors(this.props.pageKey)
-
-    const options = {
-      method:'PUT',
-      body: JSON.stringify(values),
-    }
-
-    this.enhancedVisit(this.props.<%= singular_table_name.camelize(:lower) %>Path, options).then( rsp => {
-      setSubmitting(false)
-      if (this.props.errors) {
-        this.formRef.current.setErrors(this.props.errors)
-      }
-    })
-  }
-
+class <%= plural_table_name.camelize %>Edit extends React.Component {
   render () {
+    const {
+      form,
+      flash,
+      <%= singular_table_name.camelize(:lower) %>Path,
+      <%= plural_table_name.camelize(:lower) %>Path,
+    } = this.props
+    const error = flash.form_error
+
+    const messagesEl = error && (
+      <div id="error_explanation">
+        <h2>{ error.explanation }</h2>
+        <ul>{ error.messages.map(({body})=> <li key={body}>{body}</li>) }</ul>
+      </div>
+    )
+
     return (
       <div>
-        <<%= plural_table_name.camelize %>Form
-          onSubmit={this.handleSubmit}
-          initialValues={this.props.attributesForForm}
-          ref={this.formRef}
-        />
-        <a onClick={ e => this.enhancedVisit(this.props.<%= singular_table_name.camelize(:lower) %>Path)}>Show</a>
-        <a onClick={ e => this.enhancedVisit(this.props.<%= plural_table_name.camelize(:lower) %>Path)}>Back</a>
+        {messagesEl}
+        <RailsTag {...form} data-bz-visit={true}/>
+        <a href={<%= singular_table_name.camelize(:lower) %>Path} data-bz-visit={true}>Show</a>
+        <a href={<%= plural_table_name.camelize(:lower) %>Path}  data-bz-visit={true}>Back</a>
       </div>
     )
   }

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

@@ -0,0 +1,7 @@
+<%% initial_state = controller.render_to_string(@virtual_path ,formats: [:json], locals: local_assigns, layout: true) %>
+
+<script type="text/javascript">
+  window.BREEZY_INITIAL_PAGE_STATE=<%%= initial_state.html_safe %>;
+</script>
+
+<div id="app"></div>

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

@@ -1,30 +1,33 @@
 import React from 'react'
 import {mapStateToProps, mapDispatchToProps} from '@jho406/breezy'
 import { connect } from 'react-redux'
-import BaseScreen from 'components/BaseScreen'
 
-class <%= plural_table_name.camelize %>Index extends BaseScreen {
+class <%= plural_table_name.camelize %>Index extends React.Component {
   static defaultProps = {
     <%= plural_table_name.camelize(:lower) %>: []
   }
 
   render () {
+    const {
+      flash,
+      new<%= singular_table_name.camelize %>Path,
+    } = this.props
     const <%= singular_table_name.camelize(:lower) %>Items = this.props.<%= plural_table_name.camelize(:lower) %>.map((<%= singular_table_name.camelize(:lower) %>, key) => {
       return (
         <tr key={<%= singular_table_name.camelize(:lower) %>.id}>
           <%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>
           <td>{<%=singular_table_name.camelize(:lower)%>.<%=attr.camelize(:lower)%>}</td>
           <%- end -%>
-          <td><a onClick={ e => this.enhancedVisit(<%=singular_table_name%>.<%=singular_table_name.camelize(:lower)%>Path)}>Show</a></td>
-          <td><a onClick={ e => this.enhancedVisit(<%=singular_table_name%>.edit<%=singular_table_name.camelize%>Path)}>Edit</a></td>
-          <td><a onClick={ e => this.enhancedVisit(<%=singular_table_name%>.<%=singular_table_name.camelize(:lower)%>Path, {method: 'DELETE'})}>Delete</a></td>
+          <td><a href={ <%=singular_table_name%>.<%=singular_table_name.camelize(:lower)%>Path } data-bz-visit={true}>Show</a></td>
+          <td><a href={ <%=singular_table_name%>.edit<%=singular_table_name.camelize%>Path } data-bz-visit={true}>Edit</a></td>
+          <td><a href={ <%=singular_table_name%>.delete<%=singular_table_name.camelize%>Path }data-bz-visit={true} data-bz-method={"DELETE"}>Delete</a></td>
         </tr>
       )
     })
 
     return (
       <div>
-        <p id="notice">{this.props.flash && this.props.flash.notice}</p>
+        <p id="notice">{flash.notice}</p>
 
         <h1><%= plural_table_name.capitalize %></h1>
 
@@ -43,7 +46,7 @@ class <%= plural_table_name.camelize %>Index extends BaseScreen {
           </tbody>
         </table>
         <br />
-        <a onClick={ e => this.enhancedVisit(this.props.new<%= singular_table_name.camelize %>Path)}>New <%= singular_table_name.capitalize %></a>
+        <a href={new<%= singular_table_name.camelize %>Path} data-bz-visit={true}>New <%= singular_table_name.capitalize %></a>
       </div>
     )
   }

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

@@ -0,0 +1,7 @@
+<%% initial_state = controller.render_to_string(@virtual_path ,formats: [:json], locals: local_assigns, layout: true) %>
+
+<script type="text/javascript">
+  window.BREEZY_INITIAL_PAGE_STATE=<%%= initial_state.html_safe %>;
+</script>
+
+<div id="app"></div>

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

@@ -1,37 +1,30 @@
 import React from 'react'
 import {mapStateToProps, mapDispatchToProps} from '@jho406/breezy'
 import {connect} from 'react-redux'
-import BaseScreen from 'components/BaseScreen'
-import <%= plural_table_name.camelize %>Form from 'components/<%= plural_table_name.camelize %>Form'
+import RailsTag from '@jho406/breezy/components/RailsTag'
 import * as applicationActionCreators from 'javascript/packs/action_creators'
 
-class <%= plural_table_name.camelize %>New extends BaseScreen {
-  formRef = React.createRef()
-
-  handleSubmit = (values, {setSubmitting}) => {
-    this.props.clearFormErrors(this.props.pageKey)
-
-    const options = {
-      method:'POST',
-      body: JSON.stringify(values),
-    }
+class <%= plural_table_name.camelize %>New extends React.Component {
+  render () {
+    const {
+      form,
+      flash,
+      <%= plural_table_name.camelize(:lower) %>Path,
+    } = this.props
+    const error = flash.form_error
 
-    this.enhancedVisit(this.props.<%= plural_table_name.camelize(:lower) %>Path, options).then( rsp => {
-      setSubmitting(false)
-      if (this.props.errors) {
-        this.formRef.current.setErrors(this.props.errors)
-      }
-    })
-  }
+    const messagesEl = error && (
+      <div id="error_explanation">
+        <h2>{ error.explanation }</h2>
+        <ul>{ error.messages.map(({body})=> <li key={body}>{body}</li>) }</ul>
+      </div>
+    )
 
-  render () {
     return (
       <div>
-        <<%= plural_table_name.camelize %>Form
-          onSubmit={this.handleSubmit}
-          ref={this.formRef}
-        />
-        <a onClick={ e => this.enhancedVisit(this.props.<%= plural_table_name.camelize(:lower) %>Path)}>Back</a>
+        {messagesEl}
+        <RailsTag {...this.props.form} data-bz-visit={true}/>
+        <a href={<%= plural_table_name.camelize(:lower) %>Path} data-bz-visit={true}>Back</a>
       </div>
     )
   }

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

@@ -0,0 +1,7 @@
+<%% initial_state = controller.render_to_string(@virtual_path ,formats: [:json], locals: local_assigns, layout: true) %>
+
+<script type="text/javascript">
+  window.BREEZY_INITIAL_PAGE_STATE=<%%= initial_state.html_safe %>;
+</script>
+
+<div id="app"></div>

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

@@ -1,9 +1,8 @@
 import React from 'react'
 import {mapStateToProps, mapDispatchToProps} from '@jho406/breezy'
 import { connect } from 'react-redux'
-import BaseScreen from 'components/BaseScreen'
 
-class <%= plural_table_name.camelize %>Show extends BaseScreen {
+class <%= plural_table_name.camelize %>Show extends React.Component {
   render () {
     return (
       <div>
@@ -14,8 +13,8 @@ class <%= plural_table_name.camelize %>Show extends BaseScreen {
           {this.props.<%=attr.camelize(:lower)%>}
         </p>
         <%- end -%>
-        <a onClick={ e => this.enhancedVisit(this.props.edit<%= singular_table_name.camelize %>Path)}>Edit</a>
-        <a onClick={ e => this.enhancedVisit(this.props.<%= plural_table_name.camelize(:lower) %>Path )}>Back</a>
+        <a href={ this.props.edit<%= singular_table_name.camelize %>Path } data-bz-visit={true}>Edit</a>
+        <a href={ this.props.<%= plural_table_name.camelize(:lower) %>Path } data-bz-visit={true}>Back</a>
       </div>
     )
   }