c66-copper 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59a38c72a716fdcb3c7515ac9c5f54d527856e6
-  data.tar.gz: 1726521089a78f5678090c7dc218cccfd279502d
+  metadata.gz: '0442857a59d520bd7fad729cd578fb98593b5a9a'
+  data.tar.gz: 5d1db0d767a03f9d1cc5c398bae3509a1db2667e
 SHA512:
-  metadata.gz: 774adf64bb740dc8974c354536912394e089144631d83d4636f9688e4bce24ddd8bf6b7f4eae3d6234dc7d31320520e16b2b4b80f9fafcb61717d3e2dd88ffc4
-  data.tar.gz: 17caf2de157df7ae3c7e6bb6c7dc24b35577bf76c2eba996a4542373532008f11795d0c08532a2430f224b0a8ee32d827cdac502553051a71fe7b99058b8b0b3
+  metadata.gz: 0a160e4b11c84e9c67f9ea695703209f8831f3eac7ae92d26cdc6019a9aaf69ed471bf2565d238b9e0b6b23d2b13ad63cf9abbe0e1a5a0dd0234a664caf699e2
+  data.tar.gz: a430c3fda59423add10983962110e045a153b2409a9098f05f64838569836f28b92f42ca58d78b6890a0abfda1962c9a9712091daf901a592ac18dd4ae02c8b0

data/lib/copper/data_types/data_type.rb

@@ -15,7 +15,16 @@ module Copper
 				"Image" => "::Copper::DataTypes::Image",
 				"Copper::DataTypes::ImageClass" => "::Copper::DataTypes::Image",
 				"Copper::DataTypes::FilenameClass" => "::Copper::DataTypes::Filename",
-				"Copper::DataTypes::Filename" => "::Copper::DataTypes::Filename"
+				"Copper::DataTypes::Filename" => "::Copper::DataTypes::Filename",
+				"Filename" => "::Copper::DataTypes::Filename"
+			}
+
+			DATATYPE_MAP = {
+				"semver" => "Semver",
+				"ipaddress" => "IPAddress",
+				"image" => "Image",
+				"range" => "Range",
+				"filename" => "Filename",
 			}
 
 			def initialize(value)
@@ -27,9 +36,11 @@ module Copper
 			end
 
 			def as(clazz)
-				clazz = clazz.capitalize
+				clazz = ::Copper::DataTypes::DataType::DATATYPE_MAP[clazz]
+				raise RuntimeError, "No class called #{clazz} found" if clazz.nil?
+
 				found_class = ::Copper::DataTypes::DataType.get_class(clazz)
-				return found_class.new(@value).value
+				return found_class.new(@value)
 			end
 
 			# returns a DataType based on the given PORO

data/lib/copper/data_types/ip_addr.rb

@@ -27,8 +27,15 @@ module Copper
 			end
 
 			def in(value)
-				raise ::Copper::RuntimeError, "#{value} is not an IP address" unless value.is_a?(::IPAddress)
-				(@value.first.to_i <= value.to_i) && (@value.last.to_i >= value.to_i)
+				if value.is_a?(::Copper::DataTypes::IPAddress)
+					to_check = value.ip_address
+				elsif value.is_a?(::IPAddress)
+					to_check = value
+				else
+					raise ::Copper::RuntimeError, "#{value} is not an IP address"
+				end
+
+				(@value.first.to_i <= to_check.to_i) && (@value.last.to_i >= to_check.to_i)
 			end
 
 			def full_address
@@ -75,6 +82,13 @@ module Copper
 				@value.c?
 			end
 
+			def ip_address
+				@value
+			end
+
+			def to_s
+				@value.to_string
+			end
 		end
 
 	end

data/lib/copper/set.rb

@@ -4,7 +4,13 @@ module Copper
 		include ::Copper::ExpressionUtils
 
 		def value(vars = {})
-			return handle_attributes(elements[0].value(vars), vars)
+			result = elements[0].value(vars)
+			if result.is_a?(::Array)
+				v = result
+			else
+				v = [result]
+			end
+			return handle_attributes(v, vars)
 		end
 
 	end

data/lib/copper/version.rb

@@ -1,5 +1,5 @@
 module Copper
-	VERSION = '0.0.2'
+	VERSION = '0.0.3'
 	COPYRIGHT_MESSAGE = "(c) 2018 Cloud66 Inc."
 	APP_NAME = 'Copper'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c66-copper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Khash Sajadi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler