Merge branch 'arovit-master'

faif · faif · commit 39c74d0638c3 · 2014-05-05T15:05:47.000+02:00
diff --git a/3-tier.py b/3-tier.py
@@ -3,27 +3,34 @@
 
 
 class Data(object):
+    """ Data Store Class """
 
     products = {
         'milk': {'price': 1.50, 'quantity': 10},
         'eggs': {'price': 0.20, 'quantity': 100},
         'cheese': {'price': 2.00, 'quantity': 10}
     }
 
+    def __get__(self, obj, klas):
+        print ("(Fetching from Data Store)")
+        return {'products': self.products}
+
 
 class BusinessLogic(object):
 
-    def __init__(self):
-        self.data = Data()
+    """ Business logic holding data store instances """
+
+    data = Data()
 
     def product_list(self):
-        return self.data.products.keys()
+        return self.data['products'].keys()
 
     def product_information(self, product):
-        return self.data.products.get(product, None)
+        return self.data['products'].get(product, None)
 
 
 class Ui(object):
+    """ UI interaction class """
 
     def __init__(self):
         self.business_logic = BusinessLogic()
@@ -59,14 +66,19 @@ def main():
 
 ### OUTPUT ###
 # PRODUCT LIST:
+# (Fetching from Data Store)
+# cheese
 # eggs
 # milk
-# cheese
-#
+# 
+# (Fetching from Data Store)
 # PRODUCT INFORMATION:
 # Name: Cheese, Price: 2.00, Quantity: 10
+# (Fetching from Data Store)
 # PRODUCT INFORMATION:
 # Name: Eggs, Price: 0.20, Quantity: 100
+# (Fetching from Data Store)
 # PRODUCT INFORMATION:
 # Name: Milk, Price: 1.50, Quantity: 10
+# (Fetching from Data Store)
 # That product "arepas" does not exist in the records
diff --git a/abstract_factory.py b/abstract_factory.py
@@ -23,9 +23,9 @@ def show_pet(self):
         abstract factory"""
 
         pet = self.pet_factory.get_pet()
-        print("This is a lovely {}".format(pet))
+        print("We have a lovely {}".format(pet))
         print("It says {}".format(pet.speak()))
-        print("It eats {}".format(self.pet_factory.get_food()))
+        print("We also have {}".format(self.pet_factory.get_food()))
 
 
 # Stuff that our factory makes
@@ -83,15 +83,15 @@ def get_factory():
         print("=" * 20)
 
 ### OUTPUT ###
-# This is a lovely Dog
+# We have a lovely Dog
 # It says woof
-# It eats dog food
+# We also have dog food
 # ====================
-# This is a lovely Cat
-# It says meow
-# It eats cat food
+# We have a lovely Dog
+# It says woof
+# We also have dog food
 # ====================
-# This is a lovely Dog
+# We have a lovely Dog
 # It says woof
-# It eats dog food
+# We also have dog food
 # ====================
