Skip to content

Commit

Permalink
Preparing for Angular Material v1.1.0 inclusion using RC4 resouces.
Browse files Browse the repository at this point in the history
  • Loading branch information
@karma4u101
karma4u101 committed Apr 22, 2016
1 parent f74a5c3 commit 6636ebf
Show file tree
Hide file tree
Showing 6 changed files with 158 additions and 5 deletions.
30 changes: 29 additions & 1 deletion Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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")
}
}

}
}
Expand Down
14 changes: 14 additions & 0 deletions Angular/AngularJS-Res/src/test/scala/net/liftmodules/FoBoAJSRes/FoBoAJSResSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
39 changes: 37 additions & 2 deletions Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
21 changes: 21 additions & 0 deletions Angular/AngularJS/src/test/scala/net/liftmodules/FoBo/FoBoAJSSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
36 changes: 35 additions & 1 deletion FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
23 changes: 22 additions & 1 deletion FoBo/FoBo/src/test/scala/net/liftmodules/FoBo/FoBoSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

1 comment on commit 6636ebf

@karma4u101
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#75 Preparing for Angular Material v1.1.0 inclusion using RC4 resouces.

Please sign in to comment.