Merge pull request #576 from wing328/ruby_petstore_test

Fix Ruby rspec

Author: fehguy

modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache

@@ -9,10 +9,10 @@ module Swagger
     def initialize
       @format = 'json'
       @scheme = 'http'
-      @host = 'api.wordnik.com'
-      @base_path = '/v4'
+      @host = 'petstore.swagger.io'
+      @base_path = '/v2'
       @user_agent = "ruby-swagger-#{Swagger::VERSION}"
-      @inject_format = true
+      @inject_format = false
       @force_ending_format = false
       @camelize_params = true
     end

modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache

@@ -157,8 +157,9 @@ module Swagger
     end
 
     def make
-      logger = Logger.new STDOUT
-      logger.debug self.url
+      #TODO use configuration setting to determine if debugging
+      #logger = Logger.new STDOUT
+      #logger.debug self.url
       response = case self.http_method.to_sym
       when :get,:GET
         Typhoeus::Request.get(

samples/client/petstore/ruby/Gemfile.lock

@@ -9,35 +9,43 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.7.0)
-    addressable (2.2.8)
+    ZenTest (4.11.0)
+    addressable (2.3.8)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    autotest-fsevent (0.2.8)
+    autotest-fsevent (0.2.10)
       sys-uname
     autotest-growl (0.2.16)
     autotest-rails-pure (4.1.2)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    json (1.7.0)
-    mime-types (1.18)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sys-uname (0.9.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    ethon (0.7.3)
+      ffi (>= 1.3.0)
+    ffi (1.9.8)
+    json (1.8.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    safe_yaml (1.0.4)
+    sys-uname (0.9.2)
       ffi (>= 1.0.0)
-    typhoeus (0.3.3)
-      mime-types
-    vcr (2.1.1)
-    webmock (1.8.6)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+    typhoeus (0.7.1)
+      ethon (>= 0.7.1)
+    vcr (2.9.3)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby

samples/client/petstore/ruby/lib/swagger/configuration.rb

@@ -9,10 +9,10 @@ class Configuration
     def initialize
       @format = 'json'
       @scheme = 'http'
-      @host = 'api.wordnik.com'
-      @base_path = '/v4'
+      @host = 'petstore.swagger.io'
+      @base_path = '/v2'
       @user_agent = "ruby-swagger-#{Swagger::VERSION}"
-      @inject_format = true
+      @inject_format = false
       @force_ending_format = false
       @camelize_params = true
     end

samples/client/petstore/ruby/lib/swagger/request.rb

@@ -157,8 +157,9 @@ def query_string
     end
 
     def make
-      logger = Logger.new STDOUT
-      logger.debug self.url
+      #TODO use configuration setting to determine if debugging
+      #logger = Logger.new STDOUT
+      #logger.debug self.url
       response = case self.http_method.to_sym
       when :get,:GET
         Typhoeus::Request.get(

samples/client/petstore/ruby/models/pet.rb

@@ -17,7 +17,6 @@ def self.attribute_map
   def initialize(attributes = {})
     return if attributes.empty?
     # Morph attribute keys into undescored rubyish style
-    
     if self.class.attribute_map[:"id"]
       @id = attributes["id"]
     end

samples/client/petstore/ruby/spec/pet_spec.rb

@@ -4,30 +4,30 @@
   before do
 	  Swagger.configure do |config|
 	    config.api_key = 'special-key' 
-	    config.host = 'petstore.swagger.wordnik.com'
-	    config.base_path = '/api'
+	    config.host = 'petstore.swagger.io'
+	    config.base_path = '/v2'
 	  end
   end
 
   describe "pet methods" do
     it "should fetch a pet object" do
-      pet = Pet_api.get_pet_by_id(1)
-      pet.id.should == 1
-      pet.name.should == "Cat 1"
+      pet = PetApi.getPetById(5)
+      pet.id.should == 5
+      pet.name.should == "Dog 2"
     end
 
     it "should find pets by status" do
-      pets = Pet_api.find_pets_by_status('available')
+      pets = PetApi.findPetsByStatus('available')
       pets.length.should >= 3
     end
 
     it "should not find a pet with invalid status" do
-      pets = Pet_api.find_pets_by_status('dead')
+      pets = PetApi.findPetsByStatus('dead')
       pets.length.should == 0
     end
 
 	  it "should find a pet by status" do
-	    pets = Pet_api.find_pets_by_status("available,sold")
+	    pets = PetApi.findPetsByStatus("available,sold")
 	    pets.map {|pet| 
 	      if(pet.status != 'available' && pet.status != 'sold') 
 	        raise "pet status wasn't right"
@@ -36,19 +36,19 @@
 	  end
 
 	  it "should update a pet" do
-	    pet = Pet.new({:id => 99, :name => 'programmer', :status => 'coding'})
-	    Pet_api.add_pet(pet)
+	    pet = Pet.new({'id' => 99, 'name' => 'programmer', 'status' => 'coding'})
+	    PetApi.addPet(pet)
 
-	    fetched = Pet_api.get_pet_by_id(99)
+	    fetched = PetApi.getPetById(99)
 	    fetched.id.should == 99
 	  end
 
     it "should create a pet" do 
-      pet = Pet.new({:id => 100, :name => "Gorilla"})
-      raise pet.inspect
-      Pet_api.add_pet(pet)
+      pet = Pet.new('id' => 100, 'name' => "Gorilla")
+      #raise pet.inspect
+      PetApi.addPet(pet)
 
-      pet = Pet_api.get_pet_by_id(100)
+      pet = PetApi.getPetById(100)
       pet.id.should == 100
     end
   end
@@ -58,13 +58,13 @@
   before do
 	  Swagger.configure do |config|
 	    config.api_key = 'special-key' 
-	    config.host = 'petstore.swagger.wordnik.com'
-	    config.base_path = '/api'
+	    config.host = 'petstore.swagger.io'
+	    config.base_path = '/v2'
 	  end
   end
 
   it "should fetch an order" do
-    item = Store_api.get_order_by_id(1)
-    item.id.should == 1
+    item = StoreApi.getOrderById(2)
+    item.id.should == 2
   end
-end
+end

samples/client/petstore/ruby/spec/request_spec.rb

@@ -2,9 +2,16 @@
 
 describe Swagger::Request do
 
-  before(:each) do
+  before(:each) do 
+    Swagger.configure do |config|
+      inject_format = true
+      config.api_key = 'special-key'
+      config.host = 'petstore.swagger.io'
+      config.base_path = '/v2'
+    end
+
     @default_http_method = :get
-    @default_path = "pet/fancy"
+    @default_path = "pet.{format}/fancy"
     @default_params = {
       :params => {:foo => "1", :bar => "2"}
     }
@@ -44,7 +51,7 @@
     end
 
     it "constructs a full url" do
-      @request.url.should == "http://petstore.swagger.wordnik.com/api/pet.json/fancy?bar=2&foo=1"
+      @request.url.should == "http://petstore.swagger.io/v2/pet.json/fancy?bar=2&foo=1"
     end
 
   end
@@ -66,13 +73,13 @@
   describe "path" do
 
     it "accounts for a total absence of format in the path string" do
-      @request = Swagger::Request.new(:get, "/word/{word}/entries", @default_params.merge({
+      @request = Swagger::Request.new(:get, "/word.{format}/{word}/entries", @default_params.merge({
         :format => "xml",
         :params => {
           :word => "cat"
         }
       }))
-      @request.url.should == "http://petstore.swagger.wordnik.com/api/word.xml/cat/entries"
+      @request.url.should == "http://petstore.swagger.io/v2/word.xml/cat/entries"
     end
 
     it "does string substitution on path params" do
@@ -82,7 +89,7 @@
           :word => "cat"
         }
       }))
-      @request.url.should == "http://petstore.swagger.wordnik.com/api/word.xml/cat/entries"
+      @request.url.should == "http://petstore.swagger.io/v2/word.xml/cat/entries"
     end
 
     it "leaves path-bound params out of the query string" do
@@ -193,4 +200,4 @@
 
   end
 
-end
+end

samples/client/petstore/ruby/spec/response_spec.rb

@@ -5,7 +5,7 @@
   before(:each) do
 
     VCR.use_cassette('pet_resource', :record => :new_episodes) do
-      @raw = Typhoeus::Request.get("http://petstore.swagger.wordnik.com/api/pet.json")
+      @raw = Typhoeus::Request.get("http://petstore.swagger.io/v2/pet/5")
     end
 
     @response = Swagger::Response.new(@raw)
@@ -14,7 +14,7 @@
   describe "initialization" do
     it "sets body" do
       @response.body.class.should == Hash
-      @response.body.has_key?('apis').should == true
+      @response.body.has_key?('name').should == true
     end
 
     it "sets code" do
@@ -35,7 +35,8 @@
 
     it "recognizes xml" do
       VCR.use_cassette('xml_response_request', :record => :new_episodes) do
-        @raw = Typhoeus::Request.get("http://petstore.swagger.wordnik.com/api/pet.xml")
+        @raw = Typhoeus::Request.get("http://petstore.swagger.io/v2/pet/5",
+                                    :headers => {'Accept'=> "application/xml"})
       end
       @response = Swagger::Response.new(@raw)
       @response.format.should == 'xml'
@@ -56,4 +57,4 @@
 
   end
 
-end
+end

samples/client/petstore/ruby/spec/spec_helper.rb

@@ -14,8 +14,15 @@
 
 RSpec.configure do |config|
   # some (optional) config here
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = :should
+  end
 end
 
+
 WebMock.allow_net_connect! if defined? WebMock
 
 def help