everypolitician-popolo 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d7ef4f90694c7c3bb3dd1b0c3c3d625ddb3b2b
-  data.tar.gz: 522b022a34eba1f04a62cf095fc13c4d32c73d49
+  metadata.gz: 02929dc6bc5bd531b724d07047844435bfd223ad
+  data.tar.gz: aa9c71d31ff43c43cd5edc4ea5b043b90f494213
 SHA512:
-  metadata.gz: 90aeb9436dd7897f98cf8c79932d68d3b78482de94e56d3fc23b49df30a6172e43582b0bf0b5c34ed92b606fd240f798d97764de2c066ee87346b04f8c0729e1
-  data.tar.gz: a202df2c86a1eaf3d5005c010c87a8361904a5c75b3c4a36b2b9927d960970f0f0195dcb6301e74e356ae6cef50a032a60bdd824e738b11df2269f14c6850c31
+  metadata.gz: 80c7c8dfa484a3c3f6e6533edb8099fbd5887bcf7562199c75035050cf508ec616f1c8d2a09e0030874275749b2dec51688330267760f688651a5b12407f766e
+  data.tar.gz: 243c3f25a16496072e70a326ace166fc91d73f50a8dc102cbe3239fd81cbdecf8251fb98b32163aed0f2ab96543e1c396ccddbdba6cf2ac2dd6945a5aca482d4

data/.rubocop.yml

@@ -0,0 +1,53 @@
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+Style/ClassAndModuleCamelCase:
+  Enabled: false
+
+Style/CollectionMethods:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/HashSyntax:
+  EnforcedStyle: ruby19_no_mixed_keys
+
+Style/RescueModifier:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: true
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+
+Metrics/ClassLength:
+  Max: 250
+
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/LineLength:
+  Max: 150
+
+Metrics/AbcSize:
+  Max: 50
+
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+Metrics/PerceivedComplexity:
+  Max: 8
+
+
+# Temporarily! (2016-08-01)
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,7 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-08-01 14:20:19 +0100 using RuboCop version 0.42.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+script: 
+  - bundle exec rake test
+  - bundle exec rake rubocop
 cache: bundler
 rvm:
   - 2.0.0

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.5.0] - 2016-08-01
+
+### Added
+
+- Added `Person#link(type)`
+
 ## [0.4.0] - 2016-07-04
 
 ### Added

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in everypolitician-popolo.gemspec
 gemspec
+

data/Rakefile

@@ -1,5 +1,8 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'

data/everypolitician-popolo.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'rubocop', '~> 0.42.0'
 end

data/lib/everypolitician/popolo.rb

@@ -56,12 +56,12 @@ module Everypolitician
       def legislative_periods
         events.where(classification: 'legislative period').sort_by(&:start_date)
       end
-      alias_method :terms, :legislative_periods
+      alias terms legislative_periods
 
       def current_legislative_period
         legislative_periods.last
       end
-      alias_method :current_term, :current_legislative_period
+      alias current_term current_legislative_period
     end
   end
 end

data/lib/everypolitician/popolo/collection.rb

@@ -25,7 +25,7 @@ module Everypolitician
       end
 
       def where(attributes = {})
-        find_all do |object|
+        select do |object|
           attributes.all? { |k, v| object.send(k) == v }
         end
       end
@@ -35,21 +35,21 @@ module Everypolitician
       # TODO: This feels pretty nasty, is there a better way of working out the
       # class name?
       def klass
-        case self.class.to_s.split("::").last
-        when "People"
+        case self.class.to_s.split('::').last
+        when 'People'
           Person
-        when "Organizations"
+        when 'Organizations'
           Organization
-        when "Memberships"
+        when 'Memberships'
           Membership
-        when "Events"
+        when 'Events'
           Event
-        when "Posts"
+        when 'Posts'
           Post
-        when "Areas"
+        when 'Areas'
           Area
         else
-          raise "Unknown class: #{self.class.to_s}"
+          raise "Unknown class: #{self.class}"
         end
       end
     end

data/lib/everypolitician/popolo/entity.rb

@@ -1,7 +1,6 @@
 module Everypolitician
   module Popolo
     class Entity
-
       attr_accessor :id
       attr_reader :document
       attr_reader :popolo
@@ -33,7 +32,7 @@ module Everypolitician
       alias eql? ==
 
       def identifier(scheme)
-        identifiers.find(->{{}}) { |i| i[:scheme] == scheme }[:identifier]
+        identifiers.find(-> { {} }) { |i| i[:scheme] == scheme }[:identifier]
       end
     end
   end

data/lib/everypolitician/popolo/event.rb

@@ -1,7 +1,7 @@
 module Everypolitician
   module Popolo
     class Events < Collection; end
-    class Event < Entity; 
+    class Event < Entity
       attr_accessor :start_date, :end_date
     end
   end

data/lib/everypolitician/popolo/person.rb

@@ -11,6 +11,10 @@ module Everypolitician
         document.fetch(:links, [])
       end
 
+      def link(type)
+        links.find(-> { {} }) { |i| i[:note] == type }[:url]
+      end
+
       def identifiers
         document.fetch(:identifiers, [])
       end
@@ -20,7 +24,7 @@ module Everypolitician
       end
 
       def contact(type)
-        contact_details.find(->{{}}) { |i| i[:type] == type }[:value]
+        contact_details.find(-> { {} }) { |i| i[:type] == type }[:value]
       end
 
       def phone
@@ -32,21 +36,11 @@ module Everypolitician
       end
 
       def twitter
-        if key?(:contact_details)
-          if twitter_contact = self[:contact_details].find { |d| d[:type] == 'twitter' }
-            return twitter_contact[:value].strip
-          end
-        end
-        if key?(:links)
-          if twitter_link = self[:links].find { |d| d[:note][/twitter/i] }
-            return twitter_link[:url].strip
-          end
-        end
+        contact('twitter') || link('twitter')
       end
 
       def facebook
-        facebook_link = links.find { |d| d[:note] == 'facebook' }
-        facebook_link[:url] if facebook_link
+        link('facebook')
       end
 
       def wikidata
@@ -59,9 +53,9 @@ module Everypolitician
 
       def name_at(date)
         return name unless key?(:other_names)
-        historic = other_names.find_all { |n| n.key?(:end_date) }
+        historic = other_names.select { |n| n.key?(:end_date) }
         return name if historic.empty?
-        at_date = historic.find_all do |n|
+        at_date = historic.select do |n|
           n[:end_date] >= date && (n[:start_date] || '0000-00-00') <= date
         end
         return name if at_date.empty?

data/lib/everypolitician/popolo/version.rb

@@ -1,5 +1,5 @@
 module Everypolitician
   module Popolo
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everypolitician-popolo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Mytton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
 description: 
 email:
 - chrismytton@gmail.com
@@ -75,6 +89,8 @@ extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -119,4 +135,3 @@ signing_key:
 specification_version: 4
 summary: Makes it easy to work with EveryPolitician's Popolo output files from Ruby
 test_files: []
-has_rdoc: