membrane 0.0.1 → 0.0.2

data/README.md

@@ -17,7 +17,8 @@ Membrane provides a handful of useful schemas out of the box. You should be
 able to construct the majority of your schemas using only what is provided
 by default. The provided schemas are:
 
-* _Any_        - Accepts all values. Use it sparingly.
+* _Any_        - Accepts all values. Use it sparingly. It is synonymous to
+  class Object in Ruby.
 * _Bool_       - Accepts ```true``` and ```false```.
 * _Class_      - Accepts instances of a supplied class.
 * _Dictionary_ - Accepts hashes whose keys and values validate against their
@@ -63,7 +64,7 @@ be self-explanatory.
     Membrane::SchemaParser.parse do
       { "ints"          => [Integer]
         "true_or_false" => bool,
-        "anything"      => any,
+        "anything"      => any, # You can also use Object instead.
         optional("_")   => any,
         "one_or_two"    => enum(1, 2),
         "strs_to_ints"  => dict(String, Integer),

data/lib/membrane/schema/base.rb

@@ -14,4 +14,8 @@ class Membrane::Schema::Base
   def validate(object)
     raise NotImplementedError
   end
+
+  def deparse
+    Membrane::SchemaParser.deparse(self)
+  end
 end

data/lib/membrane/schema/dictionary.rb

@@ -6,7 +6,7 @@ module Membrane
   end
 end
 
-class Membrane::Schema::Dictionary
+class Membrane::Schema::Dictionary < Membrane::Schema::Base
   attr_reader :key_schema
   attr_reader :value_schema
 

data/lib/membrane/schema_parser.rb

@@ -58,7 +58,7 @@ class Membrane::SchemaParser
     when Membrane::Schema::Bool
       "bool"
     when Membrane::Schema::Class
-      schema.klass.inspect
+      schema.klass.name
     when Membrane::Schema::Dictionary
       "dict(%s, %s)" % [deparse(schema.key_schema),
                         deparse(schema.value_schema)]
@@ -75,11 +75,7 @@ class Membrane::SchemaParser
     when Membrane::Schema::Value
       schema.value.inspect
     when Membrane::Schema::Base
-      if schema.respond_to?(:deparse)
-        schema.deparse
-      else
-        schema.inspect
-      end
+      schema.inspect
     else
       emsg = "Expected instance of Membrane::Schema::Base, given instance of" \
              + " #{schema.class}"

data/lib/membrane/version.rb

@@ -1,3 +1,3 @@
 module Membrane
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/base_schema_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+
+describe Membrane::Schema::Base do
+  describe "#validate" do
+    let(:schema) { Membrane::Schema::Base.new }
+
+    it "should raise error" do
+      expect { schema.validate }.to raise_error
+    end
+
+    it "should deparse" do
+      schema.deparse.should == schema.inspect
+    end
+  end
+end

data/spec/schema_parser_spec.rb

@@ -24,12 +24,12 @@ describe Membrane::SchemaParser do
       parser.deparse(schema).should == "bool"
     end
 
-    it "should call inspect on the class of a Membrane::Schema::Class schema" do
+    it "should call name on the class of a Membrane::Schema::Class schema" do
       klass = String
-      klass.should_receive(:inspect).twice
+      klass.should_receive(:name).twice
       schema = Membrane::Schema::Class.new(klass)
 
-      parser.deparse(schema).should == klass.inspect
+      parser.deparse(schema).should == klass.name
     end
 
     it "should deparse the k/v schemas of a Membrane::Schema::Dictionary schema" do
@@ -99,6 +99,11 @@ EOT
       parser.deparse(enum_schema).should == 'tuple(String, Integer, "test")'
     end
 
+    it "should call inspect on a Membrane::Schema::Base schema" do
+      schema = Membrane::Schema::Base.new
+      parser.deparse(schema).should == schema.inspect
+    end
+
     it "should raise an error if given a non-schema" do
       expect do
         parser.deparse({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: membrane
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -90,6 +90,7 @@ files:
 - lib/membrane/version.rb
 - membrane.gemspec
 - spec/any_schema_spec.rb
+- spec/base_schema_spec.rb
 - spec/bool_schema_spec.rb
 - spec/class_schema_spec.rb
 - spec/complex_schema_spec.rb
@@ -128,6 +129,7 @@ specification_version: 3
 summary: A DSL for validating data.
 test_files:
 - spec/any_schema_spec.rb
+- spec/base_schema_spec.rb
 - spec/bool_schema_spec.rb
 - spec/class_schema_spec.rb
 - spec/complex_schema_spec.rb