pupa 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b3361fdbe89fad7482ffc7661a04f6a610351e
-  data.tar.gz: 49066676fd5b7519c300eb9e3dfc05655bb6d864
+  metadata.gz: e4c9018ed669280a1194d4994489478c00425c8e
+  data.tar.gz: 3b9b3e8f9d3848544fcec2742a22d64015e63df7
 SHA512:
-  metadata.gz: 97f44c06bae5f107264135b2fb82a84fc17cf9ac521903e75fd4653c1a975bc5516f8f33711be9e9d1063a2be1178e728a1ff83752554074b32d895172c768d8
-  data.tar.gz: 330535ef6392fb0990a28ca8e0b30e0ce217ab68407d4afdf7f917a65d0fc8349b1a953547b5be7158f372c85aefd611c7d4e1e480f8d287f63195b3b09cdc82
+  metadata.gz: cbb606d5a3b65f8d2a0da7ad8807fb5b43c0c7da0972da461c88c72b267ef686bb8ca81be74860705c23db90f09ecf7b4e3fc822ae7616f5eb476f7bdd118572
+  data.tar.gz: a6185283e2645adb2c3455a2a53ad723f347d64cee0e4a505cc819a6027d3bad76d60426430082f966fac837a4370a7421c3e0483268fd9df621865d14a3e136

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in the gemspec
 gemspec
+
+# Remove once vcr 2.9.4 released.
+gem 'vcr', git: 'https://github.com/vcr/vcr.git'

data/Rakefile

@@ -19,18 +19,20 @@ namespace :popolo do
   desc 'Update Popolo schemas'
   task :schemas do
     require 'base64'
+    require 'json'
 
     require 'octokit'
 
     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)
+        content = JSON.load(Base64.decode64(response.content))
       else
         raise "Can't handle #{response.encoding} encoding"
       end
+      content['id'] = content['id'].sub('http://www.popoloproject.com/schemas/', '')
       File.open(File.expand_path(File.join('schemas', 'popolo', file.name), __dir__), 'w') do |f|
-        f.write(content)
+        f.write(JSON.dump(content))
       end
     end
   end

data/lib/pupa/models/area.rb

@@ -3,7 +3,7 @@ module Pupa
   class Area
     include Model
 
-    self.schema = 'popolo/area'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'area.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/models/membership.rb

@@ -3,7 +3,7 @@ module Pupa
   class Membership
     include Model
 
-    self.schema = 'popolo/membership'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'membership.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/models/model.rb

@@ -78,14 +78,7 @@ module Pupa
       # @param [Hash,String] value a hash or a relative or absolute path
       # @note `JSON::Validator#initialize_schema` runs fastest if given a hash.
       def schema=(value)
-        self.json_schema = if Hash === value
-          value
-        elsif Pathname.new(value).absolute?
-          JSON.load(File.read(value))
-        else
-          JSON.load(File.read(File.expand_path(File.join('..', '..', '..', 'schemas', "#{value}.json"), __dir__)))
-        end
-
+        self.json_schema = value
         self.validator = JSON::Validator.new(self.json_schema, {}, {
           clear_cache: false,
           parse_data: false,

data/lib/pupa/models/motion.rb

@@ -3,7 +3,7 @@ module Pupa
   class Motion
     include Model
 
-    self.schema = 'popolo/motion'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'motion.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/models/organization.rb

@@ -4,7 +4,7 @@ module Pupa
   class Organization
     include Model
 
-    self.schema = 'popolo/organization'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'organization.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/models/person.rb

@@ -3,7 +3,7 @@ module Pupa
   class Person
     include Model
 
-    self.schema = 'popolo/person'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'person.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/models/post.rb

@@ -3,7 +3,7 @@ module Pupa
   class Post
     include Model
 
-    self.schema = 'popolo/post'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'post.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/models/vote.rb

@@ -3,7 +3,7 @@ module Pupa
   class Vote
     include Model
 
-    self.schema = 'popolo/vote'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'vote.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/models/vote_event.rb

@@ -3,7 +3,7 @@ module Pupa
   class VoteEvent
     include Model
 
-    self.schema = 'popolo/vote_event'
+    self.schema = File.expand_path(File.join('..', '..', '..', 'schemas', 'popolo', 'vote_event.json'), __dir__)
 
     include Concerns::Timestamps
     include Concerns::Sourceable

data/lib/pupa/version.rb

@@ -1,3 +1,3 @@
 module Pupa
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/schemas/popolo/area.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/area.json#",
+  "id": "area.json#",
   "title": "Area",
   "description": "A geographic area whose geometry may change over time",
   "type": "object",
@@ -27,7 +27,7 @@
     },
     "parent": {
       "description": "The area that contains this area",
-      "$ref": "http://www.popoloproject.com/schemas/area.json#"
+      "$ref": "area.json#"
     },
     "geometry": {
       "description": "A geometry",
@@ -47,7 +47,7 @@
       "description": "URLs to documents from which the area is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/schemas/popolo/contact_detail.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/contact_detail.json#",
+  "id": "contact_detail.json#",
   "title": "Contact detail",
   "description": "A means of contacting an entity",
   "type": "object",
@@ -47,7 +47,7 @@
       "description": "URLs to documents from which the contact detail is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/schemas/popolo/count.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/count.json#",
+  "id": "count.json#",
   "title": "Count",
   "description": "The number of votes for an option in a vote event",
   "type": "object",

data/schemas/popolo/group_result.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/group_result.json#",
+  "id": "group_result.json#",
   "title": "Group result",
   "description": "A result of a vote event within a group of voters",
   "type": "object",

data/schemas/popolo/identifier.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/identifier.json#",
+  "id": "identifier.json#",
   "title": "Identifier",
   "description": "An issued identifier",
   "type": "object",

data/schemas/popolo/link.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/link.json#",
+  "id": "link.json#",
   "title": "Link",
   "description": "A URL",
   "type": "object",

data/schemas/popolo/membership.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/membership.json#",
+  "id": "membership.json#",
   "title": "Membership",
   "description": "A relationship between a member and an organization",
   "type": "object",
@@ -27,7 +27,7 @@
     },
     "person": {
       "description": "The person who is a member of the organization",
-      "$ref": "http://www.popoloproject.com/schemas/person.json#"
+      "$ref": "person.json#"
     },
     "organization_id": {
       "description": "The ID of the organization in which the person or organization is a member",
@@ -35,7 +35,7 @@
     },
     "organization": {
       "description": "The organization in which the person or organization is a member",
-      "$ref": "http://www.popoloproject.com/schemas/organization.json#"
+      "$ref": "organization.json#"
     },
     "post_id": {
       "description": "The ID of the post held by the member in the organization through this membership",
@@ -43,7 +43,7 @@
     },
     "post": {
       "description": "The post held by the member in the organization through this membership",
-      "$ref": "http://www.popoloproject.com/schemas/post.json#"
+      "$ref": "post.json#"
     },
     "on_behalf_of_id": {
       "description": "The ID of the organization on whose behalf the person is a member of the organization",
@@ -51,7 +51,7 @@
     },
     "on_behalf_of": {
       "description": "The organization on whose behalf the person is a member of the organization",
-      "$ref": "http://www.popoloproject.com/schemas/organization.json#"
+      "$ref": "organization.json#"
     },
     "area_id": {
       "description": "The ID of the geographic area to which this membership is related",
@@ -59,7 +59,7 @@
     },
     "area": {
       "description": "The geographic area to which this membership is related",
-      "$ref": "http://www.popoloproject.com/schemas/area.json#"
+      "$ref": "area.json#"
     },
     "start_date": {
       "description": "The date on which the relationship began",
@@ -75,14 +75,14 @@
       "description": "Means of contacting the member of the organization",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the membership",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     },
     "created_at": {
@@ -99,7 +99,7 @@
       "description": "URLs to documents from which the membership is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/schemas/popolo/motion.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/motion.json#",
+  "id": "motion.json#",
   "title": "Motion",
   "description": "A formal step to introduce a matter for consideration by an organization",
   "type": "object",
@@ -15,7 +15,7 @@
     },
     "organization": {
       "description": "The organization in which the motion is proposed",
-      "$ref": "http://www.popoloproject.com/schemas/organization.json#"
+      "$ref": "organization.json#"
     },
     "legislative_session_id": {
       "description": "The ID of the legislative session in which the motion is proposed",
@@ -31,7 +31,7 @@
     },
     "creator": {
       "description": "The person who proposed the motion",
-      "$ref": "http://www.popoloproject.com/schemas/person.json#"
+      "$ref": "person.json#"
     },
     "text": {
       "description": "The transcript or text of the motion",
@@ -58,7 +58,7 @@
       "description": "Events at which people vote on the motion",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/vote_event.json#"
+        "$ref": "vote_event.json#"
       }
     },
     "created_at": {
@@ -75,7 +75,7 @@
       "description": "URLs to documents from which the motion is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/schemas/popolo/organization.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/organization.json#",
+  "id": "organization.json#",
   "title": "Organization",
   "description": "A group with a common purpose or reason for existence that goes beyond the set of people belonging to it",
   "type": "object",
@@ -17,14 +17,14 @@
       "description": "Alternate or former names",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/other_name.json#"
+        "$ref": "other_name.json#"
       }
     },
     "identifiers": {
       "description": "Issued identifiers",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/identifier.json#"
+        "$ref": "identifier.json#"
       }
     },
     "classification": {
@@ -37,7 +37,7 @@
     },
     "parent": {
       "description": "The organization that contains this organization",
-      "$ref": "http://www.popoloproject.com/schemas/organization.json#"
+      "$ref": "organization.json#"
     },
     "area_id": {
       "description": "The ID of the geographic area to which this organization is related",
@@ -45,7 +45,7 @@
     },
     "area": {
       "description": "The geographic area to which this organization is related",
-      "$ref": "http://www.popoloproject.com/schemas/area.json#"
+      "$ref": "area.json#"
     },
     "founding_date": {
       "description": "A date of founding",
@@ -66,28 +66,28 @@
       "description": "Means of contacting the organization",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the organization",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     },
     "memberships": {
       "description": "Memberships",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/membership.json#"
+        "$ref": "membership.json#"
       }
     },
     "posts": {
       "description": "Posts within the organization",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/post.json#"
+        "$ref": "post.json#"
       }
     },
     "created_at": {
@@ -104,7 +104,7 @@
       "description": "URLs to documents from which the organization is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/schemas/popolo/other_name.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/other_name.json#",
+  "id": "other_name.json#",
   "title": "Other name",
   "description": "An alternate or former name",
   "type": "object",

data/schemas/popolo/person.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/person.json#",
+  "id": "person.json#",
   "title": "Person",
   "description": "A real person, alive or dead",
   "type": "object",
@@ -17,14 +17,14 @@
       "description": "Alternate or former names",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/other_name.json#"
+        "$ref": "other_name.json#"
       }
     },
     "identifiers": {
       "description": "Issued identifiers",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/identifier.json#"
+        "$ref": "identifier.json#"
       }
     },
     "family_name": {
@@ -95,21 +95,21 @@
       "description": "Means of contacting the person",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the person",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     },
     "memberships": {
       "description": "Memberships",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/membership.json#"
+        "$ref": "membership.json#"
       }
     },
     "created_at": {
@@ -126,7 +126,7 @@
       "description": "URLs to documents from which the person is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/schemas/popolo/post.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/post.json#",
+  "id": "post.json#",
   "title": "Post",
   "description": "A position that exists independent of the person holding it",
   "type": "object",
@@ -30,7 +30,7 @@
     },
     "organization": {
       "description": "The organization in which the post is held",
-      "$ref": "http://www.popoloproject.com/schemas/organization.json#"
+      "$ref": "organization.json#"
     },
     "area_id": {
       "description": "The ID of the geographic area to which this post is related",
@@ -38,7 +38,7 @@
     },
     "area": {
       "description": "The geographic area to which this post is related",
-      "$ref": "http://www.popoloproject.com/schemas/area.json#"
+      "$ref": "area.json#"
     },
     "start_date": {
       "description": "The date on which the post was created",
@@ -54,21 +54,21 @@
       "description": "Means of contacting the holder of the post",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the post",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     },
     "memberships": {
       "description": "The memberships through which people hold the post in the organization",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/membership.json#"
+        "$ref": "membership.json#"
       }
     },
     "created_at": {
@@ -85,7 +85,7 @@
       "description": "URLs to documents from which the post is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/schemas/popolo/vote.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/vote.json#",
+  "id": "vote.json#",
   "title": "Vote",
   "description": "A voter's vote in a vote event",
   "type": "object",
@@ -15,7 +15,7 @@
     },
     "vote_event": {
       "description": "A vote event",
-      "$ref": "http://www.popoloproject.com/schemas/vote_event.json#"
+      "$ref": "vote_event.json#"
     },
     "voter_id": {
       "description": "The ID of the person or organization that is voting",
@@ -35,7 +35,7 @@
     },
     "group": {
       "description": "The voter's primary political group",
-      "$ref": "http://www.popoloproject.com/schemas/organization.json#"
+      "$ref": "organization.json#"
     },
     "role": {
       "description": "The voter's role in the event",
@@ -51,7 +51,7 @@
     },
     "pair": {
       "description": "The person with whom the voter is paired",
-      "$ref": "http://www.popoloproject.com/schemas/person.json#"
+      "$ref": "person.json#"
     }
   }
 }

data/schemas/popolo/vote_event.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://www.popoloproject.com/schemas/vote_event.json#",
+  "id": "vote_event.json#",
   "title": "Vote event",
   "description": "An event at which people's votes are recorded",
   "type": "object",
@@ -19,7 +19,7 @@
     },
     "motion": {
       "description": "The motion being decided",
-      "$ref": "http://www.popoloproject.com/schemas/motion.json#"
+      "$ref": "motion.json#"
     },
     "organization_id": {
       "description": "The ID of the organization whose members are voting",
@@ -27,7 +27,7 @@
     },
     "organization": {
       "description": "The organization whose members are voting",
-      "$ref": "http://www.popoloproject.com/schemas/organization.json#"
+      "$ref": "organization.json#"
     },
     "legislative_session_id": {
       "description": "The ID of the legislative session in which the vote occurs",
@@ -55,21 +55,21 @@
       "description": "The result of the vote event within groups of voters",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/group_result.json#"
+        "$ref": "group_result.json#"
       }
     },
     "counts": {
       "description": "The number of votes for options",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/count.json#"
+        "$ref": "count.json#"
       }
     },
     "votes": {
       "description": "Voters' votes",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/vote.json#"
+        "$ref": "vote.json#"
       }
     },
     "created_at": {
@@ -86,7 +86,7 @@
       "description": "URLs to documents from which the vote event is derived",
       "type": "array",
       "items": {
-        "$ref": "http://www.popoloproject.com/schemas/link.json#"
+        "$ref": "link.json#"
       }
     }
   }

data/spec/cassettes/get.yml

@@ -0,0 +1,41 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://httpbin.org/get
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.1
+      Accept-Encoding:
+      - gzip,deflate
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      server:
+      - nginx
+      date:
+      - Sun, 29 Nov 2015 03:42:22 GMT
+      content-type:
+      - application/json
+      content-length:
+      - '230'
+      connection:
+      - close
+      access-control-allow-origin:
+      - "*"
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {}, \n  \"headers\": {\n    \"Accept\": \"*/*\", \n
+        \   \"Accept-Encoding\": \"gzip,deflate\", \n    \"Host\": \"httpbin.org\",
+        \n    \"User-Agent\": \"Faraday v0.9.1\"\n  }, \n  \"origin\": \"124.111.242.66\",
+        \n  \"url\": \"http://httpbin.org/get\"\n}\n"
+    http_version: 
+  recorded_at: Sun, 29 Nov 2015 03:42:22 GMT
+recorded_with: VCR 3.0.0

data/spec/cassettes/get_params.yml

@@ -0,0 +1,41 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://httpbin.org/get?foo=bar
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.1
+      Accept-Encoding:
+      - gzip,deflate
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      server:
+      - nginx
+      date:
+      - Sun, 29 Nov 2015 03:42:21 GMT
+      content-type:
+      - application/json
+      content-length:
+      - '258'
+      connection:
+      - close
+      access-control-allow-origin:
+      - "*"
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {\n    \"foo\": \"bar\"\n  }, \n  \"headers\": {\n    \"Accept\":
+        \"*/*\", \n    \"Accept-Encoding\": \"gzip,deflate\", \n    \"Host\": \"httpbin.org\",
+        \n    \"User-Agent\": \"Faraday v0.9.1\"\n  }, \n  \"origin\": \"124.111.242.66\",
+        \n  \"url\": \"http://httpbin.org/get?foo=bar\"\n}\n"
+    http_version: 
+  recorded_at: Sun, 29 Nov 2015 03:42:21 GMT
+recorded_with: VCR 3.0.0

data/spec/cassettes/post.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://httpbin.org/post
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip,deflate
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      server:
+      - nginx
+      date:
+      - Sun, 29 Nov 2015 03:42:23 GMT
+      content-type:
+      - application/json
+      content-length:
+      - '380'
+      connection:
+      - close
+      access-control-allow-origin:
+      - "*"
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {}, \n  \"data\": \"\", \n  \"files\": {}, \n  \"form\":
+        {}, \n  \"headers\": {\n    \"Accept\": \"*/*\", \n    \"Accept-Encoding\":
+        \"gzip,deflate\", \n    \"Content-Length\": \"0\", \n    \"Content-Type\":
+        \"application/x-www-form-urlencoded\", \n    \"Host\": \"httpbin.org\", \n
+        \   \"User-Agent\": \"Faraday v0.9.1\"\n  }, \n  \"json\": null, \n  \"origin\":
+        \"124.111.242.66\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
+    http_version: 
+  recorded_at: Sun, 29 Nov 2015 03:42:23 GMT
+recorded_with: VCR 3.0.0

data/spec/cassettes/post_params.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://httpbin.org/post
+    body:
+      encoding: UTF-8
+      string: foo=bar
+    headers:
+      User-Agent:
+      - Faraday v0.9.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip,deflate
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      server:
+      - nginx
+      date:
+      - Sun, 29 Nov 2015 03:42:22 GMT
+      content-type:
+      - application/json
+      content-length:
+      - '400'
+      connection:
+      - close
+      access-control-allow-origin:
+      - "*"
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: "{\n  \"args\": {}, \n  \"data\": \"\", \n  \"files\": {}, \n  \"form\":
+        {\n    \"foo\": \"bar\"\n  }, \n  \"headers\": {\n    \"Accept\": \"*/*\",
+        \n    \"Accept-Encoding\": \"gzip,deflate\", \n    \"Content-Length\": \"7\",
+        \n    \"Content-Type\": \"application/x-www-form-urlencoded\", \n    \"Host\":
+        \"httpbin.org\", \n    \"User-Agent\": \"Faraday v0.9.1\"\n  }, \n  \"json\":
+        null, \n  \"origin\": \"124.111.242.66\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
+    http_version: 
+  recorded_at: Sun, 29 Nov 2015 03:42:22 GMT
+recorded_with: VCR 3.0.0

data/spec/models/model_spec.rb

@@ -67,7 +67,7 @@ describe Pupa::Model do
     let :klass_with_relative_path do
       Class.new do
         include Pupa::Model
-        self.schema = 'schema'
+        self.schema = 'schema.json'
       end
     end
 
@@ -91,12 +91,12 @@ describe Pupa::Model do
 
     it 'should accept an absolute path' do
       expect(File).to receive(:read).and_return('{}')
-      expect(klass_with_absolute_path.json_schema).to eq({})
+      expect(klass_with_absolute_path.json_schema).to eq('/path/to/schema.json')
     end
 
     it 'should accept a relative path' do
       expect(File).to receive(:read).and_return('{}')
-      expect(klass_with_relative_path.json_schema).to eq({})
+      expect(klass_with_relative_path.json_schema).to eq('schema.json')
     end
   end
 

data/spec/processor/client_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Pupa::Processor::Client do
-  describe '.new' do
+  describe '.new', vcr: {cassette_name: 'cache'} do
     it 'should use the filesystem' do
       expect(ActiveSupport::Cache::FileStore).to receive(:new).and_call_original
       Pupa::Processor::Client.new(cache_dir: '/tmp', level: 'UNKNOWN').get('http://httpbin.org/')

data/spec/processor_spec.rb

@@ -37,21 +37,29 @@ describe Pupa::Processor do
 
   describe '#get' do
     it 'should send a GET request' do
-      expect(processor.get('http://httpbin.org/get', 'foo=bar')['args']).to eq({'foo' => 'bar'})
+      VCR.use_cassette('get_params') do
+        expect(processor.get('http://httpbin.org/get', 'foo=bar')['args']).to eq({'foo' => 'bar'})
+      end
     end
 
     it 'should automatically parse the response' do
-      expect(processor.get('http://httpbin.org/get')).to be_a(Hash)
+      VCR.use_cassette('get') do
+        expect(processor.get('http://httpbin.org/get')).to be_a(Hash)
+      end
     end
   end
 
   describe '#post' do
     it 'should send a POST request' do
-      expect(processor.post('http://httpbin.org/post', 'foo=bar')['form']).to eq({'foo' => 'bar'})
+      VCR.use_cassette('post_params') do
+        expect(processor.post('http://httpbin.org/post', 'foo=bar')['form']).to eq({'foo' => 'bar'})
+      end
     end
 
     it 'should automatically parse the response' do
-      expect(processor.post('http://httpbin.org/post')).to be_a(Hash)
+      VCR.use_cassette('post') do
+        expect(processor.post('http://httpbin.org/post')).to be_a(Hash)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -7,6 +7,14 @@ SimpleCov.start do
   add_filter 'spec'
 end
 
+require 'vcr'
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/cassettes'
+  c.hook_into :faraday
+  c.allow_http_connections_when_no_cassette = true
+  c.configure_rspec_metadata!
+end
+
 require 'multi_xml'
 require 'nokogiri'
 require 'redis-store'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupa
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - James McKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -346,6 +346,10 @@ files:
 - schemas/popolo/post.json
 - schemas/popolo/vote.json
 - schemas/popolo/vote_event.json
+- spec/cassettes/get.yml
+- spec/cassettes/get_params.yml
+- spec/cassettes/post.yml
+- spec/cassettes/post_params.yml
 - spec/fixtures/bar.json
 - spec/fixtures/baz.json
 - spec/fixtures/foo.json
@@ -411,6 +415,10 @@ signing_key:
 specification_version: 4
 summary: A data scraping framework
 test_files:
+- spec/cassettes/get.yml
+- spec/cassettes/get_params.yml
+- spec/cassettes/post.yml
+- spec/cassettes/post_params.yml
 - spec/fixtures/bar.json
 - spec/fixtures/baz.json
 - spec/fixtures/foo.json