popolo 0.0.2 → 0.0.3

data/app/views/popolo/organizations/show.html.erb

@@ -1 +1,146 @@
-<%= render partial: 'popolo/areas_or_organizations/show', locals: {object: @organization} %>
+<nav>
+  <ol class="breadcrumb">
+    <li><%= link_to Popolo::Organization.model_name.human(count: Float::INFINITY), organizations_path %></li>
+    <% @organization.ancestors.each do |ancestor| %>
+      <li><%= link_to ancestor, ancestor %></li>
+    <% end %>
+    <li class="active"><%= @organization %></li>
+  </ol>
+</nav>
+
+<section>
+  <header class="page-header">
+    <div class="media">
+      <div class="pull-left">
+        <% if @organization.image %>
+          <div class="media-object popolo-circle" style="background-image: url(<%= @organization.image %>)">
+          </div>
+        <% end %>
+      </div>
+      <div class="media-body">
+        <h1 class="media-heading">
+          <%= @organization %>
+        </h1>
+      </div>
+    </div>
+  </header>
+
+  <dl>
+    <% if @organization.classification? %>
+      <dt><%= Popolo::Organization.human_attribute_name(:classification) %></dt>
+      <dd><%=t @organization.classification, count: 1, scope: [:popolo, :organizations, :classifications], default: @organization.classification %></dd>
+    <% end %>
+    <% if @organization.founding_date? %>
+      <dt><%= Popolo::Organization.human_attribute_name(:founding_date) %></dt>
+      <dd><%=l @organization.founding_date %></dd>
+    <% end %>
+    <% if @organization.dissolution_date? %>
+      <dt><%= Popolo::Organization.human_attribute_name(:dissolution_date) %></dt>
+      <dd><%=l @organization.dissolution_date %></dd>
+    <% end %>
+  </dl>
+
+  <aside>
+    <% unless @organization.contact_details.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::ContactDetail.model_name.human(count: @organization.contact_details.size) %></h2>
+        </header>
+        <dl class="dl-horizontal">
+          <%= render @organization.contact_details %>
+        </dl>
+      </section>
+    <% end %>
+    <% unless @organization.other_names.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::OtherName.model_name.human(count: @organization.other_names.size) %></h2>
+        </header>
+        <ul>
+          <%= render @organization.other_names %>
+        </ul>
+      </section>
+    <% end %>
+    <% unless @organization.identifiers.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::Identifier.model_name.human(count: @organization.identifiers.size) %></h2>
+        </header>
+        <dl class="dl-horizontal">
+          <%= render @organization.identifiers %>
+        </dl>
+      </section>
+    <% end %>
+    <% unless @organization.links.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::Link.model_name.human(count: @organization.links.size) %></h2>
+        </header>
+        <ul>
+          <%= render @organization.links %>
+        </ul>
+      </section>
+    <% end %>
+    <% unless @organization.sources.empty? %>
+      <section>
+        <header>
+          <h2><%=t 'popolo/source', count: @organization.sources.size, scope: [:popolo]  %></h2>
+        </header>
+        <ul>
+          <%= render @organization.sources %>
+        </ul>
+      </section>
+    <% end %>
+  </aside>
+
+  <aside>
+    <% unless @organization.memberships.empty? %>
+      <section>
+        <header>
+          <h2>
+            <%= Popolo::Membership.model_name.human(count: @organization.memberships.size) %>
+          </h2>
+        </header>
+        <ol>
+          <% @organization.memberships.each do |membership| %>
+            <li>
+              <%= link_to membership.to_s(format: :person), membership %>
+            </li>
+          <% end %>
+        </ol>
+      </section>
+    <% end %>
+    <% unless @organization.posts.empty? %>
+      <section>
+        <header>
+          <h2>
+            <%= Popolo::Post.model_name.human(count: @organization.posts.size) %>
+          </h2>
+        </header>
+        <ol>
+          <% @organization.posts.each do |post| %>
+            <li>
+              <%= link_to post, post %>
+            </li>
+          <% end %>
+        </ol>
+      </section>
+    <% end %>
+    <% unless @organization.children.empty? %>
+      <section>
+        <header>
+          <h2>
+            <%= Popolo::Organization.model_name.human(count: @organization.children.size) %>
+          </h2>
+        </header>
+        <ol>
+          <% @organization.children.each do |organization| %>
+            <li>
+              <%= link_to organization, organization %>
+            </li>
+          <% end %>
+        </ol>
+      </section>
+    <% end %>
+  </aside>
+</section>

data/app/views/popolo/other_names/other_name.html.erb

@@ -0,0 +1,9 @@
+<li>
+  <%= other_name.name %>
+  <% if other_name.start_date? || other_name.end_date? %>
+    (<%=l other_name.start_date %>—<%=l other_name.end_date %>)
+  <% end %>
+  <% if other_name.note? %>
+    <span class="label label-info"><%= other_name.note %></span>
+  <% end %>
+</li>

data/app/views/popolo/people/show.html.erb

@@ -0,0 +1,120 @@
+<section>
+  <header class="page-header">
+    <div class="media">
+      <div class="pull-left">
+        <% if @person.image %>
+          <div class="media-object popolo-circle" style="background-image: url(<%= @person.image %>)">
+          </div>
+        <% end %>
+      </div>
+      <div class="media-body">
+        <h1 class="media-heading">
+          <%= @person %>
+        </h1>
+      </div>
+    </div>
+  </header>
+
+  <dl>
+    <% if @person.email? %>
+      <dt><%= Popolo::Person.human_attribute_name(:email) %></dt>
+      <dd><%= mail_to @person.email %></dd>
+    <% end %>
+    <% if @person.gender? %>
+      <dt><%= Popolo::Person.human_attribute_name(:gender) %></dt>
+      <dd><%= @person.gender %></dd>
+    <% end %>
+    <% if @person.national_identity? %>
+      <dt><%= Popolo::Person.human_attribute_name(:national_identity) %></dt>
+      <dd><%= @person.national_identity %></dd>
+    <% end %>
+    <% if @person.birth_date? %>
+      <dt><%= Popolo::Person.human_attribute_name(:birth_date) %></dt>
+      <dd><%=l @person.birth_date %></dd>
+    <% end %>
+    <% if @person.death_date? %>
+      <dt><%= Popolo::Person.human_attribute_name(:death_date) %></dt>
+      <dd><%=l @person.death_date %></dd>
+    <% end %>
+    <% if @person.summary? %>
+      <dt><%= Popolo::Person.human_attribute_name(:summary) %></dt>
+      <dd><%= simple_format @person.summary %></dd>
+    <% end %>
+    <% if @person.biography? %>
+      <dt><%= Popolo::Person.human_attribute_name(:biography) %></dt>
+      <dd><%= simple_format @person.biography %></dd>
+    <% end %>
+  </dl>
+
+  <aside>
+    <% unless @person.contact_details.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::ContactDetail.model_name.human(count: @person.contact_details.size) %></h2>
+        </header>
+        <dl class="dl-horizontal">
+          <%= render @person.contact_details %>
+        </dl>
+      </section>
+    <% end %>
+    <% unless @person.other_names.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::OtherName.model_name.human(count: @person.other_names.size) %></h2>
+        </header>
+        <ul>
+          <%= render @person.other_names %>
+        </ul>
+      </section>
+    <% end %>
+    <% unless @person.identifiers.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::Identifier.model_name.human(count: @person.identifiers.size) %></h2>
+        </header>
+        <dl class="dl-horizontal">
+          <%= render @person.identifiers %>
+        </dl>
+      </section>
+    <% end %>
+    <% unless @person.links.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::Link.model_name.human(count: @person.links.size) %></h2>
+        </header>
+        <ul>
+          <%= render @person.links %>
+        </ul>
+      </section>
+    <% end %>
+    <% unless @person.sources.empty? %>
+      <section>
+        <header>
+          <h2><%=t 'popolo/source', count: @person.sources.size, scope: [:popolo]  %></h2>
+        </header>
+        <ul>
+          <%= render @person.sources %>
+        </ul>
+      </section>
+    <% end %>
+  </aside>
+
+  <aside>
+    <% unless @person.memberships.empty? %>
+      <section>
+        <header>
+          <h2>
+            <%= Popolo::Membership.model_name.human(count: @person.memberships.size) %>
+          </h2>
+        </header>
+        <ol>
+          <% @person.memberships.each do |membership| %>
+            <li>
+              <%= link_to membership.to_s(format: :organization), membership %>
+            </li>
+          <% end %>
+        </ol>
+      </section>
+    <% end %>
+  </aside>
+</section>

data/app/views/popolo/posts/show.html.erb

@@ -0,0 +1,90 @@
+<nav>
+  <ol class="breadcrumb">
+    <li><%= link_to Popolo::Organization.model_name.human(count: Float::INFINITY), organizations_path %></li>
+    <% @post.organization.ancestors_and_self.each do |ancestor| %>
+      <li><%= link_to ancestor, ancestor %></li>
+    <% end %>
+    <li class="active"><%= @post %></li>
+  </ol>
+</nav>
+
+<section>
+  <header class="page-header">
+    <div class="media">
+      <div class="media-body">
+        <h1 class="media-heading">
+          <%= @post %>
+        </h1>
+      </div>
+    </div>
+  </header>
+
+  <dl>
+    <dt><%= Popolo::Post.human_attribute_name(:organization) %></dt>
+    <dd><%= link_to @post.organization, @post.organization %></dd>
+    <% if @post.role? %>
+      <dt><%= Popolo::Post.human_attribute_name(:role) %></dt>
+      <dd><%= @post.role %></dd>
+    <% end %>
+    <% if @post.start_date? %>
+      <dt><%= Popolo::Post.human_attribute_name(:start_date) %></dt>
+      <dd><%=l @post.start_date %></dd>
+    <% end %>
+    <% if @post.end_date? %>
+      <dt><%= Popolo::Post.human_attribute_name(:end_date) %></dt>
+      <dd><%=l @post.end_date %></dd>
+    <% end %>
+  </dl>
+
+  <aside>
+    <% unless @post.contact_details.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::ContactDetail.model_name.human(count: @post.contact_details.size) %></h2>
+        </header>
+        <dl class="dl-horizontal">
+          <%= render @post.contact_details %>
+        </dl>
+      </section>
+    <% end %>
+    <% unless @post.links.empty? %>
+      <section>
+        <header>
+          <h2><%= Popolo::Link.model_name.human(count: @post.links.size) %></h2>
+        </header>
+        <ul>
+          <%= render @post.links %>
+        </ul>
+      </section>
+    <% end %>
+    <% unless @post.sources.empty? %>
+      <section>
+        <header>
+          <h2><%=t 'popolo/source', count: @post.sources.size, scope: [:popolo]  %></h2>
+        </header>
+        <ul>
+          <%= render @post.sources %>
+        </ul>
+      </section>
+    <% end %>
+  </aside>
+
+  <aside>
+    <% unless @post.memberships.empty? %>
+      <section>
+        <header>
+          <h2>
+            <%= Popolo::Membership.model_name.human(count: @post.memberships.size) %>
+          </h2>
+        </header>
+        <ol>
+          <% @post.memberships.each do |membership| %>
+            <li>
+              <%= link_to membership, membership %>
+            </li>
+          <% end %>
+        </ol>
+      </section>
+    <% end %>
+  </aside>
+</section>

data/config/routes.rb

@@ -1,16 +1,8 @@
 Popolo::Engine.routes.draw do
-  resources :areas, only: [:index, :show]
-  resources :organizations, only: [:index, :show]
-  resources :people, only: [:index, :show]
-  resources :posts, only: [:index, :show]
-
-  match 'areas/*path/areas' => 'areas#nested_index', as: 'nested_areas'
-  match 'areas/*path' => 'areas#nested_show', as: 'nested_area'
-
-  match 'organizations/*path/organizations' => 'organizations#nested_index', as: 'nested_organizations'
-  match 'organizations/*path/posts/:id' => 'organizations#post', as: 'nested_organization_post'
-  match 'organizations/*path/posts' => 'organizations#posts', as: 'nested_organization_posts'
-  match 'organizations/*path' => 'organizations#nested_show', as: 'nested_organization'
+  resources :organizations, only: [:index, :show], id: /.*/
+  resources :memberships, only: :show, id: /.*/
+  resources :people, only: :show, id: /.*/
+  resources :posts, only: :show, id: /.*/
 
   # A host application will sometimes complain about a missing `root_path`, even
   # if it defines a `root_path`. Setting a reasonable default here.

data/lib/generators/popolo_generator.rb

@@ -28,6 +28,10 @@ module Popolo
         end
       end
 
+      def add_ruby_version_to_gemfile
+        prepend_to_file 'Gemfile', "ruby '1.9.3'"
+      end
+
       def show_readme
         readme 'README' if behavior == :invoke
       end

data/lib/popolo/initializers/pupa_compat.rb

@@ -0,0 +1,11 @@
+# @see https://github.com/mongoid/mongoid/blob/master/lib/mongoid/factory.rb#L39
+module Mongoid
+  module Factory
+    old_from_db = instance_method(:from_db)
+
+    define_method(:from_db) do |klass, attributes=nil, criteria_instance_id=nil|
+      attributes.delete('_type') if attributes && klass.name.deconstantize == 'Popolo'
+      old_from_db.bind(self).call(klass, attributes, criteria_instance_id)
+    end
+  end
+end

data/lib/popolo/version.rb

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

data/lib/popolo.rb

@@ -6,13 +6,25 @@ require 'mongoid'
 require 'mongoid/tree'
 
 module Popolo
-  # The parent controller all Popolo controllers inherits from.
-  # Defaults to ApplicationController. This should be set early
-  # in the initialization process and should be set to a string.
+  # The parent controller all Popolo controllers inherit from. Defaults to
+  # ApplicationController. This should be set early in the initialization
+  # process and should be set to a string.
   #
   # @see https://github.com/plataformatec/devise/blob/master/lib/devise.rb#L196
   mattr_accessor :parent_controller
   @@parent_controller = 'ApplicationController'
-end
 
-require 'popolo/mixins/sluggable'
+  # The database and session storage options used by all Popolo models.
+  #
+  # @see http://mongoid.org/en/mongoid/docs/documents.html#storage
+  mattr_accessor :storage_options
+  @@storage_options = {}
+
+  # The storage options for each Popolo model.
+  #
+  # @see http://mongoid.org/en/mongoid/docs/documents.html#storage
+  mattr_accessor :storage_options_per_class
+  @@storage_options_per_class = {}
+
+  DATE_STRING_FORMAT = /\A\d{4}(-\d{2}){0,2}\z/
+end

data/spec/controllers/popolo/memberships_controller_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Popolo::MembershipsController do
+  before :each do
+    @routes = Popolo::Engine.routes
+    @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
+    end
+  end
+end

data/spec/controllers/popolo/organizations_controller_spec.rb

@@ -1,15 +1,9 @@
-# coding: utf-8
 require 'spec_helper'
 
 describe Popolo::OrganizationsController do
   before :each do
     @routes = Popolo::Engine.routes
-    @organization  = FactoryGirl.create :organization, name: 'Acme Corporation'
-    @abc           = @organization.children.create name: 'ABC, Inc.'
-    @xyz           = @organization.children.create name: 'XYZ, Inc.'
-    @department    = @xyz.children.create name: "Marketing Department"
-    @branch        = @department.children.create name: "Youth Branch"
-    @post          = FactoryGirl.create :post, organization: @xyz
+    @organization  = FactoryGirl.create :organization
   end
 
   describe 'GET index' do
@@ -27,44 +21,4 @@ describe Popolo::OrganizationsController do
       response.should be_success
     end
   end
-
-  describe 'GET nested_index' do
-    it 'succeeds if properly nested' do
-      get :nested_index, path: 'acme-corporation/xyz-inc/marketing-department'
-      assigns(:organizations).to_a.should == [@branch]
-      response.should be_success
-    end
-
-    it 'fails if improperly nested' do
-      expect {get :nested_index, path: 'acme-corporation/abc-inc/marketing-department'}.to raise_error(Mongoid::Errors::DocumentNotFound)
-    end
-  end
-
-  describe 'GET nested_show' do
-    it 'succeeds if properly nested' do
-      get :nested_show, path: 'acme-corporation/xyz-inc/marketing-department'
-      assigns(:organization).should == @department
-      response.should be_success
-    end
-
-    it 'fails if improperly nested' do
-      expect {get :nested_show, path: 'acme-corporation/abc-inc/marketing-department'}.to raise_error(Mongoid::Errors::DocumentNotFound)
-    end
-  end
-
-  describe 'GET posts' do
-    it 'assigns the requested posts as @posts' do
-      get :posts, path: 'acme-corporation/xyz-inc'
-      assigns(:posts).to_a.should == [@post]
-      response.should be_success
-    end
-  end
-
-  describe 'GET post' do
-    it 'assigns the requested post as @post' do
-      get :post, path: 'acme-corporation/xyz-inc', id: 'marketing-director'
-      assigns(:post).should == @post
-      response.should be_success
-    end
-  end
 end

data/spec/controllers/popolo/people_controller_spec.rb

@@ -6,25 +6,11 @@ describe Popolo::PeopleController do
     @person = FactoryGirl.create :person
   end
 
-  describe 'GET index' do
-    it 'assigns all people as @people' do
-      get :index
-      assigns(:people).to_a.should == [@person]
-      response.should be_success
-    end
-  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
     end
-
-    it 'gets the requested person by slug' do
-      get :show, id: @person.slug
-      assigns(:person).should == @person
-      response.should be_success
-    end
   end
 end

data/spec/controllers/popolo/posts_controller_spec.rb

@@ -6,14 +6,6 @@ describe Popolo::PostsController do
     @post = FactoryGirl.create :post
   end
 
-  describe 'GET index' do
-    it 'assigns all posts as @posts' do
-      get :index
-      assigns(:posts).to_a.should == [@post]
-      response.should be_success
-    end
-  end
-
   describe 'GET show' do
     it 'assigns the requested post as @post' do
       get :show, id: @post.id.to_s

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

@@ -10,4 +10,5 @@
  *
  *= require_self
  *= require_tree .
+ *= require popolo
  */

data/spec/dummy/app/models/cat.rb

@@ -1,6 +1,3 @@
 class Cat
   include Mongoid::Document
-
-  include Popolo::Sluggable
-  index({slug: 1}, unique: true)
 end

data/spec/dummy/app/models/dog.rb

@@ -1,10 +1,3 @@
 class Dog
   include Mongoid::Document
-
-  def self.slug_source
-    :moniker
-  end
-
-  include Popolo::Sluggable
-  index({slug: 1}, unique: true)
 end

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

@@ -8,7 +8,9 @@
 </head>
 <body>
 
+<div class="container">
 <%= yield %>
+</div>
 
 </body>
 </html>

data/spec/dummy/config/locales/en.yml

@@ -3,3 +3,33 @@
 
 en:
   hello: "Hello world"
+  mongoid:
+    models:
+      popolo/contact_detail:
+        one: Contact detail
+        other: Contact details
+      popolo/identifier:
+        one: Identifier
+        other: Identifiers
+      popolo/link:
+        one: Link
+        other: Links
+      popolo/membership:
+        one: Membership
+        other: Memberships
+      popolo/organization:
+        one: Organization
+        other: Organizations
+      popolo/other_name:
+        one: Other name
+        other: Other names
+      popolo/person:
+        one: Person
+        other: People
+      popolo/post:
+        one: Post
+        other: Posts
+  popolo:
+    popolo/source:
+      one: Source
+      other: Sources

data/spec/dummy/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  mount Popolo::Engine => '/popolo'
+  mount Popolo::Engine => '/'
 end