pupa 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9f14316f20d5b37194d8e61ead60c90eaf1e41
-  data.tar.gz: 50b4de7a5b95f287f46760356e22c5fe45cbc03a
+  metadata.gz: 5ff448a08241852d405068e030d4b689b45373e0
+  data.tar.gz: 7b1327e204e05de6659155659ac6b3b7c1f3d853
 SHA512:
-  metadata.gz: 1abbc8fa6cd13e2a53ee675e8c57d040668dd9606ec62ef800a8143c35b50b5403d1085bb12a83d3e4239fac178b0f0e50d6c5c0df3d76f541df5bfd0538b909
-  data.tar.gz: b307d48deb6b948b53d42c8d76481f6c011d84665543315ca3cdaa1e1b7d329dd8696f735a2956d9fda2875f607b23f638494de063d8e99a39f723d5643b0d50
+  metadata.gz: 45805c371d13c20c22a600197df6d7a57ff70d6e1323ece52c51b108c7973d379ba2523d91afa7bf39e977a0a7c91538e437ada33be24aecdc83e8535dbe865d
+  data.tar.gz: 66fa473a639735566a13c2c2ad7c782a037865c3f5f38c7da4524f8865f25b0a3fb64c8a0d0687823968a0eadab1c908e3e6eeecd336a1b9c4e5a10bd123c2e6

data/README.md

@@ -12,7 +12,7 @@ Pupa.rb is a Ruby 2.x fork of Sunlight Labs' [Pupa](https://github.com/opencivic
 
 ## Usage
 
-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://popoloproject.com/) open government data specification. This gem is up-to-date with Popolo's 2014-05-09 version, but omits the Motion, VoteEvent, Count, Vote and Area classes.
+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-05-09 version, but omits the Motion, VoteEvent, Count, Vote and Area classes.
 
 The [cat.rb](http://opennorth.github.io/pupa-ruby/docs/cat.html) example shows you how to:
 
@@ -97,7 +97,7 @@ Pupa.rb is extensible, so that you can add your own models, parsers, helpers, ac
 
 ## [OpenCivicData](http://opencivicdata.org/) compatibility
 
-Both Pupa.rb and Sunlight Labs' [Pupa](https://github.com/opencivicdata/pupa) implement models for people, organizations and memberships from the [Popolo](http://popoloproject.com/) open government data specification. Pupa.rb lets you use your own classes, but Pupa only supports a fixed set of classes. A consequence of Pupa.rb's flexibility is that the value of the `_type` property for `Person`, `Organization` and `Membership` objects differs between Pupa.rb and Pupa. Pupa.rb has namespaced types like `pupa/person` – to allow Ruby to load the `Person` class in the `Pupa` module – whereas Pupa has unnamespaced types like `person`.
+Both Pupa.rb and Sunlight Labs' [Pupa](https://github.com/opencivicdata/pupa) implement models for people, organizations and memberships from the [Popolo](http://www.popoloproject.com/) open government data specification. Pupa.rb lets you use your own classes, but Pupa only supports a fixed set of classes. A consequence of Pupa.rb's flexibility is that the value of the `_type` property for `Person`, `Organization` and `Membership` objects differs between Pupa.rb and Pupa. Pupa.rb has namespaced types like `pupa/person` – to allow Ruby to load the `Person` class in the `Pupa` module – whereas Pupa has unnamespaced types like `person`.
 
 To save objects to MongoDB with unnamespaced types like Sunlight Labs' Pupa – in order to benefit from other tools in the [OpenCivicData](http://opencivicdata.org/) stack – add this line to the top of your script:
 

data/lib/pupa/version.rb

@@ -1,3 +1,3 @@
 module Pupa
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/schemas/popolo/area.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/area.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/area.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/schemas/popolo/contact_detail.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/contact_detail.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/schemas/popolo/count.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/count.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/group_result.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/identifier.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/link.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/membership.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/person.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/organization.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/post.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/organization.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/area.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the membership",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     },
     "created_at": {
@@ -99,7 +99,7 @@
       "description": "URLs to documents from which the membership is derived",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/schemas/popolo/motion.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/motion.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/organization.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/person.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/vote_event.json#"
+        "$ref": "http://www.popoloproject.com/schemas/vote_event.json#"
       }
     },
     "created_at": {
@@ -75,7 +75,7 @@
       "description": "URLs to documents from which the motion is derived",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/schemas/popolo/organization.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/organization.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/other_name.json#"
+        "$ref": "http://www.popoloproject.com/schemas/other_name.json#"
       }
     },
     "identifiers": {
       "description": "Issued identifiers",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/identifier.json#"
+        "$ref": "http://www.popoloproject.com/schemas/identifier.json#"
       }
     },
     "classification": {
@@ -37,7 +37,7 @@
     },
     "parent": {
       "description": "The organization that contains this organization",
-      "$ref": "http://popoloproject.com/schemas/organization.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/area.json#"
+      "$ref": "http://www.popoloproject.com/schemas/area.json#"
     },
     "founding_date": {
       "description": "A date of founding",
@@ -66,28 +66,28 @@
       "description": "Means of contacting the organization",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the organization",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     },
     "memberships": {
       "description": "Memberships",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/membership.json#"
+        "$ref": "http://www.popoloproject.com/schemas/membership.json#"
       }
     },
     "posts": {
       "description": "Posts within the organization",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/post.json#"
+        "$ref": "http://www.popoloproject.com/schemas/post.json#"
       }
     },
     "created_at": {
@@ -104,7 +104,7 @@
       "description": "URLs to documents from which the organization is derived",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/schemas/popolo/other_name.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/other_name.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/person.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/other_name.json#"
+        "$ref": "http://www.popoloproject.com/schemas/other_name.json#"
       }
     },
     "identifiers": {
       "description": "Issued identifiers",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/identifier.json#"
+        "$ref": "http://www.popoloproject.com/schemas/identifier.json#"
       }
     },
     "family_name": {
@@ -95,21 +95,21 @@
       "description": "Means of contacting the person",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the person",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     },
     "memberships": {
       "description": "Memberships",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/membership.json#"
+        "$ref": "http://www.popoloproject.com/schemas/membership.json#"
       }
     },
     "created_at": {
@@ -126,7 +126,7 @@
       "description": "URLs to documents from which the person is derived",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/schemas/popolo/post.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/post.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/organization.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/area.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/contact_detail.json#"
+        "$ref": "http://www.popoloproject.com/schemas/contact_detail.json#"
       }
     },
     "links": {
       "description": "URLs to documents about the post",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     },
     "memberships": {
       "description": "The memberships through which people hold the post in the organization",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/membership.json#"
+        "$ref": "http://www.popoloproject.com/schemas/membership.json#"
       }
     },
     "created_at": {
@@ -85,7 +85,7 @@
       "description": "URLs to documents from which the post is derived",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/schemas/popolo/vote.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/vote.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/vote_event.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/organization.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/person.json#"
+      "$ref": "http://www.popoloproject.com/schemas/person.json#"
     }
   }
 }

