rest_shifter 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5c6f62b6e629086fcd6b7445d7c7e9c0d7977b
-  data.tar.gz: a2d921e1a9820b0846dc92a2cfba0579d5020c02
+  metadata.gz: 087d1c4826f3050b7a8fc6845425704d2d2d625d
+  data.tar.gz: e29bc423be8e0925d3086c7d226f274795d65ea1
 SHA512:
-  metadata.gz: c7fba39d5774aee26ac6efa5a8b3c1acd7ba0756b157bd07281f57d1757fef68b23dd1f8d977eb7d3f6a40a7898d23b2efa81184961a959dd5f130f3e3e8473b
-  data.tar.gz: 44c7b1a22ebec0a5660db1399061e9903ff9c53485726998f0972f664a2fec4dbc4dde00ac002a7ca45f00e797092b0cf11a09cbedf8dffc0f296a3caebf4208
+  metadata.gz: e373a1efda9dcf94839ff68cb5e5d72cfbf869edcc2b0616d9d3ecdb3715a305c0ac0f494060140ad871197167883abe54e4f14176182eb0b02246a6a28f50f7
+  data.tar.gz: 0f580e7a6c1b89239422235bb9e90cb617458923468e250f3f95b88ecb89630eadbe213135f638778a09876681897d258d7686b1dfa85f20f96b00ad2f4ce5b6

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 rvm:
+  - 1.9.3
+  - 2.0.0
   - 2.1.0
+  - 2.2.0
 env: 
   - RACK_ENV=test

data/CHANGES

@@ -1,4 +1,12 @@
 
+** 0.0.13
+ - Feature
+   -- Adding support to DELETE and PUT http methods
+
+** 0.0.12
+ - Code improvement 
+   -- Just removing code ;)
+
 ** 0.0.11
  - Feature
    -- Now it is possible to start a service with https

data/README.md

@@ -2,6 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/rest_shifter.png)](https://rubygems.org/gems/rest_shifter)
 [![Build Status](https://secure.travis-ci.org/camiloribeiro/RestShifter.png)](http://travis-ci.org/camiloribeiro/RestShifter)
+[![Code Climate](https://codeclimate.com/github/camiloribeiro/RestShifter/badges/gpa.svg)](https://codeclimate.com/github/camiloribeiro/RestShifter)
+[![Test Coverage](https://codeclimate.com/github/camiloribeiro/RestShifter/badges/coverage.svg)](https://codeclimate.com/github/camiloribeiro/RestShifter)
 [![endorse](https://api.coderwall.com/camiloribeiro/endorsecount.png)](https://coderwall.com/camiloribeiro)
 
 

data/Rakefile

@@ -1,9 +1,6 @@
 require 'rspec/core/rake_task'
-require 'coveralls/rake/task'
 
-Coveralls::RakeTask.new
-
-task :default => [:spec, 'coveralls:push']
+task :default => [:spec]
 
 RSpec::Core::RakeTask .new(:spec) do |task|
     task.rspec_opts = ["--format documentation"]

data/lib/rest_shifter/shifter.rb

@@ -1,23 +1,18 @@
 require 'sinatra/base'
 require 'icecream'
 require 'rack/ssl'
+require 'webrick/https'
 
 module RestShifter; end
 
 class Shifter < Sinatra::Base
 
   def self.run_ssl! crt, key
-    require 'webrick/https'
-
-    port = 4433 
-    certificate_content = File.open(crt).read
-    key_content = File.open(key).read
-
     server_options = {
-      :Port => port,
+      :Port => 4433,
       :SSLEnable => true,
-      :SSLCertificate => OpenSSL::X509::Certificate.new(certificate_content),
-      :SSLPrivateKey => OpenSSL::PKey::RSA.new(key_content),
+      :SSLCertificate => OpenSSL::X509::Certificate.new(File.open(crt).read),
+      :SSLPrivateKey => OpenSSL::PKey::RSA.new(File.open(key).read),
       :SSLVerifyClient    => OpenSSL::SSL::VERIFY_NONE
     }
 
@@ -26,9 +21,6 @@ class Shifter < Sinatra::Base
       server.threaded = settings.threaded if server.respond_to? :threaded=
         set :running, true
     end
-    set :ssl, true
-    set :port, 4433
-    run!
   end
 
   shapes = IceCream::IceCream.new File.dirname("#{Dir.home}/.rest_shifter/flavors/*")
@@ -41,47 +33,24 @@ class Shifter < Sinatra::Base
     services << shapes.flavor(shape.to_s.gsub!("@", "").to_sym)
   end
 
-  gets = services.select { |service| service.method_used == "get"  }
-  gets_paths = gets.map { |service| service.path  }.uniq
-
-  posts = services.select { |service| service.method_used == "post"  }
-  posts_paths = gets.map { |service| service.path  }.uniq
-
-  gets.each do |service|
-    if service.request_accept.to_s == ''
-      get service.path do
-        sleep service.response_sleep
-        status service.response_status
-        content_type service.response_content_type
-        service.response_body
-      end
-    else 
-      get service.path, :provides => service.request_accept.to_s == '' ? "" : service.request_accept do
-        sleep service.response_sleep
-        status service.response_status
-        content_type service.response_content_type
-        service.response_body
-      end
-    end
-  end
-
-  posts.each do |service|
-    if service.request_accept.to_s == ''
-      post service.path do
-        sleep service.response_sleep
-        status service.response_status
-        content_type service.response_content_type
-        service.response_body
-      end
-    else 
-      post service.path, :provides => service.request_accept.to_s == '' ? "" : service.request_accept do
-        sleep service.response_sleep
-        status service.response_status
-        content_type service.response_content_type
-        service.response_body
+  def self.build_services operation 
+    operation.each do |service|
+      if service.request_accept.to_s == ''
+        send(service.method_used.to_sym, service.path) do
+          sleep service.response_sleep
+          status service.response_status
+          content_type service.response_content_type
+          service.response_body
+        end
+      else 
+        send(service.method_used.to_sym, service.path, :provides => service.request_accept.to_s == '' ? "" : service.request_accept) do
+          sleep service.response_sleep
+          status service.response_status
+          content_type service.response_content_type
+          service.response_body
+        end
       end
     end
   end
-
-
+  build_services services
 end

data/lib/rest_shifter/version.rb

@@ -1,3 +1,3 @@
 module RestShifter 
-    VERSION = "0.0.11"
+    VERSION = "0.0.13"
 end

data/rest_shifter.gemspec

@@ -21,13 +21,12 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'codeclimate-test-reporter'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rest-client'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'coveralls'
   s.add_development_dependency 'nyan-cat-formatter'
   s.add_development_dependency 'rack-test'
 

data/spec/flavors/notfound_post.flavor

@@ -1,8 +1,8 @@
 method_used                 = "post"
 path                        = "/notfound"
-request_accept              = ""
-request_content_type        = ""
+request_accept              = "text/plain"
+request_content_type        = "" 
 response_sleep              =  0
-response_status             = "404"
-response_body               = "Not Found"
-response_content_type       = "application/foo.company.product.type-version+json"
+response_status             = "201"
+response_body               = "This is just a text"
+response_content_type       = "text/plain"

data/spec/flavors/notfound_post_accept.flavor

@@ -0,0 +1,8 @@
+method_used                 = "post"
+path                        = "/notfound"
+request_accept              = "application/json"
+request_content_type        = ""
+response_sleep              =  0
+response_status             = "200"
+response_body               = "Found"
+response_content_type       = "application/json"

data/spec/flavors/sleep_post.flavor

@@ -0,0 +1,8 @@
+method_used                 = "post"
+path                        = "/sleep"
+request_accept              = ""
+request_content_type        = ""
+response_sleep              =  1
+response_status             = "200"
+response_body               = "This should sleep for one second"
+response_content_type       = "application/json"

data/spec/flavors/success_delete.flavor

@@ -0,0 +1,8 @@
+method_used                 = "delete"
+path                        = "/ok"
+request_accept              = ""
+request_content_type        = ""
+response_sleep              =  0
+response_status             = "200"
+response_body               = "delete success"
+response_content_type       = "application/json"

data/spec/flavors/success_put.flavor

@@ -0,0 +1,8 @@
+method_used                 = "put"
+path                        = "/ok"
+request_accept              = ""
+request_content_type        = ""
+response_sleep              =  0
+response_status             = "200"
+response_body               = "put success"
+response_content_type       = "application/json"

data/spec/service_spec.rb

@@ -9,14 +9,14 @@ describe RestShifter do
 
   describe Shifter do
     describe "Get Operations" do
-      it "Endpoint for get" do
+      it "GET: Endpoint for get" do
         get '/ok'
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq("success")
         expect(last_response.headers['Content-Type']).to eq("application/json")
       end
 
-      it "Known bug: Return 400 when has no endpoint with specified accept" do
+      it "GET: Known bug: Return 400 when has no endpoint with specified accept" do
         header 'Accept', 'application/xml'
         get '/notfound'
         expect(last_response.status).to eq(404)
@@ -24,7 +24,7 @@ describe RestShifter do
         expect(last_response.headers['Content-Type']).to eq("text/html;charset=utf-8")
       end
 
-      it "Should choose right endpoint based on accept header - text" do
+      it "GET: Should choose right endpoint based on accept header - text" do
         header 'Accept', 'text/plain'
         get '/notfound'
         expect(last_response.status).to eq(201)
@@ -32,7 +32,7 @@ describe RestShifter do
         expect(last_response.headers['Content-Type']).to eq("text/plain;charset=utf-8")
       end
 
-      it "Should choose right endpoint based on accept header - json" do
+      it "GET: Should choose right endpoint based on accept header - json" do
         header 'Accept', 'application/json'
         get '/notfound'
         expect(last_response.status).to eq(200)
@@ -42,23 +42,56 @@ describe RestShifter do
 
     end
     describe "Post operations" do
-      it "Endpoint for post" do
+      it "POST: Endpoint for post" do
         post '/ok'
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq("success")
         expect(last_response.headers['Content-Type']).to eq("application/json")
       end
 
-      it "Common endpoint with get should behave like post when using post" do
+      it "POST: Known bug: Return 400 when has no endpoint with specified accept" do
+        header 'Accept', 'application/xml'
         post '/notfound'
         expect(last_response.status).to eq(404)
-        expect(last_response.body).to eq("Not Found")
-        expect(last_response.headers['Content-Type']).to eq("application/foo.company.product.type-version+json")
+        expect(last_response.body).to eq("<h1>Not Found</h1>")
+        expect(last_response.headers['Content-Type']).to eq("text/html;charset=utf-8")
+      end
+
+      it "POST: Should choose right endpoint based on accept header - text" do
+        header 'Accept', 'text/plain'
+        post '/notfound'
+        expect(last_response.status).to eq(201)
+        expect(last_response.body).to eq("This is just a text")
+        expect(last_response.headers['Content-Type']).to eq("text/plain;charset=utf-8")
       end
 
+      it "POST: Should choose right endpoint based on accept header - json" do
+        header 'Accept', 'application/json'
+        post '/notfound'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("Found")
+        expect(last_response.headers['Content-Type']).to eq("application/json")
+      end
+
+    end
+    describe "Put Operations" do
+      it "PUT: Endpoint for put" do
+        put '/ok'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("put success")
+        expect(last_response.headers['Content-Type']).to eq("application/json")
+      end
+    end
+    describe "Delete Operations" do
+      it "DELETE: Endpoint for delete" do
+        delete '/ok'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("delete success")
+        expect(last_response.headers['Content-Type']).to eq("application/json")
+      end
     end
     describe "Special behaviours" do
-      it "Service should sleep for a second" do
+      it "GET: Service should sleep for a second" do
         time = Time.now
         get '/sleep'
         expect(Time.now - time).to be > 1
@@ -66,6 +99,14 @@ describe RestShifter do
         expect(last_response.body).to eq("This should sleep for one second")
         expect(last_response.headers['Content-Type']).to eq("application/json")
       end
+      it "POST: Service should sleep for a second" do
+        time = Time.now
+        post '/sleep'
+        expect(Time.now - time).to be > 1
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq("This should sleep for one second")
+        expect(last_response.headers['Content-Type']).to eq("application/json")
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,12 @@
 require 'rspec'
-require 'coveralls'
 require 'rest_client'
 require 'rack/test'
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
 require File.join(File.dirname(__FILE__), '../lib/rest_shifter/shifter.rb')
 ENV['RACK_ENV'] = 'test'
 
-Coveralls.wear_merged!
-
 module RSpecMixin
   include Rack::Test::Methods
   def app() Sinatra::Application end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_shifter
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Camilo Ribeiro
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -94,20 +94,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nyan-cat-formatter
   requirement: !ruby/object:Gem::Requirement
@@ -210,9 +196,13 @@ files:
 - spec/flavors/notfound_get.flavor
 - spec/flavors/notfound_get_accept.flavor
 - spec/flavors/notfound_post.flavor
+- spec/flavors/notfound_post_accept.flavor
 - spec/flavors/sleep_get.flavor
+- spec/flavors/sleep_post.flavor
+- spec/flavors/success_delete.flavor
 - spec/flavors/success_get.flavor
 - spec/flavors/success_post.flavor
+- spec/flavors/success_put.flavor
 - spec/service_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/camiloribeiro/RestShifter
@@ -243,8 +233,12 @@ test_files:
 - spec/flavors/notfound_get.flavor
 - spec/flavors/notfound_get_accept.flavor
 - spec/flavors/notfound_post.flavor
+- spec/flavors/notfound_post_accept.flavor
 - spec/flavors/sleep_get.flavor
+- spec/flavors/sleep_post.flavor
+- spec/flavors/success_delete.flavor
 - spec/flavors/success_get.flavor
 - spec/flavors/success_post.flavor
+- spec/flavors/success_put.flavor
 - spec/service_spec.rb
 - spec/spec_helper.rb