haipa 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 419b91465f3e5fcd6884c68c42f2b006e718ad6b
+  data.tar.gz: 3a594040647dc5f1daa1cb01bc61b7d56e9764cc
+SHA512:
+  metadata.gz: ae209ae9b11efc824dd11a537aaf5c5b75ded34d3d30dc16cbe9f2e7923db560981c6b526c48a3ffb8320ce2b1a7d832d72b3e67307c47c13a707e5202422453
+  data.tar.gz: fe92b9ca91cd9a36deaa6ad87c296be82dedfbeceeb6081f623ab2895e33d05d431b1b7006cc6d12884a2920619b30caf46f38b387b5e5d5ea60693b816b9ec8

data/README.md

@@ -77,7 +77,7 @@ Then Haipa can consume this API with
     embedded = things.embedded
     embedded.things # array of Haipa::Resource
     embedded.things.first # the first embedded thing Haipa::Resource
-    embedded.things.first.name # the first embedded thing Haipa::Resource name
+    embedded.things.first.fetch('name') # the first embedded thing Haipa::Resource name
     embedded.things[1] # the second embedded thing Haipa::Resource
     embedded.things.first.clear.other_attribute
 

data/haipa.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'faraday', '~> 0.8'
-  spec.add_runtime_dependency 'hashie', '~> 2.0.0'
   spec.add_runtime_dependency 'addressable', '~> 2.3.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/deep_merge.rb

@@ -0,0 +1,27 @@
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = { x: { y: [4, 5, 6] }, z: [7, 8, 9] }
+  #   h2 = { x: { y: [7, 8, 9] }, z: 'xyz' }
+  #
+  #   h1.deep_merge(h2) # => {x: {y: [7, 8, 9]}, z: "xyz"}
+  #   h2.deep_merge(h1) # => {x: {y: [4, 5, 6]}, z: [7, 8, 9]}
+  #   h1.deep_merge(h2) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
+  #   # => {:x=>{:y=>[4, 5, 6, 7, 8, 9]}, :z=>[7, 8, 9, "xyz"]}
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      if tv.is_a?(Hash) && v.is_a?(Hash)
+        self[k] = tv.deep_merge(v, &block)
+      else
+        self[k] = block && tv ? block.call(k, tv, v) : v
+      end
+    end
+    self
+  end
+end

data/lib/haipa.rb

@@ -1,8 +1,8 @@
 require 'uri'
 require 'forwardable'
-require 'hashie'
 require 'faraday'
 require 'addressable/template'
+require 'deep_merge'
 
 require 'haipa/version'
 require 'haipa/api'

data/lib/haipa/api.rb

@@ -10,7 +10,11 @@ module Haipa
     def initialize(params={})
       @uri = URI(params[:url].to_s).path
       @conn = Faraday.new(defaults.deep_merge(params)) do |conn|
-        yield conn if block_given?
+        if block_given?
+          yield conn
+        else
+          conn.adapter Faraday.default_adapter
+        end
       end
       @resource = Resource.new(self, @uri)
     end
@@ -22,7 +26,7 @@ module Haipa
           :accept => 'application/hal+json',
           :user_agent => 'Haipa'
         }
-      }.extend(Hashie::Extensions::DeepMerge)
+      }
     end
 
     def clear

data/lib/haipa/embedded.rb

@@ -12,6 +12,7 @@ module Haipa
     end
 
     def method_missing(name, *args, &block)
+      name = name.to_s
       if data.has_key?(name)
         from_array(data[name])
       else

data/lib/haipa/links.rb

@@ -12,6 +12,7 @@ module Haipa
     end
 
     def method_missing(name, *args, &block)
+      name = name.to_s
       if @data.has_key?(name)
         href = @data[name]['href']
         if @data[name]['templated'] == true

data/lib/haipa/resource.rb

@@ -18,11 +18,12 @@ module Haipa
     end
 
     def get
+      return @data if @data
       return {} unless uri
       response = api.get(uri)
       raise FailureResponseError unless response.success?
       raise EmptyResponseError if !response.body || response.body.empty?
-      @data ||= ::Hashie::Mash.new(JSON.parse(response.body))
+      @data = JSON.parse(response.body)
     end
 
     def delete
@@ -53,7 +54,7 @@ module Haipa
     end
 
     def href
-      (links.to_hash.self || {}).fetch('href', nil)
+      links.to_hash.fetch('self', {}).fetch('href', nil)
     end
   end
 end

data/lib/haipa/version.rb

@@ -1,3 +1,3 @@
 module Haipa
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/haipa/api_spec.rb

@@ -10,8 +10,8 @@ describe Haipa::Api do
   end
   subject { Haipa.api { |builder| builder.adapter :test, stubs } }
 
-  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'] }
+  specify { expect(subject.description).to eq(description) }
+  specify { expect(subject.links.to_hash).to eq(description['_links']) }
+  specify { expect(subject.embedded.to_hash).to eq(description['_embedded']) }
+  specify { expect(subject.href).to eq(description['_links']['self']['href']) }
 end

data/spec/haipa/resource_spec.rb

@@ -11,7 +11,7 @@ describe Haipa::Resource do
     its(:embedded) { should be_empty }
     its(:resources) { should be_empty }
     its(:links) { should_not be_empty }
-    specify { subject.links.self.should be }
+    specify { expect(subject.links.self).to be }
   end
 
   context "with a templated find" do
@@ -25,8 +25,8 @@ describe Haipa::Resource do
       }
     end
     it 'resolves the template' do
-      subject.links.find(id:1, filter1:'hello', filter2:'world').uri.should be ==
-        uri+'/things/1?filter1=hello&filter2=world'
+      expect(subject.links.find(id:1, filter1:'hello', filter2:'world').uri).
+        to eq(uri+'/things/1?filter1=hello&filter2=world')
     end
   end
 
@@ -46,10 +46,10 @@ describe Haipa::Resource do
         '_links' => {'self' => {'href' => uri}}
       }
     end
-    specify { subject.embedded.should_not be_empty }
-    specify { subject.resources.thing.should be_a Haipa::Resource }
-    specify { subject.resources.things.first.should be_a Haipa::Resource }
-    specify { subject.resources.thing.get.name.should be == 'thing' }
-    specify { subject.resources.things.first.get.name.should be == 'thing' }
+    specify { expect(subject.embedded).not_to be_empty }
+    specify { expect(subject.resources.thing).to be_a Haipa::Resource }
+    specify { expect(subject.resources.things.first).to be_a Haipa::Resource }
+    specify { expect(subject.resources.thing.get.fetch('name')).to eq('thing') }
+    specify { expect(subject.resources.things.first.get.fetch('name')).to eq('thing') }
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,9 @@
 require 'json'
-require 'faraday'
 require 'awesome_print'
-require 'hashie'
+
 require 'haipa'
 
 RSpec.configure do |config|
-  config.filter_run :wip => true
+  config.filter_run wip: true
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: haipa
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Jon Doveston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,31 +20,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !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
@@ -54,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,6 +94,7 @@ files:
 - README.md
 - Rakefile
 - haipa.gemspec
+- lib/deep_merge.rb
 - lib/haipa.rb
 - lib/haipa/api.rb
 - lib/haipa/embedded.rb
@@ -134,33 +108,26 @@ files:
 homepage: https://github.com/hatoishi/haipa
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2472982524793577646
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2472982524793577646
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HAL hypermedia client
 test_files:
 - spec/haipa/api_spec.rb