watir_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb25e51df99ac53a5b6b1dcc2f9be372bb96332d
-  data.tar.gz: f61459b4cccb2601e10f0d69c58d6d6ec301f72e
+  metadata.gz: 0bd5fa8ac2cf09b66985111647ddcab4cc178fbd
+  data.tar.gz: 0b0245d742a805fd30c29472715035454589180e
 SHA512:
-  metadata.gz: 0ede385d5cd5d0d0e903ae9395cfc82a847798f1cc14656f0bc59dac97cd3957c5a746b8d3d6249ddb8022c8337b087b24a9b530fa2dc028bdc24bb0465bcf7b
-  data.tar.gz: c296a167491f4fa69b12bc8cd7daf2de7caa22b61b710ae3e8fddff567c926f0eacc9847f9e0e33a8235003ebb95d99ebbce90d9869cd2ea41489f214488d8c4
+  metadata.gz: 516e6b75070acbe7e4db73b0398e75b111ceb4f2952237688d1b72d26256d1592c90f9c8c5077b0086a173d67bc18df2e91e04f80439b5b86413ca6ce2112d6f
+  data.tar.gz: e783068c1804287a634dd6bfeae7f6400f4382fd41a8e5faf8ea5aca95fd53ef8a79ace7bcfcecbcdb1cc265954179f724d76f66a5a9991b66967e007d85410d

data/lib/watir_api.rb

@@ -12,7 +12,7 @@ module WatirApi
 
       def show(id:, **opt)
         new rest_call({method: :get,
-                      url: "#{route}/#{id}"}.merge opt)
+                      url: "#{route}/#{id}".chomp('/')}.merge opt)
       end
 
       def create(obj = nil)
@@ -24,12 +24,12 @@ module WatirApi
 
       def destroy(id:, **opt)
         new rest_call({method: :delete,
-                      url: "#{route}/#{id}"}.merge opt)
+                      url: "#{route}/#{id}".chomp('/')}.merge opt)
       end
 
       def update(id:, with:, **opt)
         new rest_call({method: :put,
-                      url: "#{route}/#{id}",
+                      url: "#{route}/#{id}".chomp('/'),
                       payload: generate_payload(with)}.merge opt)
       end
 
@@ -41,8 +41,8 @@ module WatirApi
         @@base_url || ''
       end
 
-      def route
-        "#{base_url}/#{endpoint}"
+      def route(opt = {})
+        "#{opt[:base_url] || base_url}/#{opt.delete(:endpoint) || endpoint}"
       end
 
       def endpoint
@@ -56,6 +56,8 @@ module WatirApi
       private
 
       def rest_call(opt)
+        opt[:verify_ssl] = opt.delete(:ssl) if opt.key?(:ssl)
+        opt[:headers] = opt.delete(:headers) || headers
         RestClient::Request.execute(opt) do |response, request, result|
           [response, request, result]
         end
@@ -92,7 +94,12 @@ module WatirApi
 
     def convert_to_model(data)
       if data.is_a? Hash
-        (model_object.keys & data.keys).empty? ? return : model_object.convert(data)
+        return if (model_object.valid_keys & data.keys).empty?
+        begin
+          model_object.convert(data)
+        rescue StandardError => ex
+          raise unless ex.message.include?('Can not convert Hash to Model')
+        end
       elsif data.is_a? Array
         data.map do |hash|
           model = convert_to_model(hash)

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.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Titus Fortner