sawyer 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea76751fcf6274b2f73f762bf677f0cce3853f66
-  data.tar.gz: d38ab2bdb51b5444cdec30b6091679cd67f805d2
+  metadata.gz: f6de3df7914dedda29d5d502b9adb7b6df07eb2e
+  data.tar.gz: 26b8e89d2c2555949081f5229dac86394399a421
 SHA512:
-  metadata.gz: 6ea0e68b367d3cfe2f5d77501f4f6b26f8f246a5b04205ccb7a5e2c3a514f48b7880f3aed7829c8169a7984affbe1afa08d93b05e0d8e282d7b41c57562ca46e
-  data.tar.gz: cd211dfe87d81e4f4acfea027d904c1a11e2b03a10e2732e2abb7156f4568bfc8b57368e035556647f8ca2cbe79f31d8f59e50258432cbbba09442e2cfbd6abb
+  metadata.gz: 5efb922a2238670effddd63acea45632d784317708446c5e6c858acb9600c6a85fa71b6002591514b0059f46d96392b7423dfeadff6b2e82fd9446b696d55de9
+  data.tar.gz: efaffd42000f611e68a7c59364a6b4d0f1b3df0ed9709550e432a8dea5159293d127d1265f06eb9694257077b663ac968e76f1bf9fcb389a47767d7ccb96dffd

data/lib/sawyer.rb

@@ -1,5 +1,5 @@
 module Sawyer
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 
   class Error < StandardError; end
 end

data/lib/sawyer/link_parsers/simple.rb

@@ -17,7 +17,7 @@ module Sawyer
         inline_links = data.keys.select {|k| k.to_s[LINK_REGEX] }
         inline_links.each do |key|
           rel_name = key.to_s == 'url' ? 'self' : key.to_s.gsub(LINK_REGEX, '')
-          links[rel_name.to_sym] = data.delete(key)
+          links[rel_name.to_sym] = data[key]
         end
 
         return data, links

data/lib/sawyer/relation.rb

@@ -38,9 +38,17 @@ module Sawyer
       def keys
         @map.keys
       end
+      def to_hash
+        pairs = @map.map do |k, v|
+          [(k.to_s + "_url").to_sym, v.href]
+        end
+        Hash[pairs]
+      end
+      alias :to_h :to_hash
 
       def inspect
-        %(#<#{self.class}: #{@map.keys.inspect}>)
+        hash = to_hash
+        hash.respond_to?(:pretty_inspect) ? hash.pretty_inspect : hash.inspect
       end
     end
 

data/lib/sawyer/resource.rb

@@ -4,6 +4,7 @@ module Sawyer
     attr_reader :_agent, :_rels, :_fields
     attr_reader :attrs
     alias to_hash attrs
+    alias to_h attrs
 
     # Initializes a Resource with the given data.
     #
@@ -115,11 +116,25 @@ module Sawyer
       end
     end
 
+    def inspect
+      to_attrs.respond_to?(:pretty_inspect) ? to_attrs.pretty_inspect : to_attrs.inspect
+    end
+
     # private
     def to_yaml_properties
       [:@attrs, :@_fields, :@_rels]
     end
 
+    def to_attrs
+      hash = self.attrs.clone
+      hash.keys.each do |k|
+        if hash[k].is_a?(Sawyer::Resource)
+          hash[k] = hash[k].to_attrs
+        end
+      end
+      hash
+    end
+
     def marshal_dump
       [@attrs, @_fields, @_rels]
     end

data/test/relation_test.rb

@@ -161,5 +161,14 @@ module Sawyer
       assert_equal 204, rel.put.status
       assert_equal 204, rel.delete.status
     end
+
+    def test_map_inspect
+      map = Sawyer::Relation::Map.new
+      hash = {:href => '/users/1', :method => 'post'}
+      rel  = Sawyer::Relation.from_link(nil, :self, hash)
+      map << rel
+
+      assert_equal "{:self_url=>\"/users/1\"}\n", map.inspect
+    end
   end
 end

data/test/resource_test.rb

@@ -122,6 +122,12 @@ module Sawyer
       assert_equal hash, res.attrs
     end
 
+    def test_to_h
+      res = Resource.new @agent, :a => 1
+      hash = {:a => 1 }
+      assert_equal hash, res.to_h
+    end
+
     def test_handle_hash_notation_with_string_key
       res = Resource.new @agent, :a => 1
       assert_equal 1, res['a']
@@ -142,12 +148,12 @@ module Sawyer
 
       assert_equal '/', res.rels[:self].href
       assert_kind_of Resource, res.user
-      assert !res.fields.include?(:url)
+      assert_equal '/', res.url
       assert_equal 1, res.user.id
       assert_equal '/users/1', res.user.rels[:self].href
-      assert !res.user.fields.include?(:url)
+      assert_equal '/users/1', res.user.url
       assert_equal '/users/1/followers', res.user.rels[:followers].href
-      assert !res.user.fields.include?(:followers_url)
+      assert_equal '/users/1/followers', res.user.followers_url
     end
 
     def test_handle_yaml_dump
@@ -164,5 +170,10 @@ module Sawyer
         Marshal.dump(res)
       end
     end
+
+    def test_inspect
+      resource = Resource.new @agent, :a => 1
+      assert_equal "{:a=>1}\n", resource.inspect
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawyer
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Rick Olson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday