whos_dated_who 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6926df4ea88a005695b59c0aeaf9ea31945c1cde
-  data.tar.gz: 9fc1d12d3d151d8d5499b9cae8df2ea01e0886dc
+  metadata.gz: a5246ad18e26101327c9f7648c893fae3b1fdc1b
+  data.tar.gz: 33b92cf602bb0c9678dcc4432913bc41378df622
 SHA512:
-  metadata.gz: d21d1383ba7f9a095f3909a9b18d5633b92ada3afa1eb867885b19e6069ca2eb97dfb6f86ab2a78dbabe968024824801d16ee8e4f1ff899850ca13504dc55b6f
-  data.tar.gz: 26d201634852dc932e49afd46866257fab9525c2493b02f4b91bc1ce4b32b90ff3cf0825476c8c96b0198d5491eace5c426907ed8b8d23d50bb103f61970f24b
+  metadata.gz: 9581d74ca3ee89f125966ea3244cfb441279b90b3870d3fa8ebcf8d8f2459a40b0dd4c1a895e021e28a75fa6b017d34f8f4d47735190647926bd7b024401b2c5
+  data.tar.gz: 888aa209ec8573b714293ac4989df7d1014897f83957589d0343ce9071fcf25cdcc30d381400672baf73819436e7ee797e5f75218e8f5a17b4a2f91327cc81c6

data/.rubocop.yml

@@ -0,0 +1,4 @@
+# Offense count: 9
+Style/Documentation:
+  Enabled: false
+

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.2
+- 2.2.2
+- 2.1.2
+env:
+  global:
+    secure: LajEHfUoZ43iJI3DWRWNyWRumb73A4fCMJyTxP3chHoA7Rbh6Baie1vuQVDCbt4TiOMlZVhP7d21JonsvsFyfagKdTTNyUM1m9pNXWX1z/mIV51/TtOgpx2o8eNExI2SB4LqOrLDZ/UFvdl9xIrgmUQgRjcjqfq5MmNHLO1N/co=

data/lib/whos_dated_who/bing_client.rb

@@ -1,16 +1,19 @@
 require 'yaml'
 module WhosDatedWho
   class BingClient
-    API_KEY = ENV['BING_API_KEY'] ||
-              YAML.load_file(File.expand_path('~/.whos_dated_who.yml'))[:bing_api_key]
-
-    def initialize(type = 'Web', num_results = 10, api_key = API_KEY)
-      @api_key = api_key
+    def initialize(type = 'Web', num_results = 10, api_key = nil)
+      @api_key = api_key || ENV['BING_API_KEY'] || config[:bing_api_key]
       @client = Bing.new(@api_key, num_results, type)
     end
 
     def search(query)
       @client.search(query)
     end
+
+    private
+
+    def config
+      @config ||= YAML.load_file(File.expand_path('~/.whos_dated_who.yml'))
+    end
   end
 end

data/lib/whos_dated_who/biography.rb

@@ -4,6 +4,7 @@ class Biography < Hashie::Trash
   include Hashie::Extensions::IgnoreUndeclared
 
   @split_on_comma = ->(i) { i.is_a?(Array) ? i : i.split(', ') }
+  @parse_date     = ->(i) { Date.parse(i) }
 
   property :first_name
   property :middle_name
@@ -12,7 +13,7 @@ class Biography < Hashie::Trash
   property :full_name_at_birth
   property :other_names # array
   property :age, transform_with: ->(i) { i.to_i }
-  property :born_on, from: :date_of_birth, transform_with: ->(i) { Date.parse(i) }
+  property :born_on, from: :date_of_birth, transform_with: @parse_date
   property :born_at, from: :birthplace
   property :height
   property :weight

data/lib/whos_dated_who/cli.rb

@@ -11,23 +11,24 @@ module WhosDatedWho
     desc 'query', 'Return the relationship status of a celebrity'
     def query(name)
       result = Client.new.fetch(name)
-      puts "#{result[:relationship_status]}: #{result[:current_relationship][:human]}"
+      status = [
+        result[:relationship_status], result[:current_relationship][:human]
+      ].join(': ')
+
+      puts status
       puts result[:current_relationship][:dates].join(', ')
     end
 
-    desc 'explore', 'Return the relationship status of everyone included in celebs.yml'
+    desc 'explore', 'Return the relationship status of everyone in celebs.yml'
     def explore
-      results = []
-      celebs = my_celebs
-      celebs.each do |celeb|
+      my_celebs.map do |celeb|
         puts "Processing #{celeb}..."
         begin
-          results << Client.new.fetch(celeb)
+          Client.new.fetch(celeb)
         rescue
           puts "Error processing #{celeb}"
         end
-      end
-      results
+      end.compact
     end
 
     desc 'import_mine', 'Import my favorites into RethinkDB'
@@ -37,7 +38,8 @@ module WhosDatedWho
 
     desc 'import_maxim', 'Import maxim hot 100'
     def import_maxim
-      resp = Faraday.get('http://www.maxim.com/hot100/2014')
+      # TODO
+      # resp = Faraday.get('http://www.maxim.com/hot100/2014')
     end
 
     private

data/lib/whos_dated_who/client.rb

@@ -4,15 +4,8 @@ module WhosDatedWho
       bing_results = BingClient.new.search("#{name} site:dating.famousfix.com")
       url = bing_results.first[:Web].first[:Url]
       resp = Faraday.get(url)
-      if resp.success?
-        Parser.new.parse(resp.body)
-      end
-    end
-
-    private
 
-    def normalize(name)
-      name.gsub(/\s/, '-').downcase
+      resp.success? && Parser.new.parse(resp.body)
     end
   end
 end

data/lib/whos_dated_who/importer.rb

@@ -4,28 +4,38 @@ module WhosDatedWho
     attr_reader :conn, :logger, :table_name
 
     def initialize(db, table_name)
-      @conn = r.connect(host: 'localhost', db: db || 'celebs')
-      @logger = Logger.new(STDOUT)
+      @conn       = r.connect(host: 'localhost', db: db || 'celebs')
+      @logger     = Logger.new(STDOUT)
       @table_name = table_name
     end
 
     def fetch_and_import(celebs)
       celebs.each do |celeb|
-        begin
-          logger.info "Fetching #{celeb}"
-          result = Client.new.fetch(celeb)
-          logger.info "Importing #{celeb} to #{table_name}"
-          import(result)
-        rescue
-          first_name, last_name = celeb.split
-          r.table("missing_#{table_name}").insert(first_name: first_name, last_name: last_name).run(conn)
-          logger.error("Error importing #{celeb}, added to missing")
-        end
+        logger.info "Fetching #{celeb}"
+        import_celeb(celeb)
       end
     end
 
-    def import(results)
+    private
+
+    def import_celeb(celeb)
+      result = Client.new.fetch(celeb)
+      logger.info "Importing #{celeb} to #{table_name}"
+      create(result)
+    rescue
+      logger.error("Error importing #{celeb}, added to missing")
+      add_to_missing_celebs(celeb)
+    end
+
+    def create(results)
       r.table(table_name).insert(JSON.parse(results.to_json)).run(conn)
     end
+
+    def add_to_missing_celebs(celeb)
+      first_name, last_name = celeb.split
+      r.table("missing_#{table_name}").insert(
+        first_name: first_name, last_name: last_name
+      ).run(conn)
+    end
   end
 end

data/lib/whos_dated_who/parser.rb

@@ -17,48 +17,66 @@ module WhosDatedWho
     private
 
     def extract_bio
-      result = {}
+      result = parse_bio(@doc.css('#rcol .cbox-nopad:nth-child(3)'))
       result[:description] = @doc.css('#wikitext').text
 
-      bio = @doc.css('#rcol .cbox-nopad:nth-child(3)')
-      bio.css('.posl, .posr').each do |el|
-        if el.matches?('.posl')
-          @key = el.content
-        else
-          key = normalize_bio_key(@key)
-          if el.css('div').size > 0
-            result[key] = [] unless result[key]
-            result[key] = el.children.map(&:content).reject do |c|
-              c.empty? || c =~ /^\s\(/
-            end
-          else
-            value = el.content.rstrip
-            if respond_to?("parse_#{key}".to_sym, true)
-              result[key] = send("parse_#{key}", value)
-            else
-              result[key] = value
-            end
-          end
-        end
-      end
-
       @biography = Biography.new(result.symbolize_keys)
     end
 
     def extract_current_relationship
       current = @doc.css('.pbox.datebox')
       relationship = {}
+
       relationship[:human] = current.css('div.padb10:first').text
       relationship[:dates] = current.css('ul li').map(&:content)
       result[:current_relationship] = relationship
-      result[:status] = :married if relationship[:human] =~ /married/
-      result[:status] = :engaged if relationship[:human] =~ /engaged/
-      result[:status] = :rumored if relationship[:human] =~ /rumored/
-      result[:status] = :dating  if relationship[:human] =~ /dating/
-      result[:status] = :single  if relationship[:human] =~ /single/
+
+      result[:status] = parse_relationship_status(relationship)
       relationship
     end
 
+    def list?(el)
+      el.css('div').size > 0
+    end
+
+    def parse_bio(bio)
+      bio.css('.posl, .posr').each_with_object({}) do |el, result|
+        if el.matches?('.posl')
+          @key = el.content
+        else
+          key = normalize_bio_key(@key)
+          result[key] = list?(el) ? parse_list(el) : parse_content(el, key)
+        end
+      end
+    end
+
+    def parse_list(el)
+      el.children.map(&:content).reject do |c|
+        c.empty? || c =~ /^\s\(/
+      end
+    end
+
+    def parse_content(el, key)
+      value = el.content.rstrip
+      if respond_to?("parse_#{key}".to_sym, true)
+        send("parse_#{key}", value)
+      else
+        value
+      end
+    end
+
+    def parse_relationship_status(relationship)
+      case relationship[:human]
+      when /married/ then :married
+      when /engaged/ then :engaged
+      when /rumored/ then :rumored
+      when /dating/  then :dating
+      when /single/  then :single
+      else
+        :unknown
+      end
+    end
+
     def extract_past_relationships
     end
 

data/lib/whos_dated_who/version.rb

@@ -1,3 +1,3 @@
 module WhosDatedWho
-  VERSION = '0.3.1'
+  VERSION = '1.0.0'
 end

data/spec/spec_helper.rb

@@ -1,16 +1,26 @@
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear!
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  add_filter 'spec'
+end
 
 require 'pry'
 require 'whos_dated_who'
 
+Dir[File.expand_path('..', __FILE__) + '/support/**/*.rb'].each do |f|
+  require(f)
+end
+
 RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
-  if config.files_to_run.one?
-    config.default_formatter = 'doc'
-  end
+  config.default_formatter = 'doc' if config.files_to_run.one?
 
   config.profile_examples = 10
 

data/spec/support/fixture_helpers.rb

@@ -0,0 +1,13 @@
+module FixtureHelpers
+  def fixture_response(name)
+    File.read(fixture_file("#{name}.resp"))
+  end
+
+  def fixture_file(filename)
+    File.expand_path("../../fixtures/#{filename}", __FILE__)
+  end
+end
+
+RSpec.configure do |config|
+  config.include(FixtureHelpers)
+end

data/spec/whos_dated_who/parser_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 module WhosDatedWho
   describe Parser do
     let(:parser) { Parser.new }
+
     before do
-      body = File.read(File.expand_path('../../fixtures/scarlett-johansson.resp', __FILE__))
-      parser.parse(body)
+      parser.parse(fixture_response(:scarlett_johansson))
       @result = parser.result.biography
     end
 
@@ -42,7 +42,7 @@ module WhosDatedWho
         [
           :other_names, :brand_endorsements, :websites, :brothers, :sisters,
           :friends, :pets, :favorite_movies, :favorite_places, :favorite_foods,
-          :favorite_colors, :favorite_accessories
+          :favorite_colors, :favorite_accessories, :distinctive_features
         ].each do |key|
           expect(@result[key]).to be_kind_of(Array)
         end
@@ -56,10 +56,14 @@ module WhosDatedWho
         expect(@result.pets.size).to eq(2)
         expect(@result.favorite_movies).to include(/Heat/)
         expect(@result.favorite_places).to include('London')
+        expect(@result.distinctive_features).to include(/Lips/)
+        expect(@result.distinctive_features).to include(/Husky Voice/)
       end
 
       it 'gets a description' do
-        expect(@result.description).to match(/American actress, model, and singer/)
+        expect(@result.description).to match(
+          /American actress, model, and singer/
+        )
       end
     end
   end

data/whos_dated_who.gemspec

@@ -32,4 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-rescue'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rethinkdb'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whos_dated_who
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Adrian Perez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -192,6 +192,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Unofficial API for whosdatedwho.com
 email:
 - adrianperez.deb@gmail.com
@@ -202,6 +230,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -218,8 +247,9 @@ files:
 - lib/whos_dated_who/parser.rb
 - lib/whos_dated_who/version.rb
 - spec/acceptance/whos_dated_who_spec.rb
-- spec/fixtures/scarlett-johansson.resp
+- spec/fixtures/scarlett_johansson.resp
 - spec/spec_helper.rb
+- spec/support/fixture_helpers.rb
 - spec/whos_dated_who/client_spec.rb
 - spec/whos_dated_who/parser_spec.rb
 - whos_dated_who.gemspec
@@ -249,8 +279,9 @@ specification_version: 4
 summary: Unofficial API for whosdatedwho.com
 test_files:
 - spec/acceptance/whos_dated_who_spec.rb
-- spec/fixtures/scarlett-johansson.resp
+- spec/fixtures/scarlett_johansson.resp
 - spec/spec_helper.rb
+- spec/support/fixture_helpers.rb
 - spec/whos_dated_who/client_spec.rb
 - spec/whos_dated_who/parser_spec.rb
 has_rdoc: