hexa 0.1.2 → 0.1.4

data/lib/hexa/objects/cylinder.rb

@@ -10,12 +10,14 @@ class Cylinder
 	# @return [Cylinder] a new Cylinder object
 	def initialize(options = {})
 
-		radius = options[:radius] || nil
-		diameter = options[:diameter] || nil
+	  radius = options[:radius] || nil
+	  diameter = options[:diameter] || nil
 		height = options[:height] || nil
 
 		# Define the cylinder radius
-		if radius
+		if diameter and not radius
+			@radius = diameter / 2
+		else
 			if radius.instance_of?(Circle)
 				@radius = radius.send(:radius)
 			elsif radius.instance_of?(Fixnum)
@@ -23,8 +25,6 @@ class Cylinder
 			else
 				@radius = 1
 			end
-		else
-			@radius = 1
 		end
 
 		# Define the cylinder diameter

data/lib/hexa/shapes/circle.rb

@@ -18,4 +18,16 @@ class Circle
 		end
 	end
 
+	# @return [Float] the area of the circle
+	def area
+		Math::PI * (@radius ** 2)
+	end
+
+	# Same behavior as area but can be called just passing the radius
+	# @param [Fixnum] radius of the circle
+	# @return [Float] area of the circle
+	def self.area(radius = 1)
+		Math::PI * (radius ** 2)
+	end
+
 end

data/lib/hexa/shapes/square.rb

@@ -1,6 +1,7 @@
 class Square
 
 	attr_accessor :side
+	alias :length :side
 
 	# Constructor for the Square object
 	# @param [Hash, Fixnum] you can pass a :side option with a fixnum
@@ -17,4 +18,32 @@ class Square
 		end
 	end
 
+
+	# @return [Fixnum] perimeter of the square defined with 4 * self.side
+	def perimeter
+		4 * @side
+	end
+
+	# Same behavior as perimeter but you don't need to instance
+	# a new square object ; just call Square::perimeter(1) for instance
+	# @param [Fixnum] the length of the square's side, default is 1
+	# @return [Fixnum] perimiter of the sqare
+	def self.perimeter(side = 1)
+		4 * side
+	end
+
+	# @return [Fixnum] are of the squre defined by self.side ^ 2
+	def area
+		@side ** 2
+	end
+
+
+	# Same behavior as area but you don't have to create a new square object
+	# just call Square::area precising the side's length as a parameter
+	# @param [Fixnum] the square's side's length
+	# @return [Fixnum] area defined with the given side's length ^ 2
+	def self.area(side = 1)
+		side ** 2
+	end
+
 end

data/lib/hexa/version.rb

@@ -1,6 +1,6 @@
 module Hexa
 	MAJOR = 0
 	MINOR = 1
-	TINY = 2
+	TINY = 4
   VERSION = [MAJOR, MINOR, TINY].compact.join(".")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hexa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: