rspec-grape 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344cd46b986acfa1c98f7df3419a1a51864c78c3
-  data.tar.gz: 2afd9b00e7aca8e40e585ec4ed8f91ba699107f7
+  metadata.gz: 53dffc4ee324581222ce3f71be6f754d018c3519
+  data.tar.gz: c6fabdd0c1867136da1069423e60b1df239bd0bf
 SHA512:
-  metadata.gz: fd7def411a10fc6144d71b73e3bdd4f5e8dcac2dfd06870504a576c6b4a0a7ada075de768dd4c0fa4719310abb64bfb8cda02d80cebbab7b33f944d6ab09ae24
-  data.tar.gz: 2d85a9763c394be30c67320ea9e3ed10a0db18cc17c52624f0f28108bb29c29721eb03091e890c681e0659952c83c2e3f5fcfd649051d57550f703206edbd239
+  metadata.gz: 2355940cfd8573aeca126bfda5f4fc321f488572dca3bb5ef4dee96b08e018cf70062e21a998ca621e477c3d7b1213b678baf89bbb70b7e20706984a6b7dba05
+  data.tar.gz: 09fe14fde234836a83a7e874972f3e2ea943f301a1abcc5341288975d22fb344de85d97505dbcfc375395bc352219b681404488a0ab065d274bd9f924d600027

data/README.md

@@ -62,20 +62,12 @@ end
 
 ### Passing request params
 
-Params can be either passed to `call_api` method:
+Params can be passed to `call_api` method:
 
 ```ruby
 call_api({foo: :bar})
 ```
 
-or set via `let`:
-
-```ruby
-let(:api_params) { { foo: :bar } }
-```
-
-Note, that params, explicitly passed to `call_api`, have precendence over thoose set in `api_params`.
-
 ### Stubbing API helpers
 
 rspec-grape provides two methods to stub API helpers: `expect_endpoint_to` and `expect_endpoint_not_to`. You can easily write:
@@ -93,7 +85,7 @@ When you define some parameters in url like
 ```ruby
 get '/url/with/:param'
 ```
-you can use `parameterized_api_url` helper. You can set parameter values via `:api_params` or expliciltly pass them to helper. The result will be url with parameter names substituted with actual values:
+you can use `parameterized_api_url` helper to generate full url. Pass parameters as hash. The result will be url with parameter names substituted with actual values:
 ```ruby
 parameterized_api_url(param: 'defined') # '/url/with/defined'
 ```
@@ -101,6 +93,23 @@ parameterized_api_url(param: 'defined') # '/url/with/defined'
 If some parameters are not set, method will raise `RSpec::Grape::UrlNotSetException`.
 Note that `call_api` helper will use parameterized_url to generate url to be called.
 
+### Nested descriptions
+
+You may need to define nested descriptions of endpoint when you are using inline url parameters:
+```ruby
+describe 'GET /inline/:param' do
+  describe 'GET /inline/false' do
+    ...
+  end
+
+  describe 'GET /inline/true' do
+    ...
+  end
+end
+```
+
+In this case `api_url` will point to inner description, `/inline/false` and `/inline/true` consequently. If you set all inline parameters in description, there is no need to pass parameters to `call_api`.
+
 ### Additional spec helpers
 
 It is also possible to use two methods in your specs: `api_url` and `api_method`. The former returns url from spec description, while the latter returns http method.

data/lib/rspec/grape/methods.rb

@@ -18,7 +18,7 @@ module RSpec
       def parameterized_api_url(params = nil)
         raise RSpec::Grape::UrlIsNotParameterized unless parameterized_url?
 
-        params ||= resolve_params(params)
+        params ||= {}
 
         url = api_url.dup
         names = RSpec::Grape::Utils.url_param_names(api_url)
@@ -32,7 +32,7 @@ module RSpec
       end
 
       def call_api(params = nil)
-        params ||= resolve_params(params)
+        params ||= {}
 
         if parameterized_url?
           url = parameterized_api_url(params)
@@ -61,10 +61,6 @@ module RSpec
       def parameterized_url?
         api_url =~ /\/:/
       end
-
-      def resolve_params(params = nil)
-        params || self.respond_to?(:api_params) ? api_params : {}
-      end
     end
   end
 end

data/lib/rspec/grape/utils.rb

@@ -17,7 +17,7 @@ module RSpec
 
         raise RSpec::Grape::NoEndpointDescription unless ancestors.any?
 
-        ancestors.last.description
+        ancestors.first.description
       end
 
       def self.url_param_names(url)

data/lib/rspec/grape/version.rb

@@ -1,5 +1,5 @@
 module Rspec
   module Grape
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-grape
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Timothy Kovalev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test