vueport 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147bdb73bbbd594daa855c6c32461e5b6a3b4a88
-  data.tar.gz: a84bd46db6183701c34b159fdbece981b6150f60
+  metadata.gz: 16a3444fd6052cc9aa01af0bb7739a74d95b2104
+  data.tar.gz: d986a56d8e43ab8f744900d36b8726178fd811a1
 SHA512:
-  metadata.gz: 72e0085bd54a0eb721244dbbbea89f589334015f6f20a8ec96b2283b35dc3039e0f586944d4b3cf5fb521a613ee5c066f292a2e4079ff51b19cb4f347df5b130
-  data.tar.gz: 4942208142a73c3458686df5e5e19b6bca3574bdf96f8cd5998fc36e65f10e1020c9e859d106d1249cffe67136df95a9d2ff89976c6d434bfc448445b79b80a3
+  metadata.gz: addcc7f14a09fe9f1aa54f5066cc70cdc3e963c2ee33eab1d696674a1c2ea9c6f2de328575a786e7a9914a293b8a728a927e6b64179499623c78035db53a6512
+  data.tar.gz: f0d91aad6d3f4d59a8a25a058f5528544f8914ee019b01125d8d0144463ad91e51ba1c063b9b32015425ffa592409f781c7d0e3d37bd4faa57c07cb52b69636c

data/README.md

@@ -47,7 +47,7 @@ to boot the Webpack Dev server and your Rails app!
 
 ## Production Deployment
 
-Ensure to run `rails vueport:compile` as part of your deployment process to production. This compiles the production version of your client side bundle, as well as compiling the server side bundle for our Node JS app to use.
+Ensure to run `npm run compile` (or `yarn run compile`) as part of your deployment process to production. This compiles the production version of your client side bundle, as well as compiling the server side bundle for our Node JS app to use.
 
 In production we send HTTP requests to a basic NodeJS server to render our content. To run the Rails app and the Node server concurrently, use `Procfile`.
 

data/lib/generators/vueport/template/renderer/index.js

@@ -21,7 +21,7 @@ const render = html => new Promise((resolve, reject) => {
   })
 })
 
-app.post('/render', (req, res) => {
+app.post('*', (req, res) => {
   if (typeof req.body !== 'string' || req.body.length === 0) return res.status(400).send('')
   return render(req.body)
     .catch((err) => {

data/lib/generators/vueport/template/vueport/build.js

@@ -9,9 +9,6 @@ var webpack = require('webpack')
 var clientConfig = require('./webpack.prod.conf')
 var serverConfig = require('./webpack.server.conf')
 
-var spinner = ora('building client bundle for production...')
-spinner.start()
-
 var assetsPath = path.join(config.build.assetsRoot)
 rm('-rf', assetsPath)
 mkdir('-p', assetsPath)
@@ -24,21 +21,26 @@ var statsConfig = {
   chunkModules: false
 }
 
-webpack(clientConfig, function (err, stats) {
-  spinner.stop()
-  if (err) throw err
-  process.stdout.write(stats.toString(statsConfig) + '\n')
-
-  server()
-})
-
-var server = function () {
-  var spinner = ora('building server bundle for production...')
+const compile = (config, bundle) => {
+  const spinner = ora(`Building ${bundle} for production...`)
   spinner.start()
 
-  webpack(serverConfig, function (err, stats) {
-    spinner.stop()
-    if (err) throw err
-    process.stdout.write(stats.toString(statsConfig) + '\n')
+  return new Promise(function (resolve, reject) {
+    webpack(config, function (err, stats) {
+      if (err) {
+        spinner.text = `Error building ${bundle}.`
+        spinner.fail()
+        return reject(err)
+      }
+
+      spinner.text = `Built ${bundle} successfully`
+      spinner.succeed()
+      process.stdout.write(stats.toString(statsConfig) + '\n')
+      resolve()
+    })
   })
 }
+
+compile(clientConfig, 'client bundle').then(() => { 
+  compile(serverConfig, 'server bundle') 
+})

data/lib/generators/vueport/template/vueport/webpack.server.conf.js

@@ -5,6 +5,7 @@ var merge = require('webpack-merge')
 var baseWebpackConfig = require('./webpack.base.conf')
 
 baseWebpackConfig.plugins = []
+delete baseWebpackConfig.resolve.alias['vue$']
 var webpackConfig = merge(baseWebpackConfig, {
   entry: './webpack/server.js',
   module: {

data/lib/vueport.rb

@@ -1,5 +1,3 @@
-require 'httparty'
-
 require 'vueport/helper'
 require 'vueport/renderer'
 require 'vueport/node_client'

data/lib/vueport/helper.rb

@@ -2,7 +2,7 @@ module Vueport
   module Helper
     def vueport(content = nil, &block)
       content = capture(&block) if block_given?
-      Vueport::Renderer.new(content).render
+      Vueport::Renderer.new(content, path: request.path).render
     end
   end
 end

data/lib/vueport/node_client.rb

@@ -1,12 +1,12 @@
-
 module Vueport
   class RenderError < StandardError; end
 
   class NodeClient
-    attr_accessor :content
+    attr_accessor :content, :path
 
-    def initialize(content)
+    def initialize(content, path: '/')
       self.content = content
+      self.path = path
     end
 
     def run!
@@ -16,25 +16,20 @@ module Vueport
     private
 
       def render
-        raise(RenderError.new, response.body) if response.code != 200
-        response.body
+        case response
+        when Net::HTTPSuccess
+          response.body
+        else
+          raise(RenderError.new, response.body)
+        end
       end
 
       def response
-        @response ||= HTTParty.post("http://#{server_uri}/render", post_params)
-      end
-
-      def post_params
-        {
-          body: content,
-          headers: {
-            'Content-Type': 'text/plain'
-          }
-        }
+        @response ||= http.post path, content, 'Content-Type' => 'text/plain'
       end
 
-      def server_uri
-        "#{Vueport.config[:server_host]}:#{Vueport.config[:server_port]}"
+      def http
+        @http ||= Net::HTTP.new Vueport.config[:server_host], Vueport.config[:server_port]
       end
   end
 end

data/lib/vueport/renderer.rb

@@ -5,10 +5,11 @@ module Vueport
     CONTENT_WRAPPER_ID = 'vueport-wrapper'.freeze
     TEMPLATE_ID = 'vueport-template'.freeze
 
-    attr_accessor :content
+    attr_accessor :content, :path
 
-    def initialize(content)
+    def initialize(content, path: '/')
       self.content = content
+      self.path = path
     end
 
     def render
@@ -26,7 +27,7 @@ module Vueport
       end
 
       def ssr_content
-        Vueport::NodeClient.new(wrapper(content)).run!
+        Vueport::NodeClient.new(wrapper(content), path: path).run!
       rescue Vueport::RenderError
         wrapper
       end

data/lib/vueport/version.rb

@@ -1,3 +1,3 @@
 module Vueport
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/vueport.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.45.0'
   spec.add_development_dependency 'rspec-html-matchers', '~> 0.8.1'
   spec.add_development_dependency 'ammeter', '~> 1.1.4'
+  spec.add_development_dependency 'webmock', '~> 2.3.1'
 
   spec.add_dependency 'rails', '>= 3.2.0'
   spec.add_dependency 'webpack-rails', '~> 0.9.9'
-  spec.add_dependency 'httparty', '~> 0.14.0'
 
   spec.required_ruby_version = '>= 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vueport
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sam Garson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,47 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
+        version: 2.3.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: webpack-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: webpack-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.9.9
 description: Use webpack and Vue js to get modern front end technology in your Rails
   app, including hotloading and single file components.
 email: