+
.get(90) %>)
@@ -38,61 +40,76 @@
<% if @actor.tag_line.present? %>
<%= truncate (@actor.tag_line || @actor.summary || "Posts in this tag"), length: 200 %>
- <% else %>
- Member since <%= @actor.created_at.strftime("%b %e, %Y") %>
<% end %>
<%= follow_button(@actor) %>
-
- <% if @actor.class.name == "Organization" && @actor.approved_and_filled_out_cta? %>
-
-
-
+ <% if @actor.class.name == "User" %>
+ <%= render "articles/user_metadata" %>
+ <% elsif @actor.class.name == "Organization" && @actor.approved_and_filled_out_cta? %>
+ <% end %>
+
+ <% if params[:html_variant_id] %>
+ <% @html_variant = HtmlVariant.where(group: "article_show_sidebar_cta", id: params[:html_variant_id].to_i ).first %>
+ <% else %>
+ <% @html_variant = HtmlVariant.find_for_test(@article.cached_tag_list_array) %>
+ <% end %>
+ <% if ( params[:html_variant_id] || !user_signed_in? ) && @html_variant %>
+
+ <%= @html_variant.html.html_safe %>
<% end %>
- <% if @user_stickies && @user_stickies.any? %>
-
- <% @user_stickies.each do |article| %>
-
- .get(90) %>)
- <%= article.title %>
-
- <% article.decorate.cached_tag_list_array.each do |tag| %>
- #<%= tag %>
- <% end %>
-
-
+ <% if user_signed_in? && @user_stickies && @user_stickies.any? %>
+ <% @user_stickies.each_with_index do |article, index| %>
+
<% end %>
<% end %>
- <% if @sticky_articles %>
-
- <% @sticky_articles.each do |article| %>
-
-
- <%= article.title %>
-
- <% article.decorate.cached_tag_list_array.each do |tag| %>
- #<%= tag %>
- <% end %>
-
-
+ <% if user_signed_in? && @sticky_articles %>
+ <% @sticky_articles.each_with_index do |article, index| %>
+
<% end %>
<% end %>
diff --git a/app/views/articles/edit.html.erb b/app/views/articles/edit.html.erb
index 5e026508c..9d735708b 100644
--- a/app/views/articles/edit.html.erb
+++ b/app/views/articles/edit.html.erb
@@ -1,4 +1,4 @@
-<% title "Edit Article - DEV" %>
+<% title "Edit Post" %>
<% if @article.video.present? %>
@@ -9,7 +9,7 @@
You'll get an email when this process finishes.
-
+
This is an ordinary unpublished post. Add title/tags/body/etc, and then mark as published after the video is done processing.
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 4f19ce35b..38ff1a1d6 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -216,7 +216,7 @@
-<% cache("sticky-sidebar-#{@article.id}-#{@article.edited_at}", :expires_in => 8.hours) do %>
+<% cache("sticky-sidebar-#{@article.id}-#{@article.edited_at}-#{(@organization || @user).updated_at}", :expires_in => 8.hours) do %>
<%= render "articles/sticky_nav" %>
<% end %>
@@ -238,4 +238,4 @@
<%= GistTag.script.html_safe %>
<%= RunkitTag.script.html_safe %>
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/html_variants/_form.html.erb b/app/views/html_variants/_form.html.erb
new file mode 100644
index 000000000..e4d2312ca
--- /dev/null
+++ b/app/views/html_variants/_form.html.erb
@@ -0,0 +1,26 @@
+<% if @html_variant.errors.any? %>
+
+
<%= pluralize(@html_variant.errors.count, "error") %> prohibited this block from being saved:
+
+
+ <% @html_variant.errors.full_messages.each do |message| %>
+ - <%= message %>
+ <% end %>
+
+
+<% end %>
+
+
+<%= form_for(@html_variant) do |f| %>
+ <% if @html_variant.new_record? %>
+ <%= f.label :name %>
+ <%= f.text_field :name, placeholder: 'Unique, descriptive name' %>
+ <% end %>
+ <%= f.label :html %>
+ <%= f.text_area :html, placeholder: 'HTML to be shown. Make sure all CSS is properly scoped, and all HTML tags are closed, etc. Manditory field.' %>
+ <%= f.label :published %>
+ <%= f.check_box :published %>
+ <%= f.label :target_tag %>
+ <%= f.text_field :target_tag, placeholder: 'One tag, e.g. javascript. Optional targeting.' %>
+ <%= f.submit %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/html_variants/_page_styles.html.erb b/app/views/html_variants/_page_styles.html.erb
new file mode 100644
index 000000000..f3ee523e4
--- /dev/null
+++ b/app/views/html_variants/_page_styles.html.erb
@@ -0,0 +1,71 @@
+
\ No newline at end of file
diff --git a/app/views/html_variants/_single_html_variant.html.erb b/app/views/html_variants/_single_html_variant.html.erb
new file mode 100644
index 000000000..b040d2c68
--- /dev/null
+++ b/app/views/html_variants/_single_html_variant.html.erb
@@ -0,0 +1,23 @@
+
+
+ <%= html_variant.name %>
+
+ <%= html_variant.html %>
+
+ <% if html_variant.published %>
+
published
+
fork
+ <% else %>
+
edit
+ <% end %>
+
preview
+ <% if html_variant.approved %>
+
approved
+ <% elsif admin %>
+ <%= form_for(html_variant) do |f| %>
+ <%= f.hidden_field :approved, value: "true" %>
+ <%= f.submit "APPROVE" %>
+ <% end %>
+ <% end %>
+
+
diff --git a/app/views/html_variants/edit.html.erb b/app/views/html_variants/edit.html.erb
new file mode 100644
index 000000000..8d7f70d63
--- /dev/null
+++ b/app/views/html_variants/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render "page_styles" %>
+
+
+
<%= @html_variant.name %>
+ <%= render "form" %>
+
diff --git a/app/views/html_variants/index.html.erb b/app/views/html_variants/index.html.erb
new file mode 100644
index 000000000..ca7465f2e
--- /dev/null
+++ b/app/views/html_variants/index.html.erb
@@ -0,0 +1,15 @@
+<%= render "page_styles" %>
+
+
+
+ HTML Variants New
+
+
Your HTML Variants
+ <% @user_variants.each do |html_variant| %>
+ <%= render "single_html_variant", html_variant: html_variant, admin: false %>
+ <% end %>
+
All Published
+ <% @all_published_variants.each do |html_variant| %>
+ <%= render "single_html_variant", html_variant: html_variant, admin: true %>
+ <% end %>
+
diff --git a/app/views/html_variants/new.html.erb b/app/views/html_variants/new.html.erb
new file mode 100644
index 000000000..e12a44994
--- /dev/null
+++ b/app/views/html_variants/new.html.erb
@@ -0,0 +1,5 @@
+<%= render "page_styles" %>
+
+
+ <%= render "form" %>
+
diff --git a/app/views/users/_org_admin.html.erb b/app/views/users/_org_admin.html.erb
index 24d338427..73d10ccda 100644
--- a/app/views/users/_org_admin.html.erb
+++ b/app/views/users/_org_admin.html.erb
@@ -113,38 +113,19 @@
<%= f.text_area :tech_stack, maxlength: 640, placeholder: "Limit of 640 characters" %>
- <%= f.label "Button Text" %>
+ <%= f.label "CTA Link Text" %>
<%= f.text_field :cta_button_text, maxlength: 12, placeholder: "Limit of 12 characters" %>
- <%= f.label "Button Link" %>
+ <%= f.label "CTA Link URL" %>
<%= f.text_field :cta_button_url %>
- <%= f.label "Body text" %>
- <%= f.text_area :cta_body_markdown, maxlength: 140, placeholder: "Limit of 140 characters" %>
+ <%= f.label "Body text (markdown inline only)" %>
+ <%= f.text_area :cta_body_markdown, maxlength: 256, placeholder: "Limit of 256 characters" %>
- <% if @organization.approved_and_filled_out_cta? %>
-
diff --git a/config/routes.rb b/config/routes.rb
index 7bd14f2b4..0d25ac310 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -113,6 +113,9 @@ Rails.application.routes.draw do
resources :videos, only: %i[create new]
resources :video_states, only: [:create]
resources :twilio_tokens, only: [:show]
+ resources :html_variants
+ resources :html_variant_trials, only: [:create]
+ resources :html_variant_successes, only: [:create]
resources :push_notification_subscriptions, only: [:create]
get "/notifications/:username" => "notifications#index"
diff --git a/db/migrate/20181019195746_create_html_variants.rb b/db/migrate/20181019195746_create_html_variants.rb
new file mode 100644
index 000000000..1d3adccc6
--- /dev/null
+++ b/db/migrate/20181019195746_create_html_variants.rb
@@ -0,0 +1,15 @@
+class CreateHtmlVariants < ActiveRecord::Migration[5.1]
+ def change
+ create_table :html_variants do |t|
+ t.integer :user_id
+ t.string :group
+ t.string :name
+ t.text :html
+ t.string :target_tag
+ t.float :success_rate, default: 0.0
+ t.boolean :published, default: false
+ t.boolean :approved, default: false
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20181020195949_create_html_variant_trials.rb b/db/migrate/20181020195949_create_html_variant_trials.rb
new file mode 100644
index 000000000..da5ac8b36
--- /dev/null
+++ b/db/migrate/20181020195949_create_html_variant_trials.rb
@@ -0,0 +1,10 @@
+class CreateHtmlVariantTrials < ActiveRecord::Migration[5.1]
+ def change
+ create_table :html_variant_trials do |t|
+ t.integer :html_variant_id
+ t.integer :article_id
+ t.timestamps
+ end
+ add_index :html_variant_trials, [:html_variant_id, :article_id]
+ end
+end
diff --git a/db/migrate/20181020195954_create_html_variant_successes.rb b/db/migrate/20181020195954_create_html_variant_successes.rb
new file mode 100644
index 000000000..30fde94ce
--- /dev/null
+++ b/db/migrate/20181020195954_create_html_variant_successes.rb
@@ -0,0 +1,10 @@
+class CreateHtmlVariantSuccesses < ActiveRecord::Migration[5.1]
+ def change
+ create_table :html_variant_successes do |t|
+ t.integer :html_variant_id
+ t.integer :article_id
+ t.timestamps
+ end
+ add_index :html_variant_successes, [:html_variant_id, :article_id]
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 51495dcd2..44779ac25 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@@ -12,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20181016181008) do
+ActiveRecord::Schema.define(version: 20181020195954) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -358,6 +356,35 @@ ActiveRecord::Schema.define(version: 20181016181008) do
t.integer "watchers_count"
end
+ create_table "html_variant_successes", force: :cascade do |t|
+ t.integer "article_id"
+ t.datetime "created_at", null: false
+ t.integer "html_variant_id"
+ t.datetime "updated_at", null: false
+ t.index ["html_variant_id", "article_id"], name: "index_html_variant_successes_on_html_variant_id_and_article_id"
+ end
+
+ create_table "html_variant_trials", force: :cascade do |t|
+ t.integer "article_id"
+ t.datetime "created_at", null: false
+ t.integer "html_variant_id"
+ t.datetime "updated_at", null: false
+ t.index ["html_variant_id", "article_id"], name: "index_html_variant_trials_on_html_variant_id_and_article_id"
+ end
+
+ create_table "html_variants", force: :cascade do |t|
+ t.boolean "approved", default: false
+ t.datetime "created_at", null: false
+ t.string "group"
+ t.text "html"
+ t.string "name"
+ t.boolean "published", default: false
+ t.float "success_rate", default: 0.0
+ t.string "target_tag"
+ t.datetime "updated_at", null: false
+ t.integer "user_id"
+ end
+
create_table "identities", id: :serial, force: :cascade do |t|
t.text "auth_data_dump"
t.datetime "created_at", null: false
diff --git a/lib/tasks/fetch.rake b/lib/tasks/fetch.rake
index bbcc04f04..282ca6dd6 100644
--- a/lib/tasks/fetch.rake
+++ b/lib/tasks/fetch.rake
@@ -91,3 +91,12 @@ task :award_contributor_badges, [:arg1] => :environment do |_t, args|
BadgeRewarder.award_contributor_badges(usernames)
puts "Done!"
end
+
+task remove_old_html_variant_data: :environment do
+ HtmlVariantTrial.where("created_at < ?", 1.week.ago).destroy_all
+ HtmlVariantSuccess.where("created_at < ?", 1.week.ago).destroy_all
+ HtmlVariant.find_each do |html_variant|
+ return if html_variant.html_variant_successes.size < 20
+ html_variant.calculate_success_rate!
+ end
+end
diff --git a/spec/factories/html_variants.rb b/spec/factories/html_variants.rb
new file mode 100644
index 000000000..9d3215d75
--- /dev/null
+++ b/spec/factories/html_variants.rb
@@ -0,0 +1,9 @@
+FactoryBot.define do
+ factory :html_variant do
+ user
+ name { Faker::Hipster.paragraph(1) }
+ html { "
#{rand(10000000000)}
HEllo
" }
+ success_rate { 0.3 }
+ group { "article_show_sidebar_cta" }
+ end
+end
diff --git a/spec/models/html_variant_spec.rb b/spec/models/html_variant_spec.rb
new file mode 100644
index 000000000..448cc5e43
--- /dev/null
+++ b/spec/models/html_variant_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+RSpec.describe HtmlVariant, type: :model do
+ it { is_expected.to validate_uniqueness_of(:name) }
+ it { is_expected.to validate_presence_of(:html) }
+ it { is_expected.to belong_to(:user) }
+
+ let(:html_variant) { create(:html_variant, approved: true, published: true) }
+
+ it "calculates success rate" do
+ HtmlVariantTrial.create!(html_variant_id: html_variant.id)
+ HtmlVariantTrial.create!(html_variant_id: html_variant.id)
+ HtmlVariantTrial.create!(html_variant_id: html_variant.id)
+ HtmlVariantTrial.create!(html_variant_id: html_variant.id)
+ HtmlVariantSuccess.create!(html_variant_id: html_variant.id)
+ html_variant.calculate_success_rate!
+ expect(html_variant.success_rate).to eq(0.025)
+ end
+
+ it "finds for test without tag" do
+ html_variant.save!
+ expect(HtmlVariant.find_for_test.id).to eq(html_variant.id)
+ end
+ it "finds for test with tag given" do
+ html_variant.target_tag = "hello"
+ html_variant.save!
+ expect(HtmlVariant.find_for_test(["hello"]).id).to eq(html_variant.id)
+ end
+ it "does not find if different tag targeted" do
+ html_variant.target_tag = "different_tag_yolo"
+ html_variant.save!
+ expect(HtmlVariant.find_for_test(["hello"])).to eq(nil)
+ end
+ it "finds if no tag targeted and tag given" do
+ html_variant.save!
+ expect(HtmlVariant.find_for_test(["hello"]).id).to eq(html_variant.id)
+ end
+end
diff --git a/spec/models/html_variant_success_spec.rb b/spec/models/html_variant_success_spec.rb
new file mode 100644
index 000000000..b7433582b
--- /dev/null
+++ b/spec/models/html_variant_success_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe HtmlVariantSuccess, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/html_variant_trial_spec.rb b/spec/models/html_variant_trial_spec.rb
new file mode 100644
index 000000000..9b77d92a1
--- /dev/null
+++ b/spec/models/html_variant_trial_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe HtmlVariantTrial, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/policies/html_variant_policy_spec.rb b/spec/policies/html_variant_policy_spec.rb
new file mode 100644
index 000000000..15be28800
--- /dev/null
+++ b/spec/policies/html_variant_policy_spec.rb
@@ -0,0 +1,18 @@
+require "rails_helper"
+
+RSpec.describe HtmlVariantPolicy do
+ subject { described_class.new(user, html_variant) }
+
+ context "when user is not an admin" do
+ let(:user) { build(:user) }
+ let(:html_variant) { build(:html_variant) }
+
+ it { is_expected.to forbid_actions(%i[index show edit update create]) }
+ end
+
+ context "when user is an admin" do
+ let(:user) { build(:user, :super_admin) }
+ let(:html_variant) { build(:html_variant) }
+ it { is_expected.to permit_actions(%i[index show edit update create]) }
+ end
+end
diff --git a/spec/requests/html_variant_successes_spec.rb b/spec/requests/html_variant_successes_spec.rb
new file mode 100644
index 000000000..af3e61f32
--- /dev/null
+++ b/spec/requests/html_variant_successes_spec.rb
@@ -0,0 +1,25 @@
+require "rails_helper"
+
+RSpec.describe "HtmlVariantSuccesses", type: :request do
+ let(:user) { create(:user) }
+ let(:article) { create(:article, user_id: user.id, approved: true) }
+ let(:html_variant) { create(:html_variant) }
+
+ before do
+ Delayed::Worker.delay_jobs = false
+ end
+
+ after do
+ Delayed::Worker.delay_jobs = true
+ end
+
+ describe "POST /html_variant_successes" do
+ it "rejects non-permissioned user" do
+ post "/html_variant_successes", params: {
+ article_id: article.id,
+ html_variant_id: html_variant.id,
+ }
+ expect(HtmlVariantSuccess.all.size).to eq(1)
+ end
+ end
+end
diff --git a/spec/requests/html_variant_trials_spec.rb b/spec/requests/html_variant_trials_spec.rb
new file mode 100644
index 000000000..6ba711c39
--- /dev/null
+++ b/spec/requests/html_variant_trials_spec.rb
@@ -0,0 +1,25 @@
+require "rails_helper"
+
+RSpec.describe "HtmlVariantTrials", type: :request do
+ let(:user) { create(:user) }
+ let(:article) { create(:article, user_id: user.id, approved: true) }
+ let(:html_variant) { create(:html_variant) }
+
+ before do
+ Delayed::Worker.delay_jobs = false
+ end
+
+ after do
+ Delayed::Worker.delay_jobs = true
+ end
+
+ describe "POST /html_variant_trials" do
+ it "rejects non-permissioned user" do
+ post "/html_variant_trials", params: {
+ article_id: article.id,
+ html_variant_id: html_variant.id,
+ }
+ expect(HtmlVariantTrial.all.size).to eq(1)
+ end
+ end
+end
diff --git a/spec/requests/html_variants_spec.rb b/spec/requests/html_variants_spec.rb
new file mode 100644
index 000000000..bd09fb9bc
--- /dev/null
+++ b/spec/requests/html_variants_spec.rb
@@ -0,0 +1,110 @@
+require "rails_helper"
+
+RSpec.describe "HtmlVariants", type: :request do
+ let(:user) { create(:user)}
+ let(:article) { create(:article, user_id: user.id, approved: true) }
+
+ before do
+ sign_in user
+ end
+
+ describe "GET /html_variants" do
+ it "rejects non-permissioned user" do
+ expect { get "/html_variants" }.to raise_error(Pundit::NotAuthorizedError)
+ end
+
+ it "accepts permissioned" do
+ user.add_role(:super_admin)
+ get "/html_variants"
+ expect(response.body).to include("HTML Variants")
+ end
+ end
+
+ describe "GET /html_variants/new" do
+ it "rejects non-permissioned user" do
+ expect { get "/html_variants/new" }.to raise_error(Pundit::NotAuthorizedError)
+ end
+
+ it "accepts permissioned" do
+ user.add_role(:super_admin)
+ get "/html_variants/new"
+ expect(response.body).to include("
"/> Trending on dev.to
-