global_registry 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdcc85777bc0361fd963560777430b8b3913f75c
-  data.tar.gz: f3f9b5470dc2a52a3565f90f6e8484e42f9f211a
+  metadata.gz: 64ce57dbf8a816d806e978b1bc5bcd31c84ea387
+  data.tar.gz: 405831e2b00acd2096977138a5184569877b82d0
 SHA512:
-  metadata.gz: bb49500a657bc071a8f29b8cebe8bafe866945e10184179b6d6b28730f2bc9fe1b1a84e15ff13317fb9c1b0ecea124f79487f8ed60b6045fce77f18c5cc22166
-  data.tar.gz: 23feec9df04ab75372b9e67624330411fc46ece8b2012b5ad64a4e29a0d165ef6d02eb479dec74723f5354e73d75b2f06ec9e6e828d6f4e85aeffbef827d602a
+  metadata.gz: 0d9eb988e414bf32f4e5a2da3f312a66ec0e639d493a625b5f419d7e922d18049125c17079c9d887c42acb2a2932cf279e3340520a328de18cb7de565779d758
+  data.tar.gz: 6ab0a32677502ddf3a49f03a31b6ddbac9fbe5a8da6b85b61fcd350eebcf6ddf8e7873cbca6b0d1fb951ff98007916d1d48246c0b754b7d1f8b8e2f06999d9c3

data/.travis.yml

@@ -0,0 +1,7 @@
+sudo: false
+cache: bundler
+language: ruby
+rvm:
+  - 2.2.4
+script:
+- bundle exec rspec spec

data/lib/global_registry/base.rb

@@ -4,63 +4,109 @@ require 'retryable'
 
 module GlobalRegistry
   class Base
+    def initialize(args = {})
+      @base_url = args[:base_url]
+      @access_token = args[:access_token]
+      @xff = args[:xff]
+    end
 
-    def self.find(id, params = {})
-      request(:get, params, path_with_id(id))
+    def self.find(id, params = {}, headers = {})
+      new.find(id, params, headers)
+    end
+    def find(id, params = {}, headers = {})
+      request(:get, params, path_with_id(id), headers)
     end
 
-    def self.get(params = {})
-      request(:get, params)
+    def self.get(params = {}, headers = {})
+      new.get(params, headers)
+    end
+    def get(params = {}, headers = {})
+      request(:get, params, nil, headers)
     end
 
-    def self.post(params = {})
-      request(:post, params)
+    def self.post(params = {}, headers = {})
+      new.post(params, headers)
+    end
+    def post(params = {}, headers = {})
+      request(:post, params, nil, headers)
     end
 
-    def self.put(id, params = {})
-      request(:put, params, path_with_id(id))
+    def self.put(id, params = {}, headers = {})
+      new.put(id, params, headers)
+    end
+    def put(id, params = {}, headers = {})
+      request(:put, params, path_with_id(id), headers)
     end
 
-    def self.delete(id)
-      request(:delete, {}, path_with_id(id))
+    def self.delete(id, headers = {})
+      new.delete(id, headers)
+    end
+    def delete(id, headers = {})
+      request(:delete, {}, path_with_id(id), headers)
     end
 
-    def self.delete_or_ignore(id)
-      begin
-        delete(id)
-      rescue RestClient::Exception => e
-        unless e.response.code.to_i == 404
-          raise
-        end
-      end
+    def self.delete_or_ignore(id, headers = {})
+      delete(id, headers)
+    rescue RestClient::Exception => e
+      raise unless e.response.code.to_i == 404
+    end
+    def delete_or_ignore(id, headers = {})
+      delete(id, headers)
+    rescue RestClient::Exception => e
+      raise unless e.response.code.to_i == 404
     end
 
 
-    def self.request(method, params, path = nil)
-      raise 'You need to configure GlobalRegistry with your access_token.' unless GlobalRegistry.access_token
+    def self.request(method, params, path = nil, headers = {})
+      new.request(method, params, path, headers)
+    end
+
+    def request(method, params, path = nil, headers = {})
+      raise 'You need to configure GlobalRegistry with your access_token.' unless access_token
 
       path ||= default_path
-      url = GlobalRegistry.base_url
+      url = base_url
       url += '/' unless url.last == '/'
       url += path
 
       case method
       when :post
-        RestClient.post(url, params.to_json, :content_type => :json, :accept => :json, authorization: "Bearer #{GlobalRegistry.access_token}", :timeout => -1) { |response, request, result, &block|
+        post_headers = default_headers.merge(content_type: :json, timeout: -1).merge(headers)
+        RestClient.post(url, params.to_json, post_headers) { |response, request, result, &block|
           handle_response(response, request, result)
         }
       when :put
-        RestClient.put(url, params.to_json, :content_type => :json, :accept => :json, authorization: "Bearer #{GlobalRegistry.access_token}", :timeout => -1) { |response, request, result, &block|
+        put_headers = default_headers.merge(content_type: :json, timeout: -1).merge(headers)
+        RestClient.put(url, params.to_json, put_headers) { |response, request, result, &block|
           handle_response(response, request, result)
         }
       else
-        RestClient::Request.execute(:method => method, :url => url, :headers => {params: params, authorization: "Bearer #{GlobalRegistry.access_token}", :accept => :json}, :timeout => -1) { |response, request, result, &block|
+        get_args = { method: method, url: url, timeout: -1,
+                     headers: default_headers.merge(params: params).merge(headers)
+                   }
+        RestClient::Request.execute(get_args) { |response, request, result, &block|
           handle_response(response, request, result)
         }
       end
     end
 
-    def self.handle_response(response, request, result)
+    def default_path
+      self.class.to_s.split('::').last.underscore.pluralize
+    end
+
+    def path_with_id(id)
+      "#{default_path}/#{id}"
+    end
+
+    private
+
+    def default_headers
+      headers = { authorization: "Bearer #{access_token}", accept: :json }
+      headers = headers.merge('X-Forwarded-For': @xff) if @xff.present?
+      headers
+    end
+
+    def handle_response(response, request, result)
       case response.code
       when 200..299
         Oj.load(response)
@@ -77,14 +123,13 @@ module GlobalRegistry
       end
     end
 
-    def self.default_path
-      to_s.split('::').last.underscore.pluralize
+    def base_url
+      @base_url || GlobalRegistry.base_url
     end
 
-    def self.path_with_id(id)
-      "#{default_path}/#{id}"
+    def access_token
+      @access_token || GlobalRegistry.access_token
     end
-
   end
 end
 

data/lib/global_registry/version.rb

@@ -1,4 +1,4 @@
 module GlobalRegistry
-  VERSION = "1.0.8"
+  VERSION = '1.1.0'
 end
 

data/spec/base_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'Base' do
+  describe '#get' do
+    before do
+      stub_request(:get, 'http://google.com/bases')
+          .with(headers: {authorization: 'Bearer asdf'})
+          .to_return(:body => {a: 'b'}.to_json)
+    end
+
+    it 'finds something' do
+      response = GlobalRegistry::Base.get
+      expect(response).to be_a Hash
+    end
+
+    it 'can be configured' do
+      @custom_gr_url = stub_request(:get, 'http://cru.org/bases')
+                           .with(headers: { authorization: 'Bearer qwer',
+                                            'X-Forwarded-For': '203.0.113.7' })
+                           .to_return(:body => {a: 'b'}.to_json)
+      gr = GlobalRegistry::Base.new(access_token: 'qwer', base_url: 'cru.org', xff: '203.0.113.7')
+      expect(gr.get).to be_a Hash
+      expect(@custom_gr_url).to have_been_requested
+    end
+  end
+end

data/spec/entity_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe 'Entity' do
+  describe '#get' do
+    before do
+      stub_request(:get, 'http://google.com/entities')
+          .to_return(:body => {a: 'b'}.to_json)
+    end
+
+    it 'finds something' do
+      response = GlobalRegistry::Entity.get
+      expect(response).to be_a Hash
+    end
+
+    it 'can be configured' do
+      @custom_gr_url = stub_request(:get, 'http://cru.org/entities')
+                           .to_return(:body => {a: 'b'}.to_json)
+      gr = GlobalRegistry::Entity.new(base_url: 'cru.org')
+      expect(gr.get).to be_a Hash
+      expect(@custom_gr_url).to have_been_requested
+    end
+  end
+
+  describe '#put' do
+    before do
+      stub_request(:get, 'http://google.com/entities')
+          .to_return(:body => {a: 'b'}.to_json)
+    end
+
+    it 'sends data' do
+      response = GlobalRegistry::Entity.get
+      expect(response).to be_a Hash
+    end
+  end
+
+  describe '#find' do
+    before do
+      stub_request(:get, 'http://google.com/entities/asdf')
+          .to_return(:body => {a: 'b'}.to_json)
+    end
+
+    it 'sends data' do
+      response = GlobalRegistry::Entity.find('asdf')
+      expect(response).to be_a Hash
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'global_registry'
+require 'active_support/core_ext/string'
+require 'webmock/rspec'
+
+RSpec.configure do |_config|
+  # some config here
+
+end
+
+GlobalRegistry.configure do |config|
+  config.access_token = 'asdf'
+  config.base_url = 'google.com/'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global_registry
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Josh Starcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -104,6 +105,9 @@ files:
 - lib/global_registry/relationship_type.rb
 - lib/global_registry/system.rb
 - lib/global_registry/version.rb
+- spec/base_spec.rb
+- spec/entity_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -123,8 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Push and pull data from the Global Registry
-test_files: []
+test_files:
+- spec/base_spec.rb
+- spec/entity_spec.rb
+- spec/spec_helper.rb
+has_rdoc: