vapid 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 556c2464ab664d12716b9aa0e667dd11d663edc5
-  data.tar.gz: a56555d344f0277090d06c52d8a7efd0809fc464
+  metadata.gz: 9dca8a0632172a7cd5c13c853dada608dd278b60
+  data.tar.gz: 4ec0be44b5311e4e49718c9588c4ee604389c1ba
 SHA512:
-  metadata.gz: 92a59742ea2b378905fa5d59d329ce49cf278d52515fce565ca1019a734c6bb8894d292293f7c4482f5e860da14699c290b1c98be835fb33a8f9c53548021f7e
-  data.tar.gz: 2d259c98b3ad956e51c11ea98cda9714236188a0c503d4976a7722c141dc44ebea479a2af47018ea9ca9544d6e7aa636e5c5c33145a10a3bed56a5752ec0c8b5
+  metadata.gz: 9ffff0e3149dafc97c930f1eb5fc275070ff40ea2938a3523319062c0f1fb32e605b1e60a7905a4c7056685f90f21c941abd62a5ff8697e1206313fc97c74aae
+  data.tar.gz: 3ab1f4b9be6f3039c6b360d6d7506f5ac6456189a85b2d23060a6e9a8e5e679b724b9eca873fd8776cf86b3993570460d8a925c6ceaeab93cf02d163956892d3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.3
+* Cache rendered templates
+* Updated generator example
+
 ## 0.1.2
 * Changed dashboard route from `/admin` to `/dashboard`
 * Updated styles to match new design

data/lib/vapid.rb

@@ -9,8 +9,10 @@ end
 
 # Top-level namespace
 module Vapid
+  autoload :API,        "vapid/api"
   autoload :Builder,    "vapid/builder"
   autoload :CLI,        "vapid/cli"
+  autoload :Deployer,   "vapid/deployer"
   autoload :Directive,  "vapid/directive"
   autoload :Directives, "vapid/directives"
   autoload :Models,     "vapid/models"

data/lib/vapid/api.rb

@@ -0,0 +1,74 @@
+require "faraday"
+require "base64"
+
+module Vapid
+  # This is a big ol' placeholder class
+  # TODO: Think through an API
+  class API
+    def initialize(token = nil)
+      @conn = conn(token)
+    end
+
+    class << self
+      def base_url
+        ENV["API_URL"] || "https://api.vapid.com"
+      end
+
+      def base_uri
+        URI.parse(self.base_url).host
+      end
+
+      def version
+        1
+      end
+
+      def version_url
+        "#{base_url}/v#{version}"
+      end
+    end
+
+    def login(email, password)
+      basic_auth_conn = conn(email, password)
+      basic_auth_conn.get "auth/login"
+    end
+
+    def create_site(site_name)
+      post "sites", name: site_name
+    end
+
+    def update_site(site_id, params)
+      patch "sites/#{site_id}", params
+    end
+
+    def presigned_posts(site_id, manifest)
+      post "sites/#{site_id}/presigned_posts", manifest: manifest
+    end
+
+    private
+
+      def post(path, params)
+        @conn.post path do |req|
+          req.headers["Content-Type"] = "application/json"
+          req.body = params.to_json
+        end
+      end
+
+      def patch(path, params)
+        @conn.patch path do |req|
+          req.headers["Content-Type"] = "application/json"
+          req.body = params.to_json
+        end
+      end
+
+      def conn(email_or_token, password = nil)
+        ::Faraday.new(url: self.class.version_url) do |f|
+          if password.nil?
+            f.token_auth(email_or_token)
+          else
+            f.basic_auth(email_or_token, password)
+          end
+          f.adapter :net_http
+        end
+      end
+  end
+end

data/lib/vapid/builder.rb

@@ -3,12 +3,28 @@ module Vapid
   class Builder
     class << self
       def build!(template_files, &block)
-        project_tree = build_project_tree(template_files, &block)
-        groups = consolidate_into_groups(project_tree)
+        groups = generate_tree(template_files, &block)
         update_data_model(groups)
         remove_unused_groups(groups)
       end
 
+      def generate_tree(template_files, &block)
+        project_tree = build_project_tree(template_files, &block)
+        consolidate_into_groups(project_tree)
+      end
+
+      def update_data_model(groups)
+        groups.each do |name, attributes|
+          group = Models::Group.named(name) || Models::Group.new(name: name)
+          group.update_attributes attributes
+          prune_orphaned_content(group)
+        end
+      end
+
+      def remove_unused_groups(used_groups)
+        Models::Group.where.not(name: used_groups.keys).destroy_all
+      end
+
       private
 
         def build_project_tree(template_files)
@@ -28,14 +44,6 @@ module Vapid
           end
         end
 
-        def update_data_model(groups)
-          groups.each do |name, attributes|
-            group = Models::Group.named(name) || Models::Group.new(name: name)
-            group.update_attributes attributes
-            prune_orphaned_content(group)
-          end
-        end
-
         def parse_file(file)
           html = File.open(file).read
           Template.new(html).tree
@@ -58,10 +66,6 @@ module Vapid
           end
         end
 
-        def remove_unused_groups(used_groups)
-          Models::Group.where.not(name: used_groups.keys).destroy_all
-        end
-
         def content_directives
           @content_directives ||= Directives.content_changers.keys
         end

data/lib/vapid/cli.rb

@@ -2,6 +2,8 @@ require "thor"
 require "guard"
 require "guard/commander"
 require "thread"
+require "netrc"
+require "json"
 
 module Vapid
   # Command line interface
@@ -55,7 +57,7 @@ module Vapid
         ensure_user_exists(options.reset_login)
 
         say "== Parsing templates for fields"
-        template_files = Dir[File.join(target, "templates", "**/*")].reject { |f| File.directory? f }
+        template_files = files("templates")
         Builder.build!(template_files) do |filepath|
           say_status :parse, filepath
         end
@@ -63,6 +65,24 @@ module Vapid
       end
     end
 
+    desc "deploy", "Deploy to Vapid's hosting service"
+    map %w(d -d --deploy) => :deploy
+    def deploy(target = ".")
+      inside_target(target) do
+        @api_key = ensure_api_key
+        site_id = ensure_site_id
+
+        project_files = files("templates", "assets")
+        Deployer.new(@api_key, site_id).deploy(project_files) do |message, color, status|
+          if status
+            say_status status, message, color
+          else
+            say "== #{message}", color
+          end
+        end
+      end
+    end
+
     desc "version", "Show the Vapid version number"
     map %w(v -v --version) => :version
     def version
@@ -75,7 +95,7 @@ module Vapid
         if !File.exist? File.join(target, "config.ru")
           say_status :error, "Could not find a Vapid project in #{expanded_target(target)}", :red
         else
-          FileUtils.mkdir_p File.join(target, ".cache")
+          ensure_cache_exists(target)
           inside(target, &block)
         end
       end
@@ -84,6 +104,61 @@ module Vapid
         File.expand_path(target)
       end
 
+      def ensure_cache_exists(target)
+        FileUtils.mkdir_p File.join(target, ".cache")
+        FileUtils.touch File.join(target, ".cache", "livereload.txt")
+      end
+
+      def ensure_api_key
+        email = nil
+        token = nil
+        invalid = false
+
+        loop do
+          n = ::Netrc.read
+          email, token = n[API.base_uri]
+          break if token
+
+          say "== Enter your Vapid credentials, or signup at vapid.com:" unless invalid
+          email = ask "Email:", default: email
+          password = ask "Password:", echo: false
+          say ""
+        
+          response = API.new(token).login(email, password)
+          if response.status == 200
+            token = ::JSON.parse(response.body)["api_key"]
+            n[API.base_uri] = email, token
+            n.save
+          else
+            invalid = true
+            say "== Invalid credentials"
+          end
+        end
+
+        token
+      end
+
+      def ensure_site_id
+        site_id = Settings.site_id
+
+        loop do
+          break if site_id.present?
+
+          if yes? "== Is this a new website? (yes/no)"
+            site_name = ask "Enter a name:"
+            response = API.new(@api_key).create_site(site_name)
+            if response.status == 200
+              site_id = ::JSON.parse(response.body)["id"]
+            end
+          else
+            site_id = ask "Enter the site_id (found on vapid.com):"
+          end
+          Settings.replace_site_id(site_id) if site_id.present?
+        end
+
+        site_id
+      end
+
       def ensure_user_exists(force)
         return if !force && Models::User.any?
 
@@ -102,7 +177,7 @@ module Vapid
         end
 
         loop do
-          user.password = ask("Enter a password:", echo: false)
+          user.password = ask "Enter a password:", echo: false
           user.valid?
           say ""
           break unless user.errors[:password].any?
@@ -120,5 +195,10 @@ module Vapid
           raise
         end
       end
+
+      def files(*directories)
+        paths = directories.map { |dir| File.join(Dir.pwd, dir, "**/*") }
+        Dir[*paths].reject { |f| File.directory? f }
+      end
   end
 end

data/lib/vapid/controllers/dashboard_controller.rb

@@ -123,7 +123,10 @@ module Vapid
           end
 
           def livereload
-            FileUtils.touch(settings.reload) if settings.development?
+            if settings.development?
+              cache_clear
+              FileUtils.touch(settings.reload)
+            end
           end
 
           def run_builder
@@ -183,7 +186,7 @@ module Vapid
             @code = Settings.install_code
 
             # TODO: Should display contextually-relevant error message
-            if (@code.nil? || @code.casecmp(params[:code]) == 0) && user.save
+            if (@code.nil? || @code.casecmp(params[:code]).zero?) && user.save
               run_builder
               session[:user_id] = user.id
               flash[:success] = "Successfully created admin account."

data/lib/vapid/controllers/project_controller.rb

@@ -7,11 +7,25 @@ module Vapid
       # rubocop:disable Metrics/AbcSize, MethodLength
       def self.registered(app)
         app.configure do
+          root_path = Pathname.new(app.settings.root)
+          tmp_path = Pathname.new(app.settings.project_cache)
+          relative_path = tmp_path.relative_path_from(root_path)
+          
+          app.set :cache_enabled, false
+          app.set :cache_path, File.join(relative_path, "server")
           app.set :layouts, File.join(app.settings.project_views, "layouts")
         end
 
+        app.configure :production do
+          app.set :cache_enabled, true
+        end
+
         # rubocop:disable Lint/NestedMethodDefinition
         app.helpers do
+          def asset_timestamp(*args)
+            super(args) unless settings.deploy
+          end
+
           def dynamic_layout(path)
             path_layout = path.split("/")[1]
             if path_layout && Dir.glob(File.join(settings.layouts, "#{path_layout}.*")).any?
@@ -31,8 +45,16 @@ module Vapid
 
         app.get "*" do
           path = params[:splat].first.to_s
-          html = render_or_index(path)
-          Template.new(html).render
+
+          cache_block "#{path}_" do
+            html = render_or_index(path)
+            if app.deploy
+              headers["Content-Disposition"] = "inline"
+              html
+            else
+              Template.new(html).render
+            end
+          end
         end
       end
       # rubocop:enable Metrics/AbcSize, MethodLength

data/lib/vapid/deployer.rb

@@ -0,0 +1,179 @@
+require "rack/test"
+require "rack/mime"
+require "faraday"
+
+# TODO: DRY for path, relative_path, and build_path
+
+module Vapid
+  # Deploys to Vapid's hosting service
+  class Deployer
+    MIMES = {
+      "text/css" => "css",
+      "application/javascript" => "js",
+      "text/html" => "html"
+    }.freeze
+
+    def initialize(api_key, site_id)
+      @api = API.new(api_key)
+      @site_id = site_id
+    end
+
+    def deploy(project_files, &cli)
+      @cli = cli
+      @project_files = project_files
+      @manifest = {}
+      @site_changed = false
+
+      begin
+        config_server
+        prepare_build_dir
+        build_site
+        return unless upload_files
+        update_site
+      rescue Exception => e
+        cli_say "Deploy Error: #{e.message}", color: :red
+      end
+    end
+
+    private
+
+      def config_server
+        Server.set :deploy, true
+      end
+
+      def prepare_build_dir
+        FileUtils.mkdir_p build_dir
+        FileUtils.rm_rf "#{build_dir}/."
+      end
+
+      def build_site
+        cli_say "Building site"
+        @project_files.each do |file|
+          path = relative_path(file)
+          next unless renderable?(path)
+
+          save_path = render_and_save(path)
+          @manifest["/#{path}"] = Digest::MD5.file(save_path).hexdigest
+
+          cli_say file, color: :blue, status: :build
+        end
+      end
+
+      def upload_files
+        presigned_posts = request_presigned_posts
+        
+        if presigned_posts.empty?
+          cli_say "Nothing new to deploy"
+          return false
+        end
+
+        cli_say "Uploading files"
+        @manifest.each do |path, _digest|
+          post = presigned_posts[path]
+          say_path = path.gsub(/^\//, '')
+
+          if post
+            conn = Faraday.new(post["url"]) do |f|
+              f.request :multipart
+              f.request :url_encoded
+              f.adapter :net_http
+            end
+
+            file_path = File.join(build_dir, path)
+            file_mime = Rack::Mime.mime_type(File.extname(path))
+            file = Faraday::UploadIO.new(file_path, file_mime)
+
+            payload = post["fields"].merge file: file
+            conn.post "/", payload
+
+            cli_say say_path, color: :yellow, status: :upload
+          else
+            cli_say say_path, color: :blue, status: :exists
+          end
+        end
+      end
+
+      def update_site
+        fields = Builder.generate_tree(Dir.glob("#{build_dir}/templates/**/*"))
+        response = @api.update_site @site_id, { manifest: @manifest, fields: fields }
+        json = ::JSON.parse(response.body)
+        if response.status == 200
+          site_url = json["url"]
+          cli_say "#{site_url} deployed to Vapid"
+        else
+          cli_say "Deploy Error: #{json["errors"]}", color: :red
+        end
+      end
+
+      def render_and_save(path)
+        content = render(path)
+        write_file(path, content)
+      end
+
+      def request_presigned_posts
+        response = @api.presigned_posts @site_id, @manifest
+        ::JSON.parse(response.body)["presigned_posts"] if response.status == 200
+      end
+
+      def relative_path(file)
+        path = Pathname.new(file).relative_path_from(cwd).to_s
+        convert_extensions(path)
+      end
+
+      def convert_extensions(path)
+        exts = File.basename(path).split(".")[1..-1].reverse
+
+        exts.each do |ext|
+          template_engine = Tilt.template_for(ext)
+          break unless template_engine
+
+          path.chomp! ".#{ext}"
+
+          # Special case for the last ext
+          if ext == exts[-1]
+            # TODO: Replace with Rack::Mime
+            ext = MIMES[template_engine.metadata[:mime_type]]
+            path += ".#{ext}"
+          end
+        end
+
+        path
+      end
+
+      def render(path)
+        uri = URI.escape path.sub(/^templates\//, '')
+        response = request.get uri
+        response.body
+      end
+
+      def write_file(path, contents)
+        save_path = File.join(build_dir, path)
+        save_dir = File.dirname(save_path)
+        FileUtils.mkdir_p(save_dir) unless File.directory?(save_dir)
+        File.open(save_path, "wb") { |f| f.write(contents) }
+        save_path
+      end
+
+      def renderable?(path)
+        !File.basename(path).start_with?("_") && !path.start_with?("templates/layouts")
+      end
+
+      def cwd
+        Pathname.new(Dir.pwd)
+      end
+
+      def build_dir
+        File.join(Dir.pwd, ".cache", "build")
+      end
+
+      def request
+        @request ||= ::Rack::MockRequest.new(Server)
+      end
+
+      def cli_say(message, color: :green, status: nil)
+        return unless @cli
+        
+        @cli.call message, color, status
+      end
+  end
+end

data/lib/vapid/generator_template/config/settings.yml.tt

@@ -1,11 +1,12 @@
-defaults: &defaults
+shared: &shared
   debug: false
+  site_id: ''
 
 development:
-  <<: *defaults
+  <<: *shared
   secret_key: <%= SecureRandom.hex(64) %>
 
 production:
-  <<: *defaults
+  <<: *shared
   install_code: <%= SecureRandom.hex(3) %>
   secret_key: <%%= ENV["SECRET_KEY"] %>

data/lib/vapid/generator_template/templates/index.html.erb

@@ -6,13 +6,30 @@
 <main>
   <div>
     <img src="https://cdn.vapid.com/logo.png" class="logo" alt="Vapid logo" onerror="this.style.display='none'">
-    <p>Welcome to Vapid. This is an example page, to help you get started and understand the basics.</p>
-    <p>To begin, create two tags anywhere in the HTML of this page:</p>
-<pre><code>&lt;h1 vp-text="title"&gt;&lt;/h1&gt;
+
+    <!-- BEGIN EXAMPLE (delete to uncomment) ->
+
+      <h1 vp-text="headline"></h1>
+      <div vp-richtext="body"></div>
+    
+    <!-  END EXAMPLE (delete to uncomment)  -->
+
+    <div vp-hide="headline">
+      <p>Welcome to Vapid. This is an example page, to help you get started and understand the basics.</p>
+      <p>To begin, open up <code>template/index.html.erb</code> and uncomment the following HTML:</p>
+
+<pre><code>&lt;h1 vp-text="headline"&gt;&lt;/h1&gt;
 &lt;div vp-richtext="body"&gt;&lt;/div&gt;
 </code></pre>
-    <p>The <code>vp-</code> attributes you see tell Vapid two things: 1) what type of content you'd like placed inside of the tag (e.g. <code>vp-richtext</code>); and 2) what you'd like to name the variable (e.g. <code>body</code>).</p>
-    <p>Now visit <a href="/dashboard" target="_blank">the dashboard</a> to see how you can edit content.</p>
+
+      <p>The <code>vp-</code> attributes you see tell Vapid two things: 1) what type of content you'd like placed inside of the tag (e.g. <code>vp-richtext</code>); and 2) what you'd like to name the variable (e.g. <code>body</code>).</p>
+
+      <p>Now visit <a href="/dashboard" target="_blank">the dashboard</a> to edit content.</p>
+    </div>
+
+    <div class="congrats" vp-show="headline">
+      Congrats, you did it!<br> Now, head on over to <a href="https://www.vapid.com" target="_blank">vapid.com</a> to learn more.
+    </div>
   </div>
 </main>
 
@@ -36,6 +53,10 @@
     text-decoration: underline;
   }
 
+  h1 {
+    margin-bottom: 0.5em;
+  }
+
   main {
     display: flex;
     height: 100%;
@@ -48,7 +69,8 @@
     max-width: 100%;
   }
 
-  code {
+  code,
+  .congrats {
     display: inline-block;
     background: #333;
     padding: 0 0.25em;
@@ -56,12 +78,17 @@
     vertical-align: bottom;
   }
 
-  pre > code {
+  pre > code,
+  .congrats {
     display: block;
     margin: 2em 0;
     padding: 1em;
   }
 
+  .congrats {
+    font-size: 14px;
+  }
+
   p {
     margin-bottom: 1em;
     line-height: 1.3em;

data/lib/vapid/models/group.rb

@@ -9,7 +9,7 @@ module Vapid
       has_many :records, dependent: :destroy
       accepts_nested_attributes_for :records, allow_destroy: true
 
-      default_scope { order("name = '#{DEFAULT_NAME}' DESC, created_at DESC") }
+      default_scope { order("groups.name = '#{DEFAULT_NAME}' DESC, groups.created_at DESC") }
       scope :with_fields, -> { where("fields <> ?", "{}") }
 
       def self.named(name)

data/lib/vapid/server.rb

@@ -1,5 +1,6 @@
 require "sinatra/base"
 require "sinatra/activerecord"
+require "sinatra/cacher"
 require "sinatra/extension"
 require "sinatra/flash"
 require "sinatra/namespace"
@@ -19,25 +20,23 @@ module Vapid
       enable :logging
       set :quiet,             true
 
-      set :gem_pwd,           File.dirname(__FILE__)
-      set :gem_assets,        File.join(gem_pwd, "assets")
-      set :gem_views,         File.join(gem_pwd, "views")
+      set :gem_dir,           File.dirname(__FILE__)
+      set :gem_assets,        File.join(gem_dir, "assets")
+      set :gem_views,         File.join(gem_dir, "views")
 
-      set :project_pwd,       Dir.pwd
-      set :project_assets,    File.join(project_pwd, "assets")
-      set :project_views,     File.join(project_pwd, "templates")
+      set :project_dir,       Dir.pwd
+      set :project_assets,    File.join(project_dir, "assets")
+      set :project_views,     File.join(project_dir, "templates")
+      set :project_cache,     File.join(project_dir, ".cache")
       set :project_uploads,   File.join(project_assets, "uploads")
 
-      set :vendor_assets,     File.join(gem_pwd, "vendor")
-
-      set :uri_root,          "assets"
       set :public_folder,     project_assets
-
-      set :sprockets,         Sprockets::Environment.new
-
-      set :cache,             File.join(project_pwd, ".cache")
-      set :reload,            File.join(cache, "livereload.txt")
       set :protect_from_csrf, true
+      set :reload,            File.join(project_cache, "livereload.txt")
+      set :sprockets,         Sprockets::Environment.new
+      set :uri_root,          "assets"
+      set :vendor_assets,     File.join(gem_dir, "vendor")
+      set :deploy,            false
 
       sprockets.append_path      project_assets
       sprockets.append_path      gem_assets
@@ -53,7 +52,6 @@ module Vapid
       set :show_exceptions, :after_handler
       use Rack::LiveReload, no_swf: true,
                             ignore: [%r{^/(dashboard)}]
-      FileUtils.touch settings.reload
     end
 
     configure :production do
@@ -84,6 +82,7 @@ module Vapid
       render "errors/500", layout: :modal
     end
 
+    register Sinatra::Cacher
     register Sinatra::Flash
     register Sinatra::Namespace
     register Padrino::Helpers

data/lib/vapid/settings.rb

@@ -1,13 +1,35 @@
-# Settings
 module Vapid
+  # Settings
   class Settings
-    def self.method_missing(sym, *)
-      (@settings ||= load_settings)[sym.to_s]
-    end
+    class << self
+      def replace_site_id(site_id)
+        content = File.read(settings_file)
+        new_content = content.gsub(/site_id:(.*)/, "site_id: #{site_id}")
+        File.open(settings_file, "w") {|file| file.puts new_content }
+      end
+
+      private
+
+        def method_missing(sym, *)
+          @settings ||= load_settings
+          if @settings
+            @settings[sym.to_s]
+          else
+            super
+          end
+        end
+
+        def respond_to_missing?(_method_name, _include_private = false)
+          super
+        end
+
+        def settings_file
+          File.join(Dir.pwd, "config", "settings.yml")
+        end
 
-    def self.load_settings
-      settings_file = File.join(Dir.pwd, "config", "settings.yml")
-      File.exist?(settings_file) ? YAML.load_file(settings_file)[Server.environment.to_s] : {}
+        def load_settings
+          File.exist?(settings_file) && YAML.load_file(settings_file)[Server.environment.to_s] || {}
+        end
     end
   end
 end

data/lib/vapid/template.rb

@@ -26,8 +26,10 @@ module Vapid
       branches
     end
 
+    # rubocop:disable Metrics/AbcSize
     def render
       @parser = Parser.new(@html, default_group_content)
+
       @parser.walk set_context: method(:fetch_content) do |node, content|
         node.clone(content.size - 1) if node.cloneable?
         record = node.clone? ? content[node.clone_index] : content.first
@@ -38,6 +40,7 @@ module Vapid
 
       @parser.to_html
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -64,7 +67,7 @@ module Vapid
       # TODO: Figure out a better way to do this
       #       Maybe let the directive determine the placeholder?
       def add_development_styles
-        (@parser.doc.at("head") || @parser.doc.at("body")).after """
+        (@parser.doc.at("head") || @parser.doc.at("body")).after "
           <style>
             [vp-placeholder]:before { opacity: 0.5; }
             [vp-placeholder][vp-text]:before { content: '{ ' attr(vp-text) ' }'; }
@@ -73,7 +76,7 @@ module Vapid
             [vp-placeholder][vp-audio]:before { content: '{ ' attr(vp-audio) ' }'; }
             [vp-placeholder][vp-video]:before { content: '{ ' attr(vp-video) ' }'; }
           </style>
-        """
+        "
       end
   end
 end

data/lib/vapid/template/node.rb

@@ -48,9 +48,10 @@ module Vapid
 
       # TODO: Abstract this, so that directives only need to pass in
       #       html, text, etc, and don't have to know about Nokogiri methods/concepts
+      # rubocop:disable MethodLength
       def modify(obj)
         return unless obj
-        
+
         obj.each do |prop, value|
           if value.is_a?(String)
             @node.send "#{prop}=", value
@@ -63,6 +64,7 @@ module Vapid
           end
         end
       end
+      # rubocop:enable MethodLength
 
       private
 

data/lib/vapid/template/parser.rb

@@ -11,6 +11,7 @@ module Vapid
         @context_stack = [initial_context]
       end
 
+      # rubocop:disable MethodLength
       def walk(node = doc_root, set_context: nil, &block)
         if node.group?
           context = set_context.present? ? set_context.call(node.group_expr) : node.group_expr
@@ -27,6 +28,7 @@ module Vapid
 
         pop_context if node.group?
       end
+      # rubocop:enable MethodLength
 
       def to_html
         @doc.to_html

data/lib/vapid/version.rb

@@ -1,4 +1,4 @@
 # Version
 module Vapid
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

data/vapid.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "~> 0.20"
   spec.add_dependency "sinatra", "~> 2.0"
-  spec.add_dependency "sinatra-contrib", "~> 2.0"
   spec.add_dependency "sinatra-activerecord", "~> 2.0"
+  spec.add_dependency "sinatra-cacher", "~> 1.0"
+  spec.add_dependency "sinatra-contrib", "~> 2.0"
   spec.add_dependency "sinatra-flash", "~> 0.3"
   spec.add_dependency "padrino-helpers", "~> 0.1"
   spec.add_dependency "sprockets", "~> 3.7"
@@ -38,6 +39,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rack-livereload", "~> 0.3"
   spec.add_dependency "guard-livereload", "~> 2.5"
   spec.add_dependency "ruby-oembed", "~> 0.12"
+  spec.add_dependency "netrc", "~> 0.11"
+  spec.add_dependency "faraday", "~> 0.13"
 
   spec.add_development_dependency "bundler", "~> 1.1"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vapid
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Scott Robbin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-activerecord
+  name: sinatra-cacher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -262,6 +276,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -353,6 +395,7 @@ files:
 - bin/setup
 - exe/vapid
 - lib/vapid.rb
+- lib/vapid/api.rb
 - lib/vapid/assets/images/vapid/favicon.ico
 - lib/vapid/assets/images/vapid/logo.png
 - lib/vapid/assets/images/vapid/logo_inverse.png
@@ -370,6 +413,7 @@ files:
 - lib/vapid/db/migrate/20170202182310_create_groups.rb
 - lib/vapid/db/migrate/20170202183017_create_records.rb
 - lib/vapid/db/migrate/20170202185150_create_users.rb
+- lib/vapid/deployer.rb
 - lib/vapid/directive.rb
 - lib/vapid/directives.rb
 - lib/vapid/directives/audio.rb