data/schemas/popolo/vote_event.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-03/schema#",
-  "id": "http://popoloproject.com/schemas/vote_event.json#",
+  "id": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/motion.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/organization.json#"
+      "$ref": "http://www.popoloproject.com/schemas/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://popoloproject.com/schemas/group_result.json#"
+        "$ref": "http://www.popoloproject.com/schemas/group_result.json#"
       }
     },
     "counts": {
       "description": "The number of votes for options",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/count.json#"
+        "$ref": "http://www.popoloproject.com/schemas/count.json#"
       }
     },
     "votes": {
       "description": "Voters' votes",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/vote.json#"
+        "$ref": "http://www.popoloproject.com/schemas/vote.json#"
       }
     },
     "created_at": {
@@ -86,7 +86,7 @@
       "description": "URLs to documents from which the vote event is derived",
       "type": "array",
       "items": {
-        "$ref": "http://popoloproject.com/schemas/link.json#"
+        "$ref": "http://www.popoloproject.com/schemas/link.json#"
       }
     }
   }

data/spec/processor_spec.rb

@@ -80,19 +80,19 @@ describe Pupa::Processor do
     it 'should dump a JSON document' do
       processor.dump_scraped_objects(:people)
       File.exist?(path).should == true
-      io.string.should_not match('http://popoloproject.com/schemas/person.json')
+      io.string.should_not match('http://www.popoloproject.com/schemas/person.json')
     end
 
     it 'should validate the object' do
       processor.make_person_invalid
       processor.dump_scraped_objects(:people)
-      io.string.should match('http://popoloproject.com/schemas/person.json')
+      io.string.should match('http://www.popoloproject.com/schemas/person.json')
     end
 
     it 'should not validate the object' do
       novalidate.make_person_invalid
       novalidate.dump_scraped_objects(:people)
-      io.string.should_not match('http://popoloproject.com/schemas/person.json')
+      io.string.should_not match('http://www.popoloproject.com/schemas/person.json')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupa
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Open North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport