breezy 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa0ba31629a150f6450ba7c8608bfa993cf94647
-  data.tar.gz: 3720bc116d960eec527161dc35eb6968f0ca8a60
+  metadata.gz: 7d24f3b08babf09a78c371b15e95bcb9ca5cfc9d
+  data.tar.gz: 3a0d29c9e69c63a01270739dde64031e1b0e9c1c
 SHA512:
-  metadata.gz: da76c5c33c3cb43302fc0ae8c79771700e052ec2f05169d1fb0d187dc49e06af528a386090c18f1e1f7065bd74a4fdaa43470b59386dd15ab03089a3e6878af7
-  data.tar.gz: c03fb6c6271db1ce4ef6bf8b6ebb40cdaef2d9243b0ab70a4c80acc58c126d4b6cadf6c0e60acd5ae4762fef8ba344ae887bbe8e9b5b42d98bbf1e9a7815e6fa
+  metadata.gz: 80b0cd8e3d1ef6aff04d65d9ae5a48e7b3779ea64e0352a751a0105aa6d72da71b6a4727bbe1353fc1f117c3129364beba37e8a38909a43b79c3515244394bc1
+  data.tar.gz: 533d572c650638dfb39195ac9a302aad02c41ad956bb5ed0748e5ed05a885d4f74b8aa904d8981feaf7881834038748a07b8fed0cd389bce5c26ec7b54836021

data/lib/breezy.rb

@@ -31,12 +31,10 @@ module Breezy
     config.breezy = ActiveSupport::OrderedOptions.new
     config.breezy.auto_include = true
 
-    if Rails::VERSION::MAJOR >= 4
-      generators do |app|
-        Rails::Generators.configure! app.config.generators
-        Rails::Generators.hidden_namespaces.uniq!
-        require 'generators/rails/scaffold_controller_generator'
-      end
+    generators do |app|
+      Rails::Generators.configure! app.config.generators
+      Rails::Generators.hidden_namespaces.uniq!
+      require 'generators/rails/scaffold_controller_generator'
     end
 
     initializer :breezy do |app|

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

@@ -16,7 +16,7 @@ class <%= plural_table_name.camelize %>Edit extends BaseScreen {
       body: JSON.stringify(values),
     }
 
-    this.enhancedVisit(this.props.<%= singular_table_name.camelize(:lower) %>, options).then( rsp => {
+    this.enhancedVisit(this.props.<%= singular_table_name.camelize(:lower) %>Path, options).then( rsp => {
       setSubmitting(false)
       if (this.props.errors) {
         this.formRef.current.setErrors(this.props.errors)

data/lib/install/templates/web/initializer.rb

@@ -1,6 +1,15 @@
 require 'breezy_template/core_ext'
 
 Breezy.configure do |config|
-  config.track_sprockets_assets = ['application.js', 'application.css']
+  # Configure breezy.js to refresh the browser when sprockets or
+  # webpacker asset fingerpint changes. This is similar to Turbolink's
+  # `data-turbolinks-track`.
+  #
+  # Note that this file was generated without sprockets JS tracking.
+  # If you need to change this behavior, add it like so:
+  #
+  # config.track_sprockets_assets = ['application.js', 'application.css']
+  config.track_sprockets_assets = ['application.css']
+
   config.track_pack_assets = ['application.js']
 end

data/lib/install/web.rb

@@ -1,6 +1,7 @@
 require "webpacker/configuration"
 
 babelrc = Rails.root.join(".babelrc")
+babel_config = Rails.root.join("babel.config.js")
 
 def append_js_tags
   app_html = 'app/views/layouts/application.html.erb'
@@ -35,38 +36,40 @@ def add_member_methods
   end
 end
 
-
 if File.exist?(babelrc)
   react_babelrc = JSON.parse(File.read(babelrc))
   react_babelrc["presets"] ||= []
   react_babelrc["plugins"] ||= []
 
-  if !react_babelrc["presets"].include?("react")
-    react_babelrc["presets"].push("react")
-    say "Copying react preset to your .babelrc file"
+  react_babelrc["plugins"].push(["module-resolver", {
+    "root": ["./app"],
+    "alias": {
+      "views": "./app/views",
+      "components": "./app/components",
+      "javascript": "./app/javascript"
+    }
+  }])
 
-    File.open(babelrc, "w") do |f|
-      f.puts JSON.pretty_generate(react_babelrc)
-    end
-  end
+  say "Copying module-resolver preset to your .babelrc file"
 
-  if !react_babelrc["plugins"].any?{|plugin| Array(plugin).include?("module-resolver")}
-    react_babelrc["plugins"].push(["module-resolver", {
-      "root": ["./app"],
-      "alias": {
-        "views": "./app/views",
-        "components": "./app/components",
-        "javascript": "./app/javascript"
-      }
-    }])
-
-    say "Copying module-resolver preset to your .babelrc file"
-
-    File.open(babelrc, "w") do |f|
-      f.puts JSON.pretty_generate(react_babelrc)
-    end
+  File.open(babelrc, "w") do |f|
+    f.puts JSON.pretty_generate(react_babelrc)
   end
-
+elsif File.exist?(babel_config)
+  say "Copying module-resolver preset to your babel.config.js"
+  resolver_snippet = <<~PLUGIN
+        [
+          require('babel-plugin-module-resolver').default, {
+            "root": ["./app"],
+            "alias": {
+              "views": "./app/views",
+              "components": "./app/components",
+              "javascript": "./app/javascript"
+            }
+          }
+        ],
+  PLUGIN
+  insert_into_file "babel.config.js", resolver_snippet, after: /plugins: \[\n/
 else
   say "Copying .babelrc to app root directory"
   copy_file "#{__dir__}/templates/web/babelrc", ".babelrc"
@@ -96,7 +99,8 @@ 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 reduce-reducers react react-dom immer @jho406/breezy --save"
 
-say "Updating webpack paths to include .jsx file extension"
+say "Updating webpack config to include .jsx file extension and resolved_paths"
 insert_into_file Webpacker.config.config_path, "    - .jsx\n", after: /extensions:\n/
+insert_into_file Webpacker.config.config_path, "'app/views', 'app/components'", after: /resolved_paths: \[/
 
 say "Webpacker now supports breezy.js 🎉", :green

data/lib/tasks/install.rake

@@ -27,12 +27,6 @@ namespace :breezy do
       template = File.expand_path("../install/web.rb", __dir__)
       exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{template}"
     end
-
-    desc "Install everything needed for breezy mobile"
-    task 'mobile' => ["breezy:verify_yarn"] do
-      template = File.expand_path("../install/mobile.rb", __dir__)
-      exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{template}"
-    end
   end
 end
 

data/test/render_test.rb

@@ -47,6 +47,15 @@ class RenderTest < ActionController::TestCase
 
 
   setup do
+    if Rails.version >= '6'
+      # In rails 6, the fixture orders the templates based on their appearance in the handler
+      # This doesn't happen IRL, so I'm going to explicitly set the handler here.
+      # 
+      # Note that the original is the following
+      # @controller.lookup_context.handlers = [:raw, :breezy, :erb, :js, :html, :builder, :ruby]
+      @controller.lookup_context.handlers = [:breezy, :erb]
+    end
+
     Breezy.configuration.track_sprockets_assets = ['app.js']
     Breezy.configuration.track_pack_assets = ['app.js']
   end

data/test/test_helper.rb

@@ -5,7 +5,7 @@ require 'action_controller'
 require 'breezy'
 require "active_support"
 require 'active_record'
-require 'active_support/testing/autorun' if Rails.version >= '4'
+require 'active_support/testing/autorun'
 require 'active_support/test_case'
 
 require 'breezy_template'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: breezy
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Johny Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-08-31 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'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: breezy_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: webpacker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails integration for BreezyJS