haipa 0.0.3 → 0.0.4

data/README.md

@@ -60,22 +60,19 @@ and a thing index resource
 Then Haipa can consume this API with
 
     api = Haipa.api(url:'http://localhost:3000/api/v1')
+    api.description # the root as a hash
     api.resource # the root as a Haipa::Resource
-    api.description # alias of api.resource
     api.links # the root links as a Haipa::Links
     api.href # the uri of the root
     api.embedded # the embedded resource array Haipa::Embedded
     api.resources # alias of api.embedded
-    api.to_hash # the api root as a hash
 
-    links = api.links
+    link = api.links
     links.things # the things Haipa::Resource
-    links.to_hash # the links as a hash
 
-    things = links.things # things Haipa::Resource
+    things = links.things
     things.links # the things index Haipa::Links
     things.embedded # the things index Haipa::Embedded
-    things.to_hash # the things resource as a hash
 
     embedded = things.embedded
     embedded.things # array of Haipa::Resource
@@ -83,7 +80,8 @@ Then Haipa can consume this API with
     embedded.things.first.name # the first embedded thing Haipa::Resource name
     embedded.things[1] # the second embedded thing Haipa::Resource
     embedded.things.first.clear.other_attribute
-    embedded.to_hash # the embedded resources as a hash
+
+
 
 ## Contributing
 

data/haipa.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'faraday', '~> 0.8'
   spec.add_runtime_dependency 'hashie', '~> 2.0.0'
-  # spec.add_runtime_dependency 'uri_templates', '~> 0.2.0'
+  spec.add_runtime_dependency 'addressable', '~> 2.3.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.13.0'

data/lib/haipa.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'forwardable'
 require 'hashie'
 require 'faraday'
+require 'addressable/template'
 
 require 'haipa/version'
 require 'haipa/api'

data/lib/haipa/api.rb

@@ -3,10 +3,9 @@ module Haipa
     extend Forwardable
 
     attr_reader :conn, :resource, :uri
-    def_delegators :@conn, :get, :post, :put, :delete
-    def_delegators :@resource, :links, :embedded, :href, :resources, :to_hash
+    def_delegators :@conn, :get
+    def_delegators :@resource, :links, :embedded, :href, :resources
     alias :connection :conn
-    alias :description :resource
 
     def initialize(params={})
       @uri = URI(params[:url].to_s).path
@@ -20,16 +19,19 @@ module Haipa
       {
         :headers =>
         {
-          'Accept' => 'application/hal+json',
-          'UserAgent' => 'Haipa',
-          'Content-Type' => 'application/hal+json'
+          :accept => 'application/hal+json',
+          :user_agent => 'Haipa'
         }
       }.extend(Hashie::Extensions::DeepMerge)
     end
 
     def clear
-      resource.clear
+      @resource.clear
       self
     end
+
+    def description
+      resource.get
+    end
   end
 end

data/lib/haipa/embedded.rb

@@ -2,33 +2,33 @@ module Haipa
   class Embedded
     extend Forwardable
 
-    attr_reader :resource
-    def_delegators :@data, :empty?, :has_key?, :fetch
+    attr_reader :data, :resource
+    def_delegators :@data, :empty?, :has_key?
 
     def initialize(resource, data)
       @data = data
       @resource = resource
     end
 
+    def to_hash
+      @data
+    end
+
     def method_missing(name, *args, &block)
-      if @data.has_key?(name)
-        from_array(@data[name])
+      if data.has_key?(name)
+        from_array(data[name])
       else
         super
       end
     end
 
-    def to_hash
-      @data
-    end
-
     private
 
-    def from_array(array_or_hash)
-      if array_or_hash.kind_of?(Array)
-        array_or_hash.map{ |e| from_hash(e) }
+    def from_array(array)
+      if array.kind_of?(Array)
+        array.map{ |e| from_hash(e) }
       else
-        from_hash(array_or_hash)
+        from_hash(array)
       end
     end
 

data/lib/haipa/links.rb

@@ -2,7 +2,7 @@ module Haipa
   class Links
     extend Forwardable
 
-    attr_reader :resource
+    attr_reader :data, :resource
     def_delegators :@data, :empty?, :has_key?
 
     def initialize(resource, data)
@@ -16,7 +16,13 @@ module Haipa
 
     def method_missing(name, *args, &block)
       if @data.has_key?(name)
-        Resource.new(resource.api, @data[name]['href'])
+        href = @data[name]['href']
+        if @data[name]['template'] == true
+          template = Addressable::Template.new(href)
+          options = args.last.is_a?(::Hash) ? args.pop : {}
+          href = template.expand(options).to_s
+        end
+        Resource.new(resource.api, href)
       else
         super
       end

data/lib/haipa/resource.rb

@@ -5,11 +5,7 @@ module Haipa
     def initialize(api, uri, data=nil)
       @api = api
       @uri = uri
-      @data = ::Hashie::Mash.new(data) if data
-    end
-
-    def to_hash
-      get
+      @data = data
     end
 
     def clear
@@ -22,31 +18,13 @@ module Haipa
       @data ||= ::Hashie::Mash.new(JSON.parse(api.get(uri).body))
     end
 
-    def post(params={})
-      api.post(uri, params) do |req|
-        yield req if block_given?
-      end
-    end
-
-    def put(params={})
-      api.put(uri, params) do |req|
-        yield req if block_given?
-      end
-    end
-
-    def delete(params={})
-      api.delete(uri, params) do |req|
-        yield req if block_given?
-      end
-    end
-
     def embedded
-      @embedded ||= Embedded.new(self, get.fetch('_embedded', {}))
+      Embedded.new(self, get.fetch('_embedded', {}))
     end
     alias :resources :embedded
 
     def links
-      @links ||= Links.new(self, get.fetch('_links', {}))
+      Links.new(self, get.fetch('_links', {}))
     end
 
     def href

data/lib/haipa/version.rb

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

data/spec/haipa/api_spec.rb

@@ -8,9 +8,9 @@ describe Haipa::Api do
       stub.get('/') { [200, {}, description.to_json] }
     end
   end
-  subject { Haipa.api { |conn| conn.adapter :test, stubs } }
+  subject { Haipa.api { |builder| builder.adapter :test, stubs } }
 
-  specify { subject.description.to_hash.should == description }
+  specify { subject.description.should == description }
   specify { subject.links.to_hash.should == description['_links'] }
   specify { subject.embedded.to_hash.should == description['_embedded'] }
   specify { subject.href.should == description['_links']['self']['href'] }

data/spec/haipa/resource_spec.rb

@@ -14,6 +14,11 @@ describe Haipa::Resource do
     specify { subject.links.self.should be }
   end
 
+  it 'works' do
+    # template = Addressable::Template.new('/api{?q1,q2}')
+    # ap template.expand({'q1' => 'hello', 'q2' => 'bye'}).to_s
+  end
+
   context "with embedded resources" do
     let(:body) do
       {

data/spec/haipa_spec.rb

@@ -10,5 +10,5 @@ describe Haipa do
   end
   subject { Haipa.api { |builder| builder.adapter :test, stubs } }
 
-  its(:description) { should eq(description) }
+  specify { subject.description.to_hash.should eq(description) }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haipa
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2840839347400538447
+      hash: -2216550637168734427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2840839347400538447
+      hash: -2216550637168734427
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23