breezy 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 771f9d31bef6c944ac17451b327c874eeb0d3b84
-  data.tar.gz: 6d3b19c6baa857e945254e11fc21b9352f78310d
+  metadata.gz: 5c554d6df32d5f4ea3094d93864aead03c3a6841
+  data.tar.gz: 6cbdf7de0ff0e102ff9ad95d2b668515bf68daf0
 SHA512:
-  metadata.gz: 3e64b71d987909c4493fc0d71aba31c7229e149f7dd7d75d56ab49b2b3d87de1be87666ab63ec037fba02fe8292b2d5b700c7a53a1c1a352d4bcd99231058ee2
-  data.tar.gz: 53cfe54342341a4964ae02dc45c4d440e561a09a3c58dcc329797f1c6f2a2f8e0411e5fe66b49e5c25ad3c71bc3c8ee94de32a7879c4afe3dbe1f60418447c4c
+  metadata.gz: a83a6a0113da1138ef09f09713526037147d09fae5cdaaeae99e56faaf20465dbe7b76c530a18b7dec6ce8238717a158b5024e4b88dc4e4227455af6729d3648
+  data.tar.gz: bd6609aafc25b4f67745c139ee70f3cabb60e4e30c271324a419f56cee710438fde01b5fe08c9d95c1019aee4ba4e6ab5bfe37459bdbb71fe7ce9f467112888a

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

@@ -1,10 +1,10 @@
+json.flash flash.to_h
+json.errors @<%= singular_table_name %>.errors.to_h
+
 <%- attributes_list_with_timestamps.each do |attr| -%>
 json.<%=attr%> @<%= singular_table_name %>.<%=attr%>
 <%- end -%>
 
-if @<%= singular_table_name %>.errors.any?
-  json.errors @<%= singular_table_name %>.errors.to_h
-end
 
 json.attributes_for_form do
 <%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>

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

@@ -1,3 +1,5 @@
+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| -%>
@@ -8,8 +10,5 @@ json.<%= plural_table_name %> do
   end
 end
 
-if notice
-  json.notice notice
-end
 
 json.new_post_path new_<%= singular_table_name %>_path

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

@@ -1,5 +1,4 @@
-if @<%= singular_table_name %>.errors.any?
-  json.errors @<%= singular_table_name %>.errors.to_h
-end
+json.flash flash.to_h
+json.errors @<%= singular_table_name %>.errors.to_h
 
 json.<%= plural_table_name %>_path <%= plural_table_name %>_path

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

@@ -1,10 +1,9 @@
+json.flash flash.to_h
+
 <%- attributes_list_with_timestamps.each do |attr|-%>
 json.<%=attr%> @<%= singular_table_name %>.<%=attr%>
 <%- end -%>
 
-if notice
-  json.notice notice
-end
 
 json.<%= plural_table_name %>_path <%= plural_table_name %>_path
 json.edit_<%= singular_table_name %>_path edit_<%= singular_table_name %>_path(@<%= singular_table_name %>)

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

@@ -24,7 +24,7 @@ class <%= plural_table_name.camelize %>Index extends BaseScreen {
 
     return (
       <div>
-        <p id="notice">{this.props.notice}</p>
+        <p id="notice">{this.props.flash && this.props.flash.notice}</p>
 
         <h1><%= plural_table_name.capitalize %></h1>
 

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

@@ -7,7 +7,7 @@ class <%= plural_table_name.camelize %>Show extends BaseScreen {
   render () {
     return (
       <div>
-        <p id="notice">{this.props.notice}</p>
+        <p id="notice">{this.props.flash && this.props.flash.notice}</p>
         <%- attributes_list_with_timestamps.select{|attr| attr != :id }.each do |attr| -%>
         <p>
           <strong><%= attr.capitalize %>:</strong>

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

@@ -5,6 +5,7 @@ import { Provider } from 'react-redux'
 import { render } from 'react-dom'
 import createHistory from 'history/createBrowserHistory'
 import Breezy from '@jho406/breezy'
+import Nav from '@jho406/breezy/dist/NavComponent'
 
 // Mapping between your props template to Component
 // e.g {'posts/new': PostNew}
@@ -17,14 +18,13 @@ const baseUrl = ''
 
 //The Nav is pretty bare bones
 //Feel free to replace the implementation
-const {reducer, initialState, Nav, connect} = Breezy.start({
+const {reducer, initialState, initialPageKey, connect} = Breezy.start({
   window,
   initialPage,
   baseUrl,
   history
 })
 
-
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
 
 const store = createStore(
@@ -40,7 +40,11 @@ connect(store)
 class App extends React.Component {
   render() {
     return <Provider store={store}>
-      <Nav mapping={this.props.mapping}/>
+      <Nav
+        mapping={this.props.mapping}
+        history={history}
+        initialPageKey={initialPageKey}
+      />
     </Provider>
   }
 }

data/test/render_test.rb

@@ -108,7 +108,7 @@ class RenderTest < ActionController::TestCase
     rendered = <<~HTML
       <html>
         <head>
-          <script>(function(){var joints={};var cache={};var defers=[];return ({"data":#{content.to_json},"screen":"#{opts[:screen]}","csrf_token":"secret","assets":["/app.js"],"joints":joints,"defers":defers});})();</script>
+          <script>(function(){var joints={};var cache={};var defers=[];return ({"data":#{content.to_json},"update_joints":true,"screen":"#{opts[:screen]}","csrf_token":"secret","assets":["/app.js"],"joints":joints,"defers":defers});})();</script>
         </head>
         <body></body>
       </html>
@@ -120,7 +120,7 @@ class RenderTest < ActionController::TestCase
 
   def assert_breezy_js(content)
     assert_response 200
-    assert_equal '(function(){var joints={};var cache={};var defers=[];return ({"data":' + content.to_json + ',"screen":"render/action","csrf_token":"secret","assets":["/app.js"],"joints":joints,"defers":defers});})()', @response.body
+    assert_equal '(function(){var joints={};var cache={};var defers=[];return ({"data":' + content.to_json + ',"update_joints":true,"screen":"render/action","csrf_token":"secret","assets":["/app.js"],"joints":joints,"defers":defers});})()', @response.body
     assert_equal 'text/javascript', @response.content_type
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breezy
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: webpacker
   requirement: !ruby/object:Gem::Requirement