harpy 0.1.5 → 0.1.6

data/lib/harpy/resource.rb

@@ -43,11 +43,15 @@ module Harpy
         end
       end
 
-      def from_id(id)
-        url = Harpy.entry_point.urn urn(id)
+      def from_urn(urn)
+        url = Harpy.entry_point.urn urn
         from_url url if url
       end
 
+      def from_id(id)
+        from_urn urn id
+      end
+
       def urn(id)
         raise NotImplementedError
       end

data/lib/harpy/version.rb

@@ -1,3 +1,3 @@
 module Harpy
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/harpy/resource_spec.rb

@@ -117,22 +117,54 @@ describe "class including Harpy::Resource" do
       end
     end
   end
-  describe ".from_id(id)" do
-    context "when entry point is configured" do
+  describe ".from_urn(urn)" do
+    context "when entry point is not set" do
       it "raises Harpy::EntryPointRequired" do
         lambda{
-          Harpy::Spec::Company.from_id(1)
+          Harpy::Spec::Company.from_urn("urn:harpy:company:1")
         }.should raise_error Harpy::EntryPointRequired
       end
     end
-    context "when entry point is set but urn has not been overriden" do
+    context "when entry point is set" do
+      let(:urn) { "urn:harpy:company:1" }
+      let(:url) { "http://localhost/company/1" }
+      it "asks Harpy.entry_point to convert urn to url then call .from_url" do
+        # urn:harpy:company:1 -> http://localhost/company/1
+        Harpy.entry_point = mock
+        Harpy.entry_point.should_receive(:urn).with(urn).and_return url
+
+        # http://localhost/company/1 -> Harpy::Spec::Company instance
+        Harpy::Spec::Company.should_receive(:from_url).with(url).and_return(expected = mock)
+        Harpy::Spec::Company.from_urn(urn).should be expected
+      end
+      it "is nil if urn is not found" do
+        # urn:harpy:company:1 -> nil
+        Harpy.entry_point = mock
+        Harpy.entry_point.should_receive(:urn).with(urn)
+        
+        Harpy::Spec::Company.from_urn(urn).should be_nil
+      end
+    end
+  end
+  describe ".from_id(id)" do
+    context "when urn has not been overriden" do
       it "raises NotImplementedError" do
-        Harpy.entry_point_url = "http://localhost"
         lambda{
           Harpy::Spec::Company.from_id(1)
         }.should raise_error NotImplementedError
       end
     end
+    context "when urn has been overriden but entry point is not set" do
+      let(:urn) { "urn:harpy:company:1" }
+      it "raises Harpy::EntryPointRequired" do
+        # 1 -> urn:harpy:company:1
+        Harpy::Spec::Company.should_receive(:urn).with(1).and_return urn
+        
+        lambda{
+          Harpy::Spec::Company.from_id(1)
+        }.should raise_error Harpy::EntryPointRequired
+      end
+    end
     context "when entry point is set and urn has been overriden" do
       let(:urn) { "urn:harpy:company:1" }
       let(:url) { "http://localhost/company/1" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harpy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-20 00:00:00.000000000 +02:00
+date: 2011-08-02 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &2164769540 !ruby/object:Gem::Requirement
+  requirement: &2164624240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164769540
+  version_requirements: *2164624240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164769020 !ruby/object:Gem::Requirement
+  requirement: &2164623720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164769020
+  version_requirements: *2164623720
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2164768540 !ruby/object:Gem::Requirement
+  requirement: &2164623240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164768540
+  version_requirements: *2164623240
 - !ruby/object:Gem::Dependency
   name: hash-deep-merge
-  requirement: &2155977780 !ruby/object:Gem::Requirement
+  requirement: &2156256400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2155977780
+  version_requirements: *2156256400
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2155977300 !ruby/object:Gem::Requirement
+  requirement: &2156255920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *2155977300
+  version_requirements: *2156255920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155976820 !ruby/object:Gem::Requirement
+  requirement: &2156255440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2155976820
+  version_requirements: *2156255440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155976340 !ruby/object:Gem::Requirement
+  requirement: &2156254960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2155976340
+  version_requirements: *2156254960
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &2155975860 !ruby/object:Gem::Requirement
+  requirement: &2156254480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,7 +100,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2155975860
+  version_requirements: *2156254480
 description: Client for REST API with HATEOAS
 email:
 - joseph.halter@thetalentbox.com