hal-client 2.2.1 → 2.3.1

data/lib/hal_client/representation.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'addressable/template'
 
 require 'hal_client'
@@ -9,7 +8,6 @@ class HalClient
   # HAL representation of a single resource. Provides access to
   # properties, links and embedded representations.
   class Representation
-    extend Forwardable
 
     # Create a new Representation
     #
@@ -38,6 +36,15 @@ class HalClient
       @hal_client.post(href, data, options)
     end
 
+    # Returns true if this representation contains the specified
+    # property.
+    #
+    # name - the name of the property to check
+    def property?(name)
+      raw.key? name
+    end
+    alias_method :has_property?, :property?
+
     # Returns The value of the specified property or the specified
     #   default value.
     #
@@ -96,13 +103,14 @@ class HalClient
     # embedded links) whose rel is `link_rel`.
     #
     # link_rel - The link rel of interest
-    def has_related?(link_rel)
+    def related?(link_rel)
       _ = related link_rel
       true
 
     rescue KeyError
       false
     end
+    alias_method :has_related?, :related?
 
     # Returns representations of resources related via the specified
     #   link rel or the specified default value.

data/lib/hal_client/representation_set.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 class HalClient
 
   # A collection HAL representations
@@ -24,6 +26,7 @@ class HalClient
     # Raises KeyError if the specified link does not exist
     #   and no default_proc is provided.
     def related(link_rel, options={})
+      raise KeyError unless has_related? link_rel
       RepresentationSet.new flat_map{|it| it.related(link_rel, options){[]}.to_a }
     end
 
@@ -32,11 +35,7 @@ class HalClient
     #
     # link_rel - The link rel of interest
     def has_related?(link_rel)
-      _ = related link_rel
-      true
-
-    rescue KeyError
-      false
+      any? {|it| it.has_related?(link_rel) }
     end
 
     # Post a `Representation` or `String` to the resource.

data/lib/hal_client/version.rb

@@ -1,3 +1,3 @@
 class HalClient
-  VERSION = "2.2.1"
+  VERSION = "2.3.1"
 end

data/spec/hal_client/representation_spec.rb

@@ -46,18 +46,14 @@ HAL
     it { should eq "#<HalClient::Representation: http://example.com/foo>" }
   end
 
-  describe "#property" do
-    context "existent" do
-      subject { repr.property "prop1" }
-      it { should eq 1 }
-    end
+  specify { expect(repr.property "prop1").to eq 1 }
+  specify { expect{repr.property "nonexistent-prop"}.to raise_exception KeyError }
+
+  specify { expect(repr.property? "prop1").to be true }
+  specify { expect(repr.has_property? "prop1").to be true }
+  specify { expect(repr.property? "nonexistent-prop").to be false }
+  specify { expect(repr.has_property? "nonexistent-prop").to be false }
 
-    context "non-existent" do
-      it "raises exception" do
-        expect{repr.property 'wat'}.to raise_exception KeyError
-      end
-    end
-  end
 
   its(:href) { should eq "http://example.com/foo" }
 
@@ -178,11 +174,14 @@ HAL
   end
 
   specify { expect(subject.has_related? "link1").to be true }
+  specify { expect(subject.related? "link1").to be true }
   specify { expect(subject.has_related? "link3").to be true }
+  specify { expect(subject.related? "link3").to be true }
   specify { expect(subject.has_related? "embed1").to be true }
+  specify { expect(subject.related? "embed1").to be true }
 
-  specify { expect(subject.has_related? "no-such-link").to be false }
-  specify { expect(subject.has_related? "no-such-embed").to be false }
+  specify { expect(subject.has_related? "no-such-link-or-embed").to be false }
+  specify { expect(subject.related? "no-such-link-or-embed").to be false }
 
   context "curie links" do
     let(:raw_repr) { <<-HAL }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal-client
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2800746664713076879
+      hash: -1374848680285234334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2800746664713076879
+      hash: -1374848680285234334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23