render 0.1.1 → 0.1.2

data/lib/render/attributes/attribute.rb

@@ -43,7 +43,7 @@ module Render
 
       if (options[:enum])
         self.enums = options[:enum]
-        self.format = Type::Enum
+        self.types = [Type::Enum]
       end
 
       @default = options[:default]

data/lib/render/type.rb

@@ -22,6 +22,7 @@ module Render
       end
 
       def parse(name, raise_error = false)
+        return name.collect { |union_type| parse(union_type, raise_error) } if name.is_a?(Array)
         return nil if (name.nil?)
         return name unless name.is_a?(String) || name.is_a?(Symbol)
 
@@ -34,7 +35,7 @@ module Render
         parse(name, true)
       end
 
-      def to(classes, value, enums = nil)
+      def to(classes, value)
         return nil if (value.nil? || classes.any?(&:nil?))
         return value if classes.any? { |klass| value.is_a?(klass) }
 
@@ -48,8 +49,6 @@ module Render
         when Boolean.name
           return true if (value == true || value == "true")
           return false if (value == false || value == "false")
-        when Enum.name
-          (enums & [value]).first
         else
           value
         end

data/lib/render/version.rb

@@ -1,3 +1,3 @@
 module Render
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/functional/render/schema_spec.rb

@@ -52,11 +52,37 @@ module Render
         schema = Schema.new(definition)
         schema.serialize!(films).should == films
       end
+
+      context "enums" do
+        before(:each) do
+          @genres = %w(horror comedy romcom)
+          @definition = {
+            title: "films",
+            type: Object,
+            properties: {
+              genre: {
+                enum: @genres
+              }
+            }
+          }
+        end
+
+        it "returns enum value" do
+          film = { genre: @genres.sample }
+          schema = Schema.new(@definition)
+          schema.serialize!(film).should == film
+        end
+
+        it "does not validate enum value" do
+          film = { genre: "not-defined-genre" }
+          schema = Schema.new(@definition)
+          schema.serialize!(film).should == film
+        end
+      end
     end
 
     describe "required" do
-      # Not defined in spec, but should have been
-      it "is set with HashAttribute-level keyword" do
+      it "can be set with draft-3 HashAttribute-level keyword" do
         schema = Schema.new({
           type: Object,
           properties: {

data/spec/unit/render/attributes/hash_attribute_spec.rb

@@ -65,7 +65,7 @@ module Render
       context "enums" do
         it "sets enum values" do
           enum_values = ["foo", "bar", "baz"]
-          attribute = HashAttribute.new({ key: { type: String, enum: enum_values } })
+          attribute = HashAttribute.new({ key: { enum: enum_values } })
           attribute.enums.should == enum_values
         end
       end

data/spec/unit/render/type_spec.rb

@@ -22,6 +22,11 @@ module Render
       it "returns nil if no type is found" do
         Type.parse("not-a-type").should == nil
       end
+
+      it "parses union types" do
+        union_types = ["string", "null"]
+        expect(Type.parse(union_types)).to eq([String, NilClass])
+      end
     end
 
     describe ".parse!" do
@@ -123,14 +128,8 @@ module Render
       end
 
       describe "enum" do
-        it "returns valid enum" do
-          enums = [:foo, :bar]
-          Type.to([Type::Enum], :foo, enums).should == :foo
-        end
-
-        it "return nil for invalid enums" do
-          enums = [:foo]
-          Type.to([Type::Enum], :bar, enums).should == nil
+        it "returns enum regardless of validity" do
+          Type.to([Type::Enum], :foo).should == :foo
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -226,12 +226,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2504044044340370162
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2504044044340370162
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23