collection-holder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912685734dc2d512483fb5e4a07e4e7ddb3272bc
-  data.tar.gz: e32fe40cf7d654e72ec6bd624d81a5edf67a852d
+  metadata.gz: a642fd5f065c222c5c814084e4fa1fd2d92db835
+  data.tar.gz: dc2b5bbcd72e8b3a73a629cb96db0d2448371c16
 SHA512:
-  metadata.gz: 7bd371e5e4d22f63ceaf09a4d2f97846f756367e5232c5692f39a29b06fae2db36b74db41e75bd6c4adbfb4d2bf1dc16ebcc82bc35002b3975bc5a8265ba8c4b
-  data.tar.gz: 667ee4ef9b9129ae7937451e227015c0864b235ce94562bf635aa3df899e47cce121a93cf5c96784a464ed18a33a85025fe1b549e6103db1375f706b0e3525f5
+  metadata.gz: 23c8ca91611d0fb7028c346a5212c325f3595b0b305dadaf16a592e69261602621212e1f6a216d18fecb3445dfcf1d4cefedbd16fd6e4113ff269c2857515858
+  data.tar.gz: e3ca39355047a9f639d7976949399b16e2dd2f7b39cb818053f173afe1d84d048f539eecf2385911a4559de1a90cc586d42c3212275a2e317b1989312d31c259

data/lib/collection-holder.rb

@@ -1,4 +1,6 @@
 require_relative 'que.rb'
+require_relative 'error.rb'
+require_relative 'config.rb'
 
 class CollectionHolder
 
@@ -6,13 +8,22 @@ class CollectionHolder
 
   @@collectionID = 0
 
-  def initialize
+  def initialize(data = {})
+    raise Error if !valid_number(data[:size]) && data[:size]
+
+    @size = data[:size].to_i || $DEFAULT_HOLDER_SIZE
     @holder = Hash.new
+  rescue => e
+      e.init_failed(self.class)
   end
 
   def add(collection)
-    @holder[key(@@collectionID)] = collection
-    @@collectionID += 1
+  raise Error if @holder.size >= @size
+
+  @holder[key(@@collectionID)] = collection
+  @@collectionID += 1
+  rescue => e
+    e.max_size_reached(self.class)
   end
 
   def find(id)
@@ -26,7 +37,11 @@ class CollectionHolder
   end
 
   def delete(id)
+    raise Error if @holder.empty?
+
     @holder.delete(key(id))
+    rescue => e
+      e.min_size_reached(self.class)
   end
 
   private
@@ -34,4 +49,9 @@ class CollectionHolder
       id.to_s.to_sym
     end
 
+    def valid_number(str)
+      str = str.to_s
+      !!(str =~ /[0-9]+/ && str.length == str.match(/[0-9]+/).to_s.length)
+    end
+
 end

data/lib/config.rb

@@ -0,0 +1,4 @@
+
+$DEFAULT_HOLDER_SIZE = 10
+
+$DEFAULT_QUE_SIZE = 10

data/lib/error.rb

@@ -0,0 +1,15 @@
+class Error < StandardError
+
+  def init_failed(klass)
+    puts "Couldn't make object in class:#{klass}"
+  end
+
+  def max_size_reached(klass)
+    puts "Maximum size reached in class:#{klass}"
+  end
+
+  def min_size_reached(klass)
+    puts "Minimum size reached in class:#{klass}"
+  end
+
+end

data/lib/que.rb

@@ -1,34 +1,33 @@
-$DEFAULT_QUE_SIZE = 10
+require_relative 'error.rb'
+require_relative 'config.rb'
 
 class Que
 
   attr_reader :max_size
 
   def initialize(data = {})
-    @max_size = data[:size] || $DEFAULT_QUE_SIZE
+    raise Error if !valid_number(data[:size]) && data[:size]
+
+    @max_size = get_number(data[:size]) || $DEFAULT_QUE_SIZE
     @list = Queue.new
     push_list(data[:list]) if data[:list]
+    rescue => e
+      e.init_failed(self.class)
   end
 
   def pop
-    if @list.empty?
-      puts "Empty collection! Can't pop()"
-    elsif
-      @list.pop
-    end
+    raise Error if @list.empty?
+
+    @list.pop
+    rescue => e
+      e.min_size_reached(self.class)
   end
 
   def push(item)
-    begin
-      if @list.size >= @max_size
-        puts "Full collection! Can't push(#{item.to_s})"
-      elsif
-        @list.push(item)
-      end
-
-    rescue
-      puts "Unable to push #{item.to_s}"
-    end
+    raise Error if @list.size >= @max_size
+    @list.push item
+    rescue => e
+      e.max_size_reached(self.class)
   end
 
   def clear
@@ -48,15 +47,26 @@ class Que
   end
 
   def push_list(list)
-    begin
-      list.each { |data| @list.push data } if list.is_a? Array
-    rescue
-      puts "Unable to push list #{list.to_s}"
-    end
+    raise Error if (@list.size+list.size) >= @max_size
+
+    list.each { |data| @list.push data } if list.is_a? Array
+    rescue => e
+      e.max_size_reached(self.class)
   end
 
   def display
     @list.to_s
   end
 
+  private
+    def valid_number(str)
+      str = str.to_s
+      !!(str =~ /[0-9]+/ && str.length == str.match(/[0-9]+/).to_s.length)
+    end
+
+    def get_number(str)
+      return nil if str==nil
+      return str.to_i
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collection-holder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Raj Negi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies: []
 description: A simple gem to manage your queues or any data structure!
 email: raj.negi@weboniselab.com
@@ -17,6 +17,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/collection-holder.rb
+- lib/config.rb
+- lib/error.rb
 - lib/que.rb
 homepage: https://github.com/rajn-webonise/RubyAssignments
 licenses: