resto 0.0.7 → 0.0.8

data/lib/resto.rb

@@ -63,7 +63,7 @@ module Resto
 
           @#{name} ||= {}
 
-          @#{name}[params] ||= #{class_name.capitalize}.
+          @#{name}[params] ||= #{class_name.to_s.capitalize}.
             all({#{params}}.update(params), {#{relation}})
         end
       }
@@ -76,9 +76,9 @@ module Resto
       method_definition = %Q{
         def #{name}(reload = false)
           if reload
-            @#{name} = #{name.capitalize}.get(#{name}_id)
+            @#{name} = #{name.to_s.capitalize}.get(#{name}_id)
           else
-            @#{name} ||= #{name.capitalize}.get(#{name}_id)
+            @#{name} ||= #{name.to_s.capitalize}.get(#{name}_id)
           end
         end
       }

data/lib/resto/property/handler.rb

@@ -9,10 +9,10 @@ module Resto
 
       def add(property)
         @properties_with_indifferent_access.store(property.remote_key, property)
-        @properties_with_indifferent_access
-          .store(property.attribute_key, property)
-        @properties_with_indifferent_access
-          .store(property.attribute_key_as_string, property)
+        @properties_with_indifferent_access.
+          store(property.attribute_key, property)
+        @properties_with_indifferent_access.
+          store(property.attribute_key_as_string, property)
 
         @properties.store(property.attribute_key, property)
       end

data/lib/resto/property/time.rb

@@ -14,6 +14,8 @@ module Resto
 
       def initialize(name, options={})
         @key = (name.to_s + "_time").to_sym
+        @format = options[:format]
+        @delimiter = @format.to_s.match(/(\W)/) { |m| m[0] }
         super
       end
 
@@ -22,22 +24,66 @@ module Resto
 
         formatted_value = value.to_s.strip
         if formatted_value.gsub(/([a-z|A-Z]{1,5}\Z)/, '') =~ /[^T\d\-:\+\/\s]/
-          formatted_value = "invalid"
+          errors.store(@key, ":#{attribute_key} is not a valid time format.")
+          formatted_value = ""
         end
 
         number_of_digits = formatted_value.gsub(/\D/, '').length
-        if (1..10).include?(number_of_digits)
-          formatted_value = "invalid"
+        if (1..9).include?(number_of_digits)
+          errors.store(@key, ":#{attribute_key} is not a valid time format.")
+          formatted_value = ""
         end
 
         begin
-          formatted_value.empty? ? nil : ::Time.parse(formatted_value)
-        rescue ArgumentError
-          nil.tap do
-            errors.store(@key, ":#{attribute_key} is not a valid time format.")
+          if formatted_value.empty?
+            nil
+          else
+            ::Time.parse(from_format(formatted_value))
           end
+        rescue ArgumentError, TypeError, NoMethodError
+          errors.store(@key, ":#{attribute_key} is not a valid time format.")
+          nil
         end
       end
+
+    private
+
+      def from_format(value)
+        if @format
+          first_date_part = value.split("#{@delimiter}")
+
+          reminder = first_date_part.delete_at(2)
+          last = reminder.gsub(/\A(\d+)/) { $1 + "SPLIT" }.split("SPLIT")
+          last_date_part = last[0]
+
+          time_and_zone = last[1]
+          date = first_date_part << last_date_part
+          "#{date.at(year)}-#{date.at(month)}-#{date.at(day)}#{time_and_zone}"
+        else
+           value
+        end
+      end
+
+      def to_format
+
+      end
+
+      def day
+        split_format.index('dd')
+      end
+
+      def month
+        split_format.index('mm')
+      end
+
+      def year
+        split_format.index('yyyy')
+      end
+
+      def split_format
+        @split_format ||= @format.split("#{@delimiter}")
+      end
+
     end
   end
 end

data/lib/resto/request/option.rb

@@ -100,8 +100,8 @@ module Resto
         tap { options.store(:open_timeout, time)}
       end
 
-      # Number of seconds to wait for one block to be read (via one read(2) call).
-      # If the HTTP object cannot read data in this many seconds,
+      # Number of seconds to wait for one block to be read (via one read(2)
+      # call). If the HTTP object cannot read data in this many seconds,
       # it raises a TimeoutError exception.
       def read_timeout(time)#
         tap { options.store(:read_timeout, time)}

data/lib/resto/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Resto
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/resto.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "yajl-ruby", "0.8.2"
   s.add_runtime_dependency "nokogiri", ">=1.4.4"
   # s.add_dependency "activesupport", "3.0.0" ???
-  s.add_development_dependency "bundler", ">= 1.0.11"
-  s.add_development_dependency "rspec",   ">= 2.5.0"
+  s.add_development_dependency "bundler", ">= 1.0.13"
+  s.add_development_dependency "rspec",   ">= 2.6.0"
   s.add_development_dependency "fuubar",   ">= 0.0.4"
   s.add_development_dependency "webmock", ">= 1.6.2"
   s.add_development_dependency "code-cleaner", ">= 0.8.2"

data/spec/resto/extra/copy_spec.rb

@@ -5,17 +5,17 @@ require 'resto/extra/copy'
 describe Resto::Extra::Copy do
   describe ".request_base" do
     before do
-      @request_base = Resto::Request::Base.new.port(40)
-        .url('http://www.aftonbladet.se:92/customers')
-        .query('q=adam')
-        .path('contacts')
-
-      @new_request_base = Resto::Extra::Copy.request_base(@request_base)
-        .url('http://new.se:99/other')
-        .query('q=not-same')
-        .path('other-contacts/')
-        .headers({ "accept"=> "other", "user-agent"=> "Ruby" })
-        .append_path(2)
+      @request_base = Resto::Request::Base.new.port(40).
+        url('http://www.aftonbladet.se:92/customers').
+        query('q=adam').
+        path('contacts')
+
+      @new_request_base = Resto::Extra::Copy.request_base(@request_base).
+        url('http://new.se:99/other').
+        query('q=not-same').
+        path('other-contacts/').
+        headers({ "accept"=> "other", "user-agent"=> "Ruby" }).
+        append_path(2)
     end
 
     it { @new_request_base.object_id.should_not == @request_base.object_id }
@@ -47,8 +47,8 @@ describe Resto::Extra::Copy do
   describe ".response_base" do
     before do
       @response_base = Resto::Response::Base.new.format(:json)
-      @new_response_base = Resto::Extra::Copy.response_base(@response_base)
-        .http_response('response')
+      @new_response_base = Resto::Extra::Copy.response_base(@response_base).
+        http_response('response')
     end
 
     it { @response_base.instance_eval { @response }.should == nil }

data/spec/resto/extra/hash_args_spec.rb

@@ -16,13 +16,13 @@ describe Resto::Extra::HashArgs do
     end
 
     it "returns the value found by the key"  do
-      BasicAuthication.new({'username' => 'anders', :password => 'secret'})
-        .fetch(:password) { 'other' }.should == 'secret'
+      BasicAuthication.new({'username' => 'anders', :password => 'secret'}).
+        fetch(:password) { 'other' }.should == 'secret'
     end
 
     it "the key is translated to its symbol" do
-      BasicAuthication.new({'username' => 'anders', :password => 'secret'})
-        .fetch(:username) { 'other' }.should == 'anders'
+      BasicAuthication.new({'username' => 'anders', :password => 'secret'}).
+        fetch(:username) { 'other' }.should == 'anders'
     end
   end
 
@@ -38,34 +38,34 @@ describe Resto::Extra::HashArgs do
     if RUBY_VERSION < '1.9'
 
       it "raises IndexError when no value and no block" do
-        expect { FormatExt.new({}).fetch(:extension) }
-          .to raise_error(IndexError, 'key not found')
+        expect { FormatExt.new({}).fetch(:extension) }.
+          to raise_error(IndexError, 'key not found')
       end
 
     else
 
       it "raises KeyError when no value and no block" do
-        lambda { FormatExt.new({}).fetch(:extension) }
-          .should raise_error(KeyError, 'key not found: :extension')
+        lambda { FormatExt.new({}).fetch(:extension) }.
+          should raise_error(KeyError, 'key not found: :extension')
       end
 
     end
 
     it "raises" do
-      expect { FormatExt.new({:username => "anders"}) }
-        .to raise_error(ArgumentError, /The key 'username'/)
+      expect { FormatExt.new({:username => "anders"}) }.
+        to raise_error(ArgumentError, /The key 'username'/)
 
-      expect { FormatExt.new("string") }
-        .to raise_error(ArgumentError, "'string' must be a Hash")
+      expect { FormatExt.new("string") }.
+        to raise_error(ArgumentError, "'string' must be a Hash")
 
-      expect { FormatExt.new(:extension => 'value', 'extension' => 'value') }
-        .to raise_error(ArgumentError, "duplicated keys: extension, extension")
+      expect { FormatExt.new(:extension => 'value', 'extension' => 'value') }.
+        to raise_error(ArgumentError, "duplicated keys: extension, extension")
 
-      expect { FormatExt.new({:invalid_key => 'invalid' }) }
-        .to raise_error(ArgumentError, /The key 'invalid_key' is not valid/)
+      expect { FormatExt.new({:invalid_key => 'invalid' }) }.
+        to raise_error(ArgumentError, /The key 'invalid_key' is not valid/)
 
-      expect { FormatExt.new({:extension => 'value' }).fetch(:invalid_key) }
-        .to raise_error(ArgumentError, /The key 'invalid_key' is not valid/)
+      expect { FormatExt.new({:extension => 'value' }).fetch(:invalid_key) }.
+        to raise_error(ArgumentError, /The key 'invalid_key' is not valid/)
     end
   end
 end

data/spec/resto/property/handler_spec.rb

@@ -47,8 +47,8 @@ describe Resto::Property::Handler do
           it { article.errors.fetch(:title_presence, false).should == nil }
 
           it do
-            article.errors.fetch(:empty_title_presence, false)
-              .should == ":empty_title can’t be blank"
+            article.errors.fetch(:empty_title_presence, false).
+              should == ":empty_title can’t be blank"
           end
         end
       end

data/spec/resto/property/time_spec.rb

@@ -12,10 +12,12 @@ describe Resto::Property::Time do
   let(:iso_8601_cet_winter)  { "2011-01-01T14:46:00+01:00" } #GMT +1, UTC +1
 
   let(:errors) { {} }
-  subject { Resto::Property::Time.new(:date_of_birth) }
+
 
   describe ".cast(time_string, errors)" do
-    context "local time is 2010-10-25T12:00:00 PST" do
+    subject { Resto::Property::Time.new(:date_of_birth) }
+
+    context "local time is 2010-10-25T12:00:00 PST", :ruby => 1.9  do
       it "returns a time object parsed from the string" do
         at_time("2010-10-25T12:00:00 PST", '-08:00') do #UTC -8
           time = subject.cast(iso_8601_plus, errors)
@@ -74,7 +76,7 @@ describe Resto::Property::Time do
     end
 
     context ".cast('q', errors)" do
-      it("returns nil and sets errors[:date_of_birth_time]") do
+      it("returns nil and sets errors[:date_of_birth_time]", :ruby => 1.9) do
         subject.cast('q', errors).should == nil
         errors.fetch(:date_of_birth_time, false).should ==
           ':date_of_birth is not a valid time format.'
@@ -113,7 +115,7 @@ describe Resto::Property::Time do
       end
     end
 
-    context ".cast('22/02/2010 00:00:00 UTC', errors)" do
+    context ".cast('22/02/2010 00:00:00 UTC', errors)", :ruby => 1.9 do
       it("returns a time object parsed from the string") do
         time = subject.cast('22/02/2010 00:00:00 UTC', errors)
         time.utc.iso8601.should == '2010-02-22T00:00:00Z'
@@ -121,4 +123,23 @@ describe Resto::Property::Time do
       end
     end
   end
+
+  context ":format => 'mm/dd/yyyy'" do
+    subject do
+      Resto::Property::Time.new(:date_of_birth, :format => 'mm/dd/yyyy')
+    end
+
+    it("returns a time object parsed from the string") do
+      time = subject.cast('02/22/2010 00:00:00 UTC', errors)
+      time.utc.iso8601.should == '2010-02-22T00:00:00Z'
+      errors.fetch(:date_of_birth_time, false).should == nil
+    end
+
+    it("returns nil and sets errors") do
+      subject.cast('ddd', errors).should == nil
+      errors.fetch(:date_of_birth_time, false).should ==
+        ':date_of_birth is not a valid time format.'
+    end
+  end
+
 end

data/spec/resto/property_spec.rb

@@ -50,8 +50,8 @@ describe Resto::Property do
           before { subject.validate(article, :empty_title)  }
 
           it {
-            article.errors[:empty_title_presence]
-              .should == ":empty_title can’t be blank"
+            article.errors[:empty_title_presence].
+              should == ":empty_title can’t be blank"
           }
         end
       end

data/spec/resto/request/base_spec.rb

@@ -20,8 +20,8 @@ describe Resto::Request::Base do
 
     describe "@request" do
       it do
-        subject.instance_eval { @request }
-          .should be_instance_of(Resto::Request::Factory)
+        subject.instance_eval { @request }.
+          should be_instance_of(Resto::Request::Factory)
       end
     end
   end
@@ -39,8 +39,8 @@ describe Resto::Request::Base do
   context "#content_type('text/html').headers({'content-type' => 'text/plain',
                                                'User-agent' => 'Ruby' })" do
     before do
-      subject.content_type('text/html')
-        .headers({'content-type' => 'text/plain', 'user-agent' => 'Ruby' })
+      subject.content_type('text/html').
+        headers({'content-type' => 'text/plain', 'user-agent' => 'Ruby' })
     end
 
     its(:composed_headers) do
@@ -54,8 +54,8 @@ describe Resto::Request::Base do
             .content_type('text/html')" do
 
     before do
-      subject.basic_auth('username' => "developer", "password" => "secret")
-        .content_type('text/html')
+      subject.basic_auth('username' => "developer", "password" => "secret").
+        content_type('text/html')
     end
 
     its(:composed_headers) do
@@ -112,9 +112,9 @@ describe Resto::Request::Base do
             .params('longUrl' => 'http://betaworks.com', 'short' => 'htt')" do
 
     before do
-      subject.url('http://www.aftonbladet.se:92/customers')
-        .query('q=adam')
-        .params('longUrl' => 'http://betaworks.com', 'short' => 'htt')
+      subject.url('http://www.aftonbladet.se:92/customers').
+        query('q=adam').
+        params('longUrl' => 'http://betaworks.com', 'short' => 'htt')
     end
 
     its(:read_host)     { should == 'www.aftonbladet.se' }
@@ -130,10 +130,10 @@ describe Resto::Request::Base do
             .path('contacts')" do
 
     before do
-      subject.port(40)
-        .url('http://www.aftonbladet.se:92/customers')
-        .query('q=adam')
-        .path('contacts')
+      subject.port(40).
+        url('http://www.aftonbladet.se:92/customers').
+        query('q=adam').
+        path('contacts')
     end
 
     its(:read_host)      { should == 'www.aftonbladet.se' }
@@ -154,8 +154,8 @@ describe Resto::Request::Base do
             .append_path(1)" do
 
     before do
-      subject.url('http://www.aftonbladet.se:92/customers/?q=adam')
-        .append_path(1)
+      subject.url('http://www.aftonbladet.se:92/customers/?q=adam').
+        append_path(1)
     end
 
     its(:read_host)          { should == 'www.aftonbladet.se' }
@@ -167,8 +167,8 @@ describe Resto::Request::Base do
             .query('q=take presendent')" do
 
      before do
-       subject.url('http://www.aftonbladet.se:92/customers/?q=adam')
-        .query("q=take presendent")
+       subject.url('http://www.aftonbladet.se:92/customers/?q=adam').
+         query("q=take presendent")
      end
 
      its(:read_host)          { should == 'www.aftonbladet.se' }
@@ -181,9 +181,9 @@ describe Resto::Request::Base do
             .query('q=take presendent')" do
 
      before do
-       subject.host('www.take-presedent.se')
-        .url('http://www.aftonbladet.se:92/customers/?q=adam')
-        .query('q=take presendent')
+       subject.host('www.take-presedent.se').
+         url('http://www.aftonbladet.se:92/customers/?q=adam').
+        query('q=take presendent')
      end
 
      its(:read_host)          { should == 'www.take-presedent.se' }
@@ -207,8 +207,8 @@ describe Resto::Request::Base do
 
      context "when formatter is Resto::Format::Json" do
        before do
-         subject.format(:json)
-          .body( { :foo => 12425125, :bar => "some string" } )
+         subject.format(:json).
+           body( { :foo => 12425125, :bar => "some string" } )
         end
 
        its(:read_body) do

data/spec/resto/request/factory_spec.rb

@@ -9,19 +9,19 @@ describe Resto::Request::Factory do
   let(:base) { Resto::Request::Base.new }
 
   subject do
-    factory.new(base
-                  .host('sr.se')
-                  .port(8080)
-                  .headers('content-type' => 'text/html')
-                  .body('Anders')
-                  .path('/dashboard'))
+    factory.new(base.
+                  host('sr.se').
+                  port(8080).
+                  headers('content-type' => 'text/html').
+                  body('Anders').
+                  path('/dashboard'))
   end
 
   describe "#head" do
     before do
-      stub_request(:head, "sr.se:8080/dashboard")
-        .with(:headers => headers("content-type" => "text/html"))
-        .to_return(:status => 200)
+      stub_request(:head, "sr.se:8080/dashboard").
+        with(:headers => headers("content-type" => "text/html")).
+        to_return(:status => 200)
     end
 
     it { subject.head.code.should == "200" }
@@ -29,9 +29,9 @@ describe Resto::Request::Factory do
 
   describe "#get" do
     before do
-      stub_request(:get, "sr.se:8080/dashboard")
-        .with(:headers => headers("content-type" => "text/html"))
-        .to_return(:status => 200)
+      stub_request(:get, "sr.se:8080/dashboard").
+        with(:headers => headers("content-type" => "text/html")).
+        to_return(:status => 200)
     end
 
     it { subject.get.code.should == "200" }
@@ -39,10 +39,10 @@ describe Resto::Request::Factory do
 
   describe "#post" do
     before do
-      stub_request(:post, "sr.se:8080/dashboard")
-        .with(:headers => headers("content-type" => "text/html"),
-              :body => 'Anders')
-        .to_return(:status => 200)
+      stub_request(:post, "sr.se:8080/dashboard").
+        with(:headers => headers("content-type" => "text/html"),
+             :body => 'Anders').
+        to_return(:status => 200)
     end
 
     it { subject.post.code.should == "200" }
@@ -50,10 +50,10 @@ describe Resto::Request::Factory do
 
   describe "#put" do
     before do
-      stub_request(:put, "sr.se:8080/dashboard")
-        .with(:headers => headers("content-type" => "text/html"),
-              :body => 'Anders')
-        .to_return(:status => 200)
+      stub_request(:put, "sr.se:8080/dashboard").
+        with(:headers => headers("content-type" => "text/html"),
+             :body => 'Anders').
+        to_return(:status => 200)
     end
 
     it { subject.put.code.should == "200" }
@@ -61,9 +61,9 @@ describe Resto::Request::Factory do
 
   describe "#delete" do
     before do
-      stub_request(:delete, "sr.se:8080/dashboard")
-        .with(:headers => headers("content-type" => "text/html"))
-        .to_return(:status => 200)
+      stub_request(:delete, "sr.se:8080/dashboard").
+        with(:headers => headers("content-type" => "text/html")).
+        to_return(:status => 200)
     end
 
     it { subject.delete.code.should == "200" }
@@ -72,19 +72,19 @@ describe Resto::Request::Factory do
 
   context "other settings" do
     subject do
-      factory.new(Resto::Request::Base.new
-                  .host('sr.se')
-                  .path('/friends_timeline')
-                  .body('Anders')
-                  .headers('content-type' => 'application/xml')
-                  .basic_auth(:username => 'developer', :password => 'secret'))
+      factory.new(Resto::Request::Base.new.
+                  host('sr.se').
+                  path('/friends_timeline').
+                  body('Anders').
+                  headers('content-type' => 'application/xml').
+                  basic_auth(:username => 'developer', :password => 'secret'))
     end
 
     describe "#head" do
       before do
-        stub_request(:head, "developer:secret@sr.se/friends_timeline")
-          .with(:headers => headers("content-type" => "application/xml"))
-          .to_return(:status => 200)
+        stub_request(:head, "developer:secret@sr.se/friends_timeline").
+          with(:headers => headers("content-type" => "application/xml")).
+          to_return(:status => 200)
       end
 
       it { subject.head.code.should == "200" }
@@ -92,9 +92,9 @@ describe Resto::Request::Factory do
 
     describe "#get" do
       before do
-        stub_request(:get, "developer:secret@sr.se/friends_timeline")
-          .with(:headers => headers("content-type" => "application/xml"))
-          .to_return(:status => 200)
+        stub_request(:get, "developer:secret@sr.se/friends_timeline").
+          with(:headers => headers("content-type" => "application/xml")).
+          to_return(:status => 200)
       end
 
       it { subject.get.code.should == "200" }
@@ -102,10 +102,10 @@ describe Resto::Request::Factory do
 
     describe "#post" do
       before do
-        stub_request(:post, "developer:secret@sr.se/friends_timeline")
-          .with(:headers => headers("content-type" => "application/xml"),
-                :body => 'Anders')
-          .to_return(:status => 200)
+        stub_request(:post, "developer:secret@sr.se/friends_timeline").
+          with(:headers => headers("content-type" => "application/xml"),
+               :body => 'Anders').
+          to_return(:status => 200)
       end
 
       it { subject.post.code.should == "200" }

data/spec/resto_spec.rb

@@ -40,7 +40,7 @@ describe Resto do
     end
 
     let(:body) do
-      { :subscription => attributes.merge({}).keep_if { |k, _| k != :id } }
+      { :subscription => attributes.merge({}).reject { |k, _| k == :id } }
     end
 
     let(:response) do
@@ -50,10 +50,10 @@ describe Resto do
     describe ".all" do
       before do
         stub_request(:get,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'))
-          .to_return(:status => 200, :body => [response].to_json)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions.json").
+            with(:headers => headers('accept' => 'application/json, */*',
+                                    'content-type' => 'application/json')).
+            to_return(:status => 200, :body => [response].to_json)
       end
 
       subject { Subscription.all.first }
@@ -70,10 +70,10 @@ describe Resto do
     describe ".get(id)" do
       before do
         stub_request(:get,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'))
-          .to_return(:status => 200, :body => response.to_json)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json").
+          with(:headers => headers('accept' => 'application/json, */*',
+                                    'content-type' => 'application/json')).
+          to_return(:status => 200, :body => response.to_json)
       end
 
       subject { Subscription.get(415520) }
@@ -90,10 +90,10 @@ describe Resto do
     describe "#get" do
       before do
         stub_request(:get,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'))
-          .to_return(:status => 200, :body => response.to_json)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json").
+          with(:headers => headers('accept' => 'application/json, */*',
+                                   'content-type' => 'application/json')).
+          to_return(:status => 200, :body => response.to_json)
       end
 
       subject { Subscription.new(attributes).get }
@@ -110,10 +110,10 @@ describe Resto do
     describe "#reload" do
       before do
         stub_request(:get,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'))
-          .to_return(:status => 200, :body => response.to_json)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json").
+          with(:headers => headers('accept' => 'application/json, */*',
+                                    'content-type' => 'application/json')).
+           to_return(:status => 200, :body => response.to_json)
       end
 
       subject { Subscription.new(attributes).reload }
@@ -129,12 +129,16 @@ describe Resto do
 
     describe ".post(attributes)" do
       before do
+        # Ruby < 1.9 doesn't preserve key insert order => webmock stub of body
+        # request doesn't match
+        content = {}
+        content[:body] = body.to_json if RUBY_VERSION >= '1.9.1'
+        content[:headers] = headers('accept' => 'application/json, */*',
+                                    'content-type' => 'application/json')
         stub_request(:post,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'),
-                :body => body.to_json)
-          .to_return(:status => 201, :body => response.to_json)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions.json").
+          with(content).
+          to_return(:status => 201, :body => response.to_json)
       end
 
       subject { Subscription.post(attributes) }
@@ -150,12 +154,17 @@ describe Resto do
 
     describe ".put(attributes)" do
       before do
+        # Ruby < 1.9 doesn't preserve key insert order => webmock stub of body
+        # request doesn't match
+        content = {}
+        content[:body] = body.to_json if RUBY_VERSION >= '1.9.1'
+        content[:headers] = headers('accept' => 'application/json, */*',
+                                    'content-type' => 'application/json')
+
         stub_request(:put,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'),
-                :body => body.to_json)
-          .to_return(:status => 200, :body => response.to_json)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json").
+          with(content).
+          to_return(:status => 200, :body => response.to_json)
       end
 
       subject { Subscription.put(attributes) }
@@ -169,14 +178,19 @@ describe Resto do
       it                          { should be_valid }
     end
 
-    describe "#put" do
+    describe "#put(attributes)" do
       before do
+        # Ruby < 1.9 doesn't preserve key insert order => webmock stub of body
+        # request doesn't match
+        content = {}
+        content[:body] = body.to_json if RUBY_VERSION >= '1.9.1'
+        content[:headers] = headers('accept' => 'application/json, */*',
+                                    'content-type' => 'application/json')
+
         stub_request(:put,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'),
-                :body => body.to_json)
-          .to_return(:status => 200, :body => response.to_json)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json").
+          with(content).
+          to_return(:status => 200, :body => response.to_json)
       end
 
       subject { Subscription.new(attributes).put }
@@ -193,10 +207,10 @@ describe Resto do
     describe ".delete(id)" do
       before do
         stub_request(:delete,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'))
-          .to_return(:status => 200)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json").
+          with(:headers => headers('accept' => 'application/json, */*',
+                                    'content-type' => 'application/json')).
+          to_return(:status => 200)
       end
 
       subject { Subscription.delete(415520) }
@@ -208,10 +222,10 @@ describe Resto do
     describe "#delete" do
       before do
         stub_request(:delete,
-          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json")
-          .with(:headers => headers('accept' => 'application/json, */*',
-                                    'content-type' => 'application/json'))
-          .to_return(:status => 200)
+          "https://EyphE_t:x@dns-parrot.chargify.com/subscriptions/415520.json").
+          with(:headers => headers('accept' => 'application/json, */*',
+                                   'content-type' => 'application/json')).
+          to_return(:status => 200)
       end
 
       subject { Subscription.new(attributes).delete }
@@ -246,8 +260,8 @@ describe Resto do
       property :id, Integer
       property :title, String
       property :body, String, :remote_name => 'a_bad_body_name' do
-        validate_presence .if { |user| user.title.to_s.size < 3 }
-                          .message 'must be present'
+        validate_presence .if { |user| user.title.to_s.size < 3 } .
+          message 'must be present'
       end
 
       resto_request do
@@ -268,9 +282,9 @@ describe Resto do
 
     describe ".get(id)" do
       let(:request) do
-        stub_request(:get, "http://api.bit.ly/v3/users/200")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
+        stub_request(:get, "http://api.bit.ly/v3/users/200").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json'))
       end
 
       subject { RestUser.get(200) }
@@ -323,10 +337,10 @@ describe Resto do
 
     describe ".all" do
       before do
-        stub_request(:get, "http://api.bit.ly/v3/articles")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:get, "http://api.bit.ly/v3/articles").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticle.all.code.should == "200" }
@@ -334,10 +348,10 @@ describe Resto do
 
     describe ".all('tag' => 'resto')" do
       before do
-        stub_request(:get, "http://api.bit.ly/v3/articles?tag=resto")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                  'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:get, "http://api.bit.ly/v3/articles?tag=resto").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticle.all('tag' => 'resto').code.should == "200" }
@@ -345,10 +359,10 @@ describe Resto do
 
     describe ".head" do
       before do
-        stub_request(:head, "http://api.bit.ly/v3/articles")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:head, "http://api.bit.ly/v3/articles").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticle.head.code.should == "200" }
@@ -356,10 +370,10 @@ describe Resto do
 
     describe ".get(200)" do
       before do
-        stub_request(:get, "http://api.bit.ly/v3/articles/200")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:get, "http://api.bit.ly/v3/articles/200").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticle.get(200).code.should == "200" }
@@ -367,11 +381,11 @@ describe Resto do
 
     describe ".post(:author => 'Anders')" do
       before do
-        stub_request(:post, "http://api.bit.ly/v3/articles")
-          .with(:body => { "author" => "Anders"}.to_json,
-                :headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:post, "http://api.bit.ly/v3/articles").
+          with(:body => { "author" => "Anders"}.to_json,
+               :headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticle.post(:author => 'Anders').code.should == "200" }
@@ -379,11 +393,11 @@ describe Resto do
 
     describe ".put(:author => 'Anders')" do
       before do
-        stub_request(:put, "http://api.bit.ly/v3/articles")
-          .with(:body => { "author"=> "Anders"}.to_json,
-                :headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:put, "http://api.bit.ly/v3/articles").
+          with(:body => { "author"=> "Anders"}.to_json,
+               :headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticle.put(:author => 'Anders').code.should == "200" }
@@ -391,10 +405,10 @@ describe Resto do
 
     describe ".delete(400)" do
       before do
-        stub_request(:delete, "http://api.bit.ly/v3/articles/400")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:delete, "http://api.bit.ly/v3/articles/400").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticle.delete(400).code.should == "200" }
@@ -415,10 +429,10 @@ describe Resto do
 
     describe ".all" do
       before do
-        stub_request(:get, "http://api.bit.ly/v3/articles.json")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:get, "http://api.bit.ly/v3/articles.json").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticleWithExtension.all.code.should == "200" }
@@ -426,10 +440,10 @@ describe Resto do
 
     describe ".all('tag' => 'resto')" do
       before do
-        stub_request(:get, "http://api.bit.ly/v3/articles.json?tag=resto")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:get, "http://api.bit.ly/v3/articles.json?tag=resto").
+           with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticleWithExtension.all('tag' => 'resto').code.should == "200" }
@@ -437,10 +451,10 @@ describe Resto do
 
     describe ".head" do
       before do
-        stub_request(:head, "http://api.bit.ly/v3/articles.json")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:head, "http://api.bit.ly/v3/articles.json").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticleWithExtension.head.code.should == "200" }
@@ -448,10 +462,10 @@ describe Resto do
 
     describe ".get(200)" do
       before do
-        stub_request(:get, "http://api.bit.ly/v3/articles/200.json")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:get, "http://api.bit.ly/v3/articles/200.json").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticleWithExtension.get(200).code.should == "200" }
@@ -459,11 +473,11 @@ describe Resto do
 
     describe ".post(:author => 'Anders')" do
       before do
-        stub_request(:post, "http://api.bit.ly/v3/articles.json")
-          .with(:body => { "author" => "As" }.to_json,
-                :headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:post, "http://api.bit.ly/v3/articles.json").
+          with(:body => { "author" => "As" }.to_json,
+               :headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+           to_return(:status => 200)
       end
 
       it { RestArticleWithExtension.post(:author => 'As').code.should == "200" }
@@ -471,11 +485,11 @@ describe Resto do
 
     describe ".put(:author => 'Anders')" do
       before do
-        stub_request(:put, "http://api.bit.ly/v3/articles.json")
-          .with(:body => { "author" => "An" }.to_json,
-                :headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:put, "http://api.bit.ly/v3/articles.json").
+          with(:body => { "author" => "An" }.to_json,
+               :headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticleWithExtension.put(:author => 'An').code.should == "200" }
@@ -483,10 +497,10 @@ describe Resto do
 
     describe ".delete(400)" do
       before do
-        stub_request(:delete, "http://api.bit.ly/v3/articles/400.json")
-          .with(:headers => headers('accept'=>'application/json, */*',
-                                    'content-type'=>'application/json'))
-          .to_return(:status => 200)
+        stub_request(:delete, "http://api.bit.ly/v3/articles/400.json").
+          with(:headers => headers('accept'=>'application/json, */*',
+                                   'content-type'=>'application/json')).
+          to_return(:status => 200)
       end
 
       it { RestArticleWithExtension.delete(400).code.should == "200" }
@@ -509,9 +523,9 @@ describe Resto do
 
     describe ".all()" do
       before do
-        stub_request(:get, "http://bit.ly/v3?format=json&longUrl=ll")
-          .with(:headers => headers("content-type" => "text/html"))
-          .to_return(:status => 200)
+        stub_request(:get, "http://bit.ly/v3?format=json&longUrl=ll").
+          with(:headers => headers("content-type" => "text/html")).
+          to_return(:status => 200)
       end
 
       it { Bitly.all.code.should == "200" }
@@ -519,9 +533,9 @@ describe Resto do
 
     describe ".all('shortUrl' => short)" do
       before do
-        stub_request(:get, "http://bit.ly/v3?format=json&shortUrl=short")
-          .with(:headers => headers("content-type" => "text/html"))
-          .to_return(:status => 200)
+        stub_request(:get, "http://bit.ly/v3?format=json&shortUrl=short").
+          with(:headers => headers("content-type" => "text/html")).
+          to_return(:status => 200)
       end
 
       it { Bitly.all('shortUrl' => 'short').code.should == "200" }

data/spec/spec_helper.rb

@@ -15,6 +15,9 @@ RSpec.configure do |c|
   c.mock_with :rspec
   c.include WebMock::API
   c.fail_fast = true
+  c.filter_run_excluding :ruby => lambda {|version|
+    !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
+  }
 end
 
 # Helper methods

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resto
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 0.0.7
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - "Anders T\xC3\xB6rnqvist"
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 Z
+date: 2011-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -20,6 +25,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 8
+        - 2
         version: 0.8.2
   type: :runtime
   version_requirements: *id001
@@ -31,6 +41,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
   type: :runtime
   version_requirements: *id002
@@ -42,7 +57,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.11
+        hash: 13
+        segments: 
+        - 1
+        - 0
+        - 13
+        version: 1.0.13
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -53,7 +73,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -64,6 +89,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
         version: 0.0.4
   type: :development
   version_requirements: *id005
@@ -75,6 +105,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id006
@@ -86,6 +121,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 8
+        - 2
         version: 0.8.2
   type: :development
   version_requirements: *id007
@@ -97,6 +137,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -108,6 +151,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -119,6 +165,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -130,6 +179,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -202,17 +254,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: resto
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Restful Web Service