breezy 0.9.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bd43b7f1b0d29427aa03dc2ba8602072a208ae9
-  data.tar.gz: 8e5b735ee64a73a2ce2e327b4a917cadc79800ef
+  metadata.gz: ef5641dfcac8d3779955b4d9d8689e3861b5ddb9
+  data.tar.gz: 0bd4e918973827e046047b707b3e050490f35d98
 SHA512:
-  metadata.gz: b3712cc47cec6d73de6d61d6f5adc655e28c7e58e7c02795d8e6eef45ddeab6f05dd7eb24b6791259d5e04d2c0e419379ce685a94251cbce2fe1838ecbd4607a
-  data.tar.gz: adce7cc2ca1af9d817b1d53b0f890507d1208935ea7908dac8134799dbe5ecabbd93edfdb4ffcad4df27ff4087a22606a82757059459336a6ebcec23b672385c
+  metadata.gz: 278846c43c35a39e366dabb92e1b62b608349ace0dab982d87542b3a35ea76a6fbbdc6f42b8aa8fcdaebe6aec8024a327282565f6e3bc91bd842ba30e19d6172
+  data.tar.gz: 27dfef5d1aa6ab733e40d4cf3ad4ef43cfda050b397741b3cc3198373276b679daf0dca189de979798a0cd81ec2434b7060827081db751a4177736564d897da6

data/lib/breezy/helpers.rb

@@ -15,7 +15,7 @@ module Breezy
       filter = request.params[:_bz]
 
       if filter
-        filter.gsub(/[^\da-zA-Z\=\.]+/, '')
+        filter.gsub(/[^\da-zA-Z\_\=\.]+/, '')
       end
     end
   end

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

@@ -12,5 +12,5 @@ json.attributes_for_form do
 <%- end -%>
 end
 
-json.post_path <%= singular_table_name%>_path(@<%=singular_table_name%>)
-json.posts_path <%= plural_table_name %>_path
+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.js.props

@@ -5,10 +5,10 @@ json.<%= plural_table_name %> do
     <%- attributes_list_with_timestamps.each do |attr| -%>
     json.<%=attr%> <%= singular_table_name %>.<%=attr%>
     <%- end -%>
-    json.edit_post_path edit_<%=singular_table_name%>_path(<%=singular_table_name%>)
-    json.post_path <%=singular_table_name%>_path(<%=singular_table_name%>)
+    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%>)
   end
 end
 
 
-json.new_post_path new_<%= singular_table_name %>_path
+json.new_<%= singular_table_name %>_path new_<%= singular_table_name %>_path

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.jsx

@@ -3,19 +3,20 @@ 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 * 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'})
+    this.props.clearFormErrors(this.props.pageKey)
 
     const options = {
       method:'PUT',
       body: JSON.stringify(values),
     }
 
-    this.visit(this.props.<%= singular_table_name %>, options).then( rsp => {
+    this.enhancedVisit(this.props.<%= singular_table_name.camelize(:lower) %>, options).then( rsp => {
       setSubmitting(false)
       if (this.props.errors) {
         this.formRef.current.setErrors(this.props.errors)
@@ -28,11 +29,11 @@ class <%= plural_table_name.camelize %>Edit extends BaseScreen {
       <div>
         <<%= plural_table_name.camelize %>Form
           onSubmit={this.handleSubmit}
-          initialValues={this.props.attributes_for_form}
+          initialValues={this.props.attributesForForm}
           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>
+        <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>
       </div>
     )
   }
@@ -40,7 +41,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/form.jsx

@@ -4,7 +4,7 @@ import { Formik, Form, Field } from 'formik';
 export default React.forwardRef(
   ({initialValues = {
   <%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>
-    <%=attr.to_s%>:'',
+    <%=attr.camelize(:lower).to_s%>:'',
   <%- end -%>
   }, onSubmit}, ref) => {
    return (
@@ -17,7 +17,7 @@ export default React.forwardRef(
           <Form>
           <%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>
             <Field type="text" name="<%=attr.to_s%>" />
-            {errors.<%=attr.to_s%> && touched.<%=attr.to_s%> && errors.<%=attr.to_s%>}
+            {errors.<%=attr.camelize(:lower).to_s%> && touched.<%=attr.camelize(:lower).to_s%> && errors.<%=attr.camelize(:lower).to_s%>}
           <%- end -%>
 
             <button type="submit" disabled={isSubmitting}>

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

@@ -5,19 +5,19 @@ 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 <%= 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 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>
         </tr>
       )
     })
@@ -43,7 +43,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 onClick={ e => this.enhancedVisit(this.props.new<%= singular_table_name.camelize %>Path)}>New <%= singular_table_name.capitalize %></a>
       </div>
     )
   }

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

@@ -3,19 +3,20 @@ 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 * 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'})
+    this.props.clearFormErrors(this.props.pageKey)
 
     const options = {
       method:'POST',
       body: JSON.stringify(values),
     }
 
-    this.visit(this.props.<%= plural_table_name %>_path, options).then( rsp => {
+    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)
@@ -30,7 +31,7 @@ class <%= plural_table_name.camelize %>New extends BaseScreen {
           onSubmit={this.handleSubmit}
           ref={this.formRef}
         />
-        <a onClick={ e => this.visit(this.props.<%= plural_table_name %>_path)}>Back</a>
+        <a onClick={ e => this.enhancedVisit(this.props.<%= plural_table_name.camelize(:lower) %>Path)}>Back</a>
       </div>
     )
   }
@@ -38,6 +39,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.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 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>
       </div>
     )
   }

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

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

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

@@ -0,0 +1 @@
+export const CLEAR_FORM_ERRORS = 'CLEAR_FORM_ERRORS'

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

@@ -1,11 +1,14 @@
 import React from 'react'
 import {combineReducers, createStore, applyMiddleware, compose} from 'redux'
+import reduceReducers from 'reduce-reducers'
 import thunk from 'redux-thunk'
 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'
+import applicationReducer from './reducer'
+
 
 // Mapping between your props template to Component
 // e.g {'posts/new': PostNew}
@@ -27,9 +30,15 @@ const {reducer, initialState, initialPageKey, connect} = Breezy.start({
 
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
 
+const {
+  breezy: breezyReducer,
+  pages: pagesReducer,
+} = reducer
+
 const store = createStore(
   combineReducers({
-    ...reducer,
+    breezy: breezyReducer,
+    pages: reduceReducers(pagesReducer, applicationReducer),
   }),
   initialState,
   composeEnhancers(applyMiddleware(thunk))
@@ -41,6 +50,7 @@ class App extends React.Component {
   render() {
     return <Provider store={store}>
       <Nav
+        store={store}
         mapping={this.props.mapping}
         history={history}
         initialPageKey={initialPageKey}

data/lib/install/templates/web/babelrc

@@ -18,7 +18,9 @@
     ["module-resolver", {
       "root": ["./app"],
       "alias": {
-        "views": "./app/views"
+        "views": "./app/views",
+        "components": "./app/components",
+        "javascript": "./app/javascript"
       }
     }],
     "transform-object-rest-spread",

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

@@ -0,0 +1,19 @@
+import {
+  CLEAR_FORM_ERRORS
+} from './actions'
+import produce from "immer"
+
+export default function (state = {}, action) {
+  switch(action.type) {
+  case CLEAR_FORM_ERRORS: {
+    const {pageKey} = action.payload
+
+    return produce(state, draft => {
+      const currentPage = draft[pageKey]
+      delete currentPage.errors
+    })
+  }
+  default:
+    return state
+  }
+}

data/lib/install/web.rb

@@ -24,7 +24,7 @@ def add_member_methods
   inject_into_file "app/models/application_record.rb", after: "class ApplicationRecord < ActiveRecord::Base\n" do
     <<-RUBY
   def self.member_at(index)
-    offset(index).limit(1)
+    offset(index).limit(1).first
   end
 
   def self.member_by(attr, value)
@@ -56,7 +56,7 @@ if File.exist?(babelrc)
       "alias": {
         "views": "./app/views",
         "components": "./app/components",
-        "javascripts": "./app/javascripts"
+        "javascript": "./app/javascript"
       }
     }])
 
@@ -75,6 +75,15 @@ end
 say "Copying application.js file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/templates/web/application.js", "#{Webpacker.config.source_entry_path}/application.js"
 
+say "Copying reducer.js file to #{Webpacker.config.source_entry_path}"
+copy_file "#{__dir__}/templates/web/reducer.js", "#{Webpacker.config.source_entry_path}/reducer.js"
+
+say "Copying action_creators.js file to #{Webpacker.config.source_entry_path}"
+copy_file "#{__dir__}/templates/web/action_creators.js", "#{Webpacker.config.source_entry_path}/action_creators.js"
+
+say "Copying actions.js file to #{Webpacker.config.source_entry_path}"
+copy_file "#{__dir__}/templates/web/actions.js", "#{Webpacker.config.source_entry_path}/actions.js"
+
 say "Copying Breezy initializer"
 copy_file "#{__dir__}/templates/web/initializer.rb", "config/initializers/breezy.rb"
 
@@ -85,7 +94,7 @@ say "Adding required member methods to ApplicationRecord"
 add_member_methods
 
 say "Installing React, Redux, and Breezy"
-run "yarn add babel-plugin-module-resolver babel-preset-react formik history prop-types react-redux redux-thunk redux react react-dom @jho406/breezy --save"
+run "yarn add babel-plugin-module-resolver babel-preset-react formik history prop-types react-redux redux-thunk redux reduce-reducers react react-dom immer @jho406/breezy --save"
 
 say "Updating webpack paths to include .jsx file extension"
 insert_into_file Webpacker.config.config_path, "    - .jsx\n", after: /extensions:\n/

data/test/helpers_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class HelpersTest < ActiveSupport::TestCase
+  include Breezy::Helpers
+  attr_reader :request
+
+  class Request
+    attr_reader :params
+    def initialize(params = {})
+      @params = params
+    end
+  end
+
+  test 'breezy_filter returns a valid _bz param' do
+    @request = Request.new({:_bz => 'foo.bar.baz_baz'})
+
+    assert_equal breezy_filter, 'foo.bar.baz_baz'
+  end
+
+  test 'breezy_filter removes invalid _bz param chars' do
+    @request = Request.new({:_bz => 'foo.bar/?)()-'})
+
+    assert_equal breezy_filter, 'foo.bar'
+  end
+
+  test 'breezy_filter return nil when no params are present' do
+    @request = Request.new({})
+
+    assert_nil breezy_filter
+  end
+end

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 fragments={};var lastFragmentName;var lastFragmentPath;var cache={};var defers=[];return ({"data":#{content.to_json},"screen":"#{opts[:screen]}","fragments":fragments,"privateOpts":{"csrfToken":"secret","assets":["/app.js"],"lastFragmentName":lastFragmentName,"lastFragmentPath":lastFragmentPath,"defers":defers}});})();</script>
         </head>
         <body></body>
       </html>
@@ -120,13 +120,13 @@ 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 fragments={};var lastFragmentName;var lastFragmentPath;var cache={};var defers=[];return ({"data":' + content.to_json + ',"screen":"render/action","fragments":fragments,"privateOpts":{"csrfToken":"secret","assets":["/app.js"],"lastFragmentName":lastFragmentName,"lastFragmentPath":lastFragmentPath,"defers":defers}});})()', @response.body
     assert_equal 'text/javascript', @response.content_type
   end
 
   def assert_breezy_replace_js(content)
     assert_response 200
-    assert_equal 'Breezy.replace((function(){return ({"data":' + content.to_json + ',"csrf_token":"secret","assets":["/app.js"]});})());', @response.body
+    assert_equal 'Breezy.replace((function(){return ({"data":' + content.to_json + ',"csrfToken":"secret","assets":["/app.js"]});})());', @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.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: webpacker
   requirement: !ruby/object:Gem::Requirement
@@ -177,14 +177,18 @@ files:
 - lib/generators/rails/templates/web/index.jsx
 - lib/generators/rails/templates/web/new.jsx
 - lib/generators/rails/templates/web/show.jsx
+- lib/install/templates/web/action_creators.js
+- lib/install/templates/web/actions.js
 - lib/install/templates/web/application.js
 - lib/install/templates/web/babelrc
 - lib/install/templates/web/initializer.rb
+- lib/install/templates/web/reducer.js
 - lib/install/web.rb
 - lib/tasks/install.rake
 - test/breezy_test.rb
 - test/configuration_test.rb
 - test/engine_test.rb
+- test/helpers_test.rb
 - test/render_test.rb
 - test/test_helper.rb
 homepage: https://github.com/jho406/breezy/
@@ -214,6 +218,7 @@ summary: Rails integration for BreezyJS
 test_files:
 - test/render_test.rb
 - test/configuration_test.rb
+- test/helpers_test.rb
 - test/engine_test.rb
 - test/test_helper.rb
 - test/breezy_test.rb