breezy 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180ec22718cca06ce353a6b67d975c7f7f7a3633
-  data.tar.gz: 7650ea18f750cb26180a388f0ff151d552282def
+  metadata.gz: 771f9d31bef6c944ac17451b327c874eeb0d3b84
+  data.tar.gz: 6d3b19c6baa857e945254e11fc21b9352f78310d
 SHA512:
-  metadata.gz: '08465297490eb25c96f3c88ae2388eb70e49e1528a4f40ed2053a3fcdbc26767ef4282dd9e5cbcdd2214a21695acf50ecaffa312894e9875d371bcf80a7d94d0'
-  data.tar.gz: cb3cb587d99b46ae64038439dd87d2642d137eec7f80326d886c0e57cc0c97e4b0045275d8f13bec2b7fd24b71c81fd77f5188612bd95d0b533c319537e3e8b6
+  metadata.gz: 3e64b71d987909c4493fc0d71aba31c7229e149f7dd7d75d56ab49b2b3d87de1be87666ab63ec037fba02fe8292b2d5b700c7a53a1c1a352d4bcd99231058ee2
+  data.tar.gz: 53cfe54342341a4964ae02dc45c4d440e561a09a3c58dcc329797f1c6f2a2f8e0411e5fe66b49e5c25ad3c71bc3c8ee94de32a7879c4afe3dbe1f60418447c4c

data/lib/breezy.rb

@@ -20,10 +20,8 @@ module Breezy
       end
 
       if base.respond_to?(:helper_method)
-        base.helper_method :breezy_tag
-        base.helper_method :breezy_silient?
         base.helper_method :breezy_snippet
-        base.helper_method :use_breezy_html
+        base.helper_method :use_breezy
         base.helper_method :breezy_filter
       end
     end

data/lib/breezy/helpers.rb

@@ -1,24 +1,14 @@
 module Breezy
   module Helpers
-    def breezy_tag
-      if defined?(@breezy) && @breezy
-        "<script type='text/javascript'>Breezy.replace(#{@breezy});</script>".html_safe
-      end
-    end
-
     def breezy_snippet
-      if defined?(@breezy) && @breezy
-        snippet = @breezy.gsub(/\;$/, '')
+      if defined?(@_breezy_snippet) && @_breezy_snippet
+        snippet = @_breezy_snippet.gsub(/\;$/, '')
         "#{snippet};".html_safe
       end
     end
 
-    def use_breezy_html
-      @_use_breezy_html = true
-    end
-
-    def breezy_silient?
-      !!request.headers["X-SILENT"]
+    def use_breezy
+      @_use_breezy = true
     end
 
     def breezy_filter

data/lib/breezy/render.rb

@@ -1,7 +1,7 @@
 module Breezy
   module Render
     def default_render(*args)
-      if @_use_breezy_html
+      if @_use_breezy
         render(*args)
       else
         super
@@ -9,28 +9,26 @@ module Breezy
     end
 
     def render(*args, &block)
-      render_options = args.extract_options!
-      breezy = render_options.delete(:breezy)
-
-      if breezy == true
-        breezy = {}
+      if !@_use_breezy
+        return super
       end
 
-      if !breezy && @_use_breezy_html
+      render_options = args.extract_options!
+      breezy_options = render_options.delete(:breezy)
+
+      if !breezy_options
         breezy = {}
       end
 
-      if breezy
-        render_options[:locals] ||= {}
-        render_options[:locals][:breezy] = breezy
-      end
+      render_options[:locals] ||= {}
+      render_options[:locals][:breezy] = breezy
 
-      if @_use_breezy_html && request.format == :html
-         original_formats = self.formats
+      if request.format == :html
+        original_formats = self.formats
+        @_breezy_snippet = render_to_string(*args, render_options.merge(formats: [:js]))
+        self.formats = original_formats
 
-         @breezy = render_to_string(*args, render_options.merge(formats: [:js]))
-         self.formats = original_formats
-         render_options.reverse_merge!(formats: original_formats, template: 'breezy/response')
+        render_options.reverse_merge!(formats: original_formats, template: 'breezy/response')
       end
 
       super(*args, render_options, &block)

data/lib/breezy/xhr_headers.rb

@@ -19,15 +19,6 @@ module Breezy
 
       if request.xhr? && request.headers["X-BREEZY-REQUEST"]
         self.status = 200
-
-        if params['_bz'] && !url.include?('_bz')
-          parsed_url =  URI.parse(url)
-          qry_with_bz = URI.decode_www_form(String(parsed_url.query)) << ["_bz", params['_bz']]
-          parsed_url.query = URI.encode_www_form(qry_with_bz)
-
-          url = parsed_url.to_s
-        end
-
         response.headers["X-BREEZY-LOCATION"] = url
       end
 

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

@@ -5,9 +5,9 @@ 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_html` returns a blank template, allowing for JS to take over
+  # `use_breezy` enables breezy functionality
   # on application.html.erb
-  before_action :use_breezy_html
+  before_action :use_breezy
 
   # GET <%= route_url %>
   def index

data/lib/install/web.rb

@@ -85,8 +85,7 @@ say "Adding required member methods to ApplicationRecord"
 add_member_methods
 
 say "Installing React, Redux, and Breezy"
-run "yarn add react-redux redux react react-dom babel-preset-react prop-types formik @jho406/breezy --save"
-run "yarn add babel-plugin-module-resolver --save-dev"
+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"
 
 say "Updating webpack paths to include .jsx file extension"
 insert_into_file Webpacker.config.config_path, "    - .jsx\n", after: /extensions:\n/

data/test/breezy_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class BreezyController < TestController
   before_action do
-    @_use_breezy_html = false
+    @_use_breezy = false
   end
 
   def simple_action

data/test/render_test.rb

@@ -8,16 +8,19 @@ class RenderController < TestController
     'render/action.html.erb' => 'john smith',
     'render/implied_render_with_breezy.js.breezy' => 'json.author "john smith"',
     'render/implied_render_with_breezy.html.erb' => 'john smith',
-    'layouts/application.html.erb' => "<html><head><%=breezy_tag%></head><body><%=yield%></body></html>"
+    'layouts/application.html.erb' => <<~HTML
+      <html>
+        <head>
+          <script><%= breezy_snippet %></script>
+        </head>
+        <body><%=yield%></body>
+      </html>
+    HTML
   ))
 
   layout 'application'
 
-  before_action do
-    @_use_breezy_html = false
-  end
-
-  before_action :use_breezy_html, only: [:simple_render_with_breezy, :implied_render_with_breezy]
+  before_action :use_breezy, only: [:simple_render_with_breezy, :implied_render_with_breezy]
 
   def render_action
     render :action
@@ -31,7 +34,7 @@ class RenderController < TestController
   end
 
   def render_action_with_breezy_false
-    render :action, breezy: false
+    render :action
   end
 
   def form_authenticity_token
@@ -60,12 +63,12 @@ class RenderTest < ActionController::TestCase
 
   test "simple render with breezy" do
     get :simple_render_with_breezy
-    assert_breezy_html({author: "john smith"}, screen: :action)
+    assert_breezy_html({author: "john smith"}, screen: 'render/action')
   end
 
   test "implied render with breezy" do
     get :implied_render_with_breezy
-    assert_breezy_html({author: "john smith"}, screen: :implied_render_with_breezy)
+    assert_breezy_html({author: "john smith"}, screen: 'render/implied_render_with_breezy')
   end
 
   test "simple render with breezy via get js" do
@@ -102,7 +105,16 @@ class RenderTest < ActionController::TestCase
   def assert_breezy_html(content, opts={})
     assert_response 200
 
-    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
+    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>
+        </head>
+        <body></body>
+      </html>
+    HTML
+
+    assert_equal rendered, @response.body
     assert_equal 'text/html', @response.content_type
   end
 
@@ -120,7 +132,17 @@ class RenderTest < ActionController::TestCase
 
   def assert_normal_render(content)
     assert_response 200
-    assert_equal "<html><head></head><body>#{content}</body></html>", @response.body
+
+    rendered = <<~HTML
+      <html>
+        <head>
+          <script></script>
+        </head>
+        <body>#{content}</body>
+      </html>
+    HTML
+
+    assert_equal rendered, @response.body
     assert_equal 'text/html', @response.content_type
   end
 end

metadata

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