From ef7379a6ce4dccdb585d8563e2a7e42fb4d60fa8 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim Date: Sun, 26 Apr 2015 17:55:16 -0400 Subject: [PATCH] Factor out reactive-web-{html,widgets} modules --- project/Build.scala | 10 +++++++++- reactive-web-html/build.sbt | 3 +++ .../src/main/scala/reactive/web/html/Button.scala | 0 .../main/scala/reactive/web/html/CheckboxInput.scala | 0 .../src/main/scala/reactive/web/html/Div.scala | 0 .../src/main/scala/reactive/web/html/Select.scala | 0 .../src/main/scala/reactive/web/html/Span.scala | 0 .../src/main/scala/reactive/web/html/TextArea.scala | 0 .../src/main/scala/reactive/web/html/TextInput.scala | 0 .../test/scala/reactive/web/html/SelectTests.scala | 0 .../test/scala/reactive/web/html/TextAreaTests.scala | 0 reactive-web-widgets/build.sbt | 1 + .../src/main/scala/reactive/web/widgets/Editor.scala | 0 .../main/scala/reactive/web/widgets/Filterable.scala | 0 .../main/scala/reactive/web/widgets/Messages.scala | 0 .../main/scala/reactive/web/widgets/TableEditor.scala | 0 .../main/scala/reactive/web/widgets/TableView.scala | 0 .../main/scala/reactive/web/widgets/Validity.scala | 0 .../main/scala/reactive/web/widgets/ValidityCue.scala | 0 .../src/test/scala/reactive/web/RepeaterTests.scala | 11 ++++++++++- 20 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 reactive-web-html/build.sbt rename {reactive-web => reactive-web-html}/src/main/scala/reactive/web/html/Button.scala (100%) rename {reactive-web => reactive-web-html}/src/main/scala/reactive/web/html/CheckboxInput.scala (100%) rename {reactive-web => reactive-web-html}/src/main/scala/reactive/web/html/Div.scala (100%) rename {reactive-web => reactive-web-html}/src/main/scala/reactive/web/html/Select.scala (100%) rename {reactive-web => reactive-web-html}/src/main/scala/reactive/web/html/Span.scala (100%) rename {reactive-web => reactive-web-html}/src/main/scala/reactive/web/html/TextArea.scala (100%) rename {reactive-web => reactive-web-html}/src/main/scala/reactive/web/html/TextInput.scala (100%) rename {reactive-web => reactive-web-html}/src/test/scala/reactive/web/html/SelectTests.scala (100%) rename {reactive-web => reactive-web-html}/src/test/scala/reactive/web/html/TextAreaTests.scala (100%) create mode 100644 reactive-web-widgets/build.sbt rename {reactive-web => reactive-web-widgets}/src/main/scala/reactive/web/widgets/Editor.scala (100%) rename {reactive-web => reactive-web-widgets}/src/main/scala/reactive/web/widgets/Filterable.scala (100%) rename {reactive-web => reactive-web-widgets}/src/main/scala/reactive/web/widgets/Messages.scala (100%) rename {reactive-web => reactive-web-widgets}/src/main/scala/reactive/web/widgets/TableEditor.scala (100%) rename {reactive-web => reactive-web-widgets}/src/main/scala/reactive/web/widgets/TableView.scala (100%) rename {reactive-web => reactive-web-widgets}/src/main/scala/reactive/web/widgets/Validity.scala (100%) rename {reactive-web => reactive-web-widgets}/src/main/scala/reactive/web/widgets/ValidityCue.scala (100%) diff --git a/project/Build.scala b/project/Build.scala index f5ddd9b9..58a7b85e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -61,9 +61,17 @@ object ReactiveBuild extends Build { .settings(publishingSettings: _*) .dependsOn(core, transport) + lazy val web_html = (project in file("reactive-web-html")) + .settings(publishingSettings: _*) + .dependsOn(web) + + lazy val web_widgets = (project in file("reactive-web-widgets")) + .settings(publishingSettings: _*) + .dependsOn(web_html) + lazy val web_lift = (project in file("reactive-web-lift")) .settings(publishingSettings: _*) - .dependsOn(web, routing) + .dependsOn(web_widgets, routing) lazy val web_demo = (project in file("reactive-web-demo")) .settings(nonPublishingSettings: _*) diff --git a/reactive-web-html/build.sbt b/reactive-web-html/build.sbt new file mode 100644 index 00000000..27c0baee --- /dev/null +++ b/reactive-web-html/build.sbt @@ -0,0 +1,3 @@ +name := "reactive-web-html" + +libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.0" % "test" diff --git a/reactive-web/src/main/scala/reactive/web/html/Button.scala b/reactive-web-html/src/main/scala/reactive/web/html/Button.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/html/Button.scala rename to reactive-web-html/src/main/scala/reactive/web/html/Button.scala diff --git a/reactive-web/src/main/scala/reactive/web/html/CheckboxInput.scala b/reactive-web-html/src/main/scala/reactive/web/html/CheckboxInput.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/html/CheckboxInput.scala rename to reactive-web-html/src/main/scala/reactive/web/html/CheckboxInput.scala diff --git a/reactive-web/src/main/scala/reactive/web/html/Div.scala b/reactive-web-html/src/main/scala/reactive/web/html/Div.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/html/Div.scala rename to reactive-web-html/src/main/scala/reactive/web/html/Div.scala diff --git a/reactive-web/src/main/scala/reactive/web/html/Select.scala b/reactive-web-html/src/main/scala/reactive/web/html/Select.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/html/Select.scala rename to reactive-web-html/src/main/scala/reactive/web/html/Select.scala diff --git a/reactive-web/src/main/scala/reactive/web/html/Span.scala b/reactive-web-html/src/main/scala/reactive/web/html/Span.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/html/Span.scala rename to reactive-web-html/src/main/scala/reactive/web/html/Span.scala diff --git a/reactive-web/src/main/scala/reactive/web/html/TextArea.scala b/reactive-web-html/src/main/scala/reactive/web/html/TextArea.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/html/TextArea.scala rename to reactive-web-html/src/main/scala/reactive/web/html/TextArea.scala diff --git a/reactive-web/src/main/scala/reactive/web/html/TextInput.scala b/reactive-web-html/src/main/scala/reactive/web/html/TextInput.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/html/TextInput.scala rename to reactive-web-html/src/main/scala/reactive/web/html/TextInput.scala diff --git a/reactive-web/src/test/scala/reactive/web/html/SelectTests.scala b/reactive-web-html/src/test/scala/reactive/web/html/SelectTests.scala similarity index 100% rename from reactive-web/src/test/scala/reactive/web/html/SelectTests.scala rename to reactive-web-html/src/test/scala/reactive/web/html/SelectTests.scala diff --git a/reactive-web/src/test/scala/reactive/web/html/TextAreaTests.scala b/reactive-web-html/src/test/scala/reactive/web/html/TextAreaTests.scala similarity index 100% rename from reactive-web/src/test/scala/reactive/web/html/TextAreaTests.scala rename to reactive-web-html/src/test/scala/reactive/web/html/TextAreaTests.scala diff --git a/reactive-web-widgets/build.sbt b/reactive-web-widgets/build.sbt new file mode 100644 index 00000000..4031439c --- /dev/null +++ b/reactive-web-widgets/build.sbt @@ -0,0 +1 @@ +name := "reactive-web-widgets" diff --git a/reactive-web/src/main/scala/reactive/web/widgets/Editor.scala b/reactive-web-widgets/src/main/scala/reactive/web/widgets/Editor.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/widgets/Editor.scala rename to reactive-web-widgets/src/main/scala/reactive/web/widgets/Editor.scala diff --git a/reactive-web/src/main/scala/reactive/web/widgets/Filterable.scala b/reactive-web-widgets/src/main/scala/reactive/web/widgets/Filterable.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/widgets/Filterable.scala rename to reactive-web-widgets/src/main/scala/reactive/web/widgets/Filterable.scala diff --git a/reactive-web/src/main/scala/reactive/web/widgets/Messages.scala b/reactive-web-widgets/src/main/scala/reactive/web/widgets/Messages.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/widgets/Messages.scala rename to reactive-web-widgets/src/main/scala/reactive/web/widgets/Messages.scala diff --git a/reactive-web/src/main/scala/reactive/web/widgets/TableEditor.scala b/reactive-web-widgets/src/main/scala/reactive/web/widgets/TableEditor.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/widgets/TableEditor.scala rename to reactive-web-widgets/src/main/scala/reactive/web/widgets/TableEditor.scala diff --git a/reactive-web/src/main/scala/reactive/web/widgets/TableView.scala b/reactive-web-widgets/src/main/scala/reactive/web/widgets/TableView.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/widgets/TableView.scala rename to reactive-web-widgets/src/main/scala/reactive/web/widgets/TableView.scala diff --git a/reactive-web/src/main/scala/reactive/web/widgets/Validity.scala b/reactive-web-widgets/src/main/scala/reactive/web/widgets/Validity.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/widgets/Validity.scala rename to reactive-web-widgets/src/main/scala/reactive/web/widgets/Validity.scala diff --git a/reactive-web/src/main/scala/reactive/web/widgets/ValidityCue.scala b/reactive-web-widgets/src/main/scala/reactive/web/widgets/ValidityCue.scala similarity index 100% rename from reactive-web/src/main/scala/reactive/web/widgets/ValidityCue.scala rename to reactive-web-widgets/src/main/scala/reactive/web/widgets/ValidityCue.scala diff --git a/reactive-web/src/test/scala/reactive/web/RepeaterTests.scala b/reactive-web/src/test/scala/reactive/web/RepeaterTests.scala index b69e8057..d423bb7f 100644 --- a/reactive-web/src/test/scala/reactive/web/RepeaterTests.scala +++ b/reactive-web/src/test/scala/reactive/web/RepeaterTests.scala @@ -17,7 +17,16 @@ class RepeaterTests extends FunSuite with Matchers with PropertyChecks { test("Repeater should render its children") { implicit val page = new TestPage - val select = html.Select(Val(List(1, 2, 3)))(new Observing {}, Config.defaults) + val repeater = new Repeater { + def children = SeqSignal(Val(List(1, 2, 3))).now.map { item => + RElem() + }.signal + def baseElem = ).asInstanceOf[Elem].child.length should equal(3) }