watir_api 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00da5b6321bda48b3657842314ed6de70ff47950
-  data.tar.gz: b7286ae2ee5779433b2b7364cecc181053e3b14a
+  metadata.gz: fb25e51df99ac53a5b6b1dcc2f9be372bb96332d
+  data.tar.gz: f61459b4cccb2601e10f0d69c58d6d6ec301f72e
 SHA512:
-  metadata.gz: '08d1724faed27a8122db5bf2b1268897373fecb437480c77fb40fa3497ce8241b6c07f0c2afcdc296551bd8a94ef8911e6ca29638289213ee22e78cd7398ba05'
-  data.tar.gz: c4553e0c0864f6d4bf10b257df294ca6740d82f1cdd26e2d8402e66d1cc710c3c995807e5f29f1cf3c24eb17d010d6d46ff9fc6b53bd0a1b1e61405da8284e4a
+  metadata.gz: 0ede385d5cd5d0d0e903ae9395cfc82a847798f1cc14656f0bc59dac97cd3957c5a746b8d3d6249ddb8022c8337b087b24a9b530fa2dc028bdc24bb0465bcf7b
+  data.tar.gz: c296a167491f4fa69b12bc8cd7daf2de7caa22b61b710ae3e8fddff567c926f0eacc9847f9e0e33a8235003ebb95d99ebbce90d9869cd2ea41489f214488d8c4

data/lib/watir_api.rb

@@ -6,23 +6,31 @@ module WatirApi
     class << self
 
       def index(opt = {})
-        new rest_call(:get, route, opt)
+        new rest_call({method: :get,
+                      url: route}.merge opt)
       end
 
       def show(id:, **opt)
-        new rest_call(:get, "#{route}/#{id}", opt)
+        new rest_call({method: :get,
+                      url: "#{route}/#{id}"}.merge opt)
       end
 
       def create(obj = nil)
-        new rest_call(:post, route, generate_payload(obj), content_type: :json)
+        new rest_call(method: :post,
+                      url: route,
+                      payload: generate_payload(obj),
+                      headers: headers)
       end
 
       def destroy(id:, **opt)
-        new rest_call(:delete, "#{route}/#{id}", opt)
+        new rest_call({method: :delete,
+                      url: "#{route}/#{id}"}.merge opt)
       end
 
       def update(id:, with:, **opt)
-        new rest_call(:put, "#{route}/#{id}", generate_payload(with), opt)
+        new rest_call({method: :put,
+                      url: "#{route}/#{id}",
+                      payload: generate_payload(with)}.merge opt)
       end
 
       def base_url=(base_url)
@@ -47,10 +55,10 @@ module WatirApi
 
       private
 
-      def rest_call(method, *args)
-        RestClient.send(method, *args)
-      rescue => e
-        e.response
+      def rest_call(opt)
+        RestClient::Request.execute(opt) do |response, request, result|
+          [response, request, result]
+        end
       end
 
       def generate_payload(obj)
@@ -65,13 +73,19 @@ module WatirApi
           obj.to_json
         end
       end
+
+      def headers
+        {content_type: :json}
+      end
     end
 
     attr_reader :data, :code, :response
 
-    def initialize(response)
+    def initialize(args)
+      response, request, _result = *args
       @response = response
       @code = response.code
+      @header = request.instance_variable_get('@header')
       @data = JSON.parse(response.body, symbolize_names: true) rescue nil
       @data = (convert_to_model(@data) || @data) unless @data.nil? || !(defined? model_object.new)
     end

data/watir_api.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watir_api"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 
@@ -26,7 +26,7 @@ compare test data with what is input and displayed via UI.}
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "faker"
-  spec.add_runtime_dependency "watir_model", "~> 0.4.6"
+  spec.add_runtime_dependency "watir_model", "~> 0.5.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement