restify 0.1.2.1.b28 → 0.1.2.1.b32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFmODExYzA1MWQyMWQyYjQ3NDM0M2I5NWQ3NDRmYTBkYjMzZGRhZA==
+    YjkxZWY3N2Y4NjE5ZmU1ZTE2ZjhjN2E5YjY3MGNiNjQzZGRlZjM1OA==
   data.tar.gz: !binary |-
-    MWUxMzRiN2RlZmEwZGVmMTBmNzg0ZWMzODFiMjBlOGUwN2Y5YmNkOA==
+    YzJkNTNhNzM2MzE1ZTk1Y2IxMjc1NWUyMGViZjA5NjY2ZTAwMTkzNA==
 SHA512:
   metadata.gz: !binary |-
-    NmNiMmJkNTQ4Y2Y4MjBiYzllOTBkNjE1NWExZTE0NDhhNTk3ZmRjYjE0NTky
-    N2VlYTkzZjI3NDI5N2I5MDE2M2FlYTNkYWJiYzM2Njc5OTY4YTFjOWJjZDdm
-    YmNhMTg2ODU0ZTg1YWNjZWQ2MTI0OGU3ZWRkNTYwNjg0ZmFhODM=
+    NzZhM2U3MGM5OWZiYjVkNTBiOWQxNDg5NWZjOGZhZjhiMGQwM2I4NWUyMjI0
+    NzkyNTE2ZjRmZThjMzg3ZDhjOTBjZWFhZDE2ODQ3OWVkZmFlN2JlNmVjZDUw
+    YmNmOTY2ZmYyNWM4MGNhODM5MzY5YmY5NGZmMjlkODIzZWJmY2Q=
   data.tar.gz: !binary |-
-    Yzc2ZjVhY2Q1NzYyOGIwNmRmYzMwOTMxZDYwOWJlNDYzMjExODc1MTViNjk3
-    MDBiMGI2MWUxNzc1OGU4OWI1ZjJmMzBiMjI4NzdlNzhkMjZmZDYyZWZjZDY4
-    MmUwYTcyM2Y0NzdhNGI5M2VhZTZjNDVlZTJjZjI3YmViZDA0ZDE=
+    NGRkN2Y5NDE0MGQ0NDE4OGI4NWUzZDAzYWFkYWRmMTZmZWVlYTU2Mzk3NGIy
+    ZTY3ZTcxOGMyMjNiYTdiOTE1MmZiZDU5MzZhZDNhYzU4ZDNiOTZiNjUzNTIw
+    YzNkZDZhNmMzMjEzZDFjNjY2ODdlYjdhMmM0MDM1Mjg3N2ZlMWI=

data/lib/restify/relations.rb

@@ -8,7 +8,7 @@ module Restify
     # @return [Boolean] True if resource has relation, false otherwise.
     #
     def rel?(name)
-      relations.key? name.to_s
+      relations.key? name
     end
     alias_method :relation?, :rel?
     alias_method :has_rel?, :rel?
@@ -20,7 +20,7 @@ module Restify
     # @return [Relation] Relation.
     #
     def rel(name)
-      relations.fetch name.to_s
+      relations.fetch name
     end
     alias_method :relation, :rel
 
@@ -29,7 +29,7 @@ module Restify
     # @return [Hash<String, Relation>] Relations.
     #
     def relations
-      @relations ||= Hash.new
+      @relations ||= Hashie::Mash.new
     end
   end
 end

data/lib/restify/resource.rb

@@ -1,14 +1,10 @@
 module Restify
   #
-  class Resource < Hashie::Mash
+  class Resource < Hashie::Hash
     include Result
     include Relations
-
-    # Return content Media-Type.
-    #
-    # @return [MediaType] Resource media type.
-    #
-    attr_reader :media_type
+    include Hashie::Extensions::IndifferentAccess
+    include Hashie::Extensions::MethodReader
 
     #
     def initialize(client, data = {}, response = nil)
@@ -40,9 +36,9 @@ module Restify
     def ==(other)
       case other
         when Resource
-          @data == other.data && relations == other.relations
+          super && relations == other.relations
         when Hash
-          @data == other
+          super Hash[other.map{|k,v| [convert_key(k), v] }]
         else
           super
       end

data/spec/restify/resource_spec.rb

@@ -116,6 +116,32 @@ describe Restify::Resource do
     end
   end
 
+  describe '#==' do
+    let(:data) { {a: 0, b: 1} }
+
+    it 'should eq hash' do
+      expect(res).to eq a: 0, b: 1
+      expect(res).to eq 'a' => 0, 'b' => 1
+    end
+  end
+
+  describe '#include?' do
+    let(:data) { {a: 0, b: 1} }
+
+    it 'should include partial hash' do
+      expect(res).to include a: 0
+      expect(res).to include b: 1
+
+      expect(res).to include 'a' => 0
+      expect(res).to include 'b' => 1
+
+      expect(res).to_not include a: 1
+      expect(res).to_not include c: 0
+      expect(res).to_not include 'a' => 1
+      expect(res).to_not include 'c' => 0
+    end
+  end
+
   describe '#[]=' do
     let(:data) { {a: 0, b: 1} }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1.b28
+  version: 0.1.2.1.b32
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: obligation