get_your_rep 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd6679eeba76ca59cc68de91dadad4ae1508a12
-  data.tar.gz: 62bfca1c1df86adc03f0a8ef762e3b858981173e
+  metadata.gz: 16f153f283c9e1fa3758cd00a95076e318d2a6d8
+  data.tar.gz: 3fc24259b1df82dd1f487ad198d8335901509084
 SHA512:
-  metadata.gz: 73543286e2682625a93909c8c2220fa3cd4cb7a3e206ee95a673d013021cfb762ac86eefa75c2a516bdb2f6f01d5b1de3d702134edbc37da520a31cd05b35551
-  data.tar.gz: 7d0c25329a29390f1a7265e20e08154170c89854b39b466bbb5070c4882dfbdebe755f49c14dd3690cb8b99c24c7a1851c701d09dc1b0395888accb4a9c78a3a
+  metadata.gz: 82bcfba877ab98d8240ce1125d93b08a7978f5375100c1cf40067bc4bab00c88e2d809ac7a4ea87fe55117f79a6ef48508e7340a217a8381ddb9bdce6796a10f
+  data.tar.gz: e81f56dd850bea280e7b14d7ead80bb3a8f07d7680185de083cceac0805de859dfeaee3ff87649059c1c1ab1b0e638a2ebaf3725132e9c620bf1923546d1455f

data/.rubocop.yml

@@ -2,14 +2,9 @@ AllCops:
   TargetRubyVersion: 2.3
 
 Metrics/LineLength:
-  Max: 120
-
-Metrics/BlockLength:
-  Exclude:
-    - 'lib/get_your_rep/patriotic.rb'
+  Max: 100
 
 Metrics/MethodLength:
-  Max: 15
   Exclude:
     - 'test/*'
     - 'lib/get_your_rep/cli.rb'
@@ -21,20 +16,18 @@ Style/Documentation:
     - 'test/**/*'
 
 Metrics/ModuleLength:
-  Max: 200
-
-Metrics/ClassLength:
-  Max: 200
+  Exclude:
+    - 'lib/get_your_rep/cli.rb'
 
 Metrics/AbcSize:
-  Enabled: false
+  Exclude:
+    - 'lib/get_your_rep/cli.rb'
+    - 'lib/get_your_rep/patriotic.rb'
 
 Metrics/CyclomaticComplexity:
-  Enabled: false
+  Exclude:
+    - 'lib/get_your_rep/cli.rb'
 
 Style/MultilineOperationIndentation:
   Exclude:
     - 'lib/get_your_rep/patriotic.rb'
-
-Style/HashSyntax:
-  Enabled: true

data/config.reek

@@ -11,7 +11,7 @@ TooManyStatements:
 
 TooManyMethods:
   exclude:
-    - ['lib/get_your_rep/representative.rb'] # #business_card is the offender. TODO: write method or delete.
+    - ['lib/get_your_rep/representative.rb']
 
 UncommunicativeVariableName:
   exclude:

data/get_your_rep.gemspec

@@ -17,14 +17,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.1'
   s.add_development_dependency 'minitest-reporters', '~> 1.1', '>= 1.1.13'
   s.add_development_dependency 'rake', '~> 12.0'
-  s.summary       = "Get yo' rep!"
-  s.description   = "Get your rep(s) from Google's Civic Information API and Open States. Formerly get-your-rep."
-  s.authors       = ['msimonborg']
-  s.email         = 'msimonborg@gmail.com'
-  s.homepage      = 'https://github.com/msimonborg/get-your-rep'
-  s.license       = 'MIT'
-  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.bindir        = 'exe'
-  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.summary       = 'Get yo\' rep!'
+  s.description   = 'Get your rep(s) from Google\'s Civic Information API and Open States. '\
+    'Formerly get-your-rep.'
+  s.authors     = ['msimonborg']
+  s.email       = 'msimonborg@gmail.com'
+  s.homepage    = 'https://github.com/msimonborg/get-your-rep'
+  s.license     = 'MIT'
+  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.bindir      = 'exe'
+  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 end

data/lib/get_your_rep.rb

@@ -6,6 +6,7 @@ require 'colorize'
 
 require 'get_your_rep/version'
 require 'get_your_rep/errors'
+require 'get_your_rep/associations'
 require 'get_your_rep/get_your_rep_module'
 require 'get_your_rep/patriotic'
 require 'get_your_rep/cli'

data/lib/get_your_rep/associations.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module GetYourRep
+  # Methods for making associations between objects.
+  module Associations
+    def add_child(other:, model:, children:, parent:, error:)
+      if other.is_a?(model)
+        instance_variable_get("@#{children}") << other
+        other.send("#{parent}=", self) unless other.send(parent.to_s) == self
+      else
+        error.call
+      end
+    end
+
+    def add_parent(other:, model:, parent:, child:, error:)
+      if other.is_a?(model)
+        instance_variable_set("@#{parent}", other)
+        other.send("add_#{child}", self) unless other.send("#{child}s").include?(self)
+      else
+        error.call
+      end
+    end
+  end
+end

data/lib/get_your_rep/cli.rb

@@ -109,7 +109,8 @@ but you can try a zip code if you insist.".yellow
 
       def display_reps
         rep_list
-        puts "Select a rep number for more detail. Type 'list' for the list or 'exit' for a new query.".yellow
+        puts 'Select a rep number for more detail. '\
+          "Type 'list' for the list or 'exit' for a new query.".yellow
         rep_loop
       end
 

data/lib/get_your_rep/delegation.rb

@@ -4,8 +4,11 @@ module GetYourRep
   class Delegation
     include Enumerable
     include GetYourRep::Errors
+    include GetYourRep::Associations
 
-    # Set the reps attribute, which will hold an array of Representative objects, to an empty array by default.
+    # Set the reps attribute, which will hold an array of Representative objects,
+    # to an empty array by default.
+    #
     def initialize
       @reps = []
     end
@@ -38,12 +41,11 @@ module GetYourRep
 
     # Add a Representative to the reps array. Only accepts a Representative as an argument.
     def add_rep(other)
-      if other.is_a?(Representative)
-        @reps << other
-        other.delegation = self unless other.delegation == self
-      else
-        not_a_rep_error
-      end
+      add_child other:    other,
+                model:    Representative,
+                children: :reps,
+                parent:   :delegation,
+                error:    -> { not_a_rep_error }
     end
 
     # Collects the OfficeLocations of all associated reps.

data/lib/get_your_rep/errors.rb

@@ -12,8 +12,8 @@ module GetYourRep
 
       # Raise when a rep cannot be found with the given parameters.
       def reps_not_found
-        "Error message received. Some reps were not found. Confirm your address and check your parameters. \
-Try a full address if you used a zip."
+        'Error message received. Some reps were not found. '\
+          'Confirm your address and check your parameters. Try a full address if you used a zip.'
       end
     end
 

data/lib/get_your_rep/google.rb

@@ -37,17 +37,24 @@ module GetYourRep
       end
 
       def ask_google_api(congress_only: nil)
-        if congress_only
-          url = "https://www.googleapis.com/civicinfo/v2/representatives?address=#{address}%20&includeOffices=true&\
-levels=country&roles=legislatorLowerBody&roles=legislatorUpperBody&fields=offices%2Cofficials&key=#{API_KEY}"
-        else
-          url = "https://www.googleapis.com/civicinfo/v2/representatives?address=#{address}%20&includeOffices=true&\
-levels=country&levels=administrativeArea1&roles=legislatorLowerBody&roles=legislatorUpperBody&roles=headOfGovernment\
-&roles=deputyHeadOfGovernment&fields=offices%2Cofficials&key=#{API_KEY}"
-        end
+        url = congress_only ? congress_only_url : all_reps_url
         self.response = HTTParty.get(url).parsed_response
       end
 
+      def all_reps_url
+        # rubocop:disable Style/StringLiterals
+        "https://www.googleapis.com/civicinfo/v2/representatives?address=#{address}%20&"\
+          "includeOffices=true&levels=country&levels=administrativeArea1&roles=legislatorLower"\
+          "Body&roles=legislatorUpperBody&roles=headOfGovernment&roles=deputyHeadOfGovernment&"\
+          "fields=offices%2Cofficials&key=#{API_KEY}"
+      end
+
+      def congress_only_url
+        "https://www.googleapis.com/civicinfo/v2/representatives?address=#{address}%20&"\
+          "includeOffices=true&levels=country&roles=legislatorLowerBody&roles=legislatorUpper"\
+          "Body&fields=offices%2Cofficials&key=#{API_KEY}"
+      end # rubocop:enable Style/StringLiterals
+
       def deliver_response
         if response.empty? || response['error']
           handle_reps_not_found_error

data/lib/get_your_rep/office_location.rb

@@ -3,6 +3,7 @@ module GetYourRep
   # Office information. Belongs to Representative.
   class OfficeLocation
     include GetYourRep::Errors
+    include GetYourRep::Associations
 
     # Each instance belongs to a Represenative, which has many OfficeLocations.
     attr_accessor :rep
@@ -26,12 +27,11 @@ module GetYourRep
 
     # Set the rep attribute to an instance of a Representative, and make two-way association.
     def rep=(other)
-      if other.is_a?(Representative)
-        @rep = other
-        other.add_office_location(self) unless other.office_locations.include?(self)
-      else
-        not_a_rep_error
-      end
+      add_parent other:  other,
+                 model:  Representative,
+                 parent: :rep,
+                 child:  :office_location,
+                 error:  -> { not_a_rep_error }
     end
 
     # Display self attributes for CLI.

data/lib/get_your_rep/patriotic.rb

@@ -33,43 +33,26 @@ module GetYourRep
     def self.welcome
       puts ''
       2.times do
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e   '.red + 'y o u r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y o   r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y o u r '.white + 'r   p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y o u   '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + '  o u r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + '  e t '.red + 'y o u r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y o u r '.white + 'r e   '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y o u r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y   u r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g   t '.red + 'y o u r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y o u r '.white + '  e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
-        sleep(0.05)
-        print "\r" + '- '.red + '- '.white + '- '.blue + 'g e t '.red + 'y o u r '.white + 'r e p '.blue +
-                  '- '.red + '- '.white + '- '.blue
+        sparkle_print 'g e   ', 'y o u r ', 'r e p '
+        sparkle_print 'g e t ', 'y o   r ', 'r e p '
+        sparkle_print 'g e t ', 'y o u r ', 'r   p '
+        sparkle_print 'g e t ', 'y o u   ', 'r e p '
+        sparkle_print 'g e t ', '  o u r ', 'r e p '
+        sparkle_print '  e t ', 'y o u r ', 'r e p '
+        sparkle_print 'g e t ', 'y o u r ', 'r e   '
+        sparkle_print 'g e t ', 'y o u r ', 'r e p '
+        sparkle_print 'g e t ', 'y   u r ', 'r e p '
+        sparkle_print 'g   t ', 'y o u r ', 'r e p '
+        sparkle_print 'g e t ', 'y o u r ', '  e p '
+        sparkle_print 'g e t ', 'y o u r ', 'r e p '
       end
       puts ''
     end
+
+    def self.sparkle_print(string_one, string_two, string_three)
+      print "\r" + '- '.red + '- '.white + '- '.blue + string_one.red + string_two.white +
+        string_three.blue + '- '.red + '- '.white + '- '.blue
+      sleep(0.05)
+    end
   end
 end

data/lib/get_your_rep/representative.rb

@@ -3,6 +3,7 @@ module GetYourRep
   # Stores rep info in key/value pairs, and makes values accessible by instance method.
   class Representative
     include GetYourRep::Errors
+    include GetYourRep::Associations
 
     # The Delegation object that the instance belongs to.
     attr_reader   :delegation
@@ -24,12 +25,11 @@ module GetYourRep
     # Sets the Delegation object that the instance belongs to. Will add self to the Delegation's
     # reps if not done so already.
     def delegation=(other)
-      if other.is_a?(Delegation)
-        @delegation = other
-        other.add_rep(self) unless other.reps.include?(self)
-      else
-        not_a_del_error
-      end
+      add_parent other:  other,
+                 model:  Delegation,
+                 parent: :delegation,
+                 child:  :rep,
+                 error:  -> { not_a_del_error }
     end
 
     # Returns a frozen duplicate of the office_locations array.
@@ -44,12 +44,11 @@ module GetYourRep
 
     # Creates a new OfficeLocation association. Sets self as the other's rep if not done so already.
     def add_office_location(other)
-      if other.is_a?(OfficeLocation)
-        @office_locations << other
-        other.rep = self unless other.rep == self
-      else
-        not_an_office_error
-      end
+      add_child other:    other,
+                model:    OfficeLocation,
+                children: :office_locations,
+                parent:   :rep,
+                error:    -> { not_an_office_error }
     end
 
     # Assign an individual OfficeLocation, or an array of them.
@@ -63,24 +62,36 @@ module GetYourRep
 
     # Parse the first name from the :name.
     def first_name
-      @first_name ||= if name_count == 1
-                        nil
-                      elsif (name_count > 3) || (name_array[-2].downcase == name_array[-2])
-                        name_array[0..-3].join(' ')
-                      else
-                        name_array[0..-2].join(' ')
-                      end
+      @first_name ||= parse_first_name
+    end
+
+    def parse_first_name
+      if name_count == 1
+        nil
+      elsif four_part_name
+        name_array[0..-3].join(' ')
+      else
+        name_array[0..-2].join(' ')
+      end
     end
 
     # Parse the last name from the :name.
     def last_name
-      @last_name ||= if name_count == 1
-                       name
-                     elsif (name_count > 3) || (name_array[-2].downcase == name_array[-2])
-                       name_array[-2..-1].join(' ')
-                     else
-                       name_array.last
-                     end
+      @last_name ||= parse_last_name
+    end
+
+    def parse_last_name
+      if name_count == 1
+        name
+      elsif four_part_name
+        name_array[-2..-1].join(' ')
+      else
+        name_array.last
+      end
+    end
+
+    def four_part_name
+      (name_count > 3) || (name_array[-2].downcase == name_array[-2])
     end
 
     # Splits the name into an array.

data/lib/get_your_rep/responses/base.rb

@@ -7,7 +7,8 @@ module GetYourRep
     # Taken with gratitude from davidbella https://gist.github.com/davidbella/6918455
     def initialize(options = {})
       options.each do |attr, value|
-        # Recent responses from OpenStates have had '+' appended to some keys. Trim that off or it throws an error.
+        # Recent responses from OpenStates have had '+' appended to some keys.
+        # Trim that off or it throws an error.
         attr = attr.delete('+')
         create_setters_from_opts(attr)
         create_getters_from_opts(attr)

data/lib/get_your_rep/responses/google_office.rb

@@ -23,9 +23,11 @@ module GetYourRep
     private
 
     def determine_office_type
-      if line1.downcase =~
-         /(state|house|senate|assembly|capitol|dirksen|reyburn|rayburn|legislative|legislature|government)+/
+      # rubocop:disable Metrics/LineLength
+      matches =
+        /(state|house|senate|assembly|capitol|dirksen|reyburn|rayburn|legislative|legislature|government)+/
 
+      if line1.downcase =~ matches
         'capitol'
       else
         'district'

data/lib/get_your_rep/responses/google_rep.rb

@@ -33,7 +33,9 @@ module GetYourRep
       super
     end
 
-    # Build a hash from attributes to be passed to the GetYourRep::Representative constructor method.
+    # Build a hash from attributes to be passed to
+    # the GetYourRep::Representative constructor method.
+    #
     def build_hash(offices_array, index)
       find_office_name(offices_array, index)
       self.hash = { name:             name,
@@ -44,8 +46,7 @@ module GetYourRep
                     email:            emails,
                     url:              url,
                     photo:            photoUrl }
-      parse_channels
-      hash
+      parse_channels # returns the hash object
     end
 
     private
@@ -72,6 +73,8 @@ module GetYourRep
       channels.each do |channel|
         hash[channel['type'].downcase.to_sym] = channel['id']
       end
+
+      hash
     end
   end
 end

data/lib/get_your_rep/responses/open_states_rep.rb

@@ -13,7 +13,9 @@ module GetYourRep
       @phones = []
     end
 
-    # Build a hash from attributes to be passed to the GetYourRep::Representative constructor method.
+    # Build a hash from attributes to be passed to
+    # the GetYourRep::Representative constructor method.
+    #
     def build_hash
       { name:             full_name.split(', ').reverse.join(' '),
         office:           office,

data/lib/get_your_rep/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GetYourRep
-  VERSION = '1.1.0' # :nodoc:
+  VERSION = '1.1.1' # :nodoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: get_your_rep
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - msimonborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -147,6 +147,7 @@ files:
 - exe/reps
 - get_your_rep.gemspec
 - lib/get_your_rep.rb
+- lib/get_your_rep/associations.rb
 - lib/get_your_rep/cli.rb
 - lib/get_your_rep/delegation.rb
 - lib/get_your_rep/errors.rb