Bumping to 0.5.5

Author: marcgrue

README.md

@@ -235,11 +235,11 @@ how to create a DCI project.
 
 ## Using Scala DCI in your project
 
-ScalaDCI is available for Scala 2.11.6 at [Sonatype](https://oss.sonatype.org/content/repositories/releases/org/scaladci/scaladci_2.11/0.5.4/).
+ScalaDCI is available for Scala 2.11.6 at [Sonatype](https://oss.sonatype.org/content/repositories/releases/org/scaladci/scaladci_2.11/0.5.5/).
 To start coding with DCI in Scala add the following to your SBT build file:
 
     libraryDependencies ++= Seq(
-      "org.scaladci" %% "scaladci" % "0.5.4"
+      "org.scaladci" %% "scaladci" % "0.5.5"
     ),
     addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0-M5" cross CrossVersion.full)
 
@@ -254,7 +254,7 @@ git clone https://github.com/DCI/scaladci.git
 Have fun!
 
 Marc Grue<br>
-March 2015
+April 2015
 
 ### DCI resources
 Discussions - [Object-composition](https://groups.google.com/forum/?fromgroups#!forum/object-composition)<br>

examples/src/test/scala/scaladci/examples/ShoppingCart7.scala

@@ -72,9 +72,9 @@ Deviations
 // 4 basic "dumb" Data types - Company now has a bank account
 object ShoppingCartModel7 {
   case class Product(name: String, price: Int)
-  case class Person(name: String, var cash: Int, owns: mutable.Map[Int, Product] = mutable.Map())
-  case class Company(name: String, var bankAccount: Int, stock: mutable.Map[Int, Product], goldMembers: mutable.Set[Person])
-  case class Order(customer: Person, items: mutable.Map[Int, Product] = mutable.Map())
+  case class User(name: String, var cash: Int, owns: mutable.Map[Int, Product] = mutable.Map())
+  case class Company(name: String, var bankAccount: Int, stock: mutable.Map[Int, Product], goldMembers: mutable.Set[User])
+  case class Order(customer: User, items: mutable.Map[Int, Product] = mutable.Map())
 }
 
 // Setup for each test
@@ -83,15 +83,15 @@ trait ShoppingCart7setup extends Scope {
   val (p1, p2, p3)      = (1, 2, 3)
   val (wax, tires, bmw) = (p1 -> Product("Wax", 40), p2 -> Product("Tires", 600), p3 -> Product("BMW", 50000))
   val shop              = Company("Don's Auto shop", 100000, mutable.Map(wax, tires, bmw), mutable.Set())
-  val customer          = Person("Matthew", 20000)
+  val customer          = User("Matthew", 20000)
 }
 
 class ShoppingCart7 extends Specification {
   import ShoppingCartModel7._
 
   {
     @context
-    class PlaceOrder(comp: Company, person: Person) {
+    class PlaceOrder(comp: Company, user: User) {
 
       // Trigger methods
       def processProductSelection(desiredProductId: Int): Option[Product] = {
@@ -116,9 +116,9 @@ class ShoppingCart7 extends Specification {
       // Roles (in order of "appearance")
       private val warehouse      = comp
       private val company        = comp
-      private val customer       = person
-      private val cart           = Order(person)
-      private val paymentGateway = comp
+      private val customer       = user
+      private val cart           = Order(user)
+      private val paymentGateway = comp // would be played by something else in a real-world application...
       private val companyAccount = comp
 
       role warehouse {

project/build.scala

@@ -41,7 +41,7 @@ object ScalaDciBuild extends Build with Publishing {
 
   lazy val commonSettings = Defaults.coreDefaultSettings ++ Seq(
     organization := "org.scaladci",
-    version := "0.5.4",
+    version := "0.5.5",
     scalaVersion := "2.11.6",
     scalacOptions := Seq("-unchecked", "-deprecation", "-feature"),
     resolvers ++= Seq(Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots")),