riot-gear 0.0.11 → 0.0.12

data/CHANGELOG

@@ -1,5 +1,9 @@
 # @markup markdown
 
+# 0.0.12
+
+* Allow OPTIONS HTTP calls [rquinlivan]
+
 # 0.0.10
 
 * Defines a new setup block called `once`. Useful for running a single block before assertions, but only inside the context it was defined in [jaknowlden]
@@ -17,7 +21,7 @@ context ThingsMaker do
 
   context "makes no more things" do
     get "/things/2"
-    asserts_status(404) # becuase the post didn't run again ... see ... yeah
+    asserts_status(404) # because the post didn't run again ... see ... yeah
   end
 end
 ```

data/lib/riot/gear/context.rb

@@ -1,7 +1,5 @@
 require 'riot/gear/context/once'
-require 'riot/gear/context/anything'
 require 'riot/gear/context/persist_cookie'
 require 'riot/gear/context/asserts_status'
 require 'riot/gear/context/asserts_header'
-require 'riot/gear/context/asserts_cookie'
 require 'riot/gear/context/asserts_json'

data/lib/riot/gear/context/asserts_header.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Riot
   module Gear
     module AssertsHeader

data/lib/riot/gear/middleware/riotparty.rb

@@ -45,15 +45,15 @@ private
   # Returns the list of methods that do something; like make a network call.
   #
   # @return [Array<Symbol>]
-  def actionable_methods; [:get, :post, :put, :delete, :head]; end
+  def actionable_methods; [:get, :post, :put, :delete, :head, :options]; end
 
-  # Returns the list of methods that configure actionable HTTParty methods. The {HTTParty.options} and
-  # {HTTParty.default_options} methods are explicitly excluded from this list
+  # Returns the list of methods that configure actionable HTTParty methods. The
+  # {HTTParty.default_options} method is explicitly excluded from this list
   #
   # @return [Array<Symbol>]
   def proxiable_methods
     methods = HTTParty::ClassMethods.instance_methods.map { |m| m.to_s.to_sym }
-    methods - actionable_methods - [:options, :default_options]
+    methods - actionable_methods - [:default_options]
   end
 
   # Bind the set of actionable methods to a given context.
@@ -81,10 +81,8 @@ private
   def proxy_action_methods(context)
     context_eigen = (class << context; self; end)
     actionable_methods.each do |method_name|
-
       context_eigen.__send__(:define_method, method_name) do |*args, &settings_block|
-        #hookup do
-        anything do
+        hookup do
           if settings_block
             name = args.first
             options = instance_eval(&settings_block)
@@ -93,12 +91,13 @@ private
             name = nil
             path, options = *args
           end
+          #debug_start = Time.now
           result = topic.__send__(method_name, path, options || {})
+          #puts "TIME #{(Time.now - debug_start) * 1000.0}ms #{topic.base_uri}#{path}"
           @saved_responses[name] = result
           @smoke_response = result # TODO remove this after it's certain no usages in the wild
         end
       end
-
     end # methods.each
   end
 

data/lib/riot/gear/version.rb

@@ -1,6 +1,5 @@
 module Riot
   module Gear
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end
-

data/test/actions/options_test.rb

@@ -0,0 +1,58 @@
+require 'teststrap'
+
+context "Sending an OPTIONS request with a base uri" do
+
+  context "without params" do
+    hookup do
+      stub_request(:options, 'http://test.local/foo').
+        with(:body => {"foo" => "bar"}.to_json).
+        to_return(:body => "Foo", :status => 200)
+    end
+
+    base_uri "http://test.local"
+    options "/foo", :body => {"foo" => "bar"}.to_json
+
+    asserts("status code") { response.code }.equals(200)
+    asserts("response body") { response.body }.equals("Foo")
+  end # without params
+
+  context "with params" do
+    hookup do
+      stub_request(:options, 'http://test.local/foo?bar=baz').
+        with(:body => {"goo" => "car"}.to_json).
+        to_return(:body => "", :status => 201)
+    end
+
+    context "through default_params" do
+      base_uri "http://test.local"
+      default_params({"bar" => "baz"})
+      options "/foo", :body => {"goo" => "car"}.to_json
+
+      asserts("status code") { response.code }.equals(201)
+    end # through default_params
+
+    context "through query string" do
+      base_uri "http://test.local"
+      options "/foo?bar=baz", :body => {"goo" => "car"}.to_json
+
+      asserts("status code") { response.code }.equals(201)
+    end # through query string
+  end # with params
+
+  context "while processing options from a block" do
+    hookup do
+      stub_request(:options, 'http://test.local/foo/bar').
+        with(:body => {"s" => "things"}.to_json).
+        to_return(:body => "", :status => 299)
+    end
+
+    base_uri "http://test.local"
+
+    options do
+      { :path => "/foo/bar", :body => {"s" => "things"}.to_json }
+    end
+
+    asserts("status code") { response.code }.equals(299)
+  end # while processing options from a block
+
+end # Sending a POST request with a base uri

data/test/riotparty_proxy_methods_test.rb

@@ -51,7 +51,7 @@ context "A Riot Gear context" do
 
   asserts("providing an invalid format") do
     topic.format :boogers
-  end.raises(HTTParty::UnsupportedFormat, "':boogers' Must be one of: html, json, plain, xml")
+  end.raises(HTTParty::UnsupportedFormat, "':boogers' Must be one of: csv, html, json, plain, xml")
 
   debug_output StringIO.new
   asserts("default options for debug_output") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riot-gear
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riot
@@ -60,8 +60,6 @@ files:
 - Rakefile
 - lib/riot/gear.rb
 - lib/riot/gear/context.rb
-- lib/riot/gear/context/anything.rb
-- lib/riot/gear/context/asserts_cookie.rb
 - lib/riot/gear/context/asserts_header.rb
 - lib/riot/gear/context/asserts_json.rb
 - lib/riot/gear/context/asserts_status.rb
@@ -73,6 +71,7 @@ files:
 - riot-gear.gemspec
 - test/actions/delete_test.rb
 - test/actions/get_test.rb
+- test/actions/options_test.rb
 - test/actions/post_test.rb
 - test/actions/put_test.rb
 - test/assertions/asserts_json_test.rb
@@ -109,6 +108,7 @@ summary: Riot + HTTParty smoke testing framework.
 test_files:
 - test/actions/delete_test.rb
 - test/actions/get_test.rb
+- test/actions/options_test.rb
 - test/actions/post_test.rb
 - test/actions/put_test.rb
 - test/assertions/asserts_json_test.rb

data/lib/riot/gear/context/anything.rb

@@ -1,24 +0,0 @@
-class Riot::Gear::AnythingRunnable < Riot::RunnableBlock
-  def initialize(description, &definition)
-    super("[anything] #{description}", &definition)
-  end
-
-  # @param [Riot::Situation] situation An instance of a {Riot::Situation}
-  # @return [Array<Symbol>]
-  def run(situation)
-    situation.evaluate(&definition)
-    [:anything]
-  end
-end
-
-module Riot::Gear::AnythingContextHelper
-  # @param [String] description A description of what the block is for
-  # @param [lambda] &definition The block that will be executed ...
-  # @return [Riot::Gear::AnythingRunnable]
-  def anything(description="", &definition)
-    @assertions << Riot::Gear::AnythingRunnable.new(description, &definition)
-  end
-end
-
-Riot::Context.instance_eval { include Riot::Gear::AnythingContextHelper }
-

data/lib/riot/gear/context/asserts_cookie.rb

@@ -1,20 +0,0 @@
-module Riot
-  module Gear
-    module AssertsCookie
-
-      # Generates an assertion that retrieves the value of some cookie from the last response.
-      #
-      #   asserts_cookie("ui_session").matches(/stuff/)
-      #
-      # @param [String] cookie-name the name of the cookie
-      # @return [Riot::Assertion] an assertion block that macros can be applied to
-      def asserts_cookie(cookie_name)
-        asserts("set-cookie #{cookie_name}") { cookie_values[cookie_name] }
-      end
-
-    end # AssertsHeader
-  end # Gear
-end # Riot
-
-Riot::Context.instance_eval { include Riot::Gear::AssertsCookie }
-