momo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: befe622c1ebf025fb049faf7fd4ac45599983c2e
-  data.tar.gz: e86b895df8edd1fb0314055fc30c767ba23f7393
+  metadata.gz: a9a70d90b34c3107bbf8f3cbb78d2bb23356ccb4
+  data.tar.gz: b7f6e273d64aa1948bd7586d2328ea93d62a1f3f
 SHA512:
-  metadata.gz: ce1f018848a93e6170a89971ab7c18700305d12a80368446e5e620d5200fe69044bfe0c5ca6dd80f001eb592e566ad85ec6fc5c7db0c8fa961753c8f99a823a0
-  data.tar.gz: de168af0051e6894ea89b4ded43fb78982334e2b1f8efb4dd66f3b794ef70b6d6279f46304b2fbedb1eba5e74f1561a424b7cc97da8a9b59c8bb54fffe66ad49
+  metadata.gz: fc35a7ebcd9b1b06c359e610ee7e8f0ed2e4a5c4695e98b05d3ffbf91ee3c055157de9d8b355cb1ddd3c7352b7802c8c401ab976f5742dd7df12642195656e2d
+  data.tar.gz: b7d59f2351609a22dcba48b0d872e03548cee89f17ac89b091a11101e39585e0e20d0f99a9a3efea8b3a5593c6611d228c1dab66a2745031ab86829784db61a1

data/lib/momo/momoscope.rb

@@ -26,7 +26,6 @@ module Momo
 		elsif something.is_a? Reference
 			return something.representation
 		elsif something.is_a? BooleanValue
-			options[:stack].conditions[something.signature] = something.representation
 			return { "Condition" => something.signature }
 		elsif something.is_a? FuncCall
 			return something.representation
@@ -51,16 +50,39 @@ module Momo
 		end
 	end
 
+	module MomoCondition
+
+		def equals(another)
+			BooleanValue.new("Fn::Equals", @stack, self, another)
+		end
+
+		def and(another)
+			BooleanValue.new("Fn::And", @stack, self, another)
+		end
+
+		def or(another)
+			BooleanValue.new("Fn::Or", @stack, self, another)
+		end
+
+	end
+
 	class BooleanValue < FuncCall
 
+		include MomoCondition
+
 		def initialize(operator, stack, *args)
 			super(operator, stack, args)
+			stack.conditions[self.signature] = self.representation
 		end
 
 		def not()
 			BooleanValue.new("Fn::Not", @stack, self)
 		end
 
+		def either(val_true, val_false)
+			FuncCall.new("Fn::If", @stack, self.signature, val_true, val_false)
+		end
+
 		def signature_of(something)
 			if something.is_a? String or 
 				something.is_a? TrueClass or 
@@ -83,20 +105,4 @@ module Momo
 
 	end
 
-	module MomoCondition
-
-		def equals(another)
-			BooleanValue.new("Fn::Equals", @stack, self, another)
-		end
-
-		def and(another)
-			BooleanValue.new("Fn::And", @stack, self, another)
-		end
-
-		def or(another)
-			BooleanValue.new("Fn::Or", @stack, self, another)
-		end
-
-	end
-
 end

data/lib/momo/version.rb

@@ -1,3 +1,3 @@
 module Momo
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: momo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - David Siaw