restfolia 1.0.2 → 1.0.3

data/Changelog.md

@@ -1,11 +1,11 @@
 # Restfolia Changelog
 
-## 1.0.2 / edge
+## 1.0.2 / 2012-06-22
 
 * \+ [Resource Creator supports Json - Array](https://github.com/rogerleite/restfolia/commit/363b00abf379a2849790ed4be86b9085bddbd2af)
 * \+ [Support to multiple levels of hash on ResourceCreator](https://github.com/rogerleite/restfolia/commit/aa1e96a82f9b34a9415e46066874e35dfb7a1dbd)
 * ! [Fix bug on not supporting id attribute on resource](https://github.com/rogerleite/restfolia/issues/5)
-* \+ [Support http basic authentication](https://github.com/rogerleite/restfolia/commit/372aa40b9b2f4df35b7c30ed70534fc99e3b3233)
+* \+ [Support http basic authentication](https://github.com/rogerleite/restfolia/commit/372aa40b9b2f4df35b7c30ed70534fc99e3b3233) (Willian Fernandes)
 
 ## 1.0.1 / 2012-05-28
 

data/lib/restfolia/entry_point.rb

@@ -91,7 +91,7 @@ module Restfolia
     # Restfolia::HTTP::Behaviour methods for more details.
     # Raises URI::InvalidURIError if url attribute is invalid.
     def post(params)
-      body = MultiJson.dump(params)
+      body = MultiJson.encode(params)
 
       args = self.configuration.merge(:body => body)
       http_resp = Restfolia::HTTP::Request.do_request(:post, self.url, args)
@@ -118,7 +118,7 @@ module Restfolia
     # Restfolia::HTTP::Behaviour methods for more details.
     # Raises URI::InvalidURIError if url attribute is invalid.
     def put(params)
-      body = MultiJson.dump(params)
+      body = MultiJson.encode(params)
 
       args = self.configuration.merge(:body => body)
       http_resp = Restfolia::HTTP::Request.do_request(:put, self.url, args)

data/lib/restfolia/http/behaviour.rb

@@ -28,7 +28,7 @@ module Restfolia::HTTP
       def parse_json(http_response)
         body = http_response.body
         begin
-          MultiJson.load(body, :symbolize_keys => true)
+          MultiJson.decode(body, :symbolize_keys => true)
         rescue MultiJson::DecodeError => ex
           msg = "Body should be a valid json. #{ex.message}"
           raise Restfolia::ResponseError.new(msg, caller, http_response)

data/lib/restfolia/resource.rb

@@ -56,7 +56,7 @@ module Restfolia
       #Add json keys as methods of Resource
       #http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
       @_json.each do |method, value|
-        next if self.respond_to?(method) && (method != :id)
+        next if self.respond_to?(method) && (method != :id) && (method != "id")
 
         (class << self; self; end).class_eval do
           define_method(method) do |*args|
@@ -91,16 +91,16 @@ module Restfolia
     # Returns Array of EntryPoints or Empty Array if :links not exist.
     # Raises RuntimeError if link doesn't have :href and :rel keys.
     def parse_links(json)
-      links = json[:links] || json[:link]
+      links = json[:links] || json[:link] || json['links'] || json['link']
       return [] if links.nil?
 
       links = [links] unless links.is_a?(Array)
       links.map do |link|
-        if link[:href].nil? || link[:rel].nil?
+        if (link[:href].nil? && link['href'].nil?) || (link[:rel].nil? && link['rel'].nil?)
           msg = "Invalid hash link: #{link.inspect}"
           raise(RuntimeError, msg, caller)
         end
-        EntryPoint.new(link[:href], link[:rel])
+        EntryPoint.new(link[:href] || link['href'], link[:rel] || link['rel'])
       end
     end
 

data/lib/restfolia/resource_creator.rb

@@ -108,7 +108,7 @@ module Restfolia
     #
     # Returns attributes to be ignored when creating Resource.
     def attributes_to_dont_parse
-      [:links, :link].freeze
+      [:links, :link, 'links', 'link'].freeze
     end
 
     # Internal: Check if value is eligible to become a Restfolia::Resource.

data/lib/restfolia/version.rb

@@ -1,3 +1,3 @@
 module Restfolia
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/restfolia.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "multi_json", "~> 1.3.0"
+  s.add_runtime_dependency "multi_json", "~> 1.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "minitest", "~> 3"

data/test/restfolia/resource_creator_test.rb

@@ -22,6 +22,11 @@ describe Restfolia::ResourceCreator do
       resource.must_be_instance_of(OpenStruct)
     end
 
+    it "don't transforms nested link hash in Resource" do
+      resource = subject.create('link' => {:rel => "nested",:href => "http://localhost"})
+      resource.link.must_be_instance_of(Hash)
+    end
+
     it "transforms nested hash in Resource" do
       resource = subject.create(:attr_test => {:nested => "nested"})
       resource.attr_test.must_be_instance_of(OpenStruct)

data/test/restfolia/resource_test.rb

@@ -66,6 +66,18 @@ describe Restfolia::Resource do
       resource.links[0].must_be_instance_of(Restfolia::EntryPoint)
     end
 
+    it "understand 'links' as string hash key" do
+      resource = subject.new('links' => array_links)
+      resource.links.must_be_instance_of(Array)
+      resource.links[0].must_be_instance_of(Restfolia::EntryPoint)
+    end
+
+    it "understand 'link' as string hash key" do
+      resource = subject.new('link' => array_links)
+      resource.links.must_be_instance_of(Array)
+      resource.links[0].must_be_instance_of(Restfolia::EntryPoint)
+    end
+
     it "raises Error for invalid link" do
       resource = subject.new(:links => {:invalid => "invalid"})
       lambda { resource.links }.must_raise(RuntimeError)
@@ -88,6 +100,11 @@ describe Restfolia::Resource do
         resource.links("rel2").must_be_instance_of(Restfolia::EntryPoint)
       end
 
+      it "returns EntryPoint even when hash key is string" do
+        resource = subject.new('link' => {'rel' => 'rel2', 'href' => 'http://localhost/'})
+        resource.links("rel2").must_be_instance_of(Restfolia::EntryPoint)
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: restfolia
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Roger Leite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-22 00:00:00 Z
+date: 2012-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -25,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 15
         segments: 
         - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency