ember_cli_deploy_redis 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTBjNmE1MTRkMTg2NDY5ZGFjNzY3YTliZjQ4NGUxOTM1MWMxMTZiMg==
-  data.tar.gz: !binary |-
-    YTgwYjZmYTdmZGUwYjQwMjUzMWI5N2I3ZDBmZTFjMjUwMDBhNjhhNQ==
+SHA1:
+  metadata.gz: baae47917d4532d449a73befdaaa83f72bce7016
+  data.tar.gz: 1b23a6a7a553e9632ffa0a7e4d1cbc0961ea6055
 SHA512:
-  metadata.gz: !binary |-
-    MTQ5YmM1MDljMWMxMWYxMzk1M2JlZmVhOTExYTlmMDY5MDg3ZTc1ODBkYWVl
-    NDEwOWVhNmNkMGJlM2VhZDZkM2E3OGYxOTA0ZDM1MTY0YjQ2OTY3ZDQ3M2Fj
-    YjgxZTY0NTYyODUwNDQ4OGUxZGU0NmVkNTE5NTcxYWIwMmJmODU=
-  data.tar.gz: !binary |-
-    Y2M3OTEyMmMwMDJkMDk3ZjNhZmY4ZmY0OTQwODQ2NWM4OTFjZTQ2NDE2MTZj
-    OWMzNmQyYzdhZmNhNTEzYjhmZGU4NDZmNmEwZWE1MGNlNDM2Y2ViZGFmMjI1
-    NDY4YzY5NTYyMGM3OGZiMjAwMmExNWJjOGE4ZGU5YWJkN2NiM2E=
+  metadata.gz: a873a67c786d7b5b218fa04160fdba8b139a5d45e3148f8d99a02d8a0c624234cd4a2d5a9d0f96d472bd72dcafed3a0a3dd4209f47bc3896fd7d0a6072d9e475
+  data.tar.gz: 8787bcb514208aff9d14087770705193422f2292900cd25268b17cd5a9c08930f1be5a6194e9662f994b1cd227c6ad807db2c3172269bcde57e663dc56fe4329

data/README.md

@@ -107,6 +107,10 @@ EmberCliDeployRedis.configure do |config|
   config.on_revision_activated do |new_revision|
     # Slack webhook here!
   end
+
+  # By default, the web interface will assume that the Rack app it's mounted in will have sessions
+  # enabled. If not, issue the following:
+  # EmberCliDeployRedis::Web.enable_sessions!
 end
 ```
 

data/lib/ember_cli_deploy_redis/version.rb

@@ -1,3 +1,3 @@
 module EmberCliDeployRedis
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/ember_cli_deploy_redis/web.rb

@@ -7,7 +7,10 @@ require 'ember_cli_deploy_redis/web_helpers'
 
 module EmberCliDeployRedis
   class Web < Sinatra::Base
-    enable :sessions
+    def self.enable_sessions!
+      enable :sessions
+    end
+
     use Rack::Protection, :use => :authenticity_token unless ENV['RACK_ENV'] == 'test'
 
     set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
@@ -24,14 +27,16 @@ module EmberCliDeployRedis
       erb :dashboard
     end
 
-    get "/applications/:app_name" do
+    get "/applications/*" do
+      params[:app_name] = params[:splat].first
       halt 404 unless params[:app_name]
       @application = Application.new(params[:app_name])
       @revisions = @application.revisions
       erb :application
     end
 
-    post "/applications/:app_name/activate/:revision_name" do
+    post "/applications/*/activate/*" do
+      params[:app_name], params[:revision_name] = params[:splat]
       halt 404 unless params[:app_name]
       halt 404 unless params[:revision_name]
       application = Application.new(params[:app_name])

data/lib/ember_cli_deploy_redis/web_helpers.rb

@@ -128,6 +128,14 @@ module EmberCliDeployRedis
       retry
     end
 
+    def u(text)
+      ::Rack::Utils.escape(text)
+    rescue ArgumentError => e
+      raise unless e.message.eql?('invalid byte sequence in UTF-8')
+      text.encode!('UTF-16', 'UTF-8', invalid: :replace, replace: '').encode!('UTF-8', 'UTF-16')
+      retry
+    end
+
     # Any paginated list that performs an action needs to redirect
     # back to the proper page after performing that action.
     def redirect_with_query(url)
@@ -155,8 +163,20 @@ module EmberCliDeployRedis
       EmberCliDeployRedis.configuration.revision_specifier_query_param
     end
 
+    def application_path(application)
+      "applications/#{u application.name}"
+    end
+
     def revision_test_url(revision)
-      "/?#{revision_specifier_query_param}[#{revision.application.name}]=#{revision.name}"
+      "/?#{u revision_specifier_query_param}[#{u revision.application.name}]=#{u revision.name}"
+    end
+
+    def revision_activate_path(revision)
+      "applications/#{u revision.application.name}/activate/#{u revision.name}"
+    end
+
+    def css_class_name(text)
+      text.gsub(/\W+/, '-')
     end
   end
 end

data/spec/lib/ember_cli_deploy_redis/web_spec.rb

@@ -13,11 +13,11 @@ describe EmberCliDeployRedis::Web do
   end
 
   let(:application1) { EmberCliDeployRedis::Application.new('application1') }
-  let(:app1_revision_a) { EmberCliDeployRedis::Revision.new(application1, 'app1_revision_a') }
-  let(:app1_revision_b) { EmberCliDeployRedis::Revision.new(application1, 'app1_revision_b') }
+  let(:app1_revision_a) { EmberCliDeployRedis::Revision.new(application1, 'app1:revision_a') }
+  let(:app1_revision_b) { EmberCliDeployRedis::Revision.new(application1, 'app1:revision_b') }
   let(:application2) { EmberCliDeployRedis::Application.new('application2') }
-  let(:app2_revision_a) { EmberCliDeployRedis::Revision.new(application2, 'app2_revision_a') }
-  let(:app2_revision_b) { EmberCliDeployRedis::Revision.new(application2, 'app2_revision_b') }
+  let(:app2_revision_a) { EmberCliDeployRedis::Revision.new(application2, 'app2:revision_a') }
+  let(:app2_revision_b) { EmberCliDeployRedis::Revision.new(application2, 'app2:revision_b') }
 
   describe 'GET /' do
     let(:the_request) { get '/' }
@@ -39,12 +39,12 @@ describe EmberCliDeployRedis::Web do
     it 'includes a row for each application' do
       the_request
       expect(last_response.body).to have_tag('tr') do
-        with_tag 'td.col-application a', href: '/applications/application1', text: 'application1'
-        with_tag 'td.col-current-revision', text: /app1_revision_a/
+        with_tag 'td.col-application a', text: '/applications/application1', text: 'application1'
+        with_tag 'td.col-current-revision', text: /app1:revision_a/
       end
       expect(last_response.body).to have_tag('tr') do
         with_tag 'td.col-application a', href: '/applications/application2', text: 'application2'
-        with_tag 'td.col-current-revision', text: /app2_revision_b/
+        with_tag 'td.col-current-revision', text: /app2:revision_b/
       end
     end
   end
@@ -65,40 +65,40 @@ describe EmberCliDeployRedis::Web do
     it 'includes a row for each revision' do
       the_request
       expect(last_response.body).to have_tag('tr') do
-        with_tag 'td.col-revision', text: /app1_revision_b/
+        with_tag 'td.col-revision', text: /app1:revision_b/
       end
       expect(last_response.body).to have_tag('tr') do
-        with_tag 'td.col-revision', text: /app1_revision_a/
+        with_tag 'td.col-revision', text: /app1:revision_a/
       end
       expect(last_response.body).to have_tag('tr') do
-        with_tag 'td.col-revision', text: /app1_revision_b/
+        with_tag 'td.col-revision', text: /app1:revision_b/
       end
     end
     it 'shows the correct revisions as Active' do
       the_request
-      expect(last_response.body).to have_tag('tr.revision-app1_revision_b') do
+      expect(last_response.body).to have_tag('tr.revision-app1-revision_b') do
         with_tag 'td.col-status', text: /\A\s*Active\s*\z/
       end
     end
     it 'does not show the inactive revisions as Active' do
       the_request
-      expect(last_response.body).to have_tag('tr.revision-app1_revision_a') do
+      expect(last_response.body).to have_tag('tr.revision-app1-revision_a') do
         without_tag 'td.col-status', text: /\A\s*Active\s*\z/
       end
     end
     it 'has a Make Active button on non-active revisions' do
       the_request
       expect(last_response.body).to have_tag(
-        'tr.revision-app1_revision_a td.col-status form',
+        'tr.revision-app1-revision_a td.col-status form',
         method: 'post',
-        action: '/applications/application1/activate/app1_revision_a',
+        action: '/applications/application1/activate/app1%3Arevision_a',
       ) do
         with_tag 'input', value: /Make Active/i
       end
     end
     it 'does not have a Make Active button on active revisions' do
       the_request
-      expect(last_response.body).to have_tag('tr.revision-app1_revision_b') do
+      expect(last_response.body).to have_tag('tr.revision-app1-revision_b') do
         without_tag 'td.col-status form'
       end
     end
@@ -117,14 +117,14 @@ describe EmberCliDeployRedis::Web do
       it 'has a Test link for each non-active revision' do
         the_request
         expect(last_response.body).to have_tag(
-          'tr.revision-app1_revision_a td.col-revision a',
+          'tr.revision-app1-revision_a td.col-revision a',
           text: /test this revision/i,
-          href: '/?_specified_revision[application1]=app1_revision_a',
+          href: '/?_specified_revision[application1]=app1%3Arevision_a',
         )
       end
       it 'does not have a Test link for active revisions' do
         the_request
-        expect(last_response.body).to have_tag('tr.revision-app1_revision_b') do
+        expect(last_response.body).to have_tag('tr.revision-app1-revision_b') do
           without_tag 'td.col-status a', text: /test this revision/i
         end
       end
@@ -132,7 +132,7 @@ describe EmberCliDeployRedis::Web do
   end
 
   describe 'POST /applications/:app_name/activate/:revision_name' do
-    let(:the_request) { post "/applications/application1/activate/app1_revision_a" }
+    let(:the_request) { post "/applications/application1/activate/app1%3Arevision_a" }
 
     before do
       app1_revision_a.activate!

data/web/views/_footer.erb

@@ -3,10 +3,10 @@
     <div class="container text-center">
         <ul class="nav">
           <li>
-            <p class="navbar-text" style="color:white;"><%= product_version %></p>
+            <p class="navbar-text" style="color:white;"><%= h product_version %></p>
           </li>
           <li>
-            <p class="navbar-text"><%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
+            <p class="navbar-text"><%= h Time.now.utc.strftime('%H:%M:%S UTC') %></p>
           </li>
         </ul>
     </div>

data/web/views/application.erb

@@ -1,33 +1,33 @@
 <div class= "dashboard clearfix">
   <h3 >
-    <%= t('ApplicationRevisions', application_name: @application.name) %>
+    <%= h t('ApplicationRevisions', application_name: @application.name) %>
   </h3>
 </div>
 
 <div class="table_container">
   <table class="revisions table table-hover table-bordered table-striped table-white">
     <thead>
-      <th class='col col-status'><%= t('Status') %></th>
-      <th class='col col-revision'><%= t('Revision') %></th>
+      <th class='col col-status'><%= h t('Status') %></th>
+      <th class='col col-revision'><%= h t('Revision') %></th>
     </thead>
     <tbody>
     <% @revisions.each do |revision| %>
-      <tr class='revision revision-<%= revision.name.gsub(/\W+/, '-')%>'>
+      <tr class='revision revision-<%= css_class_name(revision.name) %>'>
         <td class='col col-status' width="15%">
           <% if revision.active? %>
             Active
           <% else %>
-            <form action="<%= root_path %>applications/<%= @application.name %>/activate/<%= revision.name %>" method="post">
+            <form action="<%= h root_path %><%= h revision_activate_path(revision) %>" method="post">
               <%= csrf_tag %>
-              <input class="btn btn-warn btn-xs" type="submit" name="activate" value="<%= t('MakeActive') %>" data-confirm="<%= t('AreYouSureActivateRevision', revision: h(revision.name)) %>" />
+              <input class="btn btn-warn btn-xs" type="submit" name="activate" value="<%= h t('MakeActive') %>" data-confirm="<%= h t('AreYouSureActivateRevision', revision: revision.name) %>" />
             </form>
           <% end %>
         </td>
         <td class='col col-revision'>
-          <%= revision.name %>
+          <%= h revision.name %>
           <% if revision_specifier_query_param && !revision.active? %>
-            <a target='_new' href="<%= revision_test_url(revision) %>">
-              <%= t('TestThisRevision') %>
+            <a target='_new' href="<%= h revision_test_url(revision) %>">
+              <%= h t('TestThisRevision') %>
             </a>
           <% end %>
         </td>

data/web/views/dashboard.erb

@@ -1,23 +1,23 @@
 <div class= "dashboard clearfix">
   <h3 >
-    <%= t('DeployedApplications') %>
+    <%= h t('DeployedApplications') %>
   </h3>
 </div>
 
 <div class="table_container">
   <table class="applications table table-hover table-bordered table-striped table-white">
     <thead>
-      <th class='col col-application'><%= t('Application') %></th>
-      <th class='col col-current-revision'><%= t('CurrentRevision') %></th>
+      <th class='col col-application'><%= h t('Application') %></th>
+      <th class='col col-current-revision'><%= h t('CurrentRevision') %></th>
     </thead>
     <tbody>
     <% @applications.each do |application| %>
       <tr class='application'>
         <td class='col col-application'>
-          <a href="<%= root_path %>applications/<%= application.name %>"><%= application.name %></a>
+          <a href="<%= h root_path %><%= h application_path(application) %>"><%= h application.name %></a>
         </td>
         <td class='col col-current-revision'>
-          <%= application.active_revision ? application.active_revision.name : t('none')%>
+          <%= h application.active_revision ? application.active_revision.name : t('none')%>
         </td>
       </tr>
     <% end %>

data/web/views/layout.erb

@@ -3,11 +3,11 @@
   <head>
     <title>Ember-CLI Deployments</title>
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
-    <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
-    <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
-    <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
+    <link href="<%= h root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="<%= h root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" type="image/ico" href="<%= h root_path %>images/favicon.ico" />
+    <script type="text/javascript" src="<%= h root_path %>javascripts/application.js"></script>
+    <script type="text/javascript" src="<%= h root_path %>javascripts/locales/jquery.timeago.<%= h locale %>.js"></script>
     <meta name="google" content="notranslate" />
     <%= display_custom_head %>
   </head>
@@ -21,6 +21,6 @@
         </div>
       </div>
     </div>
-    <%=  erb :_footer %>
+    <%= erb :_footer %>
   </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember_cli_deploy_redis
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ahalogy
@@ -9,148 +9,144 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   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: fakeredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Handles the serving of page contents of deployed ember-cli projects
-  deployed using our fork of
-
+description: |
+  Handles the serving of page contents of deployed ember-cli projects deployed using our fork of
   (ember-cli-deploy-redis)[https://github.com/Ahalogy/ember-cli-deploy-redis],
-
   which stores deployment information including the index page contents in Redis.
-
-'
 email:
 - robin@robindaugherty.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .hound.yml
-- .jrubyrc
-- .rspec
-- .rubocop.yml
-- .ruby-version
-- .tm_properties
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".jrubyrc"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".tm_properties"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -237,23 +233,32 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - An Ember-ClI project
-- (ember-cli-deploy)[https://github.com/ember-cli/ember-cli-deploy], 0.4.x
-- (ember-cli-deploy-redis)[https://github.com/Ahalogy/ember-cli-deploy-redis]
+- "(ember-cli-deploy)[https://github.com/ember-cli/ember-cli-deploy], 0.4.x"
+- "(ember-cli-deploy-redis)[https://github.com/Ahalogy/ember-cli-deploy-redis]"
 - A Ruby (Rails/Sinatra/etc) app to serve up the Ember-CLI project and provide it
   an API.
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Serves up ember-cli content deployed with our fork of ember-cli-deploy-redis
-test_files: []
+test_files:
+- spec/lib/ember_cli_deploy_redis/application_spec.rb
+- spec/lib/ember_cli_deploy_redis/configuration_spec.rb
+- spec/lib/ember_cli_deploy_redis/revision_list_spec.rb
+- spec/lib/ember_cli_deploy_redis/revision_spec.rb
+- spec/lib/ember_cli_deploy_redis/web_helpers_spec.rb
+- spec/lib/ember_cli_deploy_redis/web_spec.rb
+- spec/lib/ember_cli_deploy_redis_spec.rb
+- spec/spec_helper.rb
+has_rdoc: