popolo 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b262b9d00eefda6f0d4c7d4a1f16156d2171e8fd
-  data.tar.gz: 39a3597b95e23673b95359835a7fa8616b79a43a
+  metadata.gz: 4e4af5de6382cd30315c8b8d91f7196a0b2b7e10
+  data.tar.gz: 1ac17145d435c01a474f4d1e6d5bece79dbef95c
 SHA512:
-  metadata.gz: 0387526074220780969de76501f8be258d523f89e61335bc392a4e533c00547f945aa47979d4fcb9a9df28159058d9cc48b8b0bd3dee19c19faf43c488380302
-  data.tar.gz: 134501f00a580017df2b4cbb38343056ae0d5d0d8279914c3df3e33e764295b870a8bfabf5a1de27287bce79f2ab6e1a1f63b01d48dc4cc7de9c712d61619056
+  metadata.gz: 2dc1011a71bb243ac1cf2606f90e9d98620c276460715f7970a7f5f55b31e18db03389a2dd8d8a6cfc785628ac799a91e030f32963080d8c5071243e790d8d1a
+  data.tar.gz: eaebcd62d51538da8922bd6cbe3d20d54cd9c72d98eb226a3947797d19c75dcee0c4c6dc5d01de4186037b735ad2150fec0bab4e328fe3e61d0cbd4b42328e37

data/README.md

@@ -12,11 +12,15 @@ Popolo's goal is to make it easier for civic developers to create government tra
 
 Popolo is a [Ruby on Rails engine](http://guides.rubyonrails.org/engines.html) that provides additional functionality to a [Ruby on Rails](http://rubyonrails.org/) application, so that developers can focus on what's special about the governments they want to monitor, instead of re-implementing features commonly found in open government websites. The core Popolo engine provides basic models, controllers and views for the objects found in all open government websites – people, organizations and the relationships between the two. Other engines provide additional functionality.
 
-In addition to being a Rails engine, Popolo is also a [data specification](http://popoloproject.com/specs/). This engine is up-to-date with its 2014-02-10 version.
+In addition to being a Rails engine, Popolo is also a [data specification](http://popoloproject.com/specs/). This engine is up-to-date with its 2014-12-21 version, except for the updates:
+
+* 2014-12-14: Add a video property to the Speech class.
+* 2014-11-23: Add a Speech class.
+* 2014-05-09: Add a member property to the Membership class, to relate organizations to organizations.
 
 ## Getting Started
 
-Popolo uses Mongoid to connect to MongoDB, which requires Rails 3 and supports only MRI 1.9.3, 2.0.0 and HEAD, and JRuby 1.6.0+ in 1.9 mode.
+Popolo uses Mongoid to connect to MongoDB.
 
 First, create your Rails application:
 

data/Rakefile

@@ -1,10 +1,19 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+load 'rails/tasks/engine.rake'
+
+require 'thor'
+helper = Bundler::GemHelper.new
+helper.install
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+task default: :spec
 
 begin
   require 'yard'

data/app/models/popolo/area.rb

@@ -7,11 +7,11 @@ module Popolo
 
     store_in Popolo.storage_options_per_class.fetch(:Area, Popolo.storage_options)
 
-    # The geographic area to which the membership is related.
+    # The memberships to which this area is related.
     has_many :memberships, class_name: 'Popolo::Membership'
-    # The geographic area to which the organization is related.
+    # The organizations to which this area is related.
     has_many :organizations, class_name: 'Popolo::Organization'
-    # The geographic area to which the post is related.
+    # The posts to which this area is related.
     has_many :posts, class_name: 'Popolo::Post'
 
     # URLs to documents from which the area is derived.

data/app/models/popolo/contact_detail.rb

@@ -16,6 +16,10 @@ module Popolo
     field :value, type: String
     # A note, e.g. for grouping contact details by physical location.
     field :note, type: String
+    # The date from which the contact detail is valid.
+    field :valid_from, type: DateString
+    # The date from which the contact detail is no longer valid.
+    field :valid_until, type: DateString
 
     validates_presence_of :type, :value
   end

data/app/models/popolo/motion.rb

@@ -9,7 +9,7 @@ module Popolo
     # The organization in which the motion is proposed.
     belongs_to :organization, class_name: 'Popolo::Organization'
     # The legislative session in which the motion is proposed.
-    # @todo belongs to :legislative_session, class_name: 'Popolo::Event'
+    belongs_to :legislative_session # @todo , class_name: 'Popolo::Event'
     # The person who proposed the motion.
     belongs_to :creator, class_name: 'Popolo::Person'
     # Events at which people vote on the motion.
@@ -19,6 +19,8 @@ module Popolo
 
     # The transcript or text of the motion.
     field :text, type: String
+    # An issued identifier.
+    field :identifier, type: String
     # A motion category, e.g. adjournment.
     field :classification, type: String
     # The date on which the motion was proposed.

data/app/models/popolo/organization.rb

@@ -10,15 +10,15 @@ module Popolo
 
     # The geographic area to which the organization is related.
     belongs_to :area, index: true, class_name: 'Popolo::Area'
-    # The relationships to which the organization is a party.
+    # The memberships of the members of the organization.
     has_many :memberships, class_name: 'Popolo::Membership', dependent: :destroy, inverse_of: :organization
-    # The organization in which the motion is proposed.
+    # Motions within the organization.
     has_many :motions, class_name: 'Popolo::Motion', dependent: :destroy
     # Posts within the organization.
     has_many :posts, class_name: 'Popolo::Post', dependent: :destroy
-    # The organization whose members are voting.
+    # Vote events in which members of the organization are voting.
     has_many :vote_events, class_name: 'Popolo::VoteEvent', dependent: :destroy
-    # The organization that is voting.
+    # Votes cast by the organization.
     has_many :votes, as: :voter, class_name: 'Popolo::Vote'
     # Alternate or former names.
     embeds_many :other_names, as: :nameable, class_name: 'Popolo::OtherName'
@@ -35,6 +35,10 @@ module Popolo
     field :name, type: String
     # An organization category, e.g. committee.
     field :classification, type: String
+    # A one-line description of an organization.
+    field :abstract, type: String
+    # An extended description of an organization.
+    field :description, type: String
     # A date of founding.
     field :founding_date, type: DateString
     # A date of dissolution.

data/app/models/popolo/other_name.rb

@@ -7,6 +7,18 @@ module Popolo
 
     # An alternate or former name.
     field :name, type: String
+    # One or more family names.
+    field :family_name, type: String
+    # One or more primary given names.
+    field :given_name, type: String
+    # One or more secondary given names.
+    field :additional_name, type: String
+    # One or more honorifics preceding a person's name.
+    field :honorific_prefix, type: String
+    # One or more honorifics following a person's name.
+    field :honorific_suffix, type: String
+    # One or more patronymic names.
+    field :patronymic_name, type: String
     # The date on which the name was adopted.
     field :start_date, type: DateString
     # The date on which the name was abandoned.

data/app/models/popolo/person.rb

@@ -6,11 +6,11 @@ module Popolo
 
     store_in Popolo.storage_options_per_class.fetch(:Person, Popolo.storage_options)
 
-    # The relationships to which the person is a party.
+    # The person's memberships.
     has_many :memberships, class_name: 'Popolo::Membership', dependent: :destroy
-    # The person who proposed the motion.
+    # The person's motions.
     has_many :motions, class_name: 'Popolo::Motion'
-    # The person that is voting.
+    # The person's votes.
     has_many :votes, as: :voter, class_name: 'Popolo::Vote'
     # Alternate or former names.
     embeds_many :other_names, as: :nameable, class_name: 'Popolo::OtherName'

data/app/models/popolo/post.rb

@@ -21,6 +21,8 @@ module Popolo
 
     # A label describing the post.
     field :label, type: String
+    # An alternate label.
+    field :other_label, type: Array
     # The function that the holder of the post fulfills.
     field :role, type: String
     # The date on which the post was created.

data/app/models/popolo/vote_event.rb

@@ -9,7 +9,7 @@ module Popolo
     # The organization whose members are voting.
     belongs_to :organization, class_name: 'Popolo::Organization'
     # The legislative session in which the vote occurs.
-    # @todo belongs to :legislative_session, class_name: 'Popolo::Event'
+    belongs_to :legislative_session # @todo , class_name: 'Popolo::Event'
     # The motion being decided.
     belongs_to :motion, class_name: 'Popolo::Motion'
     # The result of the vote event within groups of voters.

data/lib/popolo/version.rb

@@ -1,3 +1,3 @@
 module Popolo
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/controllers/popolo/memberships_controller_spec.rb

@@ -1,16 +1,18 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Popolo::MembershipsController do
-  before :each do
-    @routes = Popolo::Engine.routes
-    @membership = FactoryGirl.create :membership
-  end
+module Popolo
+  RSpec.describe MembershipsController, type: :controller do
+    routes { Engine.routes }
+
+    before :each do
+      @membership = FactoryGirl.create(:membership)
+    end
 
-  describe 'GET show' do
-    it 'assigns the requested membership as @membership' do
-      get :show, id: @membership.id.to_s
-      assigns(:membership).should == @membership
-      response.should be_success
+    describe 'GET show' do
+      it 'assigns the requested membership as @membership' do
+        get :show, {id: @membership.to_param}
+        expect(assigns(:membership)).to eq(@membership)
+      end
     end
   end
 end

data/spec/controllers/popolo/organizations_controller_spec.rb

@@ -1,24 +1,25 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Popolo::OrganizationsController do
-  before :each do
-    @routes = Popolo::Engine.routes
-    @organization  = FactoryGirl.create :organization
-  end
+module Popolo
+  RSpec.describe OrganizationsController, type: :controller do
+    routes { Engine.routes }
 
-  describe 'GET index' do
-    it 'assigns all organizations as @organizations' do
-      get :index
-      assigns(:organizations).to_a.should == [@organization]
-      response.should be_success
+    before :each do
+      @organization = FactoryGirl.create(:organization)
+    end
+
+    describe 'GET index' do
+      it 'assigns all organizations as @organizations' do
+        get :index, {}
+        expect(assigns(:organizations)).to eq([@organization])
+      end
     end
-  end
 
-  describe 'GET show' do
-    it 'assigns the requested organization as @organization' do
-      get :show, id: @organization.id.to_s
-      assigns(:organization).should == @organization
-      response.should be_success
+    describe 'GET show' do
+      it 'assigns the requested organization as @organization' do
+        get :show, {id: @organization.to_param}
+        expect(assigns(:organization)).to eq(@organization)
+      end
     end
   end
 end

data/spec/controllers/popolo/people_controller_spec.rb

@@ -1,16 +1,18 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Popolo::PeopleController do
-  before :each do
-    @routes = Popolo::Engine.routes
-    @person = FactoryGirl.create :person
-  end
+module Popolo
+  RSpec.describe PeopleController, type: :controller do
+    routes { Engine.routes }
+
+    before :each do
+      @person = FactoryGirl.create(:person)
+    end
 
-  describe 'GET show' do
-    it 'assigns the requested person as @person' do
-      get :show, id: @person.id.to_s
-      assigns(:person).should == @person
-      response.should be_success
+    describe 'GET show' do
+      it 'assigns the requested person as @person' do
+        get :show, {id: @person.to_param}
+        expect(assigns(:person)).to eq(@person)
+      end
     end
   end
 end

data/spec/controllers/popolo/posts_controller_spec.rb

@@ -1,16 +1,18 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Popolo::PostsController do
-  before :each do
-    @routes = Popolo::Engine.routes
-    @post = FactoryGirl.create :post
-  end
+module Popolo
+  RSpec.describe PostsController, type: :controller do
+    routes { Engine.routes }
+
+    before :each do
+      @post = FactoryGirl.create(:post)
+    end
 
-  describe 'GET show' do
-    it 'assigns the requested post as @post' do
-      get :show, id: @post.id.to_s
-      assigns(:post).should == @post
-      response.should be_success
+    describe 'GET show' do
+      it 'assigns the requested post as @post' do
+        get :show, {id: @post.to_param}
+        expect(assigns(:post)).to eq(@post)
+      end
     end
   end
 end

data/spec/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -1,7 +1,6 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -5,9 +5,9 @@
 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
 //
 //= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -5,10 +5,11 @@
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
  *
- *= require_self
  *= require_tree .
- *= require popolo
+ *= require_self
  */

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
 end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,15 +2,13 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
+  <%= stylesheet_link_tag    'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
 
-<div class="container">
 <%= yield %>
-</div>
 
 </body>
 </html>

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/config/application.rb

@@ -2,10 +2,9 @@ require File.expand_path('../boot', __FILE__)
 
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
 require "sprockets/railtie"
 
-Bundler.require
+Bundler.require(*Rails.groups)
 require "popolo"
 
 module Dummy
@@ -14,16 +13,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -31,32 +20,6 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
   end
 end
 

data/spec/dummy/config/boot.rb

@@ -1,10 +1,5 @@
-require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-end
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-Dummy::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -1,37 +1,37 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  # config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  # config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 
-  # Expands the lines which load the assets
-  config.assets.debug = true
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end