Rename main project to alcova

cbrewster · Aug 18, 2020 · 75cccda · 75cccda
1 parent a2f7409
commit 75cccda
Show file tree

Hide file tree

Showing 30 changed files with 82 additions and 154 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,5 @@
 members = [
     "./alcova",
     "./alcova_macros",
-    "./example",
-    "./liveview",
+    "./alcova_examples",
 ]
diff --git a/alcova/Cargo.toml b/alcova/Cargo.toml
@@ -1,11 +1,19 @@
 [package]
 name = "alcova"
 version = "0.1.0"
-authors = ["Connor Brewster <[email protected]>"]
+authors = ["Connor Brewster <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0"
+actix = "0.9.0"
+actix-web-actors = "2.0.0"
+actix-web = "2.0.0"
+alcova_macros = { path = "../alcova_macros" }
+futures = "0.3.5"
+jsonwebtoken = "7"
+log = "0.4.8"
+serde = { version = "1.0", features = [ "derive" ] }
+serde_json = "1.0"
 
diff --git a/alcova/src/lib.rs b/alcova/src/lib.rs
@@ -1,5 +1,13 @@
-mod ast;
-mod parse;
+#[macro_use]
+extern crate log;
 
-pub use ast::{BinaryOperator, CodeExpression, Expression, Pattern, Template, TypePath};
-pub use parse::{parse_template, Parser};
+mod live_socket;
+mod live_template;
+mod live_view;
+mod registry;
+
+pub use live_socket::{LiveSocket, LiveSocketContext};
+pub use live_template::{Changes, LiveTemplate, RenderedTemplate, Slot};
+pub use live_view::{LiveHandler, LiveMessage, LiveView, LiveViewContext};
+pub use registry::LiveViewRegistry;
+pub use alcova_macros::*;
diff --git a/liveview/src/live_socket.rs → alcova/src/live_socket.rs b/liveview/src/live_socket.rs → alcova/src/live_socket.rs
diff --git a/liveview/src/live_template.rs → alcova/src/live_template.rs b/liveview/src/live_template.rs → alcova/src/live_template.rs
diff --git a/liveview/src/live_view.rs → alcova/src/live_view.rs b/liveview/src/live_view.rs → alcova/src/live_view.rs
diff --git a/liveview/src/registry.rs → alcova/src/registry.rs b/liveview/src/registry.rs → alcova/src/registry.rs
diff --git a/example/Cargo.toml → alcova_examples/Cargo.toml b/example/Cargo.toml → alcova_examples/Cargo.toml
@@ -1,13 +1,12 @@
 [package]
-name = "example"
+name = "alcova_examples"
 version = "0.1.0"
-authors = ["Connor Brewster <[email protected]>"]
+authors = ["Connor Brewster <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-liveview = { path = "../liveview" }
 alcova = { path = "../alcova" }
 alcova_macros = { path = "../alcova_macros" }
 actix = "0.9.0"

diff --git a/example/fruits.txt → alcova_examples/fruits.txt b/example/fruits.txt → alcova_examples/fruits.txt
diff --git a/example/src/chat.rs → alcova_examples/src/chat.rs b/example/src/chat.rs → alcova_examples/src/chat.rs
@@ -2,8 +2,7 @@ use crate::RootTemplate;
 use actix::{Actor, Addr, AsyncContext, Context, Handler, Message, Recipient};
 use actix_identity::Identity;
 use actix_web::{http, web, HttpRequest, Responder};
-use alcova_macros::LiveTemplate;
-use liveview::{
+use alcova::{
     LiveHandler, LiveMessage, LiveSocketContext, LiveTemplate, LiveView, LiveViewContext,
 };
 use serde::{Deserialize, Serialize};

diff --git a/example/src/fruit.rs → alcova_examples/src/fruit.rs b/example/src/fruit.rs → alcova_examples/src/fruit.rs
@@ -1,7 +1,6 @@
 use crate::RootTemplate;
 use actix_web::{web, Responder};
-use alcova_macros::LiveTemplate;
-use liveview::{LiveSocketContext, LiveTemplate, LiveView, LiveViewContext};
+use alcova::{LiveSocketContext, LiveTemplate, LiveView, LiveViewContext};
 
 fn fruits() -> Vec<&'static str> {
     include_str!("../fruits.txt").lines().collect()

diff --git a/example/src/main.rs → alcova_examples/src/main.rs b/example/src/main.rs → alcova_examples/src/main.rs
@@ -10,11 +10,10 @@ use actix_files as fs;
 use actix_identity::{CookieIdentityPolicy, IdentityService};
 use actix_web::{middleware, web, App, Error, HttpRequest, HttpResponse, HttpServer, Responder};
 use actix_web_actors::ws;
-use alcova_macros::LiveTemplate;
+use alcova::{LiveSocket, LiveTemplate, LiveViewRegistry};
 use chat::{ChatLive, Lobby};
 use fruit::FruitLive;
 use listenfd::ListenFd;
-use liveview::{LiveSocket, LiveTemplate, LiveViewRegistry};
 use timer::TimerLive;
 use top::TopLive;
 

diff --git a/example/src/timer.rs → alcova_examples/src/timer.rs b/example/src/timer.rs → alcova_examples/src/timer.rs
@@ -1,8 +1,7 @@
 use crate::RootTemplate;
 use actix::{AsyncContext, Message, SpawnHandle};
 use actix_web::{web, Responder};
-use alcova_macros::LiveTemplate;
-use liveview::{
+use alcova::{
     LiveHandler, LiveMessage, LiveSocketContext, LiveTemplate, LiveView, LiveViewContext,
 };
 use std::time::{Duration, Instant};

diff --git a/example/src/top.rs → alcova_examples/src/top.rs b/example/src/top.rs → alcova_examples/src/top.rs
@@ -1,8 +1,7 @@
 use crate::RootTemplate;
 use actix::{AsyncContext, Message};
 use actix_web::{web, Responder};
-use alcova_macros::LiveTemplate;
-use liveview::{
+use alcova::{
     LiveHandler, LiveMessage, LiveSocketContext, LiveTemplate, LiveView, LiveViewContext,
 };
 use std::{process::Stdio, time::Duration};

diff --git a/example/templates/chat.html.rlt → alcova_examples/templates/chat.html.rlt b/example/templates/chat.html.rlt → alcova_examples/templates/chat.html.rlt
diff --git a/example/templates/fruit.html.rlt → alcova_examples/templates/fruit.html.rlt b/example/templates/fruit.html.rlt → alcova_examples/templates/fruit.html.rlt
@@ -1,4 +1,4 @@
-<h1 class="mt-4 text-xl font-bold text-gray-800">Rust LiveView Autocomplete</h1>
+<h1 class="mt-4 text-xl font-bold text-gray-800">Alcova Autocomplete</h1>
 
 {{ if true != !(@selected.len() > 3) }}
     Well thats a lot of fruit!

diff --git a/example/templates/index.html.rlt → alcova_examples/templates/index.html.rlt b/example/templates/index.html.rlt → alcova_examples/templates/index.html.rlt
@@ -1,4 +1,4 @@
-<h1 class="mt-4 text-xl font-bold text-gray-800">Rust LiveView Demos</h1>
+<h1 class="mt-4 text-xl font-bold text-gray-800">Alcova Demos</h1>
 
 <ul class="list-disc text-lg font-medium">
     <li><a href="/fruit" class="text-blue-500 underline">Fruit Autocomplete Demo</a></li>

diff --git a/example/templates/layout.html.rlt → alcova_examples/templates/layout.html.rlt b/example/templates/layout.html.rlt → alcova_examples/templates/layout.html.rlt
@@ -4,8 +4,8 @@
 <head>
   <meta charset="utf-8">
 
-  <title>Rust LiveView Demo</title>
-  <meta name="description" content="Rust LiveView">
+  <title>Alcova Demo</title>
+  <meta name="description" content="Alcova Demo">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">

diff --git a/example/templates/login.html.rlt → alcova_examples/templates/login.html.rlt b/example/templates/login.html.rlt → alcova_examples/templates/login.html.rlt
diff --git a/example/templates/timer.html.rlt → alcova_examples/templates/timer.html.rlt b/example/templates/timer.html.rlt → alcova_examples/templates/timer.html.rlt
diff --git a/example/templates/top.html.rlt → alcova_examples/templates/top.html.rlt b/example/templates/top.html.rlt → alcova_examples/templates/top.html.rlt
diff --git a/alcova_macros/Cargo.toml b/alcova_macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "alcova_macros"
 version = "0.1.0"
-authors = ["Connor Brewster <[email protected]>"]
+authors = ["Connor Brewster <[email protected]>"]
 edition = "2018"
 
 [lib]
@@ -11,6 +11,5 @@ proc-macro = true
 [dependencies]
 syn = {version = "1.0", features = [ "full" ] }
 quote = "1.0"
-alcova = {path = "../alcova"}
 proc-macro-error = "1.0"
 proc-macro2 = "1.0"
diff --git a/alcova/src/ast.rs → alcova_macros/src/ast.rs b/alcova/src/ast.rs → alcova_macros/src/ast.rs
diff --git a/alcova_macros/src/lib.rs b/alcova_macros/src/lib.rs
@@ -1,8 +1,10 @@
 extern crate proc_macro;
 
-use alcova::{
-    parse_template, BinaryOperator, CodeExpression, Expression, Parser, Pattern, TypePath,
-};
+mod ast;
+mod parse;
+
+use ast::{BinaryOperator, CodeExpression, Expression, Pattern, Template, TypePath};
+use parse::{parse_template, Parser};
 use proc_macro::TokenStream;
 use proc_macro_error::{abort, proc_macro_error};
 use quote::quote;
@@ -95,25 +97,25 @@ fn impl_live_template(ast: &syn::DeriveInput) -> TokenStream {
 
         #[automatically_derived]
         #[allow(unused_qualifications)]
-        impl liveview::LiveTemplate for #name {
-            fn render(&self) -> liveview::RenderedTemplate {
+        impl alcova::LiveTemplate for #name {
+            fn render(&self) -> alcova::RenderedTemplate {
                 use std::convert::TryInto;
 
-                liveview::RenderedTemplate {
+                alcova::RenderedTemplate {
                     slots: vec![
                         #slots
                     ]
                 }
             }
 
-            fn changes(&self, old_template: &Self) -> liveview::Changes {
+            fn changes(&self, old_template: &Self) -> alcova::Changes {
                 use std::convert::TryInto;
 
                 let mut changes = vec![];
 
                 #changes
 
-                liveview::Changes { changes }
+                alcova::Changes { changes }
             }
         }
     };
@@ -370,15 +372,15 @@ fn generate_match_arm(
     }
 }
 
-fn generate_slots(template: &alcova::Template) -> Result<proc_macro2::TokenStream, &'static str> {
+fn generate_slots(template: &Template) -> Result<proc_macro2::TokenStream, &'static str> {
     let mut tokens: Vec<proc_macro2::TokenTree> = vec![];
 
     for expression in &template.expressions {
         let value = generate_expression(expression, "self");
         match expression {
             Expression::Literal(_) => {
                 tokens.extend(quote! {
-                    liveview::Slot::Static(#value),
+                    alcova::Slot::Static(#value),
                 });
             }
             Expression::CodeBlock(_)
@@ -387,7 +389,7 @@ fn generate_slots(template: &alcova::Template) -> Result<proc_macro2::TokenStrea
             | Expression::IfLet { .. }
             | Expression::Match { .. } => {
                 tokens.extend(quote! {
-                    liveview::Slot::Dynamic(#value),
+                    alcova::Slot::Dynamic(#value),
                 });
             }
         }
@@ -396,7 +398,7 @@ fn generate_slots(template: &alcova::Template) -> Result<proc_macro2::TokenStrea
     Ok(tokens.into_iter().collect())
 }
 
-fn generate_changes(template: &alcova::Template) -> Result<proc_macro2::TokenStream, &'static str> {
+fn generate_changes(template: &Template) -> Result<proc_macro2::TokenStream, &'static str> {
     let mut tokens: Vec<proc_macro2::TokenTree> = vec![];
 
     for (i, expression) in template.expressions.iter().enumerate() {

diff --git a/alcova/src/parse.rs → alcova_macros/src/parse.rs b/alcova/src/parse.rs → alcova_macros/src/parse.rs
diff --git a/liveview/Cargo.toml b/liveview/Cargo.toml
diff --git a/liveview/src/lib.rs b/liveview/src/lib.rs