breezy 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b54ccc8a8f4bb97f78ed3370247b9f72da24685
-  data.tar.gz: b486a30659731e319926a27404dfcc785b65e6f1
+  metadata.gz: fb43f13ec70155872dfc74693dad99bde8a0e6fe
+  data.tar.gz: e1f14e0f6b31786f5308e932391b6bbed5f2db0b
 SHA512:
-  metadata.gz: 8a5dcf4a8f25f4004bc1dad76d7f67de6eae71055a3d0537313a981dd5d522e8c3894e646c54187ab8e359187c2d00adb83759d50cf2672f6c9ef77718cfd810
-  data.tar.gz: 262e322c1f2727160222de954d53544d179bea4a181435b144f7974b9b8cd7eb3e1cdca86f6ff3cb991384dd8f6a7aed09b5709b332de7d1bf402be1d138f1d1
+  metadata.gz: debe7eace5d5fac99323d56e3c8667dca975d62d5c9402c21f5a7f6943e645fc3a147c890e10f94c09ea686fe3f81419418c70ed8a7f1e486237f732b240dd9b
+  data.tar.gz: 46bdd75bbb49d8975c8a4f2bece8208b696138142d4dce4991b581051e25e41382f30adeb8e110ac928bb8b7c2091d829be49e2f0a6e0ea3d3d1da89b2f57c93

data/lib/breezy/render.rb

@@ -1,5 +1,11 @@
 module Breezy
   module Render
+    DEFAULT_ACTIONS_FOR_VERBS = {
+      :post => 'new',
+      :patch => 'edit',
+      :put => 'edit'
+    }
+
     def default_render(*args)
       if @_use_breezy_html
         render(*args)
@@ -21,7 +27,8 @@ module Breezy
       end
 
       if breezy
-        view_parts = _prefixes.reverse.push(action_name)[1..-1]
+        action = render_options[action] || DEFAULT_ACTIONS_FOR_VERBS[request.request_method_symbol] || action_name
+        view_parts = _prefixes.reverse.push(action)[1..-1]
         view_name = view_parts.map(&:camelize).join.gsub('::', '')
 
         breezy[:screen] ||= view_name

data/lib/breezy/xhr_headers.rb

@@ -21,6 +21,8 @@ module Breezy
         self.status = 200
         response.headers["X-BREEZY-LOCATION"] = url
       end
+
+      url
     end
 
     private

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

@@ -1,68 +1,12 @@
 import React from 'react'
-import {SubmissionError} from 'redux-form'
+import {withBrowserBehavior} from '@jho406/breezy'
 
 export default class extends React.Component {
   constructor (props) {
     super(props)
-    this.handleSubmit = this.handleSubmit.bind(this)
-    this.handleClick = this.handleClick.bind(this)
-  }
-
-  handleClick(path, method='GET') {
-    this.props.visit(path, {method}).then((rsp)=>{
-      // the window needs a full reload when asset fingerprint changes
-      if (rsp.needsRefresh) {
-        return window.location = rsp.url
-      }
-
-      if (rsp.canNavigate) {
-        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
-        // recent visit. Do Nothing.
-        return
-      }
-    })
-  }
-
-  handleSubmit (url, body, method='POST') {
-    const options = {
-      method,
-      body: JSON.stringify(body),
-      contentType: 'application/json'
-    }
-
-    return this.props.visit(url, options).then((rsp) => {
-      // the window needs a full reload when asset fingerprint changes
-      if (rsp.needsRefresh) {
-        return window.location = rsp.url
-      }
-
-      if (this.props.errors) {
-        throw new SubmissionError({
-          ...this.props.errors
-        })
-      }
-
-      if (rsp.canNavigate) {
-        //Uncomment this if you want full-page reloads
-        // window.location = rsp.url
-
-        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
-        // recent visit. Do Nothing.
-        return
-      }
-    }).catch((err) => {
-      if (err.name === 'SubmissionError') {
-        throw err
-      } else {
-        window.location = err.url
-      }
-    })
+    const {visit, remote} = withBrowserBehavior(props.visit, props.remote)
+    this.visit = visit.bind(this)
+    this.remote = remote.bind(this)
   }
 }
 

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

@@ -3,12 +3,26 @@ import {mapStateToProps, mapDispatchToProps} from '@jho406/breezy'
 import {delInPage} from '@jho406/breezy/dist/action_creators'
 import {connect} from 'react-redux'
 import BaseScreen from 'components/BaseScreen'
+import {SubmissionError} from 'redux-form'
 import <%= plural_table_name.camelize %>Form from 'components/<%= plural_table_name.camelize %>Form'
 
 class <%= plural_table_name.camelize %>Edit extends BaseScreen {
-  handleSubmit (body) {
+  handleSubmit = (body) => {
     this.props.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
-    return super.handleSubmit('/<%= plural_table_name %>/' + this.props.id, body, 'PATCH')
+
+    const options = {
+      method:'PUT',
+      body: JSON.stringify(body),
+    }
+    const path = '/<%= plural_table_name %>/' + this.props.id
+
+    this.visit(path, options).then( rsp => {
+      if (this.props.errors) {
+        throw new SubmissionError({
+          ...this.props.errors
+        })
+      }
+    })
   }
 
   render () {
@@ -19,8 +33,8 @@ class <%= plural_table_name.camelize %>Edit extends BaseScreen {
           onSubmit={this.handleSubmit}
           initialValues={this.props.attributes_for_form}
         />
-        <a onClick={ e => this.handleClick(this.props.meta.show_path)}>Show</a>
-        <a onClick={ e => this.handleClick(this.props.meta.index_path)}>Back</a>
+        <a onClick={ e => this.visit(this.props.meta.show_path)}>Show</a>
+        <a onClick={ e => this.visit(this.props.meta.index_path)}>Back</a>
       </div>
     )
   }

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

@@ -15,9 +15,9 @@ class <%= plural_table_name.camelize %>Index extends BaseScreen {
           <%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>
           <td>{<%=singular_table_name%>.<%=attr%>}</td>
           <%- end -%>
-          <td><a onClick={ e => this.handleClick(<%=singular_table_name%>.meta.show_path)}>Show</a></td>
-          <td><a onClick={ e => this.handleClick(<%=singular_table_name%>.meta.edit_path)}>Edit</a></td>
-          <td><a onClick={ e => this.handleClick(<%=singular_table_name%>.meta.delete_path, 'DELETE')}>Delete</a></td>
+          <td><a onClick={ e => this.visit(<%=singular_table_name%>.meta.show_path)}>Show</a></td>
+          <td><a onClick={ e => this.visit(<%=singular_table_name%>.meta.edit_path)}>Edit</a></td>
+          <td><a onClick={ e => this.visit(<%=singular_table_name%>.meta.delete_path, {method: 'DELETE'})}>Delete</a></td>
         </tr>
       )
     })
@@ -43,7 +43,7 @@ class <%= plural_table_name.camelize %>Index extends BaseScreen {
           </tbody>
         </table>
         <br />
-        <a onClick={ e => this.handleClick(this.props.meta.new_path)}>New <%= singular_table_name.capitalize %></a>
+        <a onClick={ e => this.visit(this.props.meta.new_path)}>New <%= singular_table_name.capitalize %></a>
       </div>
     )
   }

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

@@ -3,12 +3,26 @@ import {mapStateToProps, mapDispatchToProps} from '@jho406/breezy'
 import {delInPage} from '@jho406/breezy/dist/action_creators'
 import {connect} from 'react-redux'
 import BaseScreen from 'components/BaseScreen'
+import {SubmissionError} from 'redux-form'
 import <%= plural_table_name.camelize %>Form from 'components/<%= plural_table_name.camelize %>Form'
 
 class <%= plural_table_name.camelize %>New extends BaseScreen {
-  handleSubmit(body) {
+  handleSubmit = (body) => {
     this.props.delInPage({pageKey: this.props.pageKey, keypath: 'errors'})
-    return super.handleSubmit('/<%= plural_table_name %>', body, 'POST')
+
+    const options = {
+      method:'POST',
+      body: JSON.stringify(body),
+    }
+
+    this.visit('/<%= plural_table_name %>', options).then( rsp => {
+      if (this.props.errors) {
+        throw new SubmissionError({
+          ...this.props.errors
+        })
+      }
+    })
+
   }
 
   render () {
@@ -18,7 +32,7 @@ class <%= plural_table_name.camelize %>New extends BaseScreen {
           error={this.props.error}
           onSubmit={this.handleSubmit}
         />
-        <a onClick={ e => this.handleClick(this.props.meta.index_path)}>Back</a>
+        <a onClick={ e => this.visit(this.props.meta.index_path)}>Back</a>
       </div>
     )
   }

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

@@ -14,8 +14,8 @@ class <%= plural_table_name.camelize %>Show extends BaseScreen {
           {this.props.<%=attr%>}
         </p>
         <%- end -%>
-        <a onClick={ e => this.handleClick(this.props.meta.edit_path)}>Edit</a>
-        <a onClick={ e => this.handleClick(this.props.meta.index_path)}>Back</a>
+        <a onClick={ e => this.visit(this.props.meta.edit_path)}>Edit</a>
+        <a onClick={ e => this.visit(this.props.meta.index_path)}>Back</a>
       </div>
     )
   }

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: breezy
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: webpacker
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -209,14 +223,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails integration for BreezyJS
 test_files:
-- test/breezy_test.rb
+- test/render_test.rb
 - test/configuration_test.rb
 - test/engine_test.rb
-- test/render_test.rb
 - test/test_helper.rb
-has_rdoc: 
+- test/breezy_test.rb