breezy 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c761721a71765c3ed4b56408ee45634044b8227
-  data.tar.gz: 4c22efd905a87bc5725fde7aa6aa04073ed4d770
+  metadata.gz: 180ec22718cca06ce353a6b67d975c7f7f7a3633
+  data.tar.gz: 7650ea18f750cb26180a388f0ff151d552282def
 SHA512:
-  metadata.gz: a81fa42b4230d6116136d874dd75b347a81b4f84063c20c8aa16c42d153a22db8102a946b7c27a72854b6ac3b3f6b1bbac79e40738609838757ab66b9fb9bd9f
-  data.tar.gz: 33cddac08eed8376c3e04ee7c70bcbeeafc108b1bea5674d1ba3bb5734862cf7be8ccc4144f2a83752caeff85ff51806061766180cfa20a22a5cf3f7820a6e26
+  metadata.gz: '08465297490eb25c96f3c88ae2388eb70e49e1528a4f40ed2053a3fcdbc26767ef4282dd9e5cbcdd2214a21695acf50ecaffa312894e9875d371bcf80a7d94d0'
+  data.tar.gz: cb3cb587d99b46ae64038439dd87d2642d137eec7f80326d886c0e57cc0c97e4b0045275d8f13bec2b7fd24b71c81fd77f5188612bd95d0b533c319537e3e8b6

data/lib/breezy/render.rb

@@ -1,11 +1,5 @@
 module Breezy
   module Render
-    DEFAULT_ACTIONS_FOR_VERBS = {
-      :post => 'new',
-      :patch => 'edit',
-      :put => 'edit'
-    }
-
     def default_render(*args)
       if @_use_breezy_html
         render(*args)
@@ -27,11 +21,6 @@ module Breezy
       end
 
       if breezy
-        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
         render_options[:locals] ||= {}
         render_options[:locals][:breezy] = breezy
       end

data/lib/generators/rails/breezy_generator.rb

@@ -42,17 +42,14 @@ module Rails
         def append_mapping(action)
           app_js = 'app/javascript/packs/application.js'
 
-          base_parts = class_path + [file_name]
-          destination =  File.join("views", base_parts)
-
-          @js_filename = [plural_table_name, action].map(&:camelcase).join
+          component_name = [plural_table_name, action].map(&:camelcase).join
 
           inject_into_file app_js, after: "from '@jho406/breezy'" do
-            "\nimport #{@js_filename} from 'views/#{controller_file_path}/#{action}'"
+            "\nimport #{component_name} from 'views/#{controller_file_path}/#{action}'"
           end
 
-          inject_into_file app_js, after: 'const mapping = {' do
-            "\n  #{@js_filename},"
+          inject_into_file app_js, after: 'const screenToComponentMapping = {' do
+            "\n  '#{[controller_file_path, action].join('/')}': #{component_name},"
           end
         end
 

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

@@ -39,7 +39,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- end -%>
     else
       response.set_header("content-location", new_<%= singular_table_name %>_path)
-      render :new, breezy: {screen: '<%= plural_table_name.camelize %>New'}
+      render :new
     end
   end
 
@@ -53,7 +53,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- end -%>
     else
       response.set_header("content-location", edit_<%= singular_table_name %>_path(@<%= singular_table_name %>))
-      render :edit, breezy: {screen: '<%= plural_table_name.camelize %>Edit'}
+      render :edit
     end
   end
 

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

@@ -1,15 +1,14 @@
 import React from 'react'
-import {combineReducers, createStore, applyMiddleware} from 'redux'
+import {combineReducers, createStore, applyMiddleware, compose} from 'redux'
 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'
 
-// This mapping can be auto populate through
-// Breezy generators, for example:
-// Run `rails g breezy:view Post index`
-const mapping = {
+// Mapping between your props template to Component
+// e.g {'posts/new': PostNew}
+const screenToComponentMapping = {
 }
 
 const history = createHistory({})
@@ -25,12 +24,15 @@ const {reducer, initialState, Nav, connect} = Breezy.start({
   history
 })
 
+
+const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
+
 const store = createStore(
   combineReducers({
     ...reducer,
   }),
   initialState,
-  applyMiddleware(thunk)
+  composeEnhancers(applyMiddleware(thunk))
 )
 
 connect(store)
@@ -38,11 +40,11 @@ connect(store)
 class App extends React.Component {
   render() {
     return <Provider store={store}>
-      <Nav mapping={mapping}/>
+      <Nav mapping={this.props.mapping}/>
     </Provider>
   }
 }
 
 document.addEventListener("DOMContentLoaded", function() {
-  render(<App mapping={mapping}/>, document.getElementById('app'))
+  render(<App mapping={screenToComponentMapping}/>, document.getElementById('app'))
 })

data/test/render_test.rb

@@ -60,12 +60,12 @@ class RenderTest < ActionController::TestCase
 
   test "simple render with breezy" do
     get :simple_render_with_breezy
-    assert_breezy_html({author: "john smith"})
+    assert_breezy_html({author: "john smith"}, screen: :action)
   end
 
   test "implied render with breezy" do
     get :implied_render_with_breezy
-    assert_breezy_html({author: "john smith"})
+    assert_breezy_html({author: "john smith"}, screen: :implied_render_with_breezy)
   end
 
   test "simple render with breezy via get js" do
@@ -99,16 +99,16 @@ class RenderTest < ActionController::TestCase
 
   private
 
-  def assert_breezy_html(content)
+  def assert_breezy_html(content, opts={})
     assert_response 200
-    view = @response.request.params['action'].camelcase
-    assert_equal "<html><head><script type='text/javascript'>Breezy.replace((function(){var joints={};var cache={};var defers=[];return ({\"data\":#{content.to_json},\"screen\":\"Render#{view}\",\"csrf_token\":\"secret\",\"assets\":[\"/app.js\"],\"joints\":joints,\"defers\":defers});})());</script></head><body></body></html>", @response.body
+
+    assert_equal "<html><head><script type='text/javascript'>Breezy.replace((function(){var joints={};var cache={};var defers=[];return ({\"data\":#{content.to_json},\"screen\":\"render/#{opts[:screen].to_s}\",\"csrf_token\":\"secret\",\"assets\":[\"/app.js\"],\"joints\":joints,\"defers\":defers});})());</script></head><body></body></html>", @response.body
     assert_equal 'text/html', @response.content_type
   end
 
   def assert_breezy_js(content)
     assert_response 200
-    assert_equal '(function(){var joints={};var cache={};var defers=[];return ({"data":' + content.to_json + ',"screen":"RenderSimpleRenderWithBreezy","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 + ',"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.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: webpacker
   requirement: !ruby/object:Gem::Requirement