riddler_admin 0.1.0 → 0.2.0

data/app/views/riddler_admin/steps/edit.html.erb

@@ -1,6 +1,17 @@
-<h1>Editing Step</h1>
+<div class="card">
+  <div class="card-body">
+    <div class="row">
+      <div class="col-sm">
+        <h1>Editing Step</h1>
+      </div>
+    </div>
 
-<%= render 'form', step: @step %>
+    <div class="row">
+      <div class="col-sm">
+        <%= render 'form', step: @step %>
 
-<%= link_to 'Show', @step %> |
-<%= link_to 'Back', steps_path %>
+        <%= link_to 'Back', @step %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/riddler_admin/steps/index.html.erb

@@ -1,13 +1,27 @@
-<p id="notice"><%= notice %></p>
+<div class="row">
+  <% if notice %>
+  <div class="col-sm">
+    <span id="notice"><%= notice %></span>
+  </div>
+  <% end %>
+</div>
 
-<h1>Steps</h1>
+<div class="row">
+  <div class="col-sm-6">
+    <h1>Steps</h1>
+  </div>
+  <div class="col-sm-6">
+    <%= link_to 'New step', new_step_path, class: 'btn btn-primary float-right'%>
+  </div>
+</div>
 
-<table>
+<table class="table">
   <thead>
     <tr>
+      <th>Title</th>
       <th>Id</th>
       <th>Type</th>
-      <th>Name</th>
+
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -15,17 +29,17 @@
   <tbody>
     <% @steps.each do |step| %>
       <tr>
+        <td><%= link_to step.title, step %></td>
         <td><%= step.id %></td>
         <td><%= step.type.demodulize %></td>
-        <td><%= step.name %></td>
-        <td><%= link_to 'Show', step %></td>
-        <td><%= link_to 'Edit', edit_step_path(step) %></td>
-        <td><%= link_to 'Destroy', step, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+
+        <td>
+            <%= link_to 'Delete', step, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-light' %>
+
+        </td>
       </tr>
     <% end %>
   </tbody>
 </table>
 
 <br>
-
-<%= link_to 'New Step', new_step_path %>

data/app/views/riddler_admin/steps/internal_preview.js.erb

@@ -0,0 +1,5 @@
+$("#<%= @preview_context.id %>-json pre")
+  .html("<%= j JSON.pretty_generate @preview_hash %>");
+
+$("#<%= @preview_context.id %>-visual")
+  .html("<%= j render partial: "riddler_admin/steps/visual_preview", locals: { data: @preview_hash } %>")

data/app/views/riddler_admin/steps/new.html.erb

@@ -1,5 +1,10 @@
-<h1>New Step</h1>
-
-<%= render 'form', step: @step %>
-
-<%= link_to 'Back', steps_path %>
+<div class="card">
+  <div class="card-body">
+    <div class="row">
+      <div class="col-sm">
+        <h1>New Step</h1>
+      </div>
+    </div>
+    <%= render "form", step: @step %>
+  </div>
+</div>

data/app/views/riddler_admin/steps/new.js.erb

@@ -0,0 +1,3 @@
+$("#new-step")
+  .html("<%= j render partial: "new_sub_step", locals: { step: @step } %>")
+  .show()

data/app/views/riddler_admin/steps/preview.json.erb

@@ -0,0 +1 @@
+<%= @use_case.process.to_json.html_safe %>

data/app/views/riddler_admin/steps/show.html.erb

@@ -1,14 +1,29 @@
-<p id="notice"><%= notice %></p>
+<div class="row">
+  <div class="col-sm">
+    <% if notice %>
+    <div class="alert alert-success">
+      <span id="notice"><%= notice %></span>
+    </div>
+    <% end %>
+  </div>
+</div>
 
-<%= link_to 'Edit', edit_step_path(@step) %> |
-<%= link_to 'Steps', steps_path %>
-
-<h1>
-  <%= @step.name %>
-  <small class="text-muted" style="font-size: 0.4em;">
-    <%= @step.type.demodulize.titleize %> Step
-    <%= @step.id %>
-  </small>
-</h1>
+<div class="row" style="margin-bottom: 32px;">
+  <div class="col-sm-6">
+    <h1><%= @step.title %></h1>
+  </div>
+  <div class="col-sm-6">
+    <%= link_to 'Edit Step', edit_step_path(@step), class: 'btn btn-light float-right' %>
+    <%= link_to "#{@step.preview_enabled ? 'Disable' : 'Enable'} Preview", toggle_step_path(@step), class: 'btn btn-light float-right mr-2' %>
+    <% if ::RiddlerAdmin.configuration.remote_riddler? %>
+      <%= link_to "Publish", new_publish_request_path(step_id: @step.id), class: "btn btn-light float-right"%>
+    <% end %>
+    <% if @step.preview_enabled %>
+      <span class="badge badge-success float-right mr-2 mt-2">Preview Enabled</span>
+    <% else %>
+      <span class="badge badge-secondary float-right mr-2 mt-2">Preview Disabled</span>
+    <% end %>
+  </div>
+</div>
 
 <%= render partial: @step.to_partial_path("show") %>

data/app/views/riddler_admin/steps/show.js.erb

@@ -0,0 +1,4 @@
+$("#new-step").fadeOut().html("").show();
+
+$("#<%= @step.stepable.id %>-steps")
+  .html("<%= j render partial: "riddler_admin/step", collection: @step.stepable.steps %>")

data/app/views/riddler_admin/steps/variant/_show.html.erb

@@ -0,0 +1,59 @@
+<div class="row" style="margin-bottom: 32px;">
+  <div class="col-sm">
+
+    <ul id="step-tabs" class="nav nav-tabs">
+      <li class="nav-item">
+        <a class="nav-link active" id="steps-tab" data-toggle="tab" href="#steps" role="tab" aria-controls="steps" aria-selected="true">Steps</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" id="step-definition-tab" data-toggle="tab" href="#step-definition" role="tab" aria-controls="step-definition" aria-selected="false">Definition</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" id="step-preview-tab" data-toggle="tab" href="#step-preview" role="tab" aria-controls="step-preview" aria-selected="false">Preview</a>
+      </li>
+    </ul>
+
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-sm">
+
+    <div class="tab-content" id="step-tabs-content">
+      <div class="tab-pane fade show active" id="steps" role="tabpanel" aria-labelledby="steps-tab">
+
+        <div class="container">
+          <div class="row">
+            <div class="col-md-3">
+              <h4>Add a step type</h4>
+
+              <ul class="nav flex-column">
+              <% RiddlerAdmin::Step.available_classes.each do |klass| %>
+                <%= link_to "#{klass.short_name} Step", new_step_path(type: klass.name, step_id: @step.id), remote: true, class: 'nav-link' %>
+              <% end %>
+              </ul>
+
+            </div>
+            <div class="col-md-9">
+              <div id="new-step">
+              </div>
+
+              <%= render partial: "riddler_admin/step_container", locals: { stepable: @step } %>
+
+            </div>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="tab-pane fade" id="step-definition" role="tabpanel" aria-labelledby="definition-tab">
+        <%= render partial: "definition", object: @step %>
+      </div>
+
+      <div class="tab-pane fade" id="step-preview" role="tabpanel" aria-labelledby="preview-tab">
+        <%= render partial: "riddler_admin/preview_step", locals: { preview_contexts: @preview_contexts, step: @step } %>
+      </div>
+    </div>
+
+  </div>
+</div>

data/config/routes.rb

@@ -1,6 +1,25 @@
 RiddlerAdmin::Engine.routes.draw do
-  resources :steps
+  root to: "dashboard#index"
+
   resources :elements do
     put "sort", on: :collection
   end
+
+  resources :preview_contexts
+
+  resources :publish_requests do
+    post "approve", on: :member
+    post "publish", on: :member
+  end
+
+  resources :steps do
+    put "sort", on: :collection
+
+    get "internal_preview", on: :member
+    post "preview", on: :member
+    get "preview", on: :member
+    get "toggle", on: :member
+  end
+
+  resources :slugs
 end

data/db/migrate/20181124201519_riddler_admin_genesis.rb

@@ -0,0 +1,72 @@
+class RiddlerAdminGenesis < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ra_elements, id: false do |t|
+      t.primary_key :id, :string, index: true
+      t.timestamps
+      t.string :type, null: false
+      t.string :name, null: false
+      t.references :container, polymorphic: true, index: true, type: :string
+      t.integer :position
+      t.string :text
+      t.string :url
+      t.string :include_predicate
+    end
+
+    create_table :ra_content_definitions, id: false do |t|
+      t.primary_key :id, :string, index: true
+      t.timestamps
+      t.references :publish_request, type: :string
+      t.references :content, polymorphic: true, index: true, type: :string
+      t.integer :version, null: false
+      t.integer :definition_schema_version, null: false
+      t.jsonb :definition, null: false
+    end
+
+    create_table :ra_preview_contexts, id: false do |t|
+      t.primary_key :id, :string, index: true
+      t.timestamps
+      t.string :title, null: false
+      t.string :params
+      t.string :headers
+      t.string :yaml
+      t.string :encrypted_yaml
+    end
+    add_index :ra_preview_contexts, :title, unique: true
+
+    create_table :ra_publish_requests, id: false do |t|
+      t.primary_key :id, :string, index: true
+      t.timestamps
+      t.timestamp :approved_at
+      t.string :approved_by_id
+      t.string :approved_by_name
+      t.timestamp :published_at
+      t.string :title, null: false
+      t.string :description
+      t.string :status, default: "pending", null: false
+      t.references :content, polymorphic: true, index: true, type: :string
+    end
+
+    create_table :ra_steps, id: false do |t|
+      t.primary_key :id, :string, index: true
+      t.timestamps
+      t.string :type, null: false
+      t.string :title
+      t.string :name, null: false
+      t.references :stepable, polymorphic: true, index: true, type: :string
+      t.integer :position
+      t.string :include_predicate
+      t.boolean :preview_enabled, default: false
+    end
+
+    create_table :ra_slugs, id: false do |t|
+      t.primary_key :id, :string, index: true
+      t.timestamps
+      t.string :name, null: false
+      t.string :status, default: "live", null: false
+      t.references :content_definition, type: :string, null: false
+      t.string :interaction_identity
+      t.string :target_predicate
+    end
+    add_index :ra_slugs, :name, unique: true
+  end
+end

data/lib/riddler_admin.rb

@@ -2,12 +2,39 @@ require "acts_as_list"
 require "bootstrap"
 require "jquery-rails"
 require "jquery-ui-rails"
-require "ksuid"
+require "ulid"
 
 require "riddler_admin/engine"
+require "riddler_admin/configuration"
+require "riddler"
 
 module RiddlerAdmin
   def self.table_name_prefix
-    "riddler_"
+    "ra_"
+  end
+
+  def self.configure
+    yield configuration
+  end
+
+  def self.configuration
+    @configuration ||= ::RiddlerAdmin::Configuration.new
+  end
+
+  def self.config; configuration; end
+
+  def self.encrypt plaintext, key:
+    encoded_plaintext = Base64.strict_encode64 plaintext
+    secret = Vault.logical.write "transit/encrypt/#{key}",
+      plaintext: encoded_plaintext
+
+    secret.data[:ciphertext]
+  end
+
+  def self.decrypt ciphertext, key:
+    secret = Vault.logical.write "transit/decrypt/#{key}",
+      ciphertext: ciphertext
+
+    Base64.strict_decode64 secret.data[:plaintext]
   end
 end

data/lib/riddler_admin/configuration.rb

@@ -0,0 +1,44 @@
+module RiddlerAdmin
+
+  class Configuration
+    attr_accessor :riddler_grpc_address, :encrypt_preview_contexts,
+      :vault_address, :preview_context_transit_key,
+      :current_user_method, :user_id_method, :user_name_block,
+      :user_can_approve_block, :user_can_deploy_block,
+      :controller_authorization_block, :app_name, :main_app_name,
+      :javascript_includes
+
+    attr_reader :user_class_name, :user_class,
+      :base_controller_name, :base_controller
+
+    def initialize
+      @riddler_grpc_address = nil
+      @encrypt_preview_contexts = false
+      @vault_address = nil
+      @preview_context_transit_key = "riddler-admin-preview-context"
+      @app_name = "Riddler"
+      @user_id_method = :id
+      @user_name_block = -> (user) { user.name }
+      @javascript_includes = []
+    end
+
+    def remote_riddler?
+      riddler_grpc_address.to_s.strip != ""
+    end
+
+    def encrypt_preview_contexts?
+      !!encrypt_preview_contexts
+    end
+
+    def user_class_name= name
+      @user_class_name = name
+      @user_class = name.constantize
+    end
+
+    def base_controller_name= name
+      @base_controller_name = name
+      @base_controller = name.constantize
+    end
+  end
+
+end

data/lib/riddler_admin/version.rb

@@ -1,3 +1,3 @@
 module RiddlerAdmin
-  VERSION = '0.1.0'
+  VERSION = "0.2.0"
 end

metadata

@@ -1,59 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: riddler_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - JohnnyT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: riddler
-  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: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: bootstrap
+  name: riddler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: ksuid
+  name: bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: ulid-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -134,44 +120,103 @@ files:
 - Rakefile
 - app/assets/config/riddler_admin_manifest.js
 - app/assets/javascripts/riddler_admin/application.js
+- app/assets/javascripts/riddler_admin/preview_contexts.js
+- app/assets/javascripts/riddler_admin/publish_requests.js
 - app/assets/javascripts/riddler_admin/steps.js
 - app/assets/stylesheets/riddler_admin/application.scss
+- app/assets/stylesheets/riddler_admin/preview_contexts.css
+- app/assets/stylesheets/riddler_admin/publish_requests.css
 - app/assets/stylesheets/riddler_admin/steps.css
 - app/assets/stylesheets/scaffold.css
 - app/controllers/riddler_admin/application_controller.rb
+- app/controllers/riddler_admin/dashboard_controller.rb
 - app/controllers/riddler_admin/elements_controller.rb
+- app/controllers/riddler_admin/preview_contexts_controller.rb
+- app/controllers/riddler_admin/publish_requests_controller.rb
+- app/controllers/riddler_admin/slugs_controller.rb
 - app/controllers/riddler_admin/steps_controller.rb
 - app/helpers/riddler_admin/application_helper.rb
+- app/helpers/riddler_admin/preview_contexts_helper.rb
+- app/helpers/riddler_admin/publish_requests_helper.rb
 - app/helpers/riddler_admin/steps_helper.rb
 - app/jobs/riddler_admin/application_job.rb
 - app/mailers/riddler_admin/application_mailer.rb
 - app/models/riddler_admin/application_record.rb
+- app/models/riddler_admin/content_definition.rb
 - app/models/riddler_admin/element.rb
-- app/models/riddler_admin/elements/copy.rb
 - app/models/riddler_admin/elements/heading.rb
+- app/models/riddler_admin/elements/image.rb
+- app/models/riddler_admin/elements/link.rb
+- app/models/riddler_admin/elements/text.rb
+- app/models/riddler_admin/elements/variant.rb
+- app/models/riddler_admin/preview_context.rb
+- app/models/riddler_admin/publish_request.rb
+- app/models/riddler_admin/slug.rb
 - app/models/riddler_admin/step.rb
 - app/models/riddler_admin/steps/content.rb
+- app/models/riddler_admin/steps/variant.rb
+- app/validators/parseable_predicate_validator.rb
 - app/views/layouts/riddler_admin/application.html.erb
 - app/views/riddler_admin/_element.html.erb
+- app/views/riddler_admin/_element_container.html.erb
+- app/views/riddler_admin/_navbar.html.erb
+- app/views/riddler_admin/_preview_step.html.erb
+- app/views/riddler_admin/_step.html.erb
+- app/views/riddler_admin/_step_container.html.erb
+- app/views/riddler_admin/dashboard/index.html.erb
+- app/views/riddler_admin/elements/_form.html.erb
 - app/views/riddler_admin/elements/_new.html.erb
 - app/views/riddler_admin/elements/_show.html.erb
-- app/views/riddler_admin/elements/copy/_class.html.erb
-- app/views/riddler_admin/elements/copy/_form.html.erb
 - app/views/riddler_admin/elements/destroy.js.erb
-- app/views/riddler_admin/elements/heading/_class.html.erb
+- app/views/riddler_admin/elements/edit.js.erb
+- app/views/riddler_admin/elements/heading/_detail.html.erb
 - app/views/riddler_admin/elements/heading/_form.html.erb
+- app/views/riddler_admin/elements/image/_detail.html.erb
+- app/views/riddler_admin/elements/image/_form.html.erb
+- app/views/riddler_admin/elements/link/_detail.html.erb
+- app/views/riddler_admin/elements/link/_form.html.erb
 - app/views/riddler_admin/elements/new.js.erb
 - app/views/riddler_admin/elements/show.js.erb
+- app/views/riddler_admin/elements/text/_detail.html.erb
+- app/views/riddler_admin/elements/text/_form.html.erb
+- app/views/riddler_admin/elements/variant/_detail.html.erb
+- app/views/riddler_admin/elements/variant/_form.html.erb
+- app/views/riddler_admin/preview_contexts/_form.html.erb
+- app/views/riddler_admin/preview_contexts/edit.html.erb
+- app/views/riddler_admin/preview_contexts/index.html.erb
+- app/views/riddler_admin/preview_contexts/new.html.erb
+- app/views/riddler_admin/preview_contexts/show.html.erb
+- app/views/riddler_admin/publish_requests/_actions.html.erb
+- app/views/riddler_admin/publish_requests/_form.html.erb
+- app/views/riddler_admin/publish_requests/approve.js.erb
+- app/views/riddler_admin/publish_requests/edit.html.erb
+- app/views/riddler_admin/publish_requests/index.html.erb
+- app/views/riddler_admin/publish_requests/new.html.erb
+- app/views/riddler_admin/publish_requests/publish.js.erb
+- app/views/riddler_admin/publish_requests/show.html.erb
+- app/views/riddler_admin/slugs/_form.html.erb
+- app/views/riddler_admin/slugs/edit.html.erb
+- app/views/riddler_admin/slugs/index.html.erb
+- app/views/riddler_admin/slugs/new.html.erb
+- app/views/riddler_admin/slugs/show.html.erb
+- app/views/riddler_admin/steps/_definition.html.erb
 - app/views/riddler_admin/steps/_form.html.erb
-- app/views/riddler_admin/steps/_preview.html.erb
+- app/views/riddler_admin/steps/_new_sub_step.html.erb
+- app/views/riddler_admin/steps/_visual_preview.html.erb
 - app/views/riddler_admin/steps/content/_show.html.erb
 - app/views/riddler_admin/steps/edit.html.erb
 - app/views/riddler_admin/steps/index.html.erb
+- app/views/riddler_admin/steps/internal_preview.js.erb
 - app/views/riddler_admin/steps/new.html.erb
+- app/views/riddler_admin/steps/new.js.erb
+- app/views/riddler_admin/steps/preview.json.erb
 - app/views/riddler_admin/steps/show.html.erb
+- app/views/riddler_admin/steps/show.js.erb
+- app/views/riddler_admin/steps/variant/_show.html.erb
 - config/routes.rb
-- db/migrate/20181124201519_create_riddler_admin_steps.rb
+- db/migrate/20181124201519_riddler_admin_genesis.rb
 - lib/riddler_admin.rb
+- lib/riddler_admin/configuration.rb
 - lib/riddler_admin/engine.rb
 - lib/riddler_admin/version.rb
 - lib/tasks/riddler_admin_tasks.rake