inkcite 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c0ee10df003264c9c13457a64286f6f55284c4
-  data.tar.gz: 720db2e0316a425f31b390dc6e493e11af271f1f
+  metadata.gz: 9d4ff329598b10063f608482495b1067089c890f
+  data.tar.gz: 382ad87478df473ad76bda20a7fb306e125c65b5
 SHA512:
-  metadata.gz: 6ecb5788b293ad9fcf75d344a3454cd57309b6f79c93b4ff8555e3c79b234087b75d304a4904afddb368a4fdb27861991ba915918f0c41de6a9610c027e26438
-  data.tar.gz: 67aa5173680fc76cea09588242493282b6a03cbe8b7ad39bdd93766a7f92119af08220dc6a2fef5a2b1b89feeb83334484ba96e96e3d412576ec3eb1ab3421bc
+  metadata.gz: 15a0cb8480b9e0abf92c31e2304b3f65baa64b450af06bd66061e3ca18f217645239bf5bedac1a74b0b5bea43a28e6a115de350c62ea30818e9a9b58bb0bddee
+  data.tar.gz: 7313d13e0033675536c3255946bde8cd37c5eef54fbd50c9abe8787a97cf77f76fde38f7bd1e2090f967b8ba4f512da4daa16bd132db776cb8d566c2ed643932

data/assets/init/helpers.tsv

@@ -8,10 +8,10 @@
 
 // This controls the subject line used for email prevents and text that is
 // written into the <title> of the HTML created by Inkcite.
-title Welcome to Inkcite
+title	Welcome to Inkcite
 
 // This sets the color for all links generated with Inkcite's {a} helper.
-#link #0099cc
+#link	#0099cc
 
 // This defines the default font family used throughout your email.
-font-family sans-serif
+font-family	sans-serif

data/inkcite.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'builder'
   spec.add_dependency 'erubis'
   spec.add_dependency 'faker'
+  spec.add_dependency 'guard'
+  spec.add_dependency 'guard-livereload'
   spec.add_dependency 'image_optim'
   spec.add_dependency 'image_optim_pack'
   spec.add_dependency 'litmus'
@@ -34,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mailgun-ruby'
   spec.add_dependency 'net-sftp'
   spec.add_dependency 'rack'
+  spec.add_dependency 'rack-livereload'
   spec.add_dependency 'rubyzip'
   spec.add_dependency 'thor'
   spec.add_dependency 'yui-compressor'

data/lib/inkcite/cli/server.rb

@@ -1,6 +1,8 @@
-require 'webrick'
+require 'guard'
+require 'guard/commander'
 require 'rack'
-require 'socket'
+require 'rack-livereload'
+require 'webrick'
 
 module Inkcite
   module Cli
@@ -8,82 +10,102 @@ module Inkcite
 
       def self.start email, opts
 
-        # Port should always be an integer.
+        puts
+        puts "Inkcite #{Inkcite::VERSION} is starting up ..."
+        puts 'Documentation available at http://inkcite.readme.io'
+        puts
+
+        # Read the hostname and port from the opts provided on the command
+        # line - or inherit the default of localhost:4567
         port = opts[:port].to_i
         host = opts[:host]
 
-        # Resolve local public IP for mobile device address
+        # Attempt to resolve the machine's public IP so we can display the
+        # address for mobile devices.
         ip = begin
           IPSocket.getaddress(Socket.gethostname)
         rescue
           nil
         end
 
-        puts
-        puts "Inkcite #{Inkcite::VERSION} is starting up ..."
-        puts 'Documentation available at http://inkcite.readme.io'
-        puts 'Press CTRL-C to exit server mode'
-        puts
+        fork do
 
-        begin
-          @server = ::WEBrick::HTTPServer.new({
-              :BindAddress => host,
-              :Port => port,
-              :AccessLog => [],
-              :Logger => WEBrick::Log.new(nil, 0)
-          })
-        rescue Errno::EADDRINUSE
-          raise "== Port #{port} is unavailable. Either close the instance of Inkcite already running on #{port} or start this Inkcite instance on a new port with: --port=#{port+1}"
-          exit(1)
-        end
-
-        # Listen to all of the things in order to properly
-        # shutdown the server.
-        %w(INT HUP TERM QUIT).each do |sig|
-          if Signal.list[sig]
-            Signal.trap(sig) do
-              @server.shutdown
+          # Programmatically construct a Guard configuration file that
+          # instructs it to monitor all of the HTML, TSV, YML and images
+          # that can be used in the email project.
+          guardfile = <<-EOF
+            guard :livereload do
+              watch(%r{^*.+\.(html|tsv|yml)})
+              watch(%r{^images/.+\.*})
             end
-          end
+
+            logger level: :error
+          EOF
+
+          # You can omit the call to Guard.setup, Guard.start will call Guard.setup
+          # under the hood if Guard has not been setuped yet
+          Guard.start :guardfile_contents => guardfile, :no_interactions => true
+
         end
 
-        @server.mount "/", Rack::Handler::WEBrick, Inkcite::Cli::Server.new(email, opts)
+        # Assemble the Rack app with the static content middleware and the
+        # InkciteApp to server the email as the root index page.
+        app = Rack::Builder.new do
+          use Rack::LiveReload
+          use Rack::Static, :urls => %w( /images /images-optim ), :root => '.'
+          run InkciteApp.new(email, opts)
+        end
 
         puts "Your email is being served at http://#{host}:#{port}"
         puts "Point your mobile device to http://#{ip}:#{port}" if ip
-        puts
+        puts 'Press CTRL-C to exit server mode'
+        puts ''
 
-        @server.start
+        begin
 
-      end
+          # Start the server and disable WEBrick's verbose logging.
+          Rack::Server.start({
+                  :Host => host,
+                  :Port => port,
+                  :AccessLog => [],
+                  :Logger => WEBrick::Log.new(nil, 0),
+                  :app => app
+              })
+        rescue Errno::EADDRINUSE
+          abort("Oops!  Port #{port} is unavailable. Either close the instance of Inkcite already running on #{port} or start this Inkcite instance on a new port with: --port=#{port+1}")
+        end
 
-      def initialize email, opts
-        @email = email
-        @opts = opts
       end
 
-      def call env
-        begin
+      private
+
+      class InkciteApp
+
+        def initialize email, opts
+          @email = email
+          @opts = opts
+        end
+
+        def call env
 
-          path = env[REQUEST_PATH]
+          request = Rack::Request.new(env)
 
           # If this request is for the root index page, render the email.  Otherwise
           # render the static asset.
-          if path == REQUEST_ROOT
+          return if request.path_info != REQUEST_ROOT
 
-            # Check for and convert query string parameters to a symolized
-            # key hash so the designer can override the environment, format
-            # and version attributes during a given rendering.
-            # Courtesy of http://stackoverflow.com/questions/21990997/how-do-i-create-a-hash-from-a-querystring-in-ruby
-            params = CGI::parse(env[QUERY_STRING] || '')
-            params = Hash[params.map { |key, values| [ key.to_sym, values[0] || true ] }].symbolize_keys
+          response = Rack::Response.new
+          response[Rack::CONTENT_TYPE] = 'text/html'
+
+          begin
 
             # Allow the designer to specify both short- and long-form versions of
             # the (e)nvironment, (f)ormat and (v)ersion.  Otherwise, use the values
             # that Inkcite was started with.
-            environment = Util.detect(params[:e], params[:environment], @opts[:environment])
-            format = Util.detect(params[:f], params[:format], @opts[:format])
-            version = Util.detect(params[:v], params[:view], @opts[:version])
+            params = request.params
+            environment = Util.detect(params['e'], params['environment'], @opts[:environment])
+            format = Util.detect(params['f'], params['format'], @opts[:format])
+            version = Util.detect(params['v'], params['version'], @opts[:version])
 
             # Timestamp all of the messages from this rendering so it is clear which
             # messages are associated with this reload.
@@ -107,24 +129,24 @@ module Inkcite
               puts "#{ts} - #{view.errors.join("\n#{ts} - ")}"
             end
 
-            [200, {}, [html]]
-          else
-            Rack::File.new(Dir.pwd).call(env)
+            response.write html
 
+          rescue Exception => e
+            response.write "<html><head><title>Oops! There was a problem!</title></head><body style='padding: 30px; font-family: sans-serif;'>"
+            response.write '<h2>Oops!</h2>'
+            response.write "<p>There was a problem rendering your email: #{e.message}</p>"
+            response.write "<pre>#{e.backtrace.join('<br>')}</pre>"
+            response.write 'Please correct the problem and try reloading the page.'
+            response.write '</body></html>'
           end
 
-        rescue Exception => e
-          puts e.message
-          puts e.backtrace.inspect
+          response.finish
+
         end
 
       end
 
-      private
-
-      REQUEST_PATH = 'REQUEST_PATH'
       REQUEST_ROOT = '/'
-      QUERY_STRING = 'QUERY_STRING'
 
       DATEFORMAT = '%Y-%m-%d %H:%M:%S'
 

data/lib/inkcite/renderer/responsive.rb

@@ -142,8 +142,8 @@ module Inkcite
         # Brian Graves' Column Switch Pattern: Allows columns in a table to
         # be reordered based on up and down states.
         # http://www.degdigital.com/blog/content-choreography-in-responsive-email/
-        styles << Rule.new('td', SWITCH, 'display: table-footer-group; width: 100% !important; background-size: 100% auto !important;')
-        styles << Rule.new('td', SWITCH_UP, 'display: table-header-group; width: 100% !important; background-size: 100% auto !important;')
+        styles << Rule.new('td', SWITCH, 'display: table-footer-group; width: 100% !important; background-size: 100% auto !important;', false)
+        styles << Rule.new('td', SWITCH_UP, 'display: table-header-group; width: 100% !important; background-size: 100% auto !important;', false)
 
         # FILL causes specific types of elements to expand to 100% of the available
         # width of the mobile device.

data/lib/inkcite/version.rb

@@ -1,3 +1,3 @@
 module Inkcite
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkcite
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeffrey D. Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-livereload
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +192,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-livereload
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement