validic 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c02e1157a3b249037c74bdf481f101df6b456a
-  data.tar.gz: e94207ea46f138ef36ba412bdf11ae4f888f269a
+  metadata.gz: 745339ec8c3810a9ddd01ec1ca50a23d9f4fea61
+  data.tar.gz: 153c7119593ea8eb978b1f44a47a9b687d40fc7b
 SHA512:
-  metadata.gz: 23eba8028225aef63c4d460473dd61f32263de091f3f30b1207659a06bed7a51ef4b39087174d5c6d9e7c5dc3c2348ce0813d74eecd3a4aafca873704b54f534
-  data.tar.gz: f3c4506683851d89b4c6dac206af7eb399b128566893ce9b580a193bc0db8420003abdc6aa32adbc6744ca7495fc962c31501b4eca888dc3e8fbd10f22685d0e
+  metadata.gz: 6c434af9057e82f0ee62c4cd55e8f9fa4f7253fa8adfe01c5e619af6dfd9f665808767bf0fc2b0a4ccfa889c6e6eddddf7169d08fc71a40dc5ebb99ca3cad7a7
+  data.tar.gz: 7bf576f8089d439396fae428c8d69a4e1b9240aeee6647608f840f845a7ddf2fef0e3d0b849cc135a195a0509bebaf6a2d79c6c011f4ceccab84a4becce3d7b6

data/lib/validic.rb

@@ -16,5 +16,13 @@ module Validic
       yield self
       true
     end
+
+    def api_url
+      @api_url ||= "https://api.validic.com"
+    end
+
+    def api_version
+      @api_version ||= "v1"
+    end
   end
 end

data/lib/validic/client.rb

@@ -44,8 +44,8 @@ module Validic
     #
     # @params options[Hash]
     def initialize(options={})
-      @api_url          = options.fetch(:api_url, 'https://api.validic.com')
-      @api_version      = options.fetch(:api_version, 'v1')
+      @api_url          = options.fetch(:api_url, Validic.api_url)
+      @api_version      = options.fetch(:api_version, Validic.api_version)
       @access_token     = options.fetch(:access_token, Validic.access_token)
       @organization_id  = options.fetch(:organization_id, Validic.organization_id)
       reload_config

data/lib/validic/rest/request.rb

@@ -8,9 +8,9 @@ module Validic
         organization_id = options[:organization_id] || Validic.organization_id
         user_id = options.delete(:user_id)
         if user_id
-          path = "/#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}/latest.json"
+          path = "#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}/latest.json"
         else
-          path = "/#{Validic.api_version}/organizations/#{organization_id}/#{type.to_s}/latest.json"
+          path = "#{Validic.api_version}/organizations/#{organization_id}/#{type.to_s}/latest.json"
         end
         get(path, options)
       end
@@ -42,19 +42,19 @@ module Validic
         user_id = options.delete(:user_id)
         activity_id = options.delete(:_id)
         if activity_id
-          path = "/#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}/#{activity_id}.json"
+          path = "#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}/#{activity_id}.json"
         elsif user_id && type == :users
-          path = "/#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}.json"
+          path = "#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}.json"
         elsif user_id
-          path = "/#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}.json"
+          path = "#{Validic.api_version}/organizations/#{organization_id}/users/#{user_id}/#{type.to_s}.json"
         elsif type == :me
-          path = "/#{Validic.api_version}/me.json"
+          path = "#{Validic.api_version}/me.json"
         elsif type == :profile
-          path = "/#{Validic.api_version}/profile.json"
+          path = "#{Validic.api_version}/profile.json"
         elsif type == :organizations
-          path = "/#{Validic.api_version}/organizations/#{organization_id}.json"
+          path = "#{Validic.api_version}/organizations/#{organization_id}.json"
         else
-          path = "/#{Validic.api_version}/organizations/#{organization_id}/#{type.to_s}.json"
+          path = "#{Validic.api_version}/organizations/#{organization_id}/#{type.to_s}.json"
         end
         path
       end

data/lib/validic/version.rb

@@ -1,3 +1,3 @@
 module Validic
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/spec/validic/client_spec.rb

@@ -20,6 +20,18 @@ describe Validic::Client do
       expect(client.organization_id).to eq 1
     end
 
+    it 'overrides default url and api_key' do
+      Validic.configure do |config|
+        config.api_url = 'http://test.example.com'
+        config.api_version = 'v2'
+      end
+
+      client = Validic::Client.new
+
+      expect(client.api_url).to eq 'http://test.example.com'
+      expect(client.api_version).to eq 'v2'
+    end
+
     it 'uses options' do
       opts = {
                 api_url: 'http://test.example.com',
@@ -35,6 +47,13 @@ describe Validic::Client do
       expect(client.access_token).to eq 'abcd'
       expect(client.organization_id).to eq 2
     end
+
+    it 'options uses defaults' do
+      client = Validic::Client.new({})
+
+      expect(client.api_url).to eq 'https://api.validic.com'
+      expect(client.api_version).to eq 'v1'
+    end
   end
 
   describe '#connection' do

data/spec/validic/rest/weight_spec.rb

@@ -59,12 +59,15 @@ describe Validic::REST::Weight do
      expect(@weight).to be_a Validic::Weight
     end
     it 'builds the correct url' do
-      pending
       expect(a_post('/organizations/1/users/1/weight.json')
-          .with(body: { weight: { timestamp: '2013-03-10T07:12:16+00:00',
-      utf_offset: '+00:00', weight: 177,
-      height: 34, data_id: '12345'},
-      access_token: '1' })).to have_been_made
+        .with(body: {
+              weight: {
+                timestamp: '2013-03-10T07:12:16+00:00',
+                utc_offset: '+00:00', weight: 177,
+                height: 34, data_id: '12345'
+              },
+              access_token: '1' }
+             )).to have_been_made
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Validic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware