diff --git a/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala b/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala index b8de5da9..06e931fe 100644 --- a/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala +++ b/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala @@ -295,6 +295,24 @@ package object FoBoAJSRes { FoBoResources.init FoBoResources.AJMaterial107 } + + /** + * Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot. + * @version 1.1.0 + * + * '''Example:''' + * + * {{{ + * import net.liftmodules.{FoBoAJSRes => FoBo} + * : + * FoBo.Resource.Init=FoBo.Resource.AJMaterial110 + * }}} + * + */ + case object AJMaterial110 extends Resource { + FoBoResources.init + FoBoResources.AJMaterial110 + } /** * Enable usage of AngularUI-Bootstrap version 0․10․0 resource files in your bootstrap liftweb Boot. @@ -4890,7 +4908,17 @@ package object FoBoAJSRes { case "fobo" :: "angular-material.css" :: Nil if Props.devMode => List("fobo", "angular-material", "1.0.7", "css", "angular-material.css") case "fobo" :: "angular-material.css" :: Nil => List("fobo", "angular-material", "1.0.7", "css", "angular-material.min.css") } - } + } + + lazy val AJMaterial110 = { + ResourceServer.rewrite { + case "fobo" :: "angular-material.js" :: Nil if Props.devMode => List("fobo", "angular-material", "1.1.0", "js", "angular-material.js") + case "fobo" :: "angular-material.js" :: Nil => List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js") + case "fobo" :: "angular-material-mocks.js" :: Nil => List("fobo", "angular-material", "1.1.0", "js", "angular-material-mocks.js") + case "fobo" :: "angular-material.css" :: Nil if Props.devMode => List("fobo", "angular-material", "1.1.0", "css", "angular-material.css") + case "fobo" :: "angular-material.css" :: Nil => List("fobo", "angular-material", "1.1.0", "css", "angular-material.min.css") + } + } } } diff --git a/Angular/AngularJS-Res/src/test/scala/net/liftmodules/FoBoAJSRes/FoBoAJSResSpec.scala b/Angular/AngularJS-Res/src/test/scala/net/liftmodules/FoBoAJSRes/FoBoAJSResSpec.scala index 913b7c1a..dae4cf96 100644 --- a/Angular/AngularJS-Res/src/test/scala/net/liftmodules/FoBoAJSRes/FoBoAJSResSpec.scala +++ b/Angular/AngularJS-Res/src/test/scala/net/liftmodules/FoBoAJSRes/FoBoAJSResSpec.scala @@ -70,6 +70,20 @@ object FoBoAJSResSpec extends Specification { } //Angular Material + //AJMaterial110 + "With FoBoAJSRes.Resource.Init set to FoBoAJSRes.Resource.AJMaterial110 the ResourceServer" should { + "allow fobo/angular-material.js" in { + allowResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true + } + "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in { + rewriteResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== + List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js") + } + "rewrit fobo/angular-material.css to fobo/angular-material/1.1.0/js/angular-material.min.css" in { + rewriteResource(FoBoAJSRes.Resource.AJMaterial110,"fobo"::"angular-material.css"::Nil) must_== + List("fobo", "angular-material", "1.1.0", "css", "angular-material.min.css") + } + } //AJMaterial107 "With FoBoAJSRes.Resource.Init set to FoBoAJSRes.Resource.AJMaterial107 the ResourceServer" should { "allow fobo/angular-material.js" in { diff --git a/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala b/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala index 779cd8f7..2d7356a8 100644 --- a/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala +++ b/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala @@ -307,7 +307,25 @@ package object FoBoAJS { case object AJMaterial107 extends ToolKit { FoBoAJSAPI.API.Angular1 FoBoAJSRes.Resource.AJMaterial107 - } + } + + /** + * Enable usage of FoBo's Angular Material API and resources version 1․1․0 in your bootstrap liftweb Boot. + * @version 1.1.0 + * + * '''Example:''' + * + * {{{ + * import net.liftmodules.{FoBoAJS => FoBo} + * : + * FoBo.ToolKit.Init=FoBo.ToolKit.AJMaterial110 + * }}} + * + */ + case object AJMaterial110 extends ToolKit { + FoBoAJSAPI.API.Angular1 + FoBoAJSRes.Resource.AJMaterial110 + } /** * Enable usage of FoBo's Angular API and AngularUI-Bootstrap resources version 0․10․0 in your bootstrap liftweb Boot. @@ -637,7 +655,24 @@ package object FoBoAJS { */ case object AJMaterial107 extends Resource { FoBoAJSRes.Resource.AJMaterial107 - } + } + + /** + * Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot. + * @version 1.0.7 + * + * '''Example:''' + * + * {{{ + * import net.liftmodules.{FoBoAJS => FoBo} + * : + * FoBo.Resource.Init=FoBo.Resource.AJMaterial110 + * }}} + * + */ + case object AJMaterial110 extends Resource { + FoBoAJSRes.Resource.AJMaterial110 + } /** * Enable usage of AngularUI-Bootstrap version 0․10․0 resource files in your bootstrap liftweb Boot. diff --git a/Angular/AngularJS/src/test/scala/net/liftmodules/FoBo/FoBoAJSSpec.scala b/Angular/AngularJS/src/test/scala/net/liftmodules/FoBo/FoBoAJSSpec.scala index 8d792efc..6797516c 100644 --- a/Angular/AngularJS/src/test/scala/net/liftmodules/FoBo/FoBoAJSSpec.scala +++ b/Angular/AngularJS/src/test/scala/net/liftmodules/FoBo/FoBoAJSSpec.scala @@ -160,6 +160,27 @@ class FoBoAJSSpec extends mutable.Specification { } } + //AJMaterial110 + "With FoBoAJS.ToolKit.Init set to FoBoAJS.ToolKit.AJMaterial110 the ResourceServer" should { + "allow fobo/angular-material.js" in { + allowToolKitInit(FoBoAJS.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true + } + "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in { + rewriteToolKitInit(FoBoAJS.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== + List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js") + } + } + + "With FoBoAJS.Resource.Init set to FoBoAJS.Resource.AJMaterial110 the ResourceServer" should { + "allow fobo/angular-material.js" in { + allowResource(FoBoAJS.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true + } + "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in { + rewriteResource(FoBoAJS.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== + List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js") + } + } + //AJMaterial107 "With FoBoAJS.ToolKit.Init set to FoBoAJS.ToolKit.AJMaterial107 the ResourceServer" should { "allow fobo/angular-material.js" in { diff --git a/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala b/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala index 816cbd25..e237c3b0 100644 --- a/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala +++ b/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala @@ -374,7 +374,24 @@ package object FoBo { */ case object AJMaterial107 extends ToolKit { net.liftmodules.FoBoAJS.ToolKit.AJMaterial107 - } + } + + /** + * Enable usage of FoBo's Angular Material API and resources version 1․1․0 in your bootstrap liftweb Boot. + * @version 1.1.0 + * + * '''Example:''' + * + * {{{ + * import net.liftmodules.FoBo + * : + * FoBo.ToolKit.Init=FoBo.ToolKit.AJMaterial110 + * }}} + * + */ + case object AJMaterial110 extends ToolKit { + net.liftmodules.FoBoAJS.ToolKit.AJMaterial110 + } /** * Enable usage of FoBo's Angular API and AngularUI-Bootstrap resources version 0․10․0 in your bootstrap liftweb Boot. @@ -1095,6 +1112,23 @@ package object FoBo { net.liftmodules.FoBoAJS.Resource.AJMaterial107 } + /** + * Enable usage of Angular Material version 1․1․0 resource files in your bootstrap liftweb Boot. + * @version 1.1.0 + * + * '''Example:''' + * + * {{{ + * import net.liftmodules.FoBo + * : + * FoBo.Resource.Init=FoBo.Resource.AJMaterial110 + * }}} + * + */ + case object AJMaterial110 extends Resource { + net.liftmodules.FoBoAJS.Resource.AJMaterial110 + } + /** * Enable usage of AngularUI-Bootstrap version 0․10․0 resource files in your bootstrap liftweb Boot. * @version 0.10.0 diff --git a/FoBo/FoBo/src/test/scala/net/liftmodules/FoBo/FoBoSpec.scala b/FoBo/FoBo/src/test/scala/net/liftmodules/FoBo/FoBoSpec.scala index 50b18fa5..5dee2313 100644 --- a/FoBo/FoBo/src/test/scala/net/liftmodules/FoBo/FoBoSpec.scala +++ b/FoBo/FoBo/src/test/scala/net/liftmodules/FoBo/FoBoSpec.scala @@ -168,7 +168,28 @@ object FoBoSpec extends Specification { } } - //AJMaterial107 + //AJMaterial110 + "With FoBo.ToolKit.Init set to FoBo.ToolKit.AJMaterial110 the ResourceServer" should { + "allow fobo/angular-material.js" in { + allowToolKitInit(FoBo.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true + } + "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in { + rewriteToolKitInit(FoBo.ToolKit.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== + List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js") + } + } + + "With FoBo.Resource.Init set to FoBo.Resource.AJMaterial110 the ResourceServer" should { + "allow fobo/angular-material.js" in { + allowResource(FoBo.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== true + } + "rewrit fobo/angular-material.js to fobo/angular-material/1.1.0/js/angular-material.min.js" in { + rewriteResource(FoBo.Resource.AJMaterial110,"fobo"::"angular-material.js"::Nil) must_== + List("fobo", "angular-material", "1.1.0", "js", "angular-material.min.js") + } + } + + //AJMaterial107 "With FoBo.ToolKit.Init set to FoBo.ToolKit.AJMaterial107 the ResourceServer" should { "allow fobo/angular-material.js" in { allowToolKitInit(FoBo.ToolKit.AJMaterial107,"fobo"::"angular-material.js"::Nil) must_== true