breezy 0.9.0 → 0.14.0

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,8 +29,12 @@ 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)
+        %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
+
         template 'web/base.jsx', File.join('app/components', 'BaseScreen.jsx')
 
         %w(index show new edit).each do |view|
@@ -48,7 +53,7 @@ module Rails
             "\nimport #{component_name} from 'views/#{controller_file_path}/#{action}'"
           end
 
-          inject_into_file app_js, after: 'const screenToComponentMapping = {' do
+          inject_into_file app_js, after: 'const identifierToComponentMapping = {' do
             "\n  '#{[controller_file_path, action].join('/')}': #{component_name},"
           end
         end
@@ -62,13 +67,17 @@ module Rails
         end
 
         def filename_with_extensions(name)
-          [name, :js, :props] * '.'
+          [name, :json, :props] * '.'
         end
 
         def filename_with_jsx_extensions(name)
           [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

@@ -5,9 +5,6 @@ require_dependency "<%= namespaced_path %>/application_controller"
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
   before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
-  # `use_breezy` enables breezy functionality
-  # on application.html.erb
-  before_action :use_breezy
 
   # GET <%= route_url %>
   def index

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

@@ -0,0 +1,14 @@
+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.<%= singular_table_name%>_path <%= singular_table_name%>_path(@<%=singular_table_name%>)
+json.<%= plural_table_name %>_path <%= plural_table_name %>_path

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

@@ -0,0 +1,13 @@
+json.<%= plural_table_name %> do
+  json.array! @<%= plural_table_name %> do |<%= singular_table_name %>|
+    <%- attributes_list_with_timestamps.each do |attr| -%>
+    json.<%=attr%> <%= singular_table_name %>.<%=attr%>
+    <%- 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
+
+
+json.new_<%= singular_table_name %>_path new_<%= singular_table_name %>_path

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

@@ -0,0 +1,15 @@
+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.js.props → 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/base.jsx

@@ -1,12 +1,11 @@
 import React from 'react'
-import {withBrowserBehavior} from '@jho406/breezy'
+import {enhanceVisitWithBrowserBehavior} from '@jho406/breezy'
 
 export default class extends React.Component {
   constructor (props) {
     super(props)
-    const {visit, remote} = withBrowserBehavior(props.visit, props.remote)
-    this.visit = visit.bind(this)
-    this.remote = remote.bind(this)
+    const visit = enhanceVisitWithBrowserBehavior(props.visit)
+    this.enhancedVisit = visit.bind(this)
   }
 }
 

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

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

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

@@ -2,37 +2,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/dist/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.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
-
-    const options = {
-      method:'PUT',
-      body: JSON.stringify(values),
-    }
-
-    this.visit(this.props.<%= singular_table_name %>, options).then( rsp => {
-      setSubmitting(false)
-      if (this.props.errors) {
-        this.formRef.current.setErrors(this.props.errors)
-      }
-    })
-  }
-
   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.attributes_for_form}
-          ref={this.formRef}
-        />
-        <a onClick={ e => this.visit(this.props.post_path)}>Show</a>
-        <a onClick={ e => this.visit(this.props.posts_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>
     )
   }
@@ -40,7 +35,7 @@ class <%= plural_table_name.camelize %>Edit extends BaseScreen {
 
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  {...mapDispatchToProps, ...applicationActionCreators}
 )(<%= plural_table_name.camelize %>Edit)
 
 

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

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

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

@@ -5,26 +5,30 @@ import BaseScreen from 'components/BaseScreen'
 
 class <%= plural_table_name.camelize %>Index extends BaseScreen {
   static defaultProps = {
-    <%= plural_table_name %>: []
+    <%= plural_table_name.camelize(:lower) %>: []
   }
 
   render () {
-    const <%= singular_table_name %>Items = this.props.<%= plural_table_name %>.map((<%= singular_table_name %>, key) => {
+    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 %>.id}>
+        <tr key={<%= singular_table_name.camelize(:lower) %>.id}>
           <%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>
-          <td>{<%=singular_table_name%>.<%=attr%>}</td>
+          <td>{<%=singular_table_name.camelize(:lower)%>.<%=attr.camelize(:lower)%>}</td>
           <%- end -%>
-          <td><a onClick={ e => this.visit(<%=singular_table_name%>.post_path)}>Show</a></td>
-          <td><a onClick={ e => this.visit(<%=singular_table_name%>.edit_post_path)}>Edit</a></td>
-          <td><a onClick={ e => this.visit(<%=singular_table_name%>.post_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 +47,7 @@ class <%= plural_table_name.camelize %>Index extends BaseScreen {
           </tbody>
         </table>
         <br />
-        <a onClick={ e => this.visit(this.props.new_post_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,11 @@
+<%% initial_state = controller.render_to_string(@virtual_path ,formats: [:json], locals: local_assigns, layout: true) %>
+
+<%% content_for :initial_state do %>
+  <script type="text/javascript">
+    window.BREEZY_INITIAL_PAGE_STATE=<%%= initial_state.html_safe %>;
+  </script>
+<%% end %>
+
+
+
+

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

@@ -2,35 +2,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/dist/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.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
-
-    const options = {
-      method:'POST',
-      body: JSON.stringify(values),
-    }
+  render () {
+    const {
+      form,
+      flash,
+      <%= plural_table_name.camelize(:lower) %>Path,
+    } = this.props
+    const error = flash.form_error
 
-    this.visit(this.props.<%= plural_table_name %>_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.visit(this.props.<%= plural_table_name %>_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>
     )
   }
@@ -38,6 +33,6 @@ class <%= plural_table_name.camelize %>New extends BaseScreen {
 
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  {...mapDispatchToProps, ...applicationActionCreators}
 )(<%= plural_table_name.camelize %>New)
 

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

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

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

@@ -11,11 +11,11 @@ class <%= plural_table_name.camelize %>Show extends BaseScreen {
         <%- attributes_list_with_timestamps.select{|attr| attr != :id }.each do |attr| -%>
         <p>
           <strong><%= attr.capitalize %>:</strong>
-          {this.props.<%=attr%>}
+          {this.props.<%=attr.camelize(:lower)%>}
         </p>
         <%- end -%>
-        <a onClick={ e => this.visit(this.props.edit_<%= singular_table_name %>_path)}>Edit</a>
-        <a onClick={ e => this.visit(this.props.<%= plural_table_name %>_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>
     )
   }

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

@@ -0,0 +1,14 @@
+// Example:
+//
+// import {
+//   CLEAR_FORM_ERRORS
+// } from './actions'
+//
+// export function clearFormErrors(pageKey) {
+//   return {
+//     type: CLEAR_FORM_ERRORS,
+//     payload: {
+//       pageKey,
+//     }
+//   }
+// }