haipa 0.0.4 → 0.0.5

data/lib/haipa.rb

@@ -11,7 +11,7 @@ require 'haipa/links'
 require 'haipa/embedded'
 
 module Haipa
-  def self.api(params={})
-    Api.new(params, &Proc.new)
+  def self.api(params={}, &block)
+    Api.new(params, &block)
   end
 end

data/lib/haipa/api.rb

@@ -12,7 +12,7 @@ module Haipa
       @conn = Faraday.new(defaults.deep_merge(params)) do |conn|
         yield conn if block_given?
       end
-      @resource = Resource.new(self,'')
+      @resource = Resource.new(self, @uri)
     end
 
     def defaults

data/lib/haipa/embedded.rb

@@ -3,6 +3,7 @@ module Haipa
     extend Forwardable
 
     attr_reader :data, :resource
+    alias :to_hash :data
     def_delegators :@data, :empty?, :has_key?
 
     def initialize(resource, data)
@@ -10,10 +11,6 @@ module Haipa
       @resource = resource
     end
 
-    def to_hash
-      @data
-    end
-
     def method_missing(name, *args, &block)
       if data.has_key?(name)
         from_array(data[name])

data/lib/haipa/links.rb

@@ -3,6 +3,7 @@ module Haipa
     extend Forwardable
 
     attr_reader :data, :resource
+    alias :to_hash :data
     def_delegators :@data, :empty?, :has_key?
 
     def initialize(resource, data)
@@ -10,10 +11,6 @@ module Haipa
       @resource = resource
     end
 
-    def to_hash
-      @data
-    end
-
     def method_missing(name, *args, &block)
       if @data.has_key?(name)
         href = @data[name]['href']

data/lib/haipa/resource.rb

@@ -1,6 +1,10 @@
 module Haipa
+  class EmptyResponseError < StandardError; end
+  class FailureResponseError < StandardError; end
+
   class Resource
-    attr_reader :api, :uri
+    attr_reader :api, :uri, :data
+    alias :to_hash :data
 
     def initialize(api, uri, data=nil)
       @api = api
@@ -15,7 +19,10 @@ module Haipa
 
     def get
       return {} unless uri
-      @data ||= ::Hashie::Mash.new(JSON.parse(api.get(uri).body))
+      response = api.get(uri)
+      raise FailureResponseError unless response.success?
+      raise EmptyResponseError if response.body.blank?
+      @data ||= ::Hashie::Mash.new(JSON.parse(response.body))
     end
 
     def embedded

data/lib/haipa/version.rb

@@ -1,3 +1,3 @@
 module Haipa
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haipa
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -21,14 +27,14 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: hashie
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: hashie
+        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -37,14 +43,14 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: addressable
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: addressable
+        version: 2.3.0
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -53,14 +59,14 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
+        version: '1.3'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -69,44 +75,38 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
+  type: :development
+  prerelease: false
 description: HAL hypermedia client
 email:
 - jon@doveston.me.uk
@@ -144,21 +144,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      hash: -3000700123602118034
       segments:
       - 0
-      hash: -2216550637168734427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      hash: -3000700123602118034
       segments:
       - 0
-      hash: -2216550637168734427
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: HAL hypermedia client