rest_model 0.2.1 → 0.2.3

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: rspec

data/README.md

@@ -1,4 +1,4 @@
-# RestModel
+# RestModel [![Build Status](https://secure.travis-ci.org/rodrigues/rest_model.png)](http://travis-ci.org/rodrigues/rest_model)
 
             [ THE INTERNETS ]
 

data/Rakefile

@@ -1,2 +1,2 @@
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks

data/examples/embeds_many/simple.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $:.push 'examples'; require 'helper'
 
 class Item < RestModel

data/lib/rest_model/configuration.rb

@@ -6,6 +6,10 @@ class RestModel
 
     DefaultHandler = proc {|keys| keys}
 
+    def configure
+      yield self if block_given?
+    end
+
     def convert_input_keys
       @convert_input_keys || DefaultHandler
     end
@@ -45,9 +49,5 @@ class RestModel
     def date_time_format=(format)
       @date_time_format = format
     end
-
-    def configure
-      yield self if block_given?
-    end
   end
 end

data/lib/rest_model/errors.rb

@@ -17,4 +17,4 @@ class RestModel
       new(errors)
     end
   end
-end
+end

data/lib/rest_model/key/embeddable.rb

@@ -19,7 +19,7 @@ class RestModel
     end
 
     def raw?
-      [Hash, Array].include?(resource_class)
+      %w(Hash Array).include?(@class_name.to_s.camelize)
     end
 
     def from_hash(attrs, resource = nil)

data/lib/rest_model/key/href/response.rb

@@ -3,7 +3,7 @@ class RestModel
     module Response
       def to_resource(parent)
         id_key = parent.class.id_key.name
-        {name => "#{RestModel::Configuration.host}/#{parent.class.resource_name}/#{parent.send(id_key)}"}
+        {name => URI.escape("#{RestModel::Configuration.host}/#{parent.class.resource_name}/#{parent.send(id_key)}")}
       end
     end
   end

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

@@ -4,7 +4,7 @@ class RestModel
       def from_source(item, resource = nil)
         value = digg(item)
         translation.translates_from_source? ? translation.translate_from_source(value, resource)
-                                            : serializer.serialize(value)
+                                            : serializer.serialize(value, self.options)
       end
 
       def digg(input)

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

@@ -4,7 +4,7 @@ class RestModel
       def to_source!(value, resource, options = {})
         source_value = begin
           translation.translates_to_source? ? translation.translate_to_source(value, resource)
-                                            : serializer.desserialize(value)
+                                            : serializer.desserialize(value, self.options)
 
         rescue TranslationError, SerializationError => error
           raise error if options[:fail] and validates?(value)

data/lib/rest_model/key/relation/response.rb

@@ -12,7 +12,7 @@ class RestModel
         return nil unless visible?(parent)
 
         href = href(parent)
-        href ? {rel: name, href: href} : nil
+        href ? {rel: name, href: URI.escape(href)} : nil
       end
 
       private

data/lib/rest_model/key/relation.rb

@@ -20,6 +20,10 @@ class RestModel
       nil
     end
 
+    def relation?
+      true
+    end
+
     alias :parse  :from_source
   end
 end

data/lib/rest_model/key.rb

@@ -40,5 +40,9 @@ class RestModel
                                     else visible
                                     end
     end
+
+    def relation?
+      false
+    end
   end
 end

data/lib/rest_model/response.rb

@@ -10,15 +10,14 @@ class RestModel
           buffer.merge!(key.to_resource(self))
         end
 
-        if root and self.class.relations.any? and !options[:summarize]
-          links = build_links
-          resource.merge!({link: links}) if links.any?
+        if (links = build_links).any? && !options[:summarize]
+          resource.merge!(link: links)
         end
       end
     end
 
     def build_links
-      self.class.relations.map {|key| key.to_relation(self)}.reject(&:nil?)
+      self.class.relations.map {|key| key.to_relation(self)}.compact
     end
 
     def resource_keys(options)

data/lib/rest_model/serialization/boolean.rb

@@ -25,13 +25,13 @@ class RestModel
         nil     => false
       }.freeze
 
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         MAPPINGS[value].tap do |bool|
           fail SerializationError, "value '#{value}' is not boolean" if bool.nil?
         end
       end
 
-      def self.desserialize(value)
+      def self.desserialize(value, options = {})
         fail SerializationError, "value '#{value}' is not boolean" unless boolean?(value)
 
         value ? RestModel::Configuration.true_value

data/lib/rest_model/serialization/date.rb

@@ -1,15 +1,15 @@
 class RestModel
   module Serialization
     class Date
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         ::Date.parse value
       rescue
         raise SerializationError, "value '#{value}' is an invalid date"
       end
 
-      def self.desserialize(value)
+      def self.desserialize(value, options = {})
         date = value.kind_of?(::Date) ? value : ::Date.parse(value)
-        format = RestModel::Configuration.date_format
+        format = options.fetch(:format, RestModel::Configuration.date_format)
         format ? date.strftime(format) : date.to_s
       rescue
         raise SerializationError, "value '#{value}' is an invalid date"

data/lib/rest_model/serialization/date_time.rb

@@ -1,15 +1,15 @@
 class RestModel
   module Serialization
     class DateTime
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         ::DateTime.parse value
       rescue
         raise SerializationError, "value '#{value}' is an invalid date time"
       end
 
-      def self.desserialize(value)
+      def self.desserialize(value, options = {})
         date_time = value.kind_of?(::DateTime) ? value : ::DateTime.parse(value)
-        format = RestModel::Configuration.date_time_format
+        format = options.fetch(:format, RestModel::Configuration.date_time_format)
         format ? date_time.strftime(format) : date_time.to_s
       rescue
         raise SerializationError, "value '#{value}' is an invalid date time"

data/lib/rest_model/serialization/enumerable.rb

@@ -1,13 +1,13 @@
 class RestModel
   module Serialization
     class Enumerable
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         fail SerializationError, "value '#{value}' is not an enumerable" unless value.kind_of?(::Enumerable)
 
         value
       end
 
-      def self.desserialize(value)
+      def self.desserialize(value, options = {})
         fail SerializationError, "value '#{value}' is not an enumerable" unless value.kind_of?(::Enumerable)
 
         value

data/lib/rest_model/serialization/float.rb

@@ -1,13 +1,13 @@
 class RestModel
   module Serialization
     class Float
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         Float(value)
       rescue
         raise SerializationError, "value '#{value}' is not a float"
       end
 
-      def self.desserialize(value)
+      def self.desserialize(value, options = {})
         Float(value)
       rescue
         raise SerializationError, "value '#{value}' is not a float"

data/lib/rest_model/serialization/integer.rb

@@ -1,10 +1,10 @@
 class RestModel
   module Serialization
     class Integer
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         case value
         when ::String
-          if value =~ /^\d+$/
+          if value =~ /^\-?\d+$/
             value.to_i
           else
             raise
@@ -16,8 +16,10 @@ class RestModel
         raise SerializationError, "value '#{value}' is not an integer"
       end
 
-      def self.desserialize(value)
-        serialize(value)
+      def self.desserialize(value, options = {})
+        length = options.fetch(:padding_zeros, 0)
+        return serialize(value) if length == 0
+        serialize(value).to_s.rjust(length, "0")
       end
     end
   end

data/lib/rest_model/serialization/string.rb

@@ -1,13 +1,13 @@
 class RestModel
   module Serialization
     class String
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         value.nil? ? nil : value.to_s
       rescue
         raise SerializationError, "value '#{value}' is not a string"
       end
 
-      def self.desserialize(value)
+      def self.desserialize(value, options = {})
         serialize(value)
       end
     end

data/lib/rest_model/serialization/symbol.rb

@@ -1,13 +1,13 @@
 class RestModel
   module Serialization
     class Symbol
-      def self.serialize(value)
+      def self.serialize(value, options = {})
         value.to_s.to_sym
       rescue
         raise SerializationError, "value '#{value}' is not a symbol"
       end
 
-      def self.desserialize(value)
+      def self.desserialize(value, options = {})
         serialize(value)
       end
     end

data/lib/rest_model/version.rb

@@ -1,3 +1,3 @@
 class RestModel
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/rest_model.rb

@@ -1,4 +1,5 @@
 require "date"
+require "uri"
 require "active_support/inflector"
 require "active_support/concern"
 require "active_support/core_ext/object"
@@ -96,7 +97,7 @@ class RestModel
   end
 
   def self.relations
-    @keys.find_all {|k| k.kind_of?(Relation)}
+    keys.find_all(&:relation?)
   end
 
   def self.resource_name(custom_name = nil)

data/rest_model.gemspec

@@ -17,10 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activesupport", "~> 3.0"
-  s.add_dependency "i18n",          ">= 0.5"
-  s.add_development_dependency "rspec",       "~> 2.6"
-  s.add_development_dependency "guard",       "~> 0.5"
-  s.add_development_dependency "guard-rspec", "~> 0.4"
-  s.add_development_dependency "growl",       "~> 1.0"
+  s.add_dependency "activesupport",     "~> 3.2"
+  s.add_dependency "i18n",              ">= 0.6"
+  s.add_development_dependency "rspec", "~> 2.6"
+  s.add_development_dependency "rake"
 end

data/spec/spec_helper.rb

@@ -19,7 +19,6 @@ RSpec.configure do |config|
 end
 
 include Output
-include Examples
 
 RestModel::Configuration.configure do |c|
   c.host = 'http://example.com'

data/spec/support/examples.rb

@@ -1,27 +1,21 @@
-module Examples
-  extend RSpec::Core::Hooks
+EXAMPLES_CONSTANTS = %w(Root       Item     Customer  Entry
+                        Service    Billing  Developer Upcasing
+                        Camelizing Product  Address   Phone)
 
-  CONSTANTS = [:Root, :Item, :Customer, :Entry, :Phone,
-               :Service, :Billing, :Developer, :Upcasing,
-               :Camelizing, :Product, :Address]
-
-  def describe_example(file, tags = {}, &block)
-    describe "example #{file}", tags do
-      before :all do
-        CONSTANTS.each do |klass|
-          self.class.ancestors.concat([self.class, Examples]).each do |mod|
-            mod.send(:remove_const, klass) if mod.const_defined?(klass, false)
-          end
-        end
-
-        RestModel::Configuration.configure do |c|
-          c.convert_input_keys = RestModel::Configuration::DefaultHandler
-        end
+def describe_example(file, tags = {}, &block)
+  describe "example #{file}", tags do
+    before :all do
+      EXAMPLES_CONSTANTS.each do |klass|
+        Object.send(:remove_const, klass) if Object.const_defined?(klass, false)
+      end
 
-        silently {eval File.read("examples/#{file}.rb")}
+      RestModel::Configuration.configure do |c|
+        c.convert_input_keys = RestModel::Configuration::DefaultHandler
       end
 
-      instance_eval &block if block
+      silently {eval File.read("examples/#{file}.rb")}
     end
+
+    instance_eval &block if block
   end
 end

data/spec/unit/configuration_spec.rb

@@ -1,24 +1,22 @@
 require 'spec_helper'
 
 describe RestModel::Configuration do
-  after(:all) do
-    RestModel::Configuration.convert_input_keys = nil
-  end
+  after(:all) {subject.convert_input_keys = nil}
 
   context "when no custom input keys converter is set" do
     it "returns default key converter" do
       default_handler = RestModel::Configuration::DefaultHandler
-      RestModel::Configuration.convert_input_keys.should == default_handler
+      subject.convert_input_keys.should == default_handler
     end
   end
 
   context "when a custom input keys converter is set" do
     let(:custom_convert_input_keys) {lambda {|keys| keys}}
 
-    before {RestModel::Configuration.convert_input_keys = custom_convert_input_keys}
+    before {subject.convert_input_keys = custom_convert_input_keys}
 
     it "returns custom key converter" do
-      RestModel::Configuration.convert_input_keys.should == custom_convert_input_keys
+      subject.convert_input_keys.should == custom_convert_input_keys
     end
   end
 end

data/spec/unit/key/association_spec.rb

@@ -2,67 +2,43 @@ require 'spec_helper'
 
 describe RestModel::Association do
   describe "#initialize" do
-    context "class_name" do
-      context "when class_name option is passed" do
+    context "options[:class_name]" do
+      context "when it's passed" do
         subject do
           RestModel::Association.new(:login, class_name: :some_class)
         end
 
-        it "sets passed class_name" do
+        it "sets class_name" do
           subject.instance_variable_get("@class_name").should == "SomeClass"
         end
       end
 
-      context "when class_name option is not passed" do
+      context "when it isn't passed" do
         subject {RestModel::Association.new(:login)}
 
-        it "sets default class_name" do
+        it "uses default class_name" do
           subject.instance_variable_get("@class_name").should == "Login"
         end
       end
     end
 
-    context "many" do
-      context "when many option is passed with true" do
-        subject do
-          RestModel::Association.new(:login, many: true)
-        end
-
-        it "returns false to one?" do
-          subject.one?.should be_false
-        end
-
-        it "returns true to many?" do
-          subject.many?.should be_true
-        end
+    context "options[:many]" do
+      context "when it's true" do
+        subject {RestModel::Association.new(:login, many: true)}
+        its(:one?)  {should be_false}
+        its(:many?) {should be_true}
       end
 
-      context "when many option is passed with false" do
-        subject do
-          RestModel::Association.new(:login, many: false)
-        end
-
-        it "returns true to one?" do
-          subject.one?.should be_true
-        end
-
-        it "returns false to many?" do
-          subject.many?.should be_false
-        end
+      context "when it's false" do
+        subject {RestModel::Association.new(:login, many: false)}
+        its(:one?)  {should be_true}
+        its(:many?) {should be_false}
       end
 
-      context "when many option is not passed" do
-        subject do
-          RestModel::Association.new(:login)
-        end
-
-        it "returns true to one?" do
-          subject.one?.should be_true
-        end
-
-        it "returns false to many?" do
-          subject.many?.should be_false
-        end
+      context "when it isn't passed" do
+        subject {RestModel::Association.new(:login)}
+        its(:one?)  {should be_true}
+        its(:many?) {should be_false}
       end
     end
   end

data/spec/unit/key/embeddable/response_spec.rb

@@ -19,7 +19,7 @@ describe RestModel::Embeddable::Response do
 
     context "when this key shouldn't be visible on resource" do
       it "returns an empty hash" do
-        subject.should_receive(:visible?).and_return false
+        subject.should_receive(:visible?) {false}
         subject.to_resource(example).should == {}
       end
     end

data/spec/unit/key/embeddable_spec.rb

@@ -4,4 +4,27 @@ describe RestModel::Embeddable do
   it "is a relation" do
     RestModel::Embeddable.superclass.should == RestModel::Association
   end
+
+  describe "#raw?" do
+    context "when class_name is array" do
+      subject    {RestModel::Embeddable.new(:example, class_name: :array)}
+      its(:raw?) {should be_true}
+    end
+
+    context "when class_name is hash" do
+      subject    {RestModel::Embeddable.new(:example, class_name: :hash)}
+      its(:raw?) {should be_true}
+    end
+
+    context "when class_name isn't hash nor array" do
+      subject    {RestModel::Embeddable.new(:example)}
+      its(:raw?) {should be_false}
+    end
+
+    context "when fields are defined" do
+      subject      {RestModel::Embeddable.new(:example, fields: %w(a b c))}
+      its(:raw?)   {should be_true}
+      its(:fields) {should == %w(a b c)}
+    end
+  end
 end

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

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe RestModel::Property::Response do
-  class Customer
+  class User
     attr_accessor :login
   end
 
   subject {RestModel::Property.new(:login)}
 
   it "returns a pair with property name and value" do
-    customer = Customer.new.tap {|c| c.login = "jackiechan2010"}
-    subject.to_resource(customer).should == {login: "jackiechan2010"}
+    user = User.new.tap {|u| u.login = "jackiechan2010"}
+    subject.to_resource(user).should == {login: "jackiechan2010"}
   end
 
   context "when this key shouldn't be visible on resource" do
     it "returns an empty hash" do
-      subject.should_receive(:visible?).and_return false
-      customer = Customer.new.tap {|c| c.login = "jackiechan2010"}
-      subject.to_resource(customer).should == {}
+      subject.should_receive(:visible?) {false}
+      user = User.new.tap {|u| u.login = "jackiechan2010"}
+      subject.to_resource(user).should == {}
     end
   end
 end

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

@@ -7,11 +7,11 @@ describe RestModel::Property::Retriever do
   let(:serializer_mock) {mock :serializer}
 
   before do
-    subject.stub!(:serializer).and_return serializer_mock
+    subject.stub!(:serializer) {serializer_mock}
   end
 
   it "tries to serialize value" do
-    serializer_mock.should_receive(:serialize).with(item[:login]).and_return(item[:login])
+    serializer_mock.should_receive(:serialize).with(item[:login], instance_of(Hash)) {item[:login]}
     subject.from_source(item)
   end
 

data/spec/unit/key/relation/response_spec.rb

@@ -11,7 +11,7 @@ describe RestModel::Response do
     context "#to_resource" do
       context "when the key shouldn't be visible on resource" do
         it "returns an empty hash" do
-          subject.should_receive(:visible?).and_return false
+          subject.should_receive(:visible?) {false}
           subject.to_resource(example).should == {}
         end
       end
@@ -49,6 +49,31 @@ describe RestModel::Response do
     it_behaves_like "a relation"
   end
 
+  context "when has one (with :href option)" do
+    before do
+      class ExampleChild < RestModel
+        id
+        belongs_to :example
+      end
+
+      class Example < RestModel
+        id
+        has_one  :example_child, href: proc {example_child_link}
+
+        def example_child_link
+          "http://example.com/examples/#{id}/example_custom_child"
+        end
+      end
+    end
+
+    subject {Example.keys[1]}
+
+    let(:example) {Example.new(id: 100)}
+    let(:result)  {{rel: :example_child, href: "http://example.com/examples/100/example_custom_child"}}
+
+    it_behaves_like "a relation"
+  end
+
   context "when has many" do
     before do
       class ExampleChild < RestModel
@@ -70,6 +95,31 @@ describe RestModel::Response do
     it_behaves_like "a relation"
   end
 
+  context "when has many (with :href option)" do
+    before do
+      class ExampleChild < RestModel
+        id
+        belongs_to :example
+      end
+
+      class Example < RestModel
+        id
+        has_many :example_children, href: proc {example_child_link}
+
+        def example_child_link
+          "http://example.com/api/examples/#{id}/example_custom_children"
+        end
+      end
+    end
+
+    subject {Example.keys[1]}
+
+    let(:example) {Example.new(id: 200)}
+    let(:result)  {{rel: :example_children, href: "http://example.com/api/examples/200/example_custom_children"}}
+
+    it_behaves_like "a relation"
+  end
+
   context "when belongs to one" do
     before do
       class ExampleChild < RestModel
@@ -91,6 +141,52 @@ describe RestModel::Response do
     it_behaves_like "a relation"
   end
 
+  context "when belongs to one (with :href option)" do
+    before do
+      class ExampleChild < RestModel
+        id
+        belongs_to :example, href: proc {example_link}
+
+        def example_link
+          "http://example.com/api/examples/#{example_id}"
+        end
+      end
+
+      class Example < RestModel
+        id
+        has_many :example_children
+      end
+    end
+
+    subject {ExampleChild.keys[1]}
+
+    let(:example) {ExampleChild.new(id: 200, example_id: 123)}
+    let(:result)  {{rel: :example, href: "http://example.com/api/examples/123"}}
+
+    it_behaves_like "a relation"
+  end
+
+  context "escaped href" do
+    before do
+      class ExampleChild < RestModel
+        id
+        belongs_to :example
+      end
+
+      class Example < RestModel
+        id
+        has_many :example_children
+      end
+    end
+
+    subject {ExampleChild.keys[1]}
+
+    let(:example) {ExampleChild.new(id: 200, example_id: "Some Id")}
+    let(:result)  {{rel: :example, href: "http://example.com/examples/Some%20Id"}}
+
+    it_behaves_like "a relation"
+  end
+
   context "when using forbidden key names" do
     [:resource_id, :resource].each do |forbidden_name|
       it "raises an exception for #{forbidden_name}" do

data/spec/unit/key/relation_spec.rb

@@ -5,67 +5,28 @@ describe RestModel::Relation do
     RestModel::Relation.superclass.should == RestModel::Association
   end
 
-  describe "#has?" do
+  describe "#has? and #belongs?" do
     context "when it has one resource" do
-      subject do
-        RestModel::Relation.new(:service, many: false, has: true)
-      end
-
-      it "returns true" do
-        subject.has?.should be_true
-      end
+      subject        {RestModel::Relation.new(:service, many: false, has: true)}
+      its(:has?)     {should be_true}
+      its(:belongs?) {should be_false}
     end
 
     context "when it has many resources" do
-      subject do
-        RestModel::Relation.new(:service, many: true, has: true)
-      end
-
-      it "returns true" do
-        subject.has?.should be_true
-      end
+      subject        {RestModel::Relation.new(:service, many: true, has: true)}
+      its(:has?)     {should be_true}
+      its(:belongs?) {should be_false}
     end
 
     context "when it belongs to a resource" do
-      subject do
-        RestModel::Relation.new(:service, many: false, has: false)
-      end
-
-      it "returns true" do
-        subject.has?.should be_false
-      end
+      subject        {RestModel::Relation.new(:service, many: false, has: false)}
+      its(:has?)     {should be_false}
+      its(:belongs?) {should be_true}
     end
   end
 
-  describe "#belongs?" do
-    context "when it belongs to a resource" do
-      subject do
-        RestModel::Relation.new(:service, many: false, has: false)
-      end
-
-      it "returns true" do
-        subject.belongs?.should be_true
-      end
-    end
-
-    context "when it has one resource" do
-      subject do
-        RestModel::Relation.new(:service, many: false, has: true)
-      end
-
-      it "returns true" do
-        subject.belongs?.should be_false
-      end
-    end
-
-    context "when it has many resources" do
-      subject do
-        RestModel::Relation.new(:service, many: true, has: true)
-      end
-
-      it "returns true" do
-        subject.belongs?.should be_false
-      end
-    end
+  context "#relation?" do
+    subject {RestModel::Relation.new(:example)}
+    its(:relation?) {should be_true}
   end
 end

data/spec/unit/key_spec.rb

@@ -19,14 +19,14 @@ describe RestModel::Key do
   describe "#visible?" do
     context "when :visible option was defined" do
       context "and :if option was defined with false" do
-        subject {RestModel::Property.new(name, {if: proc {false}, visible: true})}
+        subject {RestModel::Property.new(name, if: proc {false}, visible: true)}
         it "return false even when visible is true" do
           subject.visible?(nil).should be_false
         end
       end
 
       context "and it evaluates to false" do
-        subject {RestModel::Property.new(name, {visible: false})}
+        subject {RestModel::Property.new(name, visible: false)}
 
         it "returns false" do
           subject.visible?(nil).should be_false
@@ -34,7 +34,7 @@ describe RestModel::Key do
       end
 
       context "and it evaluates to true" do
-        subject {RestModel::Property.new(name, {visible: true})}
+        subject {RestModel::Property.new(name, visible: true)}
 
         it "returns true" do
           subject.visible?(nil).should be_true
@@ -43,21 +43,21 @@ describe RestModel::Key do
 
       context "with a proc" do
         context "and it evaluates true" do
-          subject {RestModel::Property.new(name, {visible: proc {true}})}
+          subject {RestModel::Property.new(name, visible: proc {true})}
           it "returns true" do
             subject.visible?("a").should be_true
           end
         end
 
         context "and it evaluates false" do
-          subject {RestModel::Property.new(name, {visible: proc {false}})}
+          subject {RestModel::Property.new(name, visible: proc {false})}
           it "returns false" do
             subject.visible?("a").should be_false
           end
         end
 
         context "and it depends on resource instance" do
-          subject {RestModel::Property.new(name, {visible: proc {show}})}
+          subject {RestModel::Property.new(name, visible: proc {show})}
 
           it "uses it" do
             resource = OpenStruct.new
@@ -72,7 +72,7 @@ describe RestModel::Key do
   describe "#present?" do
     context "when :if option was defined with a proc" do
       context "and it evaluates to false" do
-        subject {RestModel::Property.new(name, {if: proc {false}})}
+        subject {RestModel::Property.new(name, if: proc {false})}
 
         it "returns false" do
           subject.present?(nil).should be_false
@@ -80,7 +80,7 @@ describe RestModel::Key do
       end
 
       context "and it evaluates to true" do
-        subject {RestModel::Property.new(name, {if: proc {true}})}
+        subject {RestModel::Property.new(name, if: proc {true})}
 
         it "returns true" do
           subject.present?(nil).should be_true
@@ -88,7 +88,7 @@ describe RestModel::Key do
       end
 
       context "and it depends on resource instance" do
-        subject {RestModel::Property.new(name, {if: proc {show}})}
+        subject {RestModel::Property.new(name, if: proc {show})}
 
         it "uses it" do
           resource = OpenStruct.new
@@ -98,4 +98,8 @@ describe RestModel::Key do
       end
     end
   end
+
+  describe "#relation?" do
+    its(:relation?) {should be_false}
+  end
 end

data/spec/unit/response_spec.rb

@@ -12,6 +12,14 @@ describe RestModel::Response do
       property   :street
       property   :city
     end
+
+    class SummarizeExample < RestModel
+      id
+      property :name
+      property :login
+
+      summarizes :id, :name, :login
+    end
   end
 
   let(:input) do
@@ -34,11 +42,41 @@ describe RestModel::Response do
     end
 
     context "when a list of resources is received" do
-      it "returns some resources in an entries array" do
-        model = 3.times.map {Example.parse(input).first}
-        result = {entries: 3.times.map {input}}
-        Example.normalize(model).with_indifferent_access.should == result.with_indifferent_access
+      context "with sumarize options" do
+        it "returns some resources in an entries array" do
+          model = 3.times.map {Example.parse(input).first}
+          result = {entries: 3.times.map {input}}
+          Example.normalize(model).with_indifferent_access.should == result.with_indifferent_access
+        end
+      end
+
+      context "without sumarize options" do
+        let(:input) do
+          {
+            id:    "Escape This",
+            name:  "My name is",
+            login: "my_login"
+          }
+        end
+
+        let(:expected) do
+          {
+            entries: [
+              {
+                id:    "Escape This",
+                name:  "My name is",
+                login: "my_login",
+                href: "http://example.com/summarize_examples/Escape%20This"
+              }
+            ]
+          }
+        end
+
+        it "returns some resources in an entries array" do
+          model = SummarizeExample.parse(input)
+          SummarizeExample.normalize(model).with_indifferent_access.should == expected.with_indifferent_access
+        end
       end
     end
   end
-end
+end

data/spec/unit/serialization/date_spec.rb

@@ -5,6 +5,10 @@ describe RestModel::Serialization::Date do
     subject.class.serialize('2011-07-01').should == Date.new(2011, 07, 01)
   end
 
+  it "desserializes to date respecting the provided format" do
+    subject.class.desserialize(Date.new(2038, 1, 19), format: "%a %b %d %Y").should == "Tue Jan 19 2038"
+  end
+
   context "when an invalid value is serialized" do
     it "raises an error" do
       expect {subject.class.serialize("not a date")}.to raise_error

data/spec/unit/serialization/date_time_spec.rb

@@ -5,6 +5,10 @@ describe RestModel::Serialization::DateTime do
     subject.class.serialize('2011-07-01T10:20:30').should == DateTime.new(2011, 07, 01, 10, 20, 30)
   end
 
+  it "desserializes to date time respecting the provided format" do
+    subject.class.desserialize(DateTime.new(2012, 12, 31, 12, 0, 0), format: "%a %b %d %H:%M:%S %Y").should == "Mon Dec 31 12:00:00 2012"
+  end
+
   context "when an invalid value is serialized" do
     it "raises an error" do
       expect {subject.class.serialize("not a date time")}.to raise_error

data/spec/unit/serialization/integer_spec.rb

@@ -1,10 +1,18 @@
 require 'spec_helper'
 
 describe RestModel::Serialization::Integer do
+  it "adds leading zeros from options while desserializing" do
+    subject.class.desserialize('1200', padding_zeros: 12).should == "000000001200"
+  end
+
   it "converts to integer" do
     subject.class.serialize('1200').should == 1200
   end
 
+  it "converts negative number to negative integer" do
+    subject.class.serialize('-1').should == -1
+  end
+
   context "when an invalid value is serialized" do
     it "raises an error" do
       expect {subject.class.serialize("not an integer")}.to raise_error

data/spec/unit/source/path_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Upcasing
+module InputKeysConverterStrategy
   def self.call(keys)
     keys.map {|key| key.to_s.upcase}
   end
@@ -21,7 +21,7 @@ describe RestModel::Source::Path do
     end
 
     context "and there is a custom keys input converter" do
-      subject {RestModel::Key.new(:name, convert_input_keys: Upcasing)}
+      subject {RestModel::Key.new(:name, convert_input_keys: InputKeysConverterStrategy)}
       let(:path) {['NAME']}
       it_behaves_like "an input path"
     end
@@ -53,7 +53,7 @@ describe RestModel::Source::Path do
     end
 
     context "and there is a custom keys input converter" do
-      let(:options) {{start_key: 'yay.upcase.path', convert_input_keys: Upcasing}}
+      let(:options) {{start_key: 'yay.upcase.path', convert_input_keys: InputKeysConverterStrategy}}
       subject {RestModel::Key.new(:name, options)}
       let(:path) {['YAY', 'UPCASE', 'PATH']}
       it_behaves_like "an input path"

data/spec/unit/source/retriever_spec.rb

@@ -7,7 +7,7 @@ describe RestModel::Source::Retriever do
         property :login
       end
 
-      models = Example.parse({login: 'jackiechan2010'})
+      models = Example.parse(login: 'jackiechan2010')
       models.should be_an(Array)
       models.first.login.should == 'jackiechan2010'
     end
@@ -17,7 +17,7 @@ describe RestModel::Source::Retriever do
         property :login, field: :customer_login
       end
 
-      models = Example.parse({customer_login: 'jackiechan2010'})
+      models = Example.parse(customer_login: 'jackiechan2010')
       models.should be_an(Array)
       models.first.login.should == 'jackiechan2010'
     end
@@ -31,12 +31,12 @@ describe RestModel::Source::Retriever do
         end
 
         it "returns true when value is 'X'" do
-          models = Example.parse({can_merge: 'X'})
+          models = Example.parse(can_merge: 'X')
           models.first.can_merge.should be_true
         end
 
         it "returns false when value isn't 'X'" do
-          models = Example.parse({can_merge: ''})
+          models = Example.parse(can_merge: '')
           models.first.can_merge.should be_false
         end
       end
@@ -47,7 +47,7 @@ describe RestModel::Source::Retriever do
             property :issue_date, type: Date
           end
 
-          models = Example.parse({issue_date: '2011-01-01'})
+          models = Example.parse(issue_date: '2011-01-01')
           models.first.issue_date.should == Date.parse('2011-01-01')
         end
       end
@@ -58,7 +58,7 @@ describe RestModel::Source::Retriever do
             property :amount, type: Float
           end
 
-          models = Example.parse({amount: '1234.5'})
+          models = Example.parse(amount: '1234.5')
           models.first.amount.should == 1234.5
         end
       end
@@ -72,20 +72,20 @@ describe RestModel::Source::Retriever do
       end
 
       it "returns key when value was mapped" do
-        models = Example.from_source!({status: '02'})
+        models = Example.from_source!(status: '02')
         models.first.status.should == :unpaid
       end
 
       context "when calling from_source" do
         it "returns nil when value wasn't mapped" do
-          models = Example.from_source({status: '03'})
+          models = Example.from_source(status: '03')
           models.first.status.should be_nil
         end
       end
 
       context "when calling from_source!" do
         it "fails when value wasn't mapped" do
-          expect {Example.from_source!({status: '03'})}.to raise_error
+          expect {Example.from_source!(status: '03')}.to raise_error
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_model
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,33 +11,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70119449382520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70119449382520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70119449382020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70119449382020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70119449381560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,40 +55,28 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70119449381560
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &70119443530980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: *70119443530980
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70119443530520 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119443530520
-- !ruby/object:Gem::Dependency
-  name: growl
-  requirement: &70119443530060 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: *70119443530060
+        version: '0'
 description: ''
 email:
 - victorcrodrigues@gmail.com
@@ -89,8 +87,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
-- Guardfile
 - README.md
 - Rakefile
 - examples/all.rb
@@ -245,46 +243,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ''
-test_files:
-- spec/integration/belongs_to_spec.rb
-- spec/integration/embeds_many_spec.rb
-- spec/integration/embeds_one_spec.rb
-- spec/integration/has_many_spec.rb
-- spec/integration/has_one_spec.rb
-- spec/integration/property_spec.rb
-- 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
-- spec/support/shared_examples.rb
-- spec/unit/configuration_spec.rb
-- spec/unit/key/association_spec.rb
-- spec/unit/key/embeddable/builder_spec.rb
-- spec/unit/key/embeddable/response_spec.rb
-- spec/unit/key/embeddable/retriever_spec.rb
-- spec/unit/key/embeddable_spec.rb
-- spec/unit/key/property/builder_spec.rb
-- spec/unit/key/property/response_spec.rb
-- spec/unit/key/property/retriever_spec.rb
-- spec/unit/key/property_spec.rb
-- spec/unit/key/relation/builder_spec.rb
-- spec/unit/key/relation/response_spec.rb
-- spec/unit/key/relation_spec.rb
-- spec/unit/key_spec.rb
-- spec/unit/response_spec.rb
-- spec/unit/rest_model_spec.rb
-- spec/unit/serialization/boolean_spec.rb
-- spec/unit/serialization/date_spec.rb
-- spec/unit/serialization/date_time_spec.rb
-- spec/unit/serialization/float_spec.rb
-- spec/unit/serialization/integer_spec.rb
-- spec/unit/serialization/string_spec.rb
-- spec/unit/source/path_spec.rb
-- spec/unit/source/retriever_spec.rb
+test_files: []

data/Guardfile

@@ -1,7 +0,0 @@
-guard 'rspec', cli: '--color' do
-  watch(%r{spec/spec_helper.rb})     {"spec"}
-  watch(%r{^config\/(.*\/)*.*\.rb$}) {"spec"}
-
-  watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/(.+)\.rb}) {|m| "spec/#{m[1]}_spec.rb"}
-end