rambo_ruby 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06856629cc151adf7fcea55093eb86430cd8984b
-  data.tar.gz: 250d9f949fa560c42568b758947ab05009c6f7a7
+  metadata.gz: ee4fdbe74465d4823e09b8cd7861e8f251b1d2e2
+  data.tar.gz: 730738e5726b1674529c8da1b319d78272354d06
 SHA512:
-  metadata.gz: b54485d848d063d80ad55b7444f900296db4cda09f2e4f250bdfa0ae80a4cdb5e43f158bb9879915a634a860402fca3344c05001fe12860e8a17210cb42934bf
-  data.tar.gz: a008371469187b544c0c7e045a78da41c6821e59bf7fee5c83c2ce0e47a4182267f834d8194cb1462eedd21d9d31054b5a173650f07cceea4094ff6d6bedf2a1
+  metadata.gz: d8e41a3b323913fc4a513d928bd192b6735bf7beb2b0c3dbb0b9c64fde3e46990e843ef86df279250446df68161555d8dde18c532f79208d2da162fc33619a5c
+  data.tar.gz: d1dec7fda7fc463ca23937d8e5c9fa23ef790e11d7222842a04dbef92a1ae04090dd0a079b45de6d8610b11e6d9c93d183a6a07048cba1f7deb576b5e9a768ba

data/README.md

@@ -4,7 +4,7 @@
 
 Rambo is a gem that generates API contract tests from API docs in [RAML](http://raml.org/). Rambo is being developed to test APIs complying with standard REST practices. Mileage may vary with other architectures, but I'm happy to consider pull requests.
 
-#### The current version of Rambo is 0.5.0. It is highly unstable and has a limited feature set. Use at your own risk and please file issue reports if they come up!
+#### The current version of Rambo is 0.6.0. It is highly unstable and has a limited feature set. Use at your own risk and please file issue reports if they come up!
 
 ## Usage
 You can install Rambo using:
@@ -14,7 +14,7 @@ gem install rambo_ruby
 You can also add it to your project's Gemfile:
 ```ruby
 group :development, :test do
-  gem 'rambo_ruby', '~> 0.5'
+  gem 'rambo_ruby', '~> 0.6'
 end
 ```
 There are three options for generating tests from Rambo: The command line tool, the rake task, and the Ruby API. In all cases, Rambo will look for a `.rambo.yml` file in the root directory of your project for configuration options. Options may also be passed in through the command line as arguments or the Ruby API as a hash. There is currently no option to pass arguments to the Rake task, but Rambo comes pre-loaded with sensible defaults, and the `.rambo.yml` file is always an option.
@@ -37,7 +37,7 @@ $ rambo foobar.raml
 Replace `foobar.raml` with the path of the actual RAML file from which you want to generate tests.
 
 #### Options
-By default, Rambo assumes you are testing a Rails app and generates tests using the Rails Rack::Test syntax. If you are testing a non-Rails Rack app, you can use the `--no-rails` switch to use the non-Rails syntax. Rambo does not currently support non-Rack-based frameworks.
+By default, Rambo assumes you are testing a Rails app and generates tests using syntax that will work for Rails apps. If you are testing a non-Rails app, you can use the `--framework` flag to indicate a `sinatra:classic`, `sinatra:modular`, or `grape` app. If you are using a different framework, please open an issue to let us know which, or submit a PR adding support for the framework you are using.
 
 If your app uses an API token header, you can also pass in the token to be used as an option using the `-T` or `--token` flag:
 ```
@@ -64,7 +64,7 @@ require "rambo"
 
 Rambo.generate_contract_tests!(File.expand_path("doc/foobar.raml"), {})
 ```
-You can pass any options in as a hash. Currently, the only supported option is `"rails"`, which can be set to `true` or `false`, with `true` being the default value. Set `"rails"` to `false` if your app is built with a different Rack-based framework. Currently, Non-Rack-based frameworks are not supported, but pull requests are welcome if your use case requires such support.
+You can pass any options in as a hash. Currently, the available options are `:framework` and `:token`. Valid values for the `:framework` option are `:grape`, `:"sinatra:classic"`, `:"sinatra:modular"`, and `:rails`, with `:rails` being the default. The `:token` option takes an API token as a string.
 
 ## The .rambo.yml File
 By default, Rambo will always check for a `.rambo.yml` file in the root directory of your projects and load options from there. If there is no `.rambo.yml` file, default values will be used (see below).
@@ -72,13 +72,14 @@ By default, Rambo will always check for a `.rambo.yml` file in the root director
 A sample `.rambo.yml` file could look like this:
 ```yaml
 raml: docs/contracts/foobar.raml
-rails: false
+framework: sinatra:modular
 token: foobarbaz
 ```
 The three possible keys are:
   - `raml` - specifies the RAML file to use to generate the tests. The default, relative
     to the root of your project directory, is `doc/raml/foobar.raml`, where `foobar.raml` is the first RAML file found in the `doc/raml` directory.
-  - `rails` - specifies whether your app is a Rails app. The default value is `true`.
+  - `framework` - specifies the framework you are using. The default value is `rails`; other available 
+    frameworks are `sinatra:classic`, `sinatra:modular`, and `grape`.
   - `token` - the API key or token to be included in the security headers. This value will be
     used for any header whose name matches either "token" or "key" (not case-sensitive).
 
@@ -90,15 +91,16 @@ In order to provide the best user experience to a majority of users, Rambo comes
 ### RAML File
 In the present version, Rambo only generates tests from a single RAML file. If you're using the command line tool, the name of this file is passed in as an argument. If you're not using the command line tool and don't specify by another means (Ruby hash, `.rambo.yml` file) which RAML file to use, Rambo will look in `your_project/doc/raml` and use the first RAML file it finds.
 
-As noted above, Rambo currently supports only Rack-based apps. Since Rails is the most popular Ruby framework, it assumes your app is a Rails app unless specified otherwise. Since Rack::Test syntax differs when testing Rails and non-Rails apps, you will need to tell Rambo if your app is not a Rails app using the `--no-rails` switch on the command line, the `{ rails: false }` option hash for the Ruby API, or specifying `rails: false` in your `.rambo.yml` file.
+As noted above, Rambo currently supports only Rails, Sinatra, and Grape apps. Since Rails is the most popular Ruby framework, it assumes your app is a Rails app unless specified otherwise. Since Rack::Test syntax differs when testing Rails and non-Rails apps, you will need to tell Rambo if your app is not a Rails app using the `--framework` flag on the command line, the `:framework` option for the Ruby API, or specifying `framework: <framework>` in your `.rambo.yml` file.
+
+## Using Rambo with Grape or Sinatra
+Rambo is able to generate tests for apps written in Rails, Grape, or Sinatra. However, it has one important limitation when working with non-Rails frameworks. Specifically, Rambo does not support multiple subclasses of `Sinatra::Base`, `Sinatra::Application`, or `Grape::API`. In order to identify the class of your app (which is required to configure Rack::Test), the Rambo-generated test configuration will use the first subclass of one of these classes that it finds. There is currently no option to override this behavior. (If you are building a classic Sinatra app instead of the modular type, `Sinatra::Application` will be used.)
 
 ## About the Project
 I started Rambo in March of 2016 as part of my work at [Renew Financial](http://renewfinancial.com). For this reason, our primary focus has been on adding the features and functionality that are most important for testing RF's back-end services. Since my contract with Renew Financial has ended, I now have more latitude to do with the project what I want, but also less time to do it.
 
 Rambo, therefore, considers RAML 1.0 and Rails 4 the default, and support for other frameworks and for RAML 0.8 is currently lower priority. We would be delighted to merge pull requests adding such support, as long as they don't adversely affect the features we need most.
 
-Although development of Rambo is largely supported by Renew Financial, we have every intention of keeping the tool open source and to continue expanding and updating its functionality.
-
 ## Contributing
 Rambo is a new project and any contributions are much appreciated. All pull requests should include comprehensive test coverage and, where appropriate, documentation. If you're not sure where to get started, contact me [through Github](https://github.com/danascheider) and I'll be glad to chat.
 

data/bin/rambo

@@ -14,9 +14,9 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: rambo [FILE] [OPTIONS]"
 
-  options[:rails] = true
-  opts.on("--no-rails", "Generate tests for a non-Rails API") do |v|
-    options[:rails] = false
+  options[:framework] = :rails
+  opts.on("--framework=FRAMEWORK", "Choose rails (default), sinatra:classic, sinatra:modular, or grape") do |v|
+    options[:framework] = v.to_sym
   end
   opts.on("--token=TOKEN", "-T=TOKEN", "Specify an API token") do |v|
     options[:token] = v

data/lib/rambo.rb

@@ -8,9 +8,9 @@ module Rambo
     attr_reader :options, :file
 
     def generate_contract_tests!(file: nil, options: {})
-      @options         = yaml_options.merge(options)
-      @options[:rails] = true unless @options.fetch(:rails, nil) == false
-      @file            = file || @options.delete(:raml) || raml_file
+      @options             = yaml_options.merge(options)
+      @options[:framework] = :rails if @options.fetch(:framework, nil).nil?
+      @file                = file || @options.delete(:raml) || raml_file
 
       DocumentGenerator.generate!(@file, @options)
     end
@@ -20,13 +20,15 @@ module Rambo
     def yaml_options
       opts = YAML.load(File.read(File.join(FileUtils.pwd, ".rambo.yml"))).symbolize_keys
 
+      opts[:framework] = opts[:framework].to_sym if opts[:framework]
+
       if opts && opts.fetch(:raml, nil)
         opts[:raml] = File.join(FileUtils.pwd, opts.fetch(:raml))
       end
 
       opts || {}
     rescue
-      { rails: true }
+      { framework: :rails }
     end
 
     # TODO: Permit use of multiple RAML files, since right now this only takes

data/lib/rambo/rspec/example_group.rb

@@ -8,7 +8,7 @@ module Rambo
 
       def initialize(resource, options={})
         @resource = resource
-        @options  = options || { rails: true }
+        @options  = options || { framework: :rails }
       end
 
       def template

data/lib/rambo/rspec/helper_file.rb

@@ -11,10 +11,19 @@ module Rambo
       def initialize(template_path:, file_path:, raml: nil, options: nil)
         @template_path = template_path
         @file_path     = file_path
-        @options       = options || { rails: true }
+        @options       = options || { framework: :rails }
         @raml          = raml ? Rambo::RamlModels::Api.new(raml) : nil
       end
 
+      def app_classes
+        {
+          :rails             => "Rails.application",
+          :"sinatra:classic" => "Sinatra::Application",
+          :"sinatra:modular" => "Sinatra::Base.descendants.find {|klass| klass != Sinatra::Application } || Sinatra::Application",
+          :grape             => "Grape::API.descendants.first"
+        }
+      end
+
       def generate
         write_to_file(render) unless file_already_exists?
       end

data/lib/rambo/rspec/templates/example_group_template.erb

@@ -1,4 +1,4 @@
-  describe "<%= @resource.to_s %>" do
+<% rails = @options.fetch(:framework, :rails) == :rails %>  describe "<%= @resource.to_s %>" do
     let(:route) { "<%= @resource.to_s %>" }
     <%- @resource.http_methods.each do |method| %>
     describe "<%= method.method.upcase %>" do
@@ -6,12 +6,13 @@
         {
         <%= headers.join(",\n        ") %>
         }
-      end<% end %><% if method.request_body %>
+      end<% end %>
+      <% if method.request_body %>
       let(:request_body) do
-        JSON.parse(
+        <% if rails %>JSON.parse(
           File.read("<%= "spec/support/examples/#{@resource.to_s.gsub("/", "")}_#{method.method}_request_body.json" %>"),
           symbolize_names: true
-        )
+        )<% else %>File.read("<%= "spec/support/examples/#{@resource.to_s.gsub("/", "")}_#{method.method}_request_body.json" %>")<% end %>
       end<% end %><% if has_schema = method.responses.first.bodies.first.schema %>
 
       let(:response_schema) do

data/lib/rambo/rspec/templates/rambo_helper_file_template.erb

@@ -1,15 +1,16 @@
-require "<%= @options.fetch(:rails, nil) ? "rails_helper" : "spec_helper" %>"
+require "<%= @options.fetch(:framework, nil).nil? || @options.fetch(:framework) == :rails ? "rails_helper" : "spec_helper" %>"
 require "rack/test"
 require_relative "./support/matchers/rambo_matchers"
 
-<% if options.fetch(:rails, nil) %>module ApiHelper
+module ApiHelper
   include Rack::Test::Methods
 
   def app
-    Rails.application
+    require "active_support/core_ext/class/subclasses"
+    <%= app_classes.fetch(@options.fetch(:framework, :rails)) %>
   end
 end
 
 RSpec.configure do |config|
   config.include ApiHelper, type: :rambo
-end<% end %>
+end

data/lib/version.rb

@@ -1,6 +1,6 @@
 module Rambo
   MAJOR = '0'
-  MINOR = '5'
+  MINOR = '6'
   PATCH = '0'
 
   def self.version

data/spec/lib/rambo/cli_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe Rambo::CLI do
   let(:io)         { StringIO.new }
   let(:stderr)     { StringIO.new }
-  let(:opts)       { { rails: true } }
+  let(:opts)       { { framework: :rails } }
   let(:valid_file) { File.join(SPEC_DIR_ROOT, 'support/foobar.raml',) }
 
   describe "run!" do

data/spec/lib/rambo/document_generator_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Rambo::DocumentGenerator do
   let(:valid_file) { File.join(SPEC_DIR_ROOT, "support/foobar.raml") }
-  let(:options)    { { rails: true } }
+  let(:options)    { { framework: :rails } }
   
   subject          { described_class.new(valid_file, options) }
 
@@ -65,7 +65,7 @@ RSpec.describe Rambo::DocumentGenerator do
           .with(hash_including(
             :template_path => File.join(RAMBO_ROOT, "rambo/rspec/templates/rambo_helper_file_template.erb"),
             :file_path     => "spec/rambo_helper.rb",
-            :options       => { rails: true }
+            :options       => { framework: :rails }
           ))
         expect_any_instance_of(Rambo::RSpec::HelperFile).to receive(:generate)
       end

data/spec/lib/rambo_spec.rb

@@ -2,13 +2,13 @@ RSpec.describe Rambo do
   let(:file_contents) do
     <<-EOF
 raml: doc/raml/foobar.raml
-rails: false
+framework: rails
     EOF
   end
 
   describe ".generate_contract_tests!" do
     let(:valid_file)      { "foobar.raml" }
-    let(:default_options) { { rails: true } }
+    let(:default_options) { { framework: :rails } }
 
     before(:each) do
       allow(Dir).to receive(:foreach).and_return("/Users/dscheider/rambo/doc/raml/#{valid_file}")
@@ -39,37 +39,57 @@ rails: false
       it "sets the RAML file to the one from the file" do
         expect(Rambo::DocumentGenerator)
           .to receive(:generate!)
-          .with(File.expand_path("doc/raml/foobar.raml"), { rails: false })
+          .with(File.expand_path("doc/raml/foobar.raml"), { framework: :rails })
 
         Rambo.generate_contract_tests!
       end
 
-      context "rails option set to false in file" do
-        it "sets rails option to false" do
-          allow(Rambo).to receive(:yaml_options).and_return({ rails: false })
+      context "framework set to sinatra:classic" do
+        it "sets framework to sinatra:classic" do
+          allow(Rambo).to receive(:yaml_options).and_return({ framework: :"sinatra:classic" })
           expect(Rambo::DocumentGenerator)
             .to receive(:generate!)
-            .with("/Users/dscheider/rambo/doc/raml/#{valid_file}", { rails: false })
+            .with("/Users/dscheider/rambo/doc/raml/#{valid_file}", { framework: :"sinatra:classic" })
           Rambo.generate_contract_tests!
         end
       end
 
-      context "rails option set to true in file" do
-        it "sets rails option to true" do
-          allow(Rambo).to receive(:yaml_options).and_return({ rails: true })
+      context "framework set to sinatra:modular" do 
+        it "sets framework to sinatra:modular" do 
+          allow(Rambo).to receive(:yaml_options).and_return({ framework: :"sinatra:modular" })
           expect(Rambo::DocumentGenerator)
             .to receive(:generate!)
-            .with("/Users/dscheider/rambo/doc/raml/#{valid_file}", { rails: true })
+            .with("/Users/dscheider/rambo/doc/raml/#{valid_file}", { framework: :"sinatra:modular" })
           Rambo.generate_contract_tests!
         end
       end
 
-      context "rails option not set in file" do
-        it "sets rails option to true" do
+      context "framework set to Grape" do 
+        it "sets framework to Grape" do 
+          allow(Rambo).to receive(:yaml_options).and_return({ framework: :grape })
+          expect(Rambo::DocumentGenerator)
+            .to receive(:generate!)
+            .with("/Users/dscheider/rambo/doc/raml/#{valid_file}", { framework: :grape })
+          Rambo.generate_contract_tests!
+        end
+      end
+
+      context "framework set to Rails" do
+        it "sets framework to Rails" do
+          allow(Rambo).to receive(:yaml_options).and_return({ framework: :rails })
+          expect(Rambo::DocumentGenerator)
+            .to receive(:generate!)
+            .with("/Users/dscheider/rambo/doc/raml/#{valid_file}", { framework: :rails })
+          Rambo.generate_contract_tests!
+        end
+      end
+
+      context "framework option not set in file" do
+        it "sets framework to Rails" do
           allow(Rambo).to receive(:yaml_options).and_return({})
           expect(Rambo::DocumentGenerator)
             .to receive(:generate!)
-            .with(File.expand_path("/Users/dscheider/rambo/doc/raml/#{valid_file}"), { rails: true })
+            .with(File.expand_path("/Users/dscheider/rambo/doc/raml/#{valid_file}"), { framework: :rails })
           Rambo.generate_contract_tests!
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rambo_ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -287,7 +287,7 @@ rubyforge_project:
 rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: rambo_ruby-0.5.0
+summary: rambo_ruby-0.6.0
 test_files:
 - features/create_files.feature
 - features/error_modes.feature