rest-in-peace 1.0.0 → 1.1.0

data/README.md

@@ -144,11 +144,9 @@ There is a helper class which can be used to create a Faraday compatible SSL con
 
 ```ruby
 ssl_config = {
-  "api_url"         => "https://api-backend.dev:3443",
-  "use_cert"        => true,
-  "ssl_cert_client" => "/etc/ssl/private/client.crt",
-  "ssl_key_client"  => "/etc/ssl/private/client.key",
-  "ssl_ca"          => "/etc/ssl/certs/ca-chain.crt"
+  "client_cert" => "/etc/ssl/private/client.crt",
+  "client_key"  => "/etc/ssl/private/client.key",
+  "ca_cert"     => "/etc/ssl/certs/ca-chain.crt"
 }
 
 ssl_config_creator = RESTinPeace::SSLConfigCreator.new(ssl_config, :peer)

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/rest_in_peace/definition_proxy/collection_method_definitions.rb

@@ -14,6 +14,9 @@ module RESTinPeace
             params = default_params.merge(args.pop)
           else
             params = default_params.dup
+          end
+
+          if args.any?
             tokens = RESTinPeace::TemplateSanitizer.new(url_template, {}).tokens
             tokens.each do |token|
               params.merge!(token.to_sym => args.shift)

data/lib/rest_in_peace/ssl_config_creator.rb

@@ -2,9 +2,15 @@ require 'openssl'
 
 module RESTinPeace
   class SSLConfigCreator
+    class MissingParam < Exception; end
+
     def initialize(config, verify = :peer)
       @config = config
       @verify = verify
+
+      raise MissingParam, 'Specify :ca_cert in ssl options' unless @config[:ca_cert]
+      raise MissingParam, 'Specify :client_key in ssl options' unless @config[:client_key]
+      raise MissingParam, 'Specify :client_cert in ssl options' unless @config[:client_cert]
     end
 
     def faraday_options
@@ -16,7 +22,7 @@ module RESTinPeace
     end
 
     def client_cert_path
-      path(@config[:ssl_cert_client])
+      path(@config[:client_cert])
     end
 
     def client_key
@@ -24,11 +30,11 @@ module RESTinPeace
     end
 
     def client_key_path
-      path(@config[:ssl_key_client])
+      path(@config[:client_key])
     end
 
     def ca_cert_path
-      path(@config[:ssl_ca])
+      path(@config[:ca_cert])
     end
 
     def verify_mode

data/spec/rest_in_peace/definition_proxy/collection_method_definitions_spec.rb

@@ -59,6 +59,15 @@ describe RESTinPeace::DefinitionProxy::CollectionMethodDefinitions do
           target.find(1)
         end
 
+        it 'handles mixed parameters' do
+          expect(RESTinPeace::ApiCall).to receive(:new).
+            with(target.api, '/a/:id', target, id: 1, embed: %w(extra_field1)).
+            and_return(api_call_double)
+
+          subject.get(:find, '/a/:id', default_params)
+          target.find(1, embed: %w(extra_field1))
+        end
+
         it 'appends the given attributes' do
           expect(RESTinPeace::ApiCall).to receive(:new).
             with(target.api, '/a', target, {name: 'daniele', last_name: 'in der o'}).

data/spec/rest_in_peace_spec.rb

@@ -50,6 +50,11 @@ describe RESTinPeace do
       specify { expect(subject.name).to eq('test42') }
       specify { expect { subject.email }.to raise_error(NoMethodError) }
     end
+
+    context 'not given param' do
+      let(:attributes) { {} }
+      specify { expect(subject.name).to eq(nil) }
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-in-peace
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake