frenetic 1.0.0.alpha.1 → 1.0.0

data/lib/frenetic/resource_collection.rb

@@ -6,7 +6,7 @@ class Frenetic
     include HalLinked
     include CollectionRestMethods
 
-    def initialize( resource, params = {} )
+    def initialize(resource, params = {})
       @resource_class = resource
       @resources      = []
       @params         = params || {}
@@ -43,7 +43,7 @@ class Frenetic
     end
 
     def embedded_collection
-      @params.fetch('_embedded',{}).fetch(collection_key, [])
+      @params.fetch('_embedded', {}).fetch(collection_key, [])
     end
   end
-end
+end

data/lib/frenetic/resource_mockery.rb

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'delegate'
 require 'active_support/concern'
+require 'active_support/core_ext/hash/deep_merge'
 
 class Frenetic
   module ResourceMockery
@@ -20,7 +21,7 @@ class Frenetic
     end
 
     def properties
-      @params.each_with_object({}) do |(k,v), props|
+      @params.each_with_object({}) do |(k, v), props|
         props[k] = v.class.to_s.underscore
       end
     end
@@ -43,13 +44,14 @@ class Frenetic
 
   private
 
-    def build_params( p )
+    def build_params(params)
+      raw_params = (params || {}).with_indifferent_access
       defaults = default_attributes.with_indifferent_access
-      @params  = defaults.merge( (p || {}).with_indifferent_access )
+      @params = defaults.deep_merge(raw_params)
     end
 
     def build_structure
-      @structure = OpenStruct.new( @attrs )
+      @structure = OpenStruct.new(@attrs)
     end
   end
-end
+end

data/lib/frenetic/version.rb

@@ -1,3 +1,3 @@
 class Frenetic
-  VERSION = '1.0.0.alpha.1'
-end
+  VERSION = '1.0.0'
+end

data/spec/briefly_memoizable_spec.rb

@@ -58,4 +58,4 @@ describe Frenetic::BrieflyMemoizable do
       end
     end
   end
-end
+end

data/spec/concerns/hal_linked_spec.rb

@@ -21,7 +21,7 @@ describe Frenetic::HalLinked do
 
     let(:_links) do
       {
-        '_links' => { 'self' => { 'href' => '/api/self' }}
+        '_links' => { 'self' => { 'href' => '/api/self' } }
       }
     end
 
@@ -65,7 +65,7 @@ describe Frenetic::HalLinked do
     context 'with an implied self link' do
       let(:_links) do
         {
-          '_links' => { 'self' => { 'href' => '/api/self' }}
+          '_links' => { 'self' => { 'href' => '/api/self' } }
         }
       end
 
@@ -92,7 +92,7 @@ describe Frenetic::HalLinked do
 
     it 'processes the link' do
       expect_any_instance_of(Frenetic::HypermediaLinkSet)
-        .to receive(:href).with( params ).and_call_original
+        .to receive(:href).with(params).and_call_original
       subject
     end
   end
@@ -106,7 +106,7 @@ describe Frenetic::HalLinked do
       before do
         allow(MyTempResource)
           .to receive(:namespace)
-            .and_return(Time.now.to_i.to_s)
+          .and_return(Time.now.to_i.to_s)
       end
 
       it 'raises an error' do
@@ -122,4 +122,4 @@ describe Frenetic::HalLinked do
       end
     end
   end
-end
+end

data/spec/concerns/member_rest_methods_spec.rb

@@ -84,4 +84,4 @@ describe Frenetic::MemberRestMethods do
       end
     end
   end
-end
+end

data/spec/concerns/structured_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Frenetic::Structured do
   let(:my_temp_resource) do
     Class.new do
-      def initialize( attrs = {} )
+      def initialize(attrs = {})
         @attrs = attrs
       end
     end
@@ -24,7 +24,7 @@ describe Frenetic::Structured do
 
   after { instance.destroy_structure! }
 
-  subject(:instance) { MyTempResource.new( foo:'foo', bar:'bar' ) }
+  subject(:instance) { MyTempResource.new(foo:'foo', bar:'bar') }
 
   describe '#struct_key' do
     subject { super().struct_key }
@@ -121,9 +121,10 @@ describe Frenetic::Structured do
 
     before do
       allow(instance).to receive(:signature).and_return(new_sig)
-      described_class.class_variable_set '@@signatures', {
+      described_class.class_variable_set(
+        '@@signatures',
         'MyTempResourceFreneticResourceStruct' => old_sig
-      }
+      )
     end
 
     context 'with a fresh signature' do
@@ -206,4 +207,4 @@ describe Frenetic::Structured do
       end
     end
   end
-end
+end

data/spec/connection_spec.rb

@@ -18,7 +18,7 @@ describe Frenetic::Connection do
       let(:url) { nil }
 
       it 'raises an error' do
-        expect{subject}.to raise_error Frenetic::ConfigError, %r{Url must be present}
+        expect{subject}.to raise_error Frenetic::ConfigError, /Url must be present/
       end
     end
 
@@ -42,8 +42,20 @@ describe Frenetic::Connection do
       expect(subject[1]).to include :url
     end
 
-    it 'converts URLs to URIs' do
-      expect(subject[1]).to include url:kind_of(Addressable::URI)
+    context 'with specific port' do
+      let(:url) { 'https://example.com:8443' }
+      it 'converts URLs to URIs' do
+        expect(subject[1]).to include url:kind_of(Addressable::URI)
+        expect(subject[1][:url].port).to eq(8443)
+      end
+    end
+
+    context 'with no specific port' do
+      let(:url) { 'https://example.com' }
+      it 'converts URLs to URIs with port inferred from scheme' do
+        expect(subject[1]).to include url:kind_of(Addressable::URI)
+        expect(subject[1][:url].port).to eq(443)
+      end
     end
   end
 
@@ -134,4 +146,4 @@ describe Frenetic::Connection do
       expect(builder).to have_received(:adapter).with(:patron)
     end
   end
-end
+end

data/spec/fixtures/test_api_requests.rb

@@ -1,78 +1,81 @@
 require 'json'
 
 class HttpStubs
-  def initialize( rspec )
+  def initialize(rspec)
     @rspec = rspec
   end
 
   def defaults
     {
       status:  200,
-      headers: { 'Content-Type'=>'application/json' },
+      headers: { 'Content-Type' => 'application/json' },
       body:    {}
     }
   end
 
-  def response( params = {} )
-    defs    = defaults.dup
+  def response(params = {})
+    defs = defaults.dup
     headers = params.delete :headers
 
     defs[:headers].merge! headers || {}
 
-    defs.merge( params ).tap do |p|
+    defs.merge(params).tap do |p|
       p[:body] = p[:body].to_json
     end
   end
 
   def api_html_response
-    @rspec.stub_request( :any, 'example.com/api' )
-      .to_return response( body:'Non-JSON response', status:200 )
+    @rspec.stub_request(:any, 'example.com/api')
+      .to_return response(body:'Non-JSON response', status:200)
   end
 
-  def api_server_error( type = :json )
+  def api_server_error(type = :json)
     body = '500 Server Error'
 
     body = { 'error' => body }.to_json if type == :json
 
-    @rspec.stub_request( :any, 'example.com/api' )
-      .to_return response( body:body, status:500 )
+    @rspec.stub_request(:any, 'example.com/api')
+      .to_return response(body:body, status:500)
   end
 
-  def api_client_error( type = :json )
+  def api_client_error(type = :json)
     body = '404 Not Found'
 
     body = { 'error' => body }.to_json if type == :json
 
-    @rspec.stub_request( :any, 'example.com/api' )
-      .to_return defaults.merge( body:body, status:404 )
+    @rspec.stub_request(:any, 'example.com/api')
+      .to_return defaults.merge(body:body, status:404)
   end
 
   def api_description
-    @rspec.stub_request( :any, 'example.com/api' )
-      .to_return response( body:schema, headers:{ 'Cache-Control' => 'max-age=3600, public' } )
+    @rspec.stub_request(:any, 'example.com/api')
+      .to_return response(body:schema, headers:{ 'Cache-Control' => 'max-age=3600, public' })
   end
 
   def unknown_instance
-    @rspec.stub_request( :get, 'example.com/api/my_temp_resources/1' )
-      .to_return response( body:{ 'error' => '404 Not Found' }, status:404 )
+    @rspec.stub_request(:get, 'example.com/api/my_temp_resources/1')
+      .to_return response(body:{ 'error' => '404 Not Found' }, status:404)
   end
 
   def known_instance
-    @rspec.stub_request( :get, 'example.com/api/my_temp_resources/1' )
-      .to_return response( body:{ 'name' => 'Resource Name' } )
+    @rspec.stub_request(:get, 'example.com/api/my_temp_resources/1')
+      .to_return response(body:{ 'name' => 'Resource Name' })
   end
 
   def known_resource
-    @rspec.stub_request( :get, 'example.com/api/my_temp_resources' )
-      .to_return response( body:{
-        '_embedded' => {
-          'my_temp_resources' => [
-            { 'name' => 'Resource Name' }
-          ]
+    @rspec.stub_request(:get, 'example.com/api/my_temp_resources')
+      .to_return response(
+        body: {
+          '_embedded' => {
+            'my_temp_resources' => [
+              { 'name' => 'Resource Name' }
+            ]
+          }
         }
-      } )
+      )
   end
 
+  # rubocop:disable Metrics/MethodLength
   def schema
     {
       _embedded: {
@@ -110,10 +113,11 @@ class HttpStubs
       }
     }
   end
+  # rubocop:enable Metrics/MethodLength
 end
 
 RSpec.configure do |c|
   c.before :all do
-    @stubs = HttpStubs.new( self )
+    @stubs = HttpStubs.new(self)
   end
-end
+end

data/spec/frenetic_spec.rb

@@ -17,7 +17,7 @@ describe Frenetic do
       expect(subject).to include headers:kind_of(Hash)
       expect(subject).to include middleware:[]
       expect(subject).to include :password
-      expect(subject).to include ssl:{verify:true}
+      expect(subject).to include ssl:{ verify:true }
       expect(subject).to include test_mode:false
       expect(subject).to include :url
       expect(subject).to include :username
@@ -37,7 +37,7 @@ describe Frenetic do
   end
 
   describe '#configure' do
-    subject { instance.configure {|c| } }
+    subject { instance.configure {|c| c } }
 
     it 'resets the Connection' do
       prev_connection = instance.connection
@@ -240,4 +240,4 @@ describe Frenetic do
   #     expect(instance.connection).to have_received(:delete)
   #   end
   # end
-end
+end

data/spec/hypermedia_link_set_spec.rb

@@ -93,7 +93,7 @@ describe Frenetic::HypermediaLinkSet do
 
     context 'with multiple matching links' do
       let(:link_a) do
-        Frenetic::HypermediaLink.new( href:'/foo/{id}', templated:true )
+        Frenetic::HypermediaLink.new(href:'/foo/{id}', templated:true)
       end
 
       let(:links) do
@@ -126,7 +126,7 @@ describe Frenetic::HypermediaLinkSet do
     subject { super()[rel] }
 
     let(:link_b) do
-      Frenetic::HypermediaLink.new( href:'/bar', rel:'bar' )
+      Frenetic::HypermediaLink.new(href:'/bar', rel:'bar')
     end
 
     let(:links) do
@@ -152,4 +152,4 @@ describe Frenetic::HypermediaLinkSet do
       end
     end
   end
-end
+end

data/spec/hypermedia_link_spec.rb

@@ -150,4 +150,4 @@ describe Frenetic::HypermediaLink do
       expect(subject).to eq 'foo'
     end
   end
-end
+end

data/spec/middleware/hal_json_spec.rb

@@ -16,9 +16,9 @@ describe Frenetic::Middleware::HalJson do
   let(:options) { Hash.new }
   let(:headers) { Hash.new }
   let(:middleware) do
-    described_class.new(lambda {|env|
+    described_class.new(lambda do |env|
       Faraday::Response.new(env)
-    }, options)
+    end, options)
   end
 
   it 'does not change nil body' do
@@ -78,4 +78,4 @@ describe Frenetic::Middleware::HalJson do
       end
     end
   end
-end
+end

data/spec/resource_collection_spec.rb

@@ -17,11 +17,10 @@ describe Frenetic::ResourceCollection do
 
   before do
     stub_const 'MyTempResource', my_temp_resource
-
     @stubs.api_description
   end
 
-  let(:collection_response) {
+  let(:collection_response) do
     {
       '_embedded' => {
         'my_temp_resources' => [
@@ -39,7 +38,7 @@ describe Frenetic::ResourceCollection do
         }
       }
     }
-  }
+  end
 
   subject(:instance) { described_class.new(MyTempResource, collection_response) }
 
@@ -84,4 +83,4 @@ describe Frenetic::ResourceCollection do
       expect(subject).to be_an_instance_of MyTempResource
     end
   end
-end
+end

data/spec/resource_mockery_spec.rb

@@ -10,18 +10,38 @@ describe Frenetic::ResourceMockery do
   let(:my_mocked_resource) do
     Class.new(my_temp_resource) do
       def self.default_attributes
-        { qux:'qux' }
+        {
+          qux: 'qux',
+          _embedded: {
+            embedded_resource: {
+              plugh: 'xyzzy'
+            }
+          }
+        }
       end
     end
   end
 
+  let(:params) do
+    {
+      foo: 1,
+      bar: 'baz',
+      _embedded: {
+        embedded_resource: {
+          grault: 'garply'
+        },
+        another_resource: {
+          waldo: 'fred'
+        }
+      }
+    }
+  end
+
   before do
     stub_const 'MyNamespace::MyMockedResource', my_mocked_resource
     MyNamespace::MyMockedResource.send :include, described_class
   end
 
-  let(:params) { { foo:1, bar:'baz' } }
-
   subject { MyNamespace::MyMockedResource.new params }
 
   it 'violates some basic CS principles by telling the parent-class of its existence' do
@@ -44,6 +64,9 @@ describe Frenetic::ResourceMockery do
       expect(subject).to include 'foo' => 1
       expect(subject).to include 'bar' => 'baz'
       expect(subject).to include 'qux' => 'qux'
+      expect(subject['_embedded']['embedded_resource']).to include 'plugh' => 'xyzzy'
+      expect(subject['_embedded']['embedded_resource']).to include 'grault' => 'garply'
+      expect(subject['_embedded']['another_resource']).to include 'waldo' => 'fred'
     end
   end
 
@@ -53,7 +76,7 @@ describe Frenetic::ResourceMockery do
     subject { MyNamespace::MyMockedResource.default_attributes }
 
     it 'allows implementors to specify sane defaults' do
-      expect(subject).to eq Hash.new
+      expect(subject).to eq({})
     end
   end
 
@@ -63,7 +86,7 @@ describe Frenetic::ResourceMockery do
     subject { MyNamespace::MyMockedResource.new.default_attributes }
 
     it 'proxies to the class method' do
-      expect(subject).to eq Hash.new
+      expect(subject).to eq({})
     end
   end
-end
+end