percy-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fe4c59629946c8db83a08b32bcd1f6d284dcb9
-  data.tar.gz: 1b0788495c7a59eac1d6c7fa0b38c44509ce3760
+  metadata.gz: ac390ac562cecfd4bf1d32a46d95e9ec544f7eb3
+  data.tar.gz: 14920f3b71e0038f51dd6bb10c30af279e5631e6
 SHA512:
-  metadata.gz: 58705c360df0b083edbdf5b4cb63307c06226c08a7648c944cfce7da4a983b2378f22d0e9a684b90f5355e213ef3ab169bd797a063048cb1ec65861955213fe1
-  data.tar.gz: 66945b217e5b81e4a10d224ac2210466166597d187f4d35c44e9021f02e10f78f50c3935ab34c4e414eb66c9913b63d8985504fc37502adb9e7719031e11bcf4
+  metadata.gz: a4c7491bfa30fff592390a09c0d83dc23e621ab523fe71ef82b7b173dd7d4118b59e9aea942b8eb59aaedf45298f84516e13fb2355ce8d197a9d01856696426f
+  data.tar.gz: 23ab3e161e502438af1ae6bc4f4661c7fca4e46b6b060d0bf1c2b57d5481d5d0fb415237d8e59f7be05c9db52831d1d93ac9107af1f533ba38f22921088454f7

data/lib/percy.rb

@@ -1,21 +1,20 @@
 require 'percy/client'
 
 module Percy
-  class << self
-    attr_accessor :access_token
+  def self.config
+    @config ||= Percy::Config.new
   end
 
-  def self.options
-    {
-      access_token: access_token,
-    }
+  def self.reset
+    @config = nil
+    @client = nil
   end
 
   # API client based on configured options.
   #
   # @return [Percy::Client] API client.
   def self.client
-    @client = Percy::Client.new(options) unless defined?(@client)
+    @client = Percy::Client.new(config: config) if !defined?(@client) || !@client
     @client
   end
 

data/lib/percy/client.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'percy/config'
 require 'percy/client/connection'
 require 'percy/client/local_git'
 require 'percy/client/version'
@@ -23,25 +24,10 @@ module Percy
       end
     end
 
-    API_BASE_URL = ENV['PERCY_API'] || 'https://percy.io'
-    API_VERSION = ENV['PERCY_API_VERSION'] || 'v1'
-
-    attr_accessor :access_token
+    attr_reader :config
 
     def initialize(options = {})
-      @access_token = options[:access_token] || ENV['PERCY_TOKEN']
-    end
-
-    def base_url
-      API_BASE_URL
-    end
-
-    def base_path
-      "/api/#{API_VERSION}"
-    end
-
-    def full_base
-      "#{base_url}#{base_path}"
+      @config = options[:config] || Percy::Config.new
     end
   end
 end

data/lib/percy/client/builds.rb

@@ -19,11 +19,11 @@ module Percy
             },
           }
         }
-        post("#{full_base}/repos/#{repo_slug}/builds/", data)
+        post("#{config.api_url}/repos/#{repo_slug}/builds/", data)
       end
 
       def finalize_build(build_id)
-        post("#{full_base}/builds/#{build_id}/finalize", {})
+        post("#{config.api_url}/builds/#{build_id}/finalize", {})
       end
     end
   end

data/lib/percy/client/connection.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'faraday'
 
 module Percy
@@ -20,8 +21,10 @@ module Percy
 
       def connection
         return @connection if defined?(@connection)
+        parsed_uri = URI.parse(config.api_url)
+        base_url = "#{parsed_uri.scheme}://#{parsed_uri.host}:#{parsed_uri.port}"
         @connection = Faraday.new(url: base_url) do |faraday|
-          faraday.request :token_auth, @access_token if @access_token
+          faraday.request :token_auth, config.access_token if config.access_token
 
           faraday.use Faraday::Adapter::HTTPClient
           faraday.use Percy::Client::Connection::FaradayNiceErrorMiddleware

data/lib/percy/client/resources.rb

@@ -47,7 +47,7 @@ module Percy
           },
         }
         begin
-          post("#{full_base}/builds/#{build_id}/resources/", data)
+          post("#{config.api_url}/builds/#{build_id}/resources/", data)
         rescue Percy::Client::ClientError => e
           raise e if e.env.status != 409
           STDERR.puts "[percy] Warning: unnecessary resource reuploaded with SHA-256: #{sha}"

data/lib/percy/client/snapshots.rb

@@ -15,7 +15,7 @@ module Percy
             },
           },
         }
-        post("#{full_base}/builds/#{build_id}/snapshots/", data)
+        post("#{config.api_url}/builds/#{build_id}/snapshots/", data)
       end
     end
   end

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/percy/config.rb

@@ -0,0 +1,28 @@
+module Percy
+  class Config
+    # @!attribute [w] access_token
+    #   @return [String] Percy repo access token.
+    # @!attribute api_url
+    #   @return [String] Base URL for API requests. Default: https://percy.io/api/v1/
+
+    attr_accessor :access_token
+    attr_accessor :api_url
+
+    # List of configurable keys for {Percy::Client}
+    # @return [Array] Option keys.
+    def keys
+      @keys ||= [
+        :access_token,
+        :api_url,
+      ]
+    end
+
+    def access_token
+      @access_token ||= ENV['PERCY_TOKEN']
+    end
+
+    def api_url
+      @api_url ||= ENV['PERCY_API'] || 'https://percy.io/api/v1'
+    end
+  end
+end

data/spec/lib/percy/client/connection_spec.rb

@@ -1,15 +1,15 @@
 RSpec.describe Percy::Client::Connection do
   describe '#get' do
-    it 'performs a GET request to the base_url and parses response' do
-      stub_request(:get, build_url('/test')).to_return(body: {foo: true}.to_json)
-      data = Percy.client.get('/test')
+    it 'performs a GET request to the api_url and parses response' do
+      stub_request(:get, "#{Percy.config.api_url}/test").to_return(body: {foo: true}.to_json)
+      data = Percy.client.get("#{Percy.config.api_url}/test")
       expect(data).to eq({'foo' => true})
     end
   end
   describe '#post' do
-    it 'performs a POST request to the base_url and parses response' do
-      stub_request(:post, build_url('/test')).to_return(body: {foo: true}.to_json)
-      data = Percy.client.post('/test', {})
+    it 'performs a POST request to the api_url and parses response' do
+      stub_request(:post, "#{Percy.config.api_url}/test").to_return(body: {foo: true}.to_json)
+      data = Percy.client.post("#{Percy.config.api_url}/test", {})
       expect(data).to eq({'foo' => true})
     end
   end

data/spec/lib/percy/client_spec.rb

@@ -1,17 +1,9 @@
 RSpec.describe Percy::Client do
-  describe '#base_url' do
-    it 'returns the base API URL' do
-      expect(Percy.client.base_url).to eq('http://localhost:3000')
-    end
-  end
-  describe '#base_path' do
-    it 'returns the base API URL path' do
-      expect(Percy.client.base_path).to eq('/api/v1')
-    end
-  end
-  describe '#full_base' do
-    it 'returns the full base API URL path' do
-      expect(Percy.client.full_base).to eq('http://localhost:3000/api/v1')
+  describe '#config' do
+    it 'returns the config object given when initialized' do
+      config = Percy::Config.new
+      client = Percy::Client.new(config: config)
+      expect(client.config).to eq(config)
     end
   end
 end

data/spec/lib/percy_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe Percy do
+  before(:each) { Percy.reset }
+  describe '#config' do
+    it 'returns a config object' do
+      expect(Percy.config.api_url).to eq('http://localhost:3000/api/v1')
+    end
+  end
+  describe '#client' do
+    it 'returns a Percy::Client that is passed the global config object by default' do
+      config = Percy.config
+      expect(Percy.client.config).to eq(config)
+    end
+  end
+  describe '#reset' do
+    it 'clears the main global config object' do
+      old_config = Percy.client.config
+      Percy.reset
+      expect(old_config).to_not eq(Percy.config)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,10 @@
-ENV['PERCY_API'] = 'http://localhost:3000'
+ENV['PERCY_API'] = 'http://localhost:3000/api/v1'
 
-require 'support/test_helpers'
 require 'support/vcr_setup'
 require 'webmock/rspec'
 require 'percy'
 
 RSpec.configure do |config|
-  config.include TestHelpers
-
   config.expect_with :rspec do |expectations|
     # This option will default to `true` in RSpec 4.
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
@@ -18,7 +15,7 @@ RSpec.configure do |config|
   end
 
   config.disable_monkey_patching!
-  config.warnings = true
+  # config.warnings = true
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -131,6 +131,7 @@ files:
 - lib/percy/client/resources.rb
 - lib/percy/client/snapshots.rb
 - lib/percy/client/version.rb
+- lib/percy/config.rb
 - percy-client.gemspec
 - spec/cassettes/Percy_Client_Builds/_create_build/creates_a_build.yml
 - spec/cassettes/Percy_Client_Builds/_finalize_build/finalizes_a_build.yml
@@ -143,8 +144,8 @@ files:
 - spec/lib/percy/client/resources_spec.rb
 - spec/lib/percy/client/snapshots_spec.rb
 - spec/lib/percy/client_spec.rb
+- spec/lib/percy_spec.rb
 - spec/spec_helper.rb
-- spec/support/test_helpers.rb
 - spec/support/vcr_setup.rb
 homepage: ''
 licenses:
@@ -182,6 +183,6 @@ test_files:
 - spec/lib/percy/client/resources_spec.rb
 - spec/lib/percy/client/snapshots_spec.rb
 - spec/lib/percy/client_spec.rb
+- spec/lib/percy_spec.rb
 - spec/spec_helper.rb
-- spec/support/test_helpers.rb
 - spec/support/vcr_setup.rb

data/spec/support/test_helpers.rb

@@ -1,7 +0,0 @@
-require 'percy'
-
-module TestHelpers
-  def build_url(path)
-    "#{Percy.client.base_url}#{path}"
-  end
-end