mobistore 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7910c1b62b6055f9b0b95e18ba9ff2ee7a3cff8b
-  data.tar.gz: 2aba8f49c9fb69ab64faa98d08505483337e693f
+  metadata.gz: b465d209c6ce528a0a32a542d4d3dfd3630d8d6c
+  data.tar.gz: f4aaec8bb595c8a4374a32c3a055a3aeb34845f3
 SHA512:
-  metadata.gz: deaf8b2ed0d4fcdffd6e2daf846b7abfc0928a35ae136320db82e541a5dc8c95d6a83e5ea7a80c0636b9559157d8072dcf84805f7bf28e52e63a05527774254e
-  data.tar.gz: 248a364d4265da3b9223bbd289b1903a9cad80092ee2bf861e53097f4ed978363dbccea7b3e6afa0e64f0de3f909b00a97f1d7c58a223896d0b4a9dfd0442dc3
+  metadata.gz: 3f7e0952193ab156de4f4ff3584a9835e3421be93398635231d93fb1a572416a4a4fcbfde3eb8c101fca39c79d1c27b5aff6d0739da5c7b5d42f397db5e45f1d
+  data.tar.gz: d636ccedd9fc4cbe1f0864bda7935a225b888722fc06cf94ec351b3093be6359137d8912fe8da2b4d254529654b033b3abc7008f99308c94c05ae54c9cf506c0

data/lib/BuyerAPI.rb

@@ -4,12 +4,15 @@ class BuyerAPI
 
   extend UserModule
 
+  $BUYER_OPTIONS = { list: "list", search: "search", buy: "buy"}
+
   @@name = "Raj Negi"
   @@money = 5000
   @@cc_details = "icic"
 
+
   def self.buy
-    puts "\tEnter the details of product you want to buy: "
+    puts "\n\tEnter the details of product you want to buy ('q' to quit): "
     product_id = get_number("ID")
     product = ProductAPI.search_id(product_id)
 

data/lib/FileStorage/products.log

@@ -1,7 +1,7 @@
 {"name":"LG 5","color":"grey","price":300,"quantity":4,"id":0}
-{"name":"Samsung Galaxy Note","color":"galaxy white","price":324,"quantity":11,"id":1}
-{"name":"Apple iPhone 7","color":"space black","price":600,"quantity":2,"id":2}
-{"name":"OnePlus 3","color":"wooden","price":601,"quantity":0,"id":3}
+{"name":"Samsung Galaxy Note","color":"galaxy white","price":324,"quantity":10,"id":1}
+{"name":"Apple iPhone 7","color":"space black","price":600,"quantity":1,"id":2}
+{"name":"OnePlus 3","color":"wooden","price":601,"quantity":20,"id":3}
 {"del":true}
 {"name":"Oppo Smartphone","color":"matte","price":250,"quantity":2,"id":5}
 {"del":true}

data/lib/FileStorage/transcations.log

@@ -5,3 +5,5 @@
 {"product_name":"Samsung Galaxy Note","buyer_name":"raj","buyer_cc_details":"icic","timestamp":"2016-09-16 15:44:41 +0530","amount_paid":324,"id":4}
 {"product_name":"LG 5","buyer_name":"raj","buyer_cc_details":"icic","timestamp":"2016-09-16 15:46:42 +0530","amount_paid":300,"id":5}
 {"product_name":"Oppo Smartphone","buyer_name":"Raj Negi","buyer_cc_details":"icic","timestamp":"2016-09-16 16:11:04 +0530","amount_paid":250,"id":6}
+{"product_name":"Samsung Galaxy Note","buyer_name":"Raj Negi","buyer_cc_details":"icic","timestamp":"2016-09-20 18:22:41 +0530","amount_paid":324,"id":7}
+{"product_name":"Apple iPhone 7","buyer_name":"Raj Negi","buyer_cc_details":"icic","timestamp":"2016-09-20 18:45:15 +0530","amount_paid":600,"id":8}

data/lib/ProductAPI.rb

@@ -4,10 +4,10 @@ class ProductAPI
 
   extend FileStorageModule
 
+
   @@file_path = File.join(File.dirname(caller[0]), "/FileStorage/products.log")
 
   def self.seed
-    byebug
     @@list = read_file(@@file_path)
   end
 

data/lib/SellerAPI.rb

@@ -1,5 +1,8 @@
 require_relative 'UserModule.rb'
 
+$SELLER_OPTIONS = {list: "list", search: "search", add: "add", update: "update", delete: "delete"}
+$PRODUCT_FIELD = {name: "Name", color: "Price", quantity: "Quantity"}
+
 class SellerAPI
 
   attr_accessor :id, :name, :money, :valid_hash
@@ -7,30 +10,40 @@ class SellerAPI
   extend UserModule
 
   def self.add_product
-    puts "Enter product details:"
+    puts "Enter product details: ('q' to quit )"
+
+    name = get_string($PRODUCT_FIELD[:name])
+    return if name == -1
+    color = get_string($PRODUCT_FIELD[:color])
+    return if color == -1
+    price = get_number($PRODUCT_FIELD[:price])
+    return if price == -1
+    quantity = get_number($PRODUCT_FIELD[:quantity])
+    return if quantity == -1
 
-    name = get_string("Name")
-    color = get_string("Color")
-    price = get_number("Price")
-    quantity = get_number("Quantity")
     product = {name: name, color: color, price: price, quantity: quantity}
     ProductAPI.add(product)
   end
 
   def self.update_product
     list_products
-    puts "\n\tEnter the product needed to be updated: "
+    puts "\n\tEnter the product needed to be updated: ('q' to quit) "
 
     id = get_number("ID of product")
+    return if id == -1
     key = get_string("Update field ")
+    return if key == -1
     value = get_string("New value for '#{key}'")
+    return if id == -1
+
     ProductAPI.update(id, key.to_sym, value)
   end
 
   def self.delete_product
     list_products
-    print "\n\tEnter product id to be deleted: "
+    print "\n\tEnter product id to be deleted ('q' to quit): "
     id = gets.chomp.to_i
+    return if id == -1
     ProductAPI.delete(id)
   end
 

data/lib/UserModule.rb

@@ -10,15 +10,19 @@ module UserModule
     list_products
     print "\n"
     key = get_string("product by? 'name' | 'id' | 'color' ")
+    return if key == -1
     value = get_string("search value for '#{key}' ")
+    return if value == -1
     puts ProductAPI.search(key.to_sym, value)
   end
 
   def get_number(label)
     print "\tEnter #{label}: "
     value = gets.chomp
-    if !!(value =~ /[0-9]/)
+    if !!(value =~ /[0-9]+/ && value.length == value.match(/[0-9]+/).to_s.length )
       return value.to_i
+    elsif value == 'q'
+      return -1
     else
       puts "\tInvalid #{label} value. Try again."
       return self.get_number(label)
@@ -28,8 +32,10 @@ module UserModule
   def get_string(label)
     print "\tEnter #{label}: "
     value = gets.chomp
-    unless value.strip.empty?
+    if !(value.strip.empty?)
       return value
+    elsif value == 'q'
+      return -1
     else
       puts "\tInvalid #{label} value. Try again."
       return self.get_string(label)

data/lib/mobistore.rb

@@ -6,28 +6,35 @@ require_relative 'SellerAPI.rb'
 class MobiStore
 
   def self.get_logo
-    "\n\t\t\t________________\n"+
-      "\t\t\t[The Mobi Store]"+
-      "\n\n\n"
+    "\n\t\t\t________________\n"  +
+    "\t\t\t[The Mobi Store]"      +
+    "\n\n\n"
   end
 
   def self.show_seller_options
     system 'clear'
     loop do
-      print "#{get_logo}\tEnter your option:\n\t'list' | 'search' | 'add' | 'update' | 'delete' | 'quit' : "
+      print "#{get_logo}\tEnter your option:\n\t " +
+                "'#{$SELLER_OPTIONS[:list]}' | " +
+                "'#{$SELLER_OPTIONS[:search]}'| " +
+                "'#{$SELLER_OPTIONS[:add]}' | " +
+                "'#{$SELLER_OPTIONS[:update]}'| " +
+                "'#{$SELLER_OPTIONS[:update]}'| " +
+                "'quit' (q) : "
+
       choice = gets.chomp.downcase
 
-      if choice == "list"
+      if choice == $SELLER_OPTIONS[:list]
         SellerAPI.list_products
-      elsif choice == "search"
+      elsif choice == $SELLER_OPTIONS[:search]
         SellerAPI.search_product
-      elsif choice == "add"
+      elsif choice == $SELLER_OPTIONS[:add]
         SellerAPI.add_product
-      elsif choice == 'update'
+      elsif choice == $SELLER_OPTIONS[:update]
         SellerAPI.update_product
-      elsif choice == 'delete'
+      elsif choice == $SELLER_OPTIONS[:delete]
         SellerAPI.delete_product
-      elsif choice == "quit"
+      elsif choice == "quit" || choice == 'q'
         break
       else
         puts "Woops, invalid input. Can you enter again?"
@@ -39,16 +46,21 @@ class MobiStore
   def self.show_buyer_options
     system 'clear'
     loop do
-      print "#{get_logo}\tEnter your option:\n\t'list' | 'search' | 'buy' | 'quit' : "
+      print "#{get_logo}\tEnter your option:\n\t " +
+                "'#{$BUYER_OPTIONS[:list]}' | " +
+                "'#{$BUYER_OPTIONS[:search]}'| " +
+                "'#{$BUYER_OPTIONS[:buy]}' | " +
+                "'quit' (q) : "
       choice = gets.chomp.downcase
 
-      if choice == "list"
+      if choice == $BUYER_OPTIONS[:list]
         BuyerAPI.list_products
-      elsif choice == "search"
+      elsif choice == $BUYER_OPTIONS[:search]
         BuyerAPI.search_product
-      elsif choice == "buy"
+      elsif choice == $BUYER_OPTIONS[:buy]
+        BuyerAPI.list_products
         BuyerAPI.buy
-      elsif choice == "quit"
+      elsif choice == "quit" || choice == 'q'
         break
       else
         puts "Woops, invalid input. Can you enter again?"
@@ -62,12 +74,14 @@ class MobiStore
     ProductAPI.seed
     TranscationAPI.seed
     system 'clear'
-    print "#{get_logo}\tWhich type of user are you? 'Buyer' | 'Seller' : "
+    print "#{get_logo}\tWhich type of user are you? 'Buyer'(b) | 'Seller'(s) | 'quit'(q) : "
     choice = gets.chomp.downcase
-    if choice == "buyer"
+    if choice == "buyer" || choice == "b"
       show_buyer_options
-    elsif choice == "seller"
+    elsif choice == "seller" || choice == "s"
       show_seller_options
+    elsif choice == "quit" || choice == "q"
+      return
     else
       puts "Invalid input, try again?"
       return init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobistore
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Raj Negi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies: []
 description: Mobile store, with built-in JSON database and seeded objects. Type 'MobiStore.init'
   to get started