enju_event 0.1.19 → 0.2.0.beta.1

data/app/views/places/_form.html.erb

@@ -0,0 +1,37 @@
+<%= form_for(@place) do |f| %>
+  <% if @place.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@place.errors.count, "error") %> prohibited this place from being saved:</h2>
+
+      <ul>
+      <% @place.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :term %><br>
+    <%= f.text_area :term %>
+  </div>
+  <div class="field">
+    <%= f.label :city %><br>
+    <%= f.text_area :city %>
+  </div>
+  <div class="field">
+    <%= f.label :country_id %><br>
+    <%= f.number_field :country_id %>
+  </div>
+  <div class="field">
+    <%= f.label :latitude %><br>
+    <%= f.text_field :latitude %>
+  </div>
+  <div class="field">
+    <%= f.label :longitude %><br>
+    <%= f.text_field :longitude %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/places/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Place</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @place %> |
+<%= link_to 'Back', places_path %>

data/app/views/places/index.html.erb

@@ -0,0 +1,35 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Listing Places</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Term</th>
+      <th>City</th>
+      <th>Country</th>
+      <th>Latitude</th>
+      <th>Longitude</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @places.each do |place| %>
+      <tr>
+        <td><%= place.term %></td>
+        <td><%= place.city %></td>
+        <td><%= place.country_id %></td>
+        <td><%= place.latitude %></td>
+        <td><%= place.longitude %></td>
+        <td><%= link_to 'Show', place %></td>
+        <td><%= link_to 'Edit', edit_place_path(place) %></td>
+        <td><%= link_to 'Destroy', place, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Place', new_place_path %>

data/app/views/places/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Place</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', places_path %>

data/app/views/places/show.html.erb

@@ -0,0 +1,29 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Term:</strong>
+  <%= @place.term %>
+</p>
+
+<p>
+  <strong>City:</strong>
+  <%= @place.city %>
+</p>
+
+<p>
+  <strong>Country:</strong>
+  <%= @place.country_id %>
+</p>
+
+<p>
+  <strong>Latitude:</strong>
+  <%= @place.latitude %>
+</p>
+
+<p>
+  <strong>Longitude:</strong>
+  <%= @place.longitude %>
+</p>
+
+<%= link_to 'Edit', edit_place_path(@place) %> |
+<%= link_to 'Back', places_path %>

data/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  resources :places
   resources :event_export_files
 
   resources :event_import_files

data/db/migrate/20151128142913_create_places.rb

@@ -0,0 +1,15 @@
+class CreatePlaces < ActiveRecord::Migration
+  def change
+    create_table :places do |t|
+      t.string :term
+      t.text :city
+      t.integer :country_id
+      t.float :latitude
+      t.float :longitude
+
+      t.timestamps null: false
+    end
+    add_index :places, :term
+    add_index :places, :country_id
+  end
+end

data/db/migrate/20151201163718_add_place_id_to_event.rb

@@ -0,0 +1,6 @@
+class AddPlaceIdToEvent < ActiveRecord::Migration
+  def change
+    add_column :events, :place_id, :integer
+    add_index :events, :place_id
+  end
+end

data/db/migrate/20160703184258_add_most_recent_to_event_import_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToEventImportFileTransitions < ActiveRecord::Migration
+  def up
+    add_column :event_import_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :event_import_file_transitions, :most_recent
+  end
+end

data/db/migrate/20160703184311_add_most_recent_to_event_export_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToEventExportFileTransitions < ActiveRecord::Migration
+  def up
+    add_column :event_export_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :event_export_file_transitions, :most_recent
+  end
+end

data/lib/enju_event.rb

@@ -1,23 +1,4 @@
 require "enju_event/engine"
 
 module EnjuEvent
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def enju_event
-      include EnjuEvent::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    private
-
-    def get_event
-      @event = Event.find(params[:event_id]) if params[:event_id]
-    end
-  end
 end
-
-ActionController::Base.send(:include, EnjuEvent)

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.19"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/tasks/enju_event_tasks.rake

@@ -3,7 +3,7 @@ desc "create initial records for enju_event"
 namespace :enju_event do
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_event/*.yml').each do |file|
-      ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_event', File.basename(file, '.*'))
+      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_event', File.basename(file, '.*'))
     end
   end
 

data/spec/controllers/event_categories_controller_spec.rb

@@ -19,7 +19,7 @@ describe EventCategoriesController do
 
       it "assigns all event_categories as @event_categories" do
         get :index
-        assigns(:event_categories).should eq(EventCategory.all)
+        assigns(:event_categories).should eq(EventCategory.order(:position))
       end
     end
 
@@ -28,7 +28,7 @@ describe EventCategoriesController do
 
       it "assigns all event_categories as @event_categories" do
         get :index
-        assigns(:event_categories).should eq(EventCategory.all)
+        assigns(:event_categories).should eq(EventCategory.order(:position))
       end
     end
 
@@ -37,14 +37,14 @@ describe EventCategoriesController do
 
       it "assigns all event_categories as @event_categories" do
         get :index
-        assigns(:event_categories).should eq(EventCategory.all)
+        assigns(:event_categories).should eq(EventCategory.order(:position))
       end
     end
 
     describe "When not logged in" do
       it "assigns all event_categories as @event_categories" do
         get :index
-        assigns(:event_categories).should eq(EventCategory.all)
+        assigns(:event_categories).should eq(EventCategory.order(:position))
       end
     end
   end
@@ -55,7 +55,7 @@ describe EventCategoriesController do
 
       it "assigns the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :show, :id => event_category.id
+        get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
     end
@@ -65,7 +65,7 @@ describe EventCategoriesController do
 
       it "assigns the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :show, :id => event_category.id
+        get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
     end
@@ -75,7 +75,7 @@ describe EventCategoriesController do
 
       it "assigns the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :show, :id => event_category.id
+        get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
     end
@@ -83,7 +83,7 @@ describe EventCategoriesController do
     describe "When not logged in" do
       it "assigns the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :show, :id => event_category.id
+        get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
     end
@@ -105,7 +105,7 @@ describe EventCategoriesController do
 
       it "should not assign the requested event_category as @event_category" do
         get :new
-        assigns(:event_category).should_not be_valid
+        assigns(:event_category).should be_nil
         response.should be_forbidden
       end
     end
@@ -115,7 +115,7 @@ describe EventCategoriesController do
 
       it "should not assign the requested event_category as @event_category" do
         get :new
-        assigns(:event_category).should_not be_valid
+        assigns(:event_category).should be_nil
         response.should be_forbidden
       end
     end
@@ -123,7 +123,7 @@ describe EventCategoriesController do
     describe "When not logged in" do
       it "should not assign the requested event_category as @event_category" do
         get :new
-        assigns(:event_category).should_not be_valid
+        assigns(:event_category).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -135,7 +135,7 @@ describe EventCategoriesController do
 
       it "assigns the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :edit, :id => event_category.id
+        get :edit, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
     end
@@ -145,7 +145,7 @@ describe EventCategoriesController do
 
       it "assigns the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :edit, :id => event_category.id
+        get :edit, id: event_category.id
         response.should be_forbidden
       end
     end
@@ -155,7 +155,7 @@ describe EventCategoriesController do
 
       it "assigns the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :edit, :id => event_category.id
+        get :edit, id: event_category.id
         response.should be_forbidden
       end
     end
@@ -163,7 +163,7 @@ describe EventCategoriesController do
     describe "When not logged in" do
       it "should not assign the requested event_category as @event_category" do
         event_category = FactoryGirl.create(:event_category)
-        get :edit, :id => event_category.id
+        get :edit, id: event_category.id
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -180,24 +180,24 @@ describe EventCategoriesController do
 
       describe "with valid params" do
         it "assigns a newly created event_category as @event_category" do
-          post :create, :event_category => @attrs
+          post :create, event_category: @attrs
           assigns(:event_category).should be_valid
         end
 
         it "redirects to the created patron" do
-          post :create, :event_category => @attrs
+          post :create, event_category: @attrs
           response.should redirect_to(assigns(:event_category))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event_category as @event_category" do
-          post :create, :event_category => @invalid_attrs
+          post :create, event_category: @invalid_attrs
           assigns(:event_category).should_not be_valid
         end
 
         it "should be successful" do
-          post :create, :event_category => @invalid_attrs
+          post :create, event_category: @invalid_attrs
           response.should be_success
         end
       end
@@ -208,24 +208,24 @@ describe EventCategoriesController do
 
       describe "with valid params" do
         it "assigns a newly created event_category as @event_category" do
-          post :create, :event_category => @attrs
-          assigns(:event_category).should be_valid
+          post :create, event_category: @attrs
+          assigns(:event_category).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event_category => @attrs
+          post :create, event_category: @attrs
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event_category as @event_category" do
-          post :create, :event_category => @invalid_attrs
-          assigns(:event_category).should_not be_valid
+          post :create, event_category: @invalid_attrs
+          assigns(:event_category).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event_category => @invalid_attrs
+          post :create, event_category: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -236,24 +236,24 @@ describe EventCategoriesController do
 
       describe "with valid params" do
         it "assigns a newly created event_category as @event_category" do
-          post :create, :event_category => @attrs
-          assigns(:event_category).should be_valid
+          post :create, event_category: @attrs
+          assigns(:event_category).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event_category => @attrs
+          post :create, event_category: @attrs
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event_category as @event_category" do
-          post :create, :event_category => @invalid_attrs
-          assigns(:event_category).should_not be_valid
+          post :create, event_category: @invalid_attrs
+          assigns(:event_category).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event_category => @invalid_attrs
+          post :create, event_category: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -262,24 +262,24 @@ describe EventCategoriesController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created event_category as @event_category" do
-          post :create, :event_category => @attrs
-          assigns(:event_category).should be_valid
+          post :create, event_category: @attrs
+          assigns(:event_category).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event_category => @attrs
+          post :create, event_category: @attrs
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event_category as @event_category" do
-          post :create, :event_category => @invalid_attrs
-          assigns(:event_category).should_not be_valid
+          post :create, event_category: @invalid_attrs
+          assigns(:event_category).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event_category => @invalid_attrs
+          post :create, event_category: @invalid_attrs
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -298,23 +298,23 @@ describe EventCategoriesController do
 
       describe "with valid params" do
         it "updates the requested event_category" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
         end
 
         it "assigns the requested event_category as @event_category" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
           assigns(:event_category).should eq(@event_category)
         end
 
         it "moves its position when specified" do
-          put :update, :id => @event_category.id, :event_category => @attrs, :move => 'lower'
+          put :update, id: @event_category.id, event_category: @attrs, :move => 'lower'
           response.should redirect_to(event_categories_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested event_category as @event_category" do
-          put :update, :id => @event_category.id, :event_category => @invalid_attrs
+          put :update, id: @event_category.id, event_category: @invalid_attrs
           response.should render_template("edit")
         end
       end
@@ -325,11 +325,11 @@ describe EventCategoriesController do
 
       describe "with valid params" do
         it "updates the requested event_category" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
         end
 
         it "assigns the requested event_category as @event_category" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
           assigns(:event_category).should eq(@event_category)
           response.should be_forbidden
         end
@@ -337,7 +337,7 @@ describe EventCategoriesController do
 
       describe "with invalid params" do
         it "assigns the requested event_category as @event_category" do
-          put :update, :id => @event_category.id, :event_category => @invalid_attrs
+          put :update, id: @event_category.id, event_category: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -348,11 +348,11 @@ describe EventCategoriesController do
 
       describe "with valid params" do
         it "updates the requested event_category" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
         end
 
         it "assigns the requested event_category as @event_category" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
           assigns(:event_category).should eq(@event_category)
           response.should be_forbidden
         end
@@ -360,7 +360,7 @@ describe EventCategoriesController do
 
       describe "with invalid params" do
         it "assigns the requested event_category as @event_category" do
-          put :update, :id => @event_category.id, :event_category => @invalid_attrs
+          put :update, id: @event_category.id, event_category: @invalid_attrs
           response.should be_forbidden
         end
       end
@@ -369,18 +369,18 @@ describe EventCategoriesController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested event_category" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
         end
 
         it "should be forbidden" do
-          put :update, :id => @event_category.id, :event_category => @attrs
+          put :update, id: @event_category.id, event_category: @attrs
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested event_category as @event_category" do
-          put :update, :id => @event_category.id, :event_category => @invalid_attrs
+          put :update, id: @event_category.id, event_category: @invalid_attrs
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -396,11 +396,11 @@ describe EventCategoriesController do
       login_fixture_admin
 
       it "destroys the requested event_category" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
       end
 
       it "redirects to the event_categories list" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
         response.should redirect_to(event_categories_url)
       end
     end
@@ -409,11 +409,11 @@ describe EventCategoriesController do
       login_fixture_librarian
 
       it "destroys the requested event_category" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
         response.should be_forbidden
       end
     end
@@ -422,22 +422,22 @@ describe EventCategoriesController do
       login_fixture_user
 
       it "destroys the requested event_category" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested event_category" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @event_category.id
+        delete :destroy, id: @event_category.id
         response.should redirect_to(new_user_session_url)
       end
     end