bookkeeper 0.0.1 → 0.0.2

data/README.md

@@ -1,4 +1,4 @@
-# Bookkeeper
+# Bookkeeper [![Build Status](https://secure.travis-ci.org/tommyblue/Bookkeeper.png?branch=master)](http://travis-ci.org/tommyblue/Bookkeeper) [![Dependency Status](https://gemnasium.com/tommyblue/Bookkeeper.png)](https://gemnasium.com/tommyblue/Bookkeeper) [![Code Climate](https://codeclimate.com/github/tommyblue/Bookkeeper.png)](https://codeclimate.com/github/tommyblue/Bookkeeper)
 
 Bookkeeper is a Rails engine with the aim of allowing a Rails application (at least 3.1) to handle the purchases you made and their receipt.
 

data/app/controllers/bookkeeper/search_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "bookkeeper/application_controller"
+
+module Bookkeeper
+  class SearchController < ApplicationController
+    def create
+      @q = params[:search][:q]
+      query = "%#{@q}%"
+      @results = Purchase.where("title LIKE ? OR description LIKE ?", query, query)
+    end
+  end
+end

data/app/models/bookkeeper/purchase.rb

@@ -7,5 +7,7 @@ module Bookkeeper
     validates_presence_of :title
     validates_numericality_of :warranty_duration, allow_nil: true
     validates_date :purchase_date, allow_nil: true, allow_blank: true
+
+    default_scope order('created_at DESC')
   end
 end

data/app/views/bookkeeper/purchases/_search.html.erb

@@ -0,0 +1,6 @@
+<div class="pull-right">
+  <%= form_tag search_index_path, class: "navbar-search pull-left" do %>
+    <%= text_field_tag 'search[q]', '', class: 'search-query', placeholder: t('.search') %>
+  <% end %>
+</div>
+

data/app/views/bookkeeper/purchases/index.html.erb

@@ -1,3 +1,4 @@
+<%= render partial: 'search' %>
 <h1><%= t '.title' %></h1>
 
 <table class='table table-striped table-condensed table-bordered'>
@@ -8,6 +9,7 @@
       <th><%=t 'bookkeeper.models.purchase.attributes.purchase_date' %></th>
       <th><%=t 'bookkeeper.models.purchase.attributes.warranty_duration' %></th>
       <th><%=t 'bookkeeper.models.purchase.attributes.receipt' %></th>
+      <th><%=t 'bookkeeper.models.purchase.attributes.updated_at' %></th>
       <th></th>
     </tr>
   </thead>
@@ -19,6 +21,7 @@
         <td><%=l purchase.purchase_date rescue '' %></td>
         <td><%= purchase.warranty_duration %> <%=t '.months' %></td>
         <td><%= link_to "<i class='icon-download-alt'></i> #{purchase.receipt.file.filename}".html_safe, purchase.receipt.url, class: 'btn btn-mini' if purchase.receipt.file %></td>
+        <td><%=l purchase.updated_at, format: :short rescue '' %></td>
         <td>
           <%= link_to ('<i class="icon-pencil"></i> ' + t('bookkeeper.actions.edit')).html_safe, edit_purchase_path(purchase), class: 'btn btn-mini' %>
           <%= link_to ('<i class="icon-remove"></i> ' + t('bookkeeper.actions.destroy')).html_safe, purchase, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-mini btn-danger' %>

data/app/views/bookkeeper/search/create.html.erb

@@ -0,0 +1,31 @@
+<h1><%= t '.title', q: @q %></h1>
+
+<table class='table table-striped table-condensed table-bordered'>
+  <thead>
+    <tr>
+      <th><%=t 'bookkeeper.models.purchase.attributes.title' %></th>
+      <th><%=t 'bookkeeper.models.purchase.attributes.description' %></th>
+      <th><%=t 'bookkeeper.models.purchase.attributes.purchase_date' %></th>
+      <th><%=t 'bookkeeper.models.purchase.attributes.warranty_duration' %></th>
+      <th><%=t 'bookkeeper.models.purchase.attributes.receipt' %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @results.each do |purchase| %>
+      <tr>
+        <td><%= purchase.title %></td>
+        <td><%= purchase.description %></td>
+        <td><%=l purchase.purchase_date rescue '' %></td>
+        <td><%= purchase.warranty_duration %> <%=t '.months' %></td>
+        <td><%= link_to "<i class='icon-download-alt'></i> #{purchase.receipt.file.filename}".html_safe, purchase.receipt.url, class: 'btn btn-mini' if purchase.receipt.file %></td>
+        <td>
+          <%= link_to ('<i class="icon-pencil"></i> ' + t('bookkeeper.actions.edit')).html_safe, edit_purchase_path(purchase), class: 'btn btn-mini' %>
+          <%= link_to ('<i class="icon-remove"></i> ' + t('bookkeeper.actions.destroy')).html_safe, purchase, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-mini btn-danger' %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+<br />
+<%= link_to ('<i class="icon-arrow-left"></i> ' + t('bookkeeper.actions.back')).html_safe, purchases_path, class: 'btn' %>

data/config/locales/en.yml

@@ -17,6 +17,7 @@ en:
           purchase_date: 'Purchase date'
           warranty_duration: 'Warranty duration'
           receipt: 'Receipt'
+          updated_at: 'Last update'
     # controllers
     controllers:
       purchases:
@@ -24,6 +25,9 @@ en:
         updated: 'Purchase was successfully updated.'
         destroyed: 'Purchase was successfully deleted.'
     # views
+    search:
+      create:
+        title: 'Search results for "%{q}"'
     purchases:
       index:
         title: 'Listing purchases'
@@ -32,3 +36,5 @@ en:
         title: 'New purchase'
       edit:
         title: 'Edit purchase'
+      search:
+        search: 'Search'

data/config/routes.rb

@@ -1,3 +1,4 @@
 Bookkeeper::Engine.routes.draw do
   resources :purchases
+  resources :search, only: [:create]
 end

data/lib/bookkeeper/version.rb

@@ -1,3 +1,3 @@
 module Bookkeeper
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/controllers/bookkeeper/purchases_controller_spec.rb

@@ -2,46 +2,50 @@ require 'spec_helper'
 
 module Bookkeeper
   describe PurchasesController do
-    def valid_session
-      {}
-    end
-
     describe "GET index" do
       it "assigns all purchases as @purchases" do
         purchase = create(:bookkeeper_purchase)
-        get :index, { use_route: :purchases }, valid_session
+        get :index, { use_route: :purchases }
         expect(assigns(:purchases)).to match_array [purchase]
       end
 
       it "renders the :index template" do
         purchase = create(:bookkeeper_purchase)
-        get :index, { use_route: :purchases }, valid_session
+        get :index, { use_route: :purchases }
         expect(response).to render_template :index
       end
-    end
 
-    describe "GET show" do
-      it "assigns the requested purchase as @purchase" do
-        purchase = create(:bookkeeper_purchase)
-        get :show, { id: purchase.to_param, use_route: :purchases }, valid_session
-        expect(assigns(:purchase)).to eq purchase
+      it "shows all purchases ordered by creation" do
+        first_purchase = create(:bookkeeper_purchase)
+        last_purchase = create(:bookkeeper_purchase)
+        get :index, { use_route: :purchases }
+        expect(assigns(:purchases)).to eq([last_purchase, first_purchase])
       end
 
-      it "renders the :show template" do
-        purchase = create(:bookkeeper_purchase)
-        get :show, { id: purchase.to_param, use_route: :purchases }, valid_session
-        expect(response).to render_template :show
-      end
     end
 
+    # describe "GET show" do
+    #   it "assigns the requested purchase as @purchase" do
+    #     purchase = create(:bookkeeper_purchase)
+    #     get :show, { id: purchase.to_param, use_route: :purchases }
+    #     expect(assigns(:purchase)).to eq purchase
+    #   end
+
+    #   it "renders the :show template" do
+    #     purchase = create(:bookkeeper_purchase)
+    #     get :show, { id: purchase.to_param, use_route: :purchases }
+    #     expect(response).to render_template :show
+    #   end
+    # end
+
     describe "GET new" do
       it "assigns a new purchase as @purchase" do
-        get :new, { use_route: :purchases }, valid_session
+        get :new, { use_route: :purchases }
         expect(assigns(:purchase)).to be_a_new(Purchase)
       end
 
       it "renders the :new template" do
-        get :new, { use_route: :purchases }, valid_session
+        get :new, { use_route: :purchases }
         expect(response).to render_template :new
       end
     end
@@ -49,13 +53,13 @@ module Bookkeeper
     describe "GET edit" do
       it "assigns the requested purchase as @purchase" do
         purchase = create(:bookkeeper_purchase)
-        get :edit, { id: purchase.to_param, use_route: :purchases }, valid_session
+        get :edit, { id: purchase.to_param, use_route: :purchases }
         expect(assigns(:purchase)).to eq(purchase)
       end
 
       it "renders the :edit template" do
         purchase = create(:bookkeeper_purchase)
-        get :edit, { id: purchase.to_param, use_route: :purchases }, valid_session
+        get :edit, { id: purchase.to_param, use_route: :purchases }
         expect(response).to render_template :edit
       end
     end
@@ -64,18 +68,18 @@ module Bookkeeper
       describe "with valid params" do
         it "creates a new Purchase" do
           expect {
-            post :create, {purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}, valid_session
+            post :create, {purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}
           }.to change(Purchase, :count).by(1)
         end
 
         it "assigns a newly created purchase as @purchase" do
-          post :create, {purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}, valid_session
+          post :create, {purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}
           expect(assigns(:purchase)).to be_a(Purchase)
           expect(assigns(:purchase)).to be_persisted
         end
 
         it "redirects to the purchases page" do
-          post :create, {purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}, valid_session
+          post :create, {purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}
           expect(response).to redirect_to :purchases
         end
       end
@@ -83,17 +87,17 @@ module Bookkeeper
       describe "with invalid params" do
         it "does not save the new Purchase" do
           expect {
-            post :create, {purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}, valid_session
+            post :create, {purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}
           }.to_not change(Purchase, :count).by(1)
         end
 
         it "assigns a newly created but unsaved purchase as @purchase" do
-          post :create, {purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}, valid_session
+          post :create, {purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}
           expect(assigns(:purchase)).to be_a_new(Purchase)
         end
 
         it "re-renders the 'new' template" do
-          post :create, {purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}, valid_session
+          post :create, {purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}
           expect(response).to render_template :new
         end
       end
@@ -107,30 +111,30 @@ module Bookkeeper
 
       describe "with valid params" do
         it "updates the requested purchase" do
-          put :update, {id: @purchase, use_route: :purchases, purchase: attributes_for(:bookkeeper_purchase)}, valid_session
+          put :update, {id: @purchase, use_route: :purchases, purchase: attributes_for(:bookkeeper_purchase)}
           expect(assigns(:purchase)).to eq(@purchase)
         end
 
         it "assigns the requested purchase as @purchase" do
-          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}, valid_session
+          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}
           expect(assigns(:purchase)).to eq(@purchase)
         end
 
         it "redirects to the purchase" do
-          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}, valid_session
+          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_purchase), use_route: :purchases}
           expect(response).to redirect_to(:purchases)
         end
       end
 
       describe "with invalid params" do
         it "assigns the purchase as @purchase" do
-          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}, valid_session
+          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}
           @purchase.reload
           expect(@purchase.title).to eq(@purchase_title)
         end
 
         it "re-renders the 'edit' template" do
-          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}, valid_session
+          put :update, {id: @purchase.to_param, purchase: attributes_for(:bookkeeper_invalid_purchase), use_route: :purchases}
           expect(response).to render_template :edit
         end
       end
@@ -142,12 +146,12 @@ module Bookkeeper
       end
       it "destroys the requested purchase" do
         expect {
-          delete :destroy, {id: @purchase.to_param, use_route: :purchases}, valid_session
+          delete :destroy, {id: @purchase.to_param, use_route: :purchases}
         }.to change(Purchase, :count).by(-1)
       end
 
       it "redirects to the purchases list" do
-        delete :destroy, {id: @purchase.to_param, use_route: :purchases}, valid_session
+        delete :destroy, {id: @purchase.to_param, use_route: :purchases}
         expect(response).to redirect_to :purchases
       end
     end

data/spec/controllers/bookkeeper/search_controller_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Bookkeeper
+  describe SearchController do
+    describe "POST create" do
+      describe "with search results" do
+        it "assigns the researched term as @q" do
+          post :create, {search: {q: 'searchable'}, use_route: :purchases}
+          expect(assigns(:q)).to eq('searchable')
+        end
+        it "Finds the purchase by title" do
+          purchase = create(:bookkeeper_purchase, title: 'My searchable purchase')
+          post :create, {search: {q: 'searchable'}, use_route: :purchases}
+          expect(assigns(:results)).to eq([purchase])
+        end
+        it "Finds the purchase by description" do
+          purchase = create(:bookkeeper_purchase, description: 'My searchable purchase')
+          post :create, {search: {q: 'searchable'}, use_route: :purchases}
+          expect(assigns(:results)).to eq([purchase])
+        end
+      end
+
+      describe "without search results" do
+        it "Doesn't find the purchase" do
+          purchase = create(:bookkeeper_purchase, title: 'My searchable purchase')
+          post :create, {search: {q: 'unsearchable'}, use_route: :purchases}
+          expect(assigns(:results)).to eq([])
+        end
+      end
+    end
+
+  end
+end