pyr 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 976f951e641281e557062b61caeb09e4ba007b13
-  data.tar.gz: 60ffb83eaf42200bb494b0b1d42d8f4c50dfc6aa
+  metadata.gz: 118839e5f2a9f5725eebc66f603f338383ff8e82
+  data.tar.gz: 3879eb7384f392f3e5be09b7fe4161e7e21dd2ca
 SHA512:
-  metadata.gz: 75fbacdad26adb045bf28ef18a7ed9d0709ce9fa2d66c336b083ec3829f76d15d885bc877534d726dd7257c3a84ecd76042f3074bb55edd4fda959b5016ed160
-  data.tar.gz: ceb9b557dd6d88acd537f54be7efadcc4217092c755674c2e302f0dc48b7850c73f84a27232691c1158294f7b5bda60f3c20d1f573d5679ac68e2e165eb9dae3
+  metadata.gz: d121f0caaea055c6fe8a09193702b2060d359e964453d85ae94a6c8c85c967109adbc3710d1c72fc13718ba92ef7313e1e81ebf3e484d0b09be0de583321ed73
+  data.tar.gz: 79eef9001f2530c13f9c6104123f0858c24583e803829b80b2a448d4f271b9b30165ff3646427b7433de202cc9a67a46aa44b8092def94f7081b56c0dccec711

data/lib/pyr.rb

@@ -20,6 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'faraday'
+require 'faraday_middleware'
+
 require 'pyr/param'
 require 'pyr/parser'
 require 'pyr/resource'
@@ -112,6 +115,13 @@ module PYR
   # The base URI for all requests
   API_BASE_URI = 'https://phone-your-rep.herokuapp.com/api/beta/'
 
+  # Faraday API Connection
+  API_CONN = Faraday.new url: API_BASE_URI do |conn|
+    conn.response :json, content_type: /\bjson$/
+    conn.response :yaml, content_type: /\byaml$/
+    conn.adapter Faraday.default_adapter
+  end
+
   # The API resources available to query
   PYR_RESOURCES = %i[
     reps
@@ -149,7 +159,7 @@ module PYR
     else
       resource = Request.build(resource, id)
       yield resource if block_given?
-      request_object = { base_url: API_BASE_URI, resource: resource }
+      request_object = { resource: resource }
     end
     Response.new request_object
   end

data/lib/pyr/response.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'httparty'
-
 module PYR
   # The object returned by a request call to the API.
   class Response
-    attr_reader :body, :uri, :code, :message, :headers, :objects, :controller
+    attr_reader :body, :uri, :code, :reason_phrase, :headers, :objects, :controller
 
     def initialize(base_url: nil, resource: nil, response_object: nil)
       assign_url_and_controller(base_url, resource, response_object)
@@ -14,24 +12,24 @@ module PYR
     end
 
     def assign_url_and_controller(base_url, resource, response_object)
-      if base_url && resource
+      if resource
         @controller = resource.controller
-        @uri        = "#{base_url}#{resource}"
+        @uri        = resource.to_s
       elsif base_url
-        @controller = base_url.sub(API_BASE_URI, '').split('/').first
+        @controller = base_url.sub!(API_BASE_URI, '').split('/').first
         @uri        = base_url
       elsif response_object
         @controller = response_object.controller
-        @uri        = response_object.self
+        @uri        = response_object.self.sub(API_BASE_URI, '')
       end
     end
 
     def fetch_and_parse_payload
-      payload  = HTTParty.get uri
-      @body    = payload.parsed_response
-      @code    = payload.code
-      @message = payload.message
-      @headers = payload.headers
+      response       = API_CONN.get uri
+      @body          = response.body
+      @code          = response.status
+      @reason_phrase = response.reason_phrase
+      @headers       = response.headers
     end
 
     def parse_objects

data/lib/pyr/response_object.rb

@@ -14,7 +14,7 @@ module PYR
     # Pass in an options hash to instantiate the object and set the data
     # attributes. First iterates through the hash converting nested hashes
     # and arrays of hashes into other PYR::ResponseObjects if possible.
-    # Hash keys that are not defined as attributes with `lr_attr_accessor`
+    # Hash keys that are not defined as attributes with `attr_accessor`
     # or `lr_has_many` will not be accessible in the parent object.
     def initialize(opts = {}, &block)
       new_opts = opts.each_with_object({}) do |(key, val), memo|
@@ -28,6 +28,11 @@ module PYR
       @controller ||= self.class.to_s.split('::').last.tableize
     end
 
+    #
+    def call
+      PYR.call self
+    end
+
     private
 
     # If the attribute key is a valid plural or singular resource,

data/lib/pyr/response_objects/office_location.rb

@@ -10,26 +10,26 @@ module PYR
     lr_scope :district, -> { where office_type: 'district' }
 
     attr_accessor :self,
-                     :city,
-                     :rep,
-                     :active,
-                     :office_id,
-                     :bioguide_id,
-                     :office_type,
-                     :distance,
-                     :building,
-                     :address,
-                     :suite,
-                     :city,
-                     :state,
-                     :zip,
-                     :phone,
-                     :fax,
-                     :hours,
-                     :latitude,
-                     :longitude,
-                     :v_card_link,
-                     :downloads,
-                     :qr_code_link
+                  :city,
+                  :rep,
+                  :active,
+                  :office_id,
+                  :bioguide_id,
+                  :office_type,
+                  :distance,
+                  :building,
+                  :address,
+                  :suite,
+                  :city,
+                  :state,
+                  :zip,
+                  :phone,
+                  :fax,
+                  :hours,
+                  :latitude,
+                  :longitude,
+                  :v_card_link,
+                  :downloads,
+                  :qr_code_link
   end
 end

data/lib/pyr/response_objects/rep.rb

@@ -13,30 +13,30 @@ module PYR
     lr_scope :representatives, -> { where role: 'United States Representative' }
 
     attr_accessor :self,
-                     :state,
-                     :district,
-                     :active,
-                     :bioguide_id,
-                     :official_full,
-                     :role,
-                     :party,
-                     :senate_class,
-                     :last,
-                     :first,
-                     :middle,
-                     :nickname,
-                     :suffix,
-                     :contact_form,
-                     :url,
-                     :photo,
-                     :twitter,
-                     :facebook,
-                     :youtube,
-                     :instagram,
-                     :googleplus,
-                     :twitter_id,
-                     :facebook_id,
-                     :youtube_id,
-                     :instagram_id
+                  :state,
+                  :district,
+                  :active,
+                  :bioguide_id,
+                  :official_full,
+                  :role,
+                  :party,
+                  :senate_class,
+                  :last,
+                  :first,
+                  :middle,
+                  :nickname,
+                  :suffix,
+                  :contact_form,
+                  :url,
+                  :photo,
+                  :twitter,
+                  :facebook,
+                  :youtube,
+                  :instagram,
+                  :googleplus,
+                  :twitter_id,
+                  :facebook_id,
+                  :youtube_id,
+                  :instagram_id
   end
 end

data/lib/pyr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PYR
-  VERSION = '0.2.4' # :nodoc:
+  VERSION = '0.2.5' # :nodoc:
 end

data/pyr.gemspec

@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty', '~> 0.14.0'
+  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday_middleware'
   spec.add_dependency 'lazy_record', '~> 0.4.0'
   spec.add_development_dependency 'bundler', '~> 1.14'
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pyr
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - M. Simon Borg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: lazy_record
   requirement: !ruby/object:Gem::Requirement