pupa 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08051be1ed0ea215d0e1c258d9b01bd189215dc2
-  data.tar.gz: dd163a78b33959069adbb5d971781a17a582a15b
+  metadata.gz: b658ac2d8e84f9eb39493e60888affea15547c1a
+  data.tar.gz: ef073506b9be5c9272422194209ab0bc64bc9af9
 SHA512:
-  metadata.gz: 597d6a420ae3c8ba04336b9ed38f4073925e90720d51895fbd83a9c77232f8c588834f66d5106fd9906c402bba752f4805c1014919812427b119aa870ead1cda
-  data.tar.gz: 98e65c5af6ea3f1a63b54c7c0c2091d0664660705d19e77bf22b2d5e7dfa911d56155e8cb6fa69ab11c22191e74444f1e60981f3523239e6a8873bc0d3c92efd
+  metadata.gz: 33bff8ac8f6bec1512228a5f4c525dc2adc87aad8892a650e9742d18ea4f89931e2acde2fc306defeb4fcb2b9828ea6783c84c1d979ff64459259e2d3c0091fb
+  data.tar.gz: 3373eb0d882ab71c705cee00dbed2bd507867c14a0683cf8d57a7ccec5814133025abd49443281919257b4e985e64320393da22ac532639ef3c9ad71da2bcda8

data/.gitignore

@@ -4,3 +4,4 @@
 Gemfile.lock
 doc/*
 pkg/*
+/test.db

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -1,7 +1,10 @@
+sudo: false
 language: ruby
+cache: bundler
 rvm:
   - 2.0.0
   - 2.1.0
+  - 2.2.0
 services:
   - memcached
   - mongodb

data/.yardopts

@@ -1,4 +1,3 @@
---no-private
 --hide-void-return
 --embed-mixin ClassMethods
 --markup=markdown

data/Gemfile

@@ -1,6 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in the gemspec
 gemspec
-
-gem 'faraday_middleware', git: 'https://github.com/lostisland/faraday_middleware.git'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Open North Inc.
+Copyright (c) 2013 James McKinney
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/PERFORMANCE.md

@@ -4,7 +4,7 @@ Pupa.rb offers several ways to significantly improve performance.
 
 In an example case, reducing disk I/O and skipping validation as described below reduced the time to scrape 10,000 documents from 100 cached HTTP responses from 100 seconds down to 5 seconds. Like fast tests, fast scrapers make development smoother.
 
-The `import` action's performance is currently limited by the database when a dependency graph is used to determine the evaluation order. If a dependency graph cannot be used because you don't know a related object's ID, [several optimizations](https://github.com/opennorth/pupa-ruby/issues/12) can be implemented to improve performance.
+The `import` action's performance is currently limited by the database when a dependency graph is used to determine the evaluation order. If a dependency graph cannot be used because you don't know a related object's ID, [several optimizations](https://github.com/jpmckinney/pupa-ruby/issues/12) can be implemented to improve performance.
 
 ## Reducing HTTP requests
 

data/README.md

@@ -1,10 +1,10 @@
 # Pupa.rb: A Data Scraping Framework
 
-[![Gem Version](https://badge.fury.io/rb/pupa.svg)](http://badge.fury.io/rb/pupa)
-[![Build Status](https://secure.travis-ci.org/opennorth/pupa-ruby.png)](http://travis-ci.org/opennorth/pupa-ruby)
-[![Dependency Status](https://gemnasium.com/opennorth/pupa-ruby.png)](https://gemnasium.com/opennorth/pupa-ruby)
-[![Coverage Status](https://coveralls.io/repos/opennorth/pupa-ruby/badge.png?branch=master)](https://coveralls.io/r/opennorth/pupa-ruby)
-[![Code Climate](https://codeclimate.com/github/opennorth/pupa-ruby.png)](https://codeclimate.com/github/opennorth/pupa-ruby)
+[![Gem Version](https://badge.fury.io/rb/pupa.svg)](https://badge.fury.io/rb/pupa)
+[![Build Status](https://secure.travis-ci.org/jpmckinney/pupa-ruby.png)](https://travis-ci.org/jpmckinney/pupa-ruby)
+[![Dependency Status](https://gemnasium.com/jpmckinney/pupa-ruby.png)](https://gemnasium.com/jpmckinney/pupa-ruby)
+[![Coverage Status](https://coveralls.io/repos/jpmckinney/pupa-ruby/badge.png?branch=master)](https://coveralls.io/r/jpmckinney/pupa-ruby)
+[![Code Climate](https://codeclimate.com/github/jpmckinney/pupa-ruby.png)](https://codeclimate.com/github/jpmckinney/pupa-ruby)
 
 Pupa.rb is a Ruby 2.x fork of Python [Pupa](https://github.com/opencivicdata/pupa). It implements an Extract, Transform and Load (ETL) process to scrape data from online sources, transform it, and write it to a database.
 
@@ -14,7 +14,7 @@ Pupa.rb is a Ruby 2.x fork of Python [Pupa](https://github.com/opencivicdata/pup
 
 You can scrape any sort of data with Pupa.rb using your own models. You can also use Pupa.rb to scrape people, organizations, memberships and posts according to the [Popolo](http://www.popoloproject.com/) open government data specification. This gem is up-to-date with Popolo's 2014-10-28 version.
 
-The [cat.rb](http://opennorth.github.io/pupa-ruby/docs/cat.html) example shows you how to:
+The [cat.rb](http://jpmckinney.github.io/pupa-ruby/docs/cat.html) example shows you how to:
 
 * write a simple Cat class that is compatible with Pupa.rb
 * use mixins to add Popolo properties to your class
@@ -22,31 +22,31 @@ The [cat.rb](http://opennorth.github.io/pupa-ruby/docs/cat.html) example shows y
 * register a scraping task with Pupa.rb
 * run the processor to save the Cat objects to MongoDB
 
-The [bill.rb](http://opennorth.github.io/pupa-ruby/docs/bill.html) example shows you how to:
+The [bill.rb](http://jpmckinney.github.io/pupa-ruby/docs/bill.html) example shows you how to:
 
 * create relations between objects
 * relate two objects, even if you do not know the ID of one object
 * write separate scraping tasks for different types of data
 * run each scraping task separately
 
-The [legislator.rb](http://opennorth.github.io/pupa-ruby/docs/legislator.html) example shows you how to:
+The [legislator.rb](http://jpmckinney.github.io/pupa-ruby/docs/legislator.html) example shows you how to:
 
 * use a different HTTP client than the default [Faraday](https://github.com/lostisland/faraday)
 * select a scraping method according to criteria like the legislative term
 * pass selection criteria to the processor before running scraping tasks
 
-The [organization.rb](http://opennorth.github.io/pupa-ruby/docs/organization.html) example shows you how to:
+The [organization.rb](http://jpmckinney.github.io/pupa-ruby/docs/organization.html) example shows you how to:
 
 * register a transformation task with Pupa.rb
 * run the processor's transformation task
 
 ### Scraping method selection
 
-1.  For simple processing, your processor class need only define a single `scrape_objects` method, which will perform all scraping. See [cat.rb](http://opennorth.github.io/pupa-ruby/docs/cat.html) for an example.
+1.  For simple processing, your processor class need only define a single `scrape_objects` method, which will perform all scraping. See [cat.rb](http://jpmckinney.github.io/pupa-ruby/docs/cat.html) for an example.
 
-1.  If you scrape many types of data from the same source, you may want to split the scraping into separate tasks according to the type of data being scraped. See [bill.rb](http://opennorth.github.io/pupa-ruby/docs/bill.html) for an example.
+1.  If you scrape many types of data from the same source, you may want to split the scraping into separate tasks according to the type of data being scraped. See [bill.rb](http://jpmckinney.github.io/pupa-ruby/docs/bill.html) for an example.
 
-1.  You may want more control over the method used to perform a scraping task. For example, a legislature may publish legislators before 1997 in one format and legislators after 1997 in another format. In this case, you may want to select the method used to scrape legislators according to the year. See [legislator.rb](http://opennorth.github.io/pupa-ruby/docs/legislator.html).
+1.  You may want more control over the method used to perform a scraping task. For example, a legislature may publish legislators before 1997 in one format and legislators after 1997 in another format. In this case, you may want to select the method used to scrape legislators according to the year. See [legislator.rb](http://jpmckinney.github.io/pupa-ruby/docs/legislator.html).
 
 ### Automatic response parsing
 
@@ -54,7 +54,7 @@ JSON parsing is enabled by default. To enable automatic parsing of HTML and XML,
 
 ## Performance
 
-Pupa.rb offers several ways to significantly improve performance. [Read the documentation.](https://github.com/opennorth/pupa-ruby/blob/master/PERFORMANCE.md#readme)
+Pupa.rb offers several ways to significantly improve performance. [Read the documentation.](https://github.com/jpmckinney/pupa-ruby/blob/master/PERFORMANCE.md#readme)
 
 ## Integration with ODMs
 
@@ -73,9 +73,9 @@ Instead, have a simple scraping model that includes `Pupa::Model` and an app mod
 
 Pupa.rb's goal is to make scraping less painful by solving common problems:
 
-* If you are updating a database by scraping a website, you can either delete and recreate records, or you can merge the scraped records with the saved records. Pupa.rb offers a simple way to merge records, by [using an object's stable properties for identification](http://opennorth.github.io/pupa-ruby/docs/cat.html#section-7).
-* If you are scraping a source that references other sources – for example, a committee that references its members – you may want to link the source to its references with foreign keys. Pupa.rb will use whatever identifying information you scrape – for example, the members' names – to [fill in the foreign keys for you](http://opennorth.github.io/pupa-ruby/docs/bill.html#section-4).
-* Data sources may use different formats in different contexts. Pupa.rb makes it easy to [select scraping methods](#scraping-method-selection) according to criteria, like the year of publication [for example](http://opennorth.github.io/pupa-ruby/docs/legislator.html#section-3).
+* If you are updating a database by scraping a website, you can either delete and recreate records, or you can merge the scraped records with the saved records. Pupa.rb offers a simple way to merge records, by [using an object's stable properties for identification](http://jpmckinney.github.io/pupa-ruby/docs/cat.html#section-7).
+* If you are scraping a source that references other sources – for example, a committee that references its members – you may want to link the source to its references with foreign keys. Pupa.rb will use whatever identifying information you scrape – for example, the members' names – to [fill in the foreign keys for you](http://jpmckinney.github.io/pupa-ruby/docs/bill.html#section-4).
+* Data sources may use different formats in different contexts. Pupa.rb makes it easy to [select scraping methods](#scraping-method-selection) according to criteria, like the year of publication [for example](http://jpmckinney.github.io/pupa-ruby/docs/legislator.html#section-3).
 * By splitting the scrape (extract) and import (load) steps, it's easier for you and volunteers to start a scraper without any interaction with a database.
 
 In short, Pupa.rb lets you spend more time on the tasks that are unique to your use case, and less time on common tasks like caching, merging and storing data. It also provides helpful features like:
@@ -83,8 +83,8 @@ In short, Pupa.rb lets you spend more time on the tasks that are unique to your
 * Logging, to make debugging and monitoring a scraper easier
 * [Automatic response parsing](#automatic-response-parsing) of JSON, XML and HTML
 * Automatic response decompression
-* [Option parsing](http://opennorth.github.io/pupa-ruby/docs/legislator.html#section-9), to control your scraper from the command-line
-* [Object validation](http://opennorth.github.io/pupa-ruby/docs/cat.html#section-4), using [JSON Schema](http://json-schema.org/)
+* [Option parsing](http://jpmckinney.github.io/pupa-ruby/docs/legislator.html#section-9), to control your scraper from the command-line
+* [Object validation](http://jpmckinney.github.io/pupa-ruby/docs/cat.html#section-4), using [JSON Schema](http://json-schema.org/)
 
 Pupa.rb is extensible, so that you can add your own models, parsers, helpers, actions, etc. It also offers several ways to [improve your scraper's performance](#performance).
 
@@ -96,8 +96,4 @@ Both Pupa.rb and Python [Pupa](https://github.com/opencivicdata/pupa) implement
 
 **DO NOT** run this gem's specs if you are using Redis database number 15 on `localhost`!
 
-## Bugs? Questions?
-
-This project's main repository is on GitHub: [http://github.com/opennorth/pupa-ruby](http://github.com/opennorth/pupa-ruby), where your contributions, forks, bug reports, feature requests, and feedback are greatly welcomed.
-
-Copyright (c) 2013 Open North Inc., released under the MIT license
+Copyright (c) 2013 James McKinney, released under the MIT license

data/Rakefile

@@ -22,8 +22,8 @@ namespace :popolo do
 
     require 'octokit'
 
-    Octokit.contents('opennorth/popolo-spec', path: 'schemas', ref: 'gh-pages').each do |file|
-      response = Octokit.contents('opennorth/popolo-spec', path: file.path, ref: 'gh-pages')
+    Octokit.contents('popolo-project/popolo-spec', path: 'schemas', ref: 'gh-pages').each do |file|
+      response = Octokit.contents('popolo-project/popolo-spec', path: file.path, ref: 'gh-pages')
       if response.encoding == 'base64'
         content = Base64.decode64(response.content)
       else

data/lib/pupa.rb

@@ -1,4 +1,3 @@
-require 'fileutils'
 require 'forwardable'
 require 'json'
 

data/lib/pupa/models/concerns/timestamps.rb

@@ -16,7 +16,7 @@ module Pupa
 
         set_callback(:save, :before) do |object|
           # The object may not set created_at.
-          # @see https://github.com/opennorth/pupa-ruby/issues/17
+          # @see https://github.com/jpmckinney/pupa-ruby/issues/17
           object.created_at = object.document['created_at'] if object.document
           object.updated_at = Time.now.utc
         end

data/lib/pupa/processor/connection.rb

@@ -13,7 +13,7 @@ module Pupa
       # @return a configured connection to a database system
       def self.new(database_url)
         case URI.parse(database_url).scheme
-        when 'postgres'
+        when 'postgres', 'sqlite'
           PostgreSQLAdapter.new(database_url)
         when 'mongodb'
           MongoDBAdapter.new(database_url)

data/lib/pupa/processor/connection_adapters/mongodb_adapter.rb

@@ -1,4 +1,4 @@
-require 'moped'
+require 'mongo'
 
 module Pupa
   class Processor
@@ -10,7 +10,7 @@ module Pupa
         # @param [String] database_url the database URL
         def initialize(database_url)
           uri = URI.parse(database_url)
-          @raw_connection = Moped::Session.new(["#{uri.host}:#{uri.port}"], database: uri.path[1..-1])
+          @raw_connection = Mongo::Client.new(["#{uri.host}:#{uri.port}"], database: uri.path[1..-1])
           @raw_connection.login(uri.user, uri.password) if uri.user && uri.password
         end
 
@@ -60,16 +60,16 @@ module Pupa
           when 0
             object.run_callbacks(:save) do
               object.run_callbacks(:create) do
-                collection.insert(object.to_h(persist: true))
+                collection.insert_one(object.to_h(persist: true))
                 [true, object._id.to_s]
               end
             end
           when 1
             # Make the document available to the callbacks.
-            # @see https://github.com/opennorth/pupa-ruby/issues/17
+            # @see https://github.com/jpmckinney/pupa-ruby/issues/17
             object.document = query.first
             object.run_callbacks(:save) do
-              query.update(object.to_h(persist: true).except(:_id))
+              query.update_one(object.to_h(persist: true).except(:_id))
               [false, object.document['_id'].to_s]
             end
           else

data/lib/pupa/processor/connection_adapters/postgresql_adapter.rb

@@ -71,7 +71,7 @@ module Pupa
             end
           when 1
             # Make the document available to the callbacks.
-            # @see https://github.com/opennorth/pupa-ruby/issues/17
+            # @see https://github.com/jpmckinney/pupa-ruby/issues/17
             object.document = stringify_keys(query.first)
             object.run_callbacks(:save) do
               query.update(object.to_h(persist: true).except(:_id))

data/lib/pupa/processor/document_store/file_store.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Pupa
   class Processor
     class DocumentStore

data/lib/pupa/refinements/faraday_middleware.rb

@@ -1,3 +1,5 @@
+require 'openssl'
+
 # Caches all requests, not only GET requests.
 class FaradayMiddleware::Caching
   def call(env)
@@ -20,6 +22,6 @@ class FaradayMiddleware::Caching
       url.query = params.any? ? build_query(params) : nil
     end
     url.normalize!
-    url.scheme + '://' + url.host + url.request_uri + env[:body].to_s # XXX add for POST requests
+    url.scheme + '://' + url.host + url.request_uri + OpenSSL::Digest::MD5.hexdigest(env[:body].to_s) # XXX add for POST requests
   end
 end

data/lib/pupa/version.rb

@@ -1,3 +1,3 @@
 module Pupa
-  VERSION = "0.1.11"
+  VERSION = "0.2.0"
 end

data/pupa.gemspec

@@ -5,9 +5,8 @@ Gem::Specification.new do |s|
   s.name        = "pupa"
   s.version     = Pupa::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Open North"]
-  s.email       = ["info@opennorth.ca"]
-  s.homepage    = "http://github.com/opennorth/pupa-ruby"
+  s.authors     = ["James McKinney"]
+  s.homepage    = "https://github.com/jpmckinney/pupa-ruby"
   s.summary     = %q{A data scraping framework}
   s.license     = 'MIT'
 
@@ -18,22 +17,23 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('activesupport', '~> 4.0')
   s.add_runtime_dependency('colored', '~> 1.2')
-  s.add_runtime_dependency('faraday_middleware', '~> 0.9.0')
-  s.add_runtime_dependency('json-schema', '~> 2.1.3')
+  s.add_runtime_dependency('faraday_middleware', '~> 0.9.2')
+  s.add_runtime_dependency('json-schema', '~> 2.3')
   s.add_runtime_dependency('mail')
-  s.add_runtime_dependency('moped', '~> 2.0.0.rc1')
+  s.add_runtime_dependency('mongo', '~> 2.0')
   s.add_runtime_dependency('oj', '~> 2.1')
   s.add_runtime_dependency('sequel', '~> 4.10.0')
   s.add_runtime_dependency('pg', '~> 0.17.0')
 
   s.add_development_dependency('coveralls')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~> 2.10')
+
   s.add_development_dependency('dalli')
-  s.add_development_dependency('json', '~> 1.7.7') # to silence coveralls warning
   s.add_development_dependency('multi_xml')
   s.add_development_dependency('nokogiri', '~> 1.6.0')
   s.add_development_dependency('octokit') # to update Popolo schema
-  s.add_development_dependency('rake')
   s.add_development_dependency('redis-store')
-  s.add_development_dependency('rspec', '~> 2.10')
+  s.add_development_dependency('sqlite3')
   s.add_development_dependency('typhoeus')
 end

data/spec/models/area_spec.rb

@@ -7,7 +7,7 @@ describe Pupa::Area do
 
   describe '#to_s' do
     it 'should return a human-readable string' do
-      object.to_s.should == 'Boston Ward 1'
+      expect(object.to_s).to eq('Boston Ward 1')
     end
   end
 end

data/spec/models/concerns/contactable_spec.rb

@@ -14,44 +14,44 @@ describe Pupa::Concerns::Contactable do
 
   describe '#initialize' do
     it 'should initialize an empty ContactDetailList' do
-      object.contact_details.should be_a(Pupa::ContactDetailList)
-      object.contact_details.should == []
+      expect(object.contact_details).to be_a(Pupa::ContactDetailList)
+      expect(object.contact_details).to eq([])
     end
 
     it 'should initialize the given ContactDetailList' do
       object = klass.new(contact_details: [{type: 'email', value: 'ceo@example.com', note: 'work'}])
-      object.contact_details.should == [{type: 'email', value: 'ceo@example.com', note: 'work'}]
+      expect(object.contact_details).to eq([{type: 'email', value: 'ceo@example.com', note: 'work'}])
     end
   end
 
   describe '#contact_details=' do
     it 'should use coerce to a ContactDetailList' do
       object.contact_details = [{type: 'email', value: 'ceo@example.com', note: 'work'}]
-      object.contact_details.should be_a(Pupa::ContactDetailList)
+      expect(object.contact_details).to be_a(Pupa::ContactDetailList)
     end
 
     it 'should symbolize keys' do
       object.contact_details = [{'type' => 'email', 'value' => 'ceo@example.com'}]
-      object.contact_details.should == [{type: 'email', value: 'ceo@example.com'}]
+      expect(object.contact_details).to eq([{type: 'email', value: 'ceo@example.com'}])
     end
   end
 
   describe '#add_contact_detail' do
     it 'should add a contact detail' do
       object.add_contact_detail('email', 'ceo@example.com', label: 'Email', note: 'work', valid_from: '2010-01-01', valid_until: '2010-12-31')
-      object.contact_details.should == [{type: 'email', value: 'ceo@example.com', label: 'Email', note: 'work', valid_from: '2010-01-01', valid_until: '2010-12-31'}]
+      expect(object.contact_details).to eq([{type: 'email', value: 'ceo@example.com', label: 'Email', note: 'work', valid_from: '2010-01-01', valid_until: '2010-12-31'}])
     end
 
     it 'should not add a contact detail without a type' do
       object.add_contact_detail(nil, 'ceo@example.com')
       object.add_contact_detail('', 'ceo@example.com')
-      object.contact_details.blank?.should == true
+      expect(object.contact_details.blank?).to eq(true)
     end
 
     it 'should not add a contact detail without a value' do
       object.add_contact_detail('email', nil)
       object.add_contact_detail('email', '')
-      object.contact_details.blank?.should == true
+      expect(object.contact_details.blank?).to eq(true)
     end
   end
 end

data/spec/models/concerns/identifiable_spec.rb

@@ -14,38 +14,38 @@ describe Pupa::Concerns::Identifiable do
 
   describe '#initialize' do
     it 'should initialize an empty IdentifierList' do
-      object.identifiers.should be_a(Pupa::IdentifierList)
-      object.identifiers.should == []
+      expect(object.identifiers).to be_a(Pupa::IdentifierList)
+      expect(object.identifiers).to eq([])
     end
 
     it 'should initialize the given IdentifierList' do
       object = klass.new(identifiers: [{identifier: '123456789', scheme: 'DUNS'}])
-      object.identifiers.should == [{identifier: '123456789', scheme: 'DUNS'}]
+      expect(object.identifiers).to eq([{identifier: '123456789', scheme: 'DUNS'}])
     end
   end
 
   describe '#identifiers=' do
     it 'should use coerce to a IdentifierList' do
       object.identifiers = [{identifier: '123456789', scheme: 'DUNS'}]
-      object.identifiers.should be_a(Pupa::IdentifierList)
+      expect(object.identifiers).to be_a(Pupa::IdentifierList)
     end
 
     it 'should symbolize keys' do
       object.identifiers = [{'identifier' => '123456789', 'scheme' => 'DUNS'}]
-      object.identifiers.should == [{identifier: '123456789', scheme: 'DUNS'}]
+      expect(object.identifiers).to eq([{identifier: '123456789', scheme: 'DUNS'}])
     end
   end
 
   describe '#add_identifier' do
     it 'should add an identifier' do
       object.add_identifier('123456789', scheme: 'duns')
-      object.identifiers.should == [{identifier: '123456789', scheme: 'duns'}]
+      expect(object.identifiers).to eq([{identifier: '123456789', scheme: 'duns'}])
     end
 
     it 'should not add an identifier without an identifier' do
       object.add_identifier(nil)
       object.add_identifier('')
-      object.identifiers.blank?.should == true
+      expect(object.identifiers.blank?).to eq(true)
     end
   end
 end

data/spec/models/concerns/linkable_spec.rb

@@ -15,20 +15,20 @@ describe Pupa::Concerns::Linkable do
   describe '#links' do
     it 'should symbolize keys' do
       object.links = [{'url' => 'http://example.com', 'note' => 'homepage'}]
-      object.links.should == [{url: 'http://example.com', note: 'homepage'}]
+      expect(object.links).to eq([{url: 'http://example.com', note: 'homepage'}])
     end
   end
 
   describe '#add_link' do
     it 'should add a link' do
       object.add_link('http://example.com', note: 'homepage')
-      object.links.should == [{url: 'http://example.com', note: 'homepage'}]
+      expect(object.links).to eq([{url: 'http://example.com', note: 'homepage'}])
     end
 
     it 'should not add a link without a url' do
       object.add_link(nil)
       object.add_link('')
-      object.links.blank?.should == true
+      expect(object.links.blank?).to eq(true)
     end
   end
 end