rest_model 0.1.19 → 0.1.20

data/examples/validations/simple.rb

@@ -0,0 +1,60 @@
+$:.push 'examples'; require 'helper'
+
+class Root < RestModel
+  id type: Integer
+  property :name
+  property :sudo, values: {true => "please"}
+  embeds_one :entry
+end
+
+class Entry < RestModel
+  property :name
+  property :some_date, type: Date
+  embeds_many :services
+end
+
+class Service < RestModel
+  property :code, type: Integer
+  embeds_many :products
+end
+
+class Product < RestModel
+  property :value, type: Float
+  property :created_at, type: DateTime
+end
+
+
+products = [
+  {
+    value: 100.00,
+    created_at: "non datetime (P0)"
+  },
+  {
+    value: "non float (P1)",
+    created_at: "2011-11-11T11:11:11"
+  }
+]
+
+services = [
+  {
+    code: "non integer (S0)",
+    products: products
+  }
+]
+
+entry = {
+  name: "Some name",
+  some_date: "some invalid date",
+  services: services
+}
+
+root = {
+  id: 1,
+  name: "Please",
+  sudo: true,
+  entry: entry
+}
+
+@root = Root.new(root)
+
+inspect_rest_model(@root)

data/lib/rest_model/errors.rb

@@ -9,6 +9,10 @@ class RestModel
       @errors = errors
     end
 
+    def message
+      @errors
+    end
+
     def self.exception(errors = {})
       new(errors)
     end

data/lib/rest_model/key/embeddable/sender.rb

@@ -18,8 +18,8 @@ class RestModel
           last = path.pop
           key_source = path.inject(source) {|buffer, key| buffer[key] = {}; buffer[key]}
           key_source[last] = raw? ? value
-                                  : one? ? value.to_source(options)
-                                         : value.map {|item| item.to_source(options)}
+                                  : one? ? embeds_one_source(value, options)
+                                         : embeds_many_source(value, options)
         else
           source.merge!(value.to_source(options))
         end
@@ -37,6 +37,27 @@ class RestModel
 
         input
       end
+
+      def embeds_one_source(value, options)
+        value.to_source(options)
+      end
+
+      def embeds_many_source(value, options)
+        errors = {}
+
+        source = value.each_with_index.map do |item, index|
+          begin
+            item.to_source(options)
+          rescue RestModel::SourceError => e
+            errors[self.name] ||= {}
+            errors[self.name][index] = e.message
+          end
+        end
+
+        fail RestModel::SourceError, errors unless errors.empty?
+
+        source
+      end
     end
   end
 end

data/lib/rest_model/key/property/builder.rb

@@ -2,6 +2,7 @@ class RestModel
   class Property
     module Builder
       def property(name, options = {})
+        options[:validate] = !options[:validate_if_present]
         key Property.new(name, options)
       end
 

data/lib/rest_model/key/property/sender.rb

@@ -5,8 +5,9 @@ class RestModel
         source_value = begin
           translation.translates_to_source? ? translation.translate_to_source(value, resource)
                                             : serializer.desserialize(value)
+
         rescue TranslationError, SerializationError => error
-          raise error if options[:fail]
+          raise error if options[:fail] and validates?(value)
         end
 
         source = {}
@@ -22,6 +23,12 @@ class RestModel
 
         source
       end
+
+      private
+
+      def validates?(value)
+        (self.options[:validate_if_present] and !value.nil?) or self.options[:validate]
+      end
     end
   end
 end

data/lib/rest_model/serialization/string.rb

@@ -3,10 +3,12 @@ class RestModel
     class String
       def self.serialize(value)
         value.nil? ? nil : value.to_s
+      rescue
+        raise SerializationError, "value '#{value}' is not a string"
       end
 
       def self.desserialize(value)
-        value.nil? ? nil : value.to_s
+        serialize(value)
       end
     end
   end

data/lib/rest_model/source/sender.rb

@@ -16,8 +16,10 @@ class RestModel
 
           begin
             source.merge! key.to_source!(value, self, key_options)
-          rescue TranslationError, SerializationError => error
-            errors[key.name] = error.message
+          rescue TranslationError, SerializationError => e
+            errors[key.name] = e.message
+          rescue SourceError => e
+            errors.merge!(e.message)
           end
         end
 

data/lib/rest_model/version.rb

@@ -1,3 +1,3 @@
 class RestModel
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

data/spec/integration/validations_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe "validations" do
+  describe_example "validations/simple" do
+    describe "#to_source!" do
+      it "raise a RestModel::SourceError" do
+        expected_message = {
+          some_date: "value 'some invalid date' is an invalid date",
+          services: {
+            0 => {
+              code: "value 'non integer (S0)' is not an integer",
+              products: {
+                0 => {
+                  created_at: "value 'non datetime (P0)' is an invalid date time"
+                },
+                1 => {
+                  value: "value 'non float (P1)' is not a float"
+                }
+              }
+            }
+          }
+        }
+
+        proc {@root.to_source!}.should raise_error(RestModel::SourceError) {|e| e.message.should == expected_message}
+      end
+    end
+  end
+end

data/spec/unit/key/property/builder_spec.rb

@@ -33,7 +33,7 @@ describe RestModel::Property::Builder do
       end
 
       let(:field)   {:id}
-      let(:options) {{id: true}}
+      let(:options) {{id: true, validate: true}}
 
       it_behaves_like "a property"
       it_behaves_like "a key"
@@ -47,7 +47,7 @@ describe RestModel::Property::Builder do
       end
 
       let(:field)   {:different_name}
-      let(:options) {{id: true}}
+      let(:options) {{id: true, validate: true}}
 
       it_behaves_like "a property"
       it_behaves_like "a key"
@@ -61,7 +61,7 @@ describe RestModel::Property::Builder do
       end
 
       let(:field)   {:id}
-      let(:options) {{some_option: 'some option value', id: true}}
+      let(:options) {{some_option: 'some option value', id: true, validate: true}}
 
       it_behaves_like "a property"
       it_behaves_like "a key"
@@ -75,7 +75,7 @@ describe RestModel::Property::Builder do
       end
 
       let(:field)   {:different_name}
-      let(:options) {{some_option: 'some option value', id: true}}
+      let(:options) {{some_option: 'some option value', id: true, validate: true}}
 
       it_behaves_like "a property"
       it_behaves_like "a key"
@@ -89,7 +89,7 @@ describe RestModel::Property::Builder do
       end
 
       let(:field)   {:id}
-      let(:options) {{id: true}}
+      let(:options) {{id: true, validate: true}}
 
       it_behaves_like "a property"
       it_behaves_like "a key"
@@ -105,7 +105,7 @@ describe RestModel::Property::Builder do
       end
 
       let(:field)   {:document_number}
-      let(:options) {{some_option: 'this is an option'}}
+      let(:options) {{some_option: 'this is an option', validate: true}}
 
       it_behaves_like "a property"
     end
@@ -118,7 +118,7 @@ describe RestModel::Property::Builder do
       end
 
       let(:field)   {:document_number}
-      let(:options) {{id: true}}
+      let(:options) {{id: true, validate: true}}
 
       it_behaves_like "a property"
       it_behaves_like "a key"
@@ -136,7 +136,7 @@ describe RestModel::Property::Builder do
     [:id, :description].each do |item|
       context "for #{item}" do
         let(:field)   {item}
-        let(:options) {{}}
+        let(:options) {{validate: true}}
 
         it_behaves_like "a property"
       end
@@ -145,7 +145,7 @@ describe RestModel::Property::Builder do
     [:price, :quantity].each do |item|
       context "for #{item}" do
         let(:field)   {item}
-        let(:options) {{firstoption: 'this is the first option', secondoption: 'this is the second option'}}
+        let(:options) {{firstoption: 'this is the first option', secondoption: 'this is the second option', validate: true}}
 
         it_behaves_like "a property"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_model
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70175820157140 !ruby/object:Gem::Requirement
+  requirement: &70239925984420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175820157140
+  version_requirements: *70239925984420
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70175820156640 !ruby/object:Gem::Requirement
+  requirement: &70239925983920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70175820156640
+  version_requirements: *70239925983920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70175820156180 !ruby/object:Gem::Requirement
+  requirement: &70239925983460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70175820156180
+  version_requirements: *70239925983460
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70175820155720 !ruby/object:Gem::Requirement
+  requirement: &70239925983000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70175820155720
+  version_requirements: *70239925983000
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70175820155260 !ruby/object:Gem::Requirement
+  requirement: &70239925982540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70175820155260
+  version_requirements: *70239925982540
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70175820154800 !ruby/object:Gem::Requirement
+  requirement: &70239925982080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70175820154800
+  version_requirements: *70239925982080
 description: ''
 email:
 - victorcrodrigues@gmail.com
@@ -148,6 +148,7 @@ files:
 - examples/update_attributes/has_many.rb
 - examples/update_attributes/has_one.rb
 - examples/update_attributes/simple.rb
+- examples/validations/simple.rb
 - lib/rest_model.rb
 - lib/rest_model/configuration.rb
 - lib/rest_model/errors.rb
@@ -193,6 +194,7 @@ files:
 - spec/integration/summarization_spec.rb
 - spec/integration/to_source_spec.rb
 - spec/integration/update_attributes_spec.rb
+- spec/integration/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/examples.rb
 - spec/support/out.rb
@@ -255,6 +257,7 @@ test_files:
 - spec/integration/summarization_spec.rb
 - spec/integration/to_source_spec.rb
 - spec/integration/update_attributes_spec.rb
+- spec/integration/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/examples.rb
 - spec/support/out.rb