expense_gun 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e08be595ad351a7b620475f7c85e81d4e5956ae
-  data.tar.gz: a3284770e9fd5d1d057087fe45ee708ce6790cc2
+  metadata.gz: 15ea68e1ac6d8376cfe784db24395eac0609e67d
+  data.tar.gz: f129be42141bda107a8f8172fa3fa13bb1cc24d4
 SHA512:
-  metadata.gz: 44f9fb09c8b001ea8b5160f1a178cc428c67847e900e9cc0d72fea45d1f3bf996bbb9c7173aa2f7174627d814588cfca81b3f62402a4d5cd98a90271a0c7d235
-  data.tar.gz: 9bb3e349247c589c2b7e3f79096667b641f72f3cdbaab2a6609529f96c5c7cdc52340fb55b3ee7b8379a7f289150a2a482c9acd454857d61e027246d8d7195d3
+  metadata.gz: 58cf6db79447a2f426b864d727c6815b96b117a1e05cd9cc7cf40493d4aef5da975ac1f4a94822ac93188a7ac3ed69ac6e0f327ef0fca7eb49bf9d0d9ec969a9
+  data.tar.gz: 9ac44f6a0586f92ed36d519079c1cb65b5ff57625d41f13d0f4ead85fc7ffddbfd4064fc290227004512fb1fe702fe6445ff80202d7663b223dd9e84ed782e54

data/app/controllers/expense_gun/application_controller.rb

@@ -3,5 +3,7 @@ module ExpenseGun
     def current_ability
       @current_ability ||= Ability.new(nil)
     end
+    
+    helper AgilideeCommons::FormHelper
   end
 end

data/app/controllers/expense_gun/expense_lines_controller.rb

@@ -20,7 +20,7 @@ module ExpenseGun
       @expense_line = @expense.expense_lines.new(expense_line_params)
       
       if @expense_line.save
-        flash[:success] = "Expense line created"
+        flash[:success] = t("expense_gun.expense_line.flash.created")
         redirect_to expense_path(@expense)
       else
         render :new
@@ -35,7 +35,7 @@ module ExpenseGun
       authorize! :edit, @expense
       
       if @expense_line.update_attributes(expense_line_params)
-        flash[:success] = "Expense line updated"
+        flash[:success] = t("expense_gun.expense_line.flash.created")
         redirect_to expense_path(@expense)
       else
         render :edit
@@ -46,7 +46,7 @@ module ExpenseGun
       authorize! :edit, @expense
       
       @expense_line.destroy
-      flash[:success] = "Expense line destroyed"
+      flash[:success] = t("expense_gun.expense_line.flash.created")
       redirect_to expense_path(@expense)
     end
     

data/app/controllers/expense_gun/expenses_controller.rb

@@ -34,7 +34,7 @@ module ExpenseGun
       @expense ||= Expense.new(expense_params)
       
       if @expense.save
-        flash[:success] = "Expense created"
+        flash[:success] = t("expense_gun.expense.flash.created")
         redirect_to expense_path(@expense)
       else
         render :new
@@ -55,7 +55,7 @@ module ExpenseGun
       authorize! :edit, @expense
       
       if @expense.update_attributes(expense_params)
-        flash[:success] = "Expense updated"
+        flash[:success] = t("expense_gun.expense.flash.updated")
         redirect_to expense_path(@expense)
       else
         render :edit
@@ -66,7 +66,7 @@ module ExpenseGun
       authorize! :submit, @expense
       
       @expense.submit!
-      flash[:success] = "Expense submited"
+      flash[:success] = t("expense_gun.expense.flash.submited")
       redirect_to expenses_path
     end
     
@@ -74,7 +74,7 @@ module ExpenseGun
       authorize! :accept, @expense
       
       @expense.accept!
-      flash[:success] = "Expense accepted"
+      flash[:success] = t("expense_gun.expense.flash.accepted")
       redirect_to expense_path(@expense)
     end
     
@@ -82,7 +82,7 @@ module ExpenseGun
       authorize! :refuse, @expense
       
       @expense.refuse!
-      flash[:success] = "Expense refused"
+      flash[:success] = t("expense_gun.expense.flash.refused")
       redirect_to expenses_path
     end
     
@@ -90,7 +90,7 @@ module ExpenseGun
       authorize! :cancel, @expense
       
       @expense.cancel!
-      flash[:success] = "Expense canceled"
+      flash[:success] = t("expense_gun.expense.flash.canceled")
       redirect_to expenses_path
     end
     

data/app/models/expense_gun/expense.rb

@@ -2,7 +2,7 @@ module ExpenseGun
   class Expense < ActiveRecord::Base
     include AASM
     
-    has_many :expense_lines, inverse_of: :expense
+    has_many :expense_lines, inverse_of: :expense, dependent: :destroy
     
     validates :name, presence: true
     validates :date, presence: true

data/app/models/expense_gun/expense_line.rb

@@ -15,6 +15,9 @@ module ExpenseGun
     validates :vat,             presence: true, numericality: {greater_than_or_equal_to: 1.0}
     validates :company_part,    presence: true, numericality: {greater_than_or_equal_to: 1.0, less_than_or_equal_to: 100.0}
     
+    # simple_form
+    validates :category_id, presence: true
+    
     def employee_payback
       (total_all_taxes * company_part / 100)
     end

data/app/views/expense_gun/expense_lines/_form.html.slim

@@ -1,16 +1,14 @@
-= form [expense_gun, @expense, @expense_line] do |f|
+= horizontal_form_for [expense_gun, @expense, @expense_line] do |f|
   .panel.panel-default
     .panel-body
       .row
         .col-md-6
           = f.input :name
           = f.input :date, as: :string, input_html: {type: :date}
-          .form-group
-            label for="expense_line_category_id" Category
-            = f.collection_select :category_id, ExpenseGun::Category.all, :id, :name, {include_blank: true}, {class: "form-control"}
+          = f.input :category_id, collection: ExpenseGun::Category.all
         .col-md-6
           = f.input :total_all_taxes
           = f.input :vat
           = f.input :company_part
 
-  = f.actions
+  = form_buttons back_url: false

data/app/views/expense_gun/expense_lines/edit.html.slim

@@ -1,4 +1,8 @@
-h1 Edit expense line
-
 .expenses.expense_lines
+  .actions-block
+    = link_to t("expense_gun.expense_line.back_to_expense"), expense_gun.expense_path(@expense), class: "btn btn-default"
+    = link_to t("expense_gun.expense.list"), expense_gun.expenses_path, class: "btn btn-default"
+    
+  h1 = t("expense_gun.expense_line.edit")
+  
   = render "form"

data/app/views/expense_gun/expense_lines/new.html.slim

@@ -1,4 +1,11 @@
-h1 = "#{@expense.name} : New expense line"
-
 .expenses.expense_lines
+  .actions-block
+    = link_to t("expense_gun.expense_line.back_to_expense"), expense_gun.expense_path(@expense), class: "btn btn-default"
+    = link_to t("expense_gun.expense.list"), expense_gun.expenses_path, class: "btn btn-default"
+  
+  h1
+    = @expense.name
+    = " : "
+    = t("expense_gun.expense_line.new")
+  
   = render "form"

data/app/views/expense_gun/expenses/_form.html.slim

@@ -1,5 +1,5 @@
 .row: .col-md-6
-  = form [expense_gun, @expense] do |f|
+  = horizontal_form_for [expense_gun, @expense] do |f|
     = f.input :name
     = f.input :date, as: :string, input_html: {type: :date}
-    = f.actions
+    = form_buttons back_url: false

data/app/views/expense_gun/expenses/edit.html.slim

@@ -1,4 +1,7 @@
-h1 = @expense.name
-
 .expenses
+  .actions-block
+    = link_to t("expense_gun.expense.list"), expense_gun.expenses_path, class: "btn btn-default"
+
+  h1 = @expense.name
+  
   = render "form"

data/app/views/expense_gun/expenses/index.html.slim

@@ -1,4 +1,4 @@
-h1 Expenses list
+h1 = t("expense_gun.expense.list")
 
 .row.expenses
   .col-md-4
@@ -6,17 +6,17 @@ h1 Expenses list
       - for state in %w(submited new accepted refused canceled)
         li class=("active" if params[:state] == state)
           a href=expense_gun.url_for(state: state)
-            = state.capitalize
+            = t("labels.states.#{state}").pluralize
             span.badge.pull-right = @all_expenses.where(state: state).count
       
       li class=("active" if params[:state] == "all")
         a href=expense_gun.url_for(state: "all")
-          = "All"
+          = t("labels.states.all")
           span.badge.pull-right = @all_expenses.count
     
     hr
     
-    p = link_to "New expense", expense_gun.new_expense_path, class: "btn btn-success"
+    p = link_to t("expense_gun.expense.new"), expense_gun.new_expense_path, class: "btn btn-success"
   
   .col-md-8
     - for expense in @expenses
@@ -28,36 +28,35 @@ h1 Expenses list
             .col-md-4
               .date = expense.date
         .panel-body
-          .row: .col-md-6
-            p
-              strong = "Employee :"
-              = expense.user.full_name if expense.respond_to?(:user)
-            
-            p
-              strong = "State :"
-              = expense.current_state.capitalize
-            
-            p
-              strong = "Total all taxes :"
-              = "#{expense.total_all_taxes} €"
+          p
+            strong = t("labels.employee") + " : "
+            = expense.user.full_name if expense.respond_to?(:user)
+          
+          p
+            strong = t("labels.state") + " : "
+            = t("labels.states.#{expense.current_state}")
+          
+          p
+            strong = t("labels.total_all_taxes") + " : "
+            = "#{expense.total_all_taxes} €"
         
         .panel-footer
-          = link_to "Show", expense_gun.expense_path(expense), class: "btn btn-default"
+          = link_to t("expense_gun.expense.show"), expense_gun.expense_path(expense), class: "btn btn-default"
           
           - if can? :edit, expense
-            = link_to "Edit", expense_gun.edit_expense_path(expense), class: "btn btn-default"
+            = link_to t("expense_gun.expense.edit"), expense_gun.edit_expense_path(expense), class: "btn btn-default"
           
           - if can? :submit, expense
-            = link_to "Submit", expense_gun.submit_expense_path(expense), data: {method: "patch"}, class: "btn btn-primary"
+            = link_to t("expense_gun.expense.submit"), expense_gun.submit_expense_path(expense), data: {method: "patch"}, class: "btn btn-primary"
             
           - if can? :accept, expense
-            = link_to "Accept", expense_gun.accept_expense_path(expense), data: {method: "patch"}, class: "btn btn-success"
+            = link_to t("expense_gun.expense.accept"), expense_gun.accept_expense_path(expense), data: {method: "patch"}, class: "btn btn-success"
           
           - if can? :refuse, expense
-            = link_to "Refuse", expense_gun.refuse_expense_path(expense), data: {method: "patch"}, class: "btn btn-danger"
+            = link_to t("expense_gun.expense.refuse"), expense_gun.refuse_expense_path(expense), data: {method: "patch"}, class: "btn btn-danger"
           
           - if can? :cancel, expense
-            = link_to "Cancel", expense_gun.cancel_expense_path(expense), data: {method: "patch"}, class: "btn btn-warning"
+            = link_to t("expense_gun.expense.cancel"), expense_gun.cancel_expense_path(expense), data: {method: "patch"}, class: "btn btn-warning"
 
 
 == paginate @expenses, theme: "bootstrap3"

data/app/views/expense_gun/expenses/new.html.slim

@@ -1,4 +1,7 @@
-h1 New Expense
-
 .expenses
+  .actions-block
+    = link_to t("expense_gun.expense.list"), expense_gun.expenses_path, class: "btn btn-default"
+
+  h1 = t("expense_gun.expense.new")
+
   = render "form"

data/app/views/expense_gun/expenses/show.html.slim

@@ -1,25 +1,30 @@
 .expenses
   .actions-block.hidden-print
     - if can? :edit, @expense
-      = link_to "New expense line", expense_gun.new_expense_expense_line_path(@expense), class: "btn btn-success"
-      = link_to "Edit expense", expense_gun.edit_expense_path(@expense), class: "btn btn-default"
-    = link_to "Expenses list", expense_gun.expenses_path, class: "btn btn-default"
-    a.btn.btn-default href="#" onclick="print(); return false;" = "Print"
+      = link_to t("expense_gun.expense_line.new"), expense_gun.new_expense_expense_line_path(@expense), class: "btn btn-success"
+      = link_to t("expense_gun.expense.edit"), expense_gun.edit_expense_path(@expense), class: "btn btn-default"
+    
+    = link_to t("expense_gun.expense.list"), expense_gun.expenses_path, class: "btn btn-default"
+    
+    a.btn.btn-default href="#" onclick="print(); return false;" = t("expense_gun.expense.print")
   
-  h1 = "Expense : #{@expense.name}"
+  h1
+    = t("expense_gun.expense.label")
+    = " : "
+    = @expense.name
   
   p
     span.date
-      strong = "Date : "
+      strong = t("labels.date") + " : "
       = @expense.date
       br
     span.user
-      strong = "Employee : "
+      strong = t("labels.employee") + " : "
       = @expense.user.full_name if @expense.respond_to?(:user)
       br
-    span.state
-      strong = "State : "
-      = @expense.state.capitalize
+    span.state class="#{@expense.state}"
+      strong = t("labels.state") + " : "
+      = t "labels.states." + @expense.state
     
   hr
   
@@ -30,39 +35,39 @@
         .row
           .col-md-6
             p
-              strong = "Name :"
+              strong = t("labels.name") + " : "
               = expense_line.name
             p
-              strong = "Date :"
+              strong = t("labels.date") + " : "
               = expense_line.date
             p
-              strong = "Category :"
+              strong = t("labels.category") + " : "
               = expense_line.category.name
               - if expense_line.category.code.present?
                 = " (#{expense_line.category.code})"
           .col-md-6
             p
-              strong = "Total all taxes :"
+              strong = t("labels.total_all_taxes") + " : "
               = "#{expense_line.total_all_taxes} €"
             p
-              strong = "Tax :"
+              strong = t("labels.vat") + " : "
               = "#{expense_line.vat} €"
             p
-              strong = "Company part :"
+              strong = t("labels.company_part") + " : "
               = "#{expense_line.company_part} %"
       
       .panel-footer
         .row
           .col-md-6.hidden-print
             - if can? :edit, @expense
-              = link_to "Edit", expense_gun.edit_expense_expense_line_path(expense_line.expense, expense_line), class: "btn btn-default"
-              = link_to "Destroy", expense_gun.expense_expense_line_path(expense_line.expense, expense_line), class: "btn btn-danger", "data-method" => "delete", "data-confirm" => "Confirm ?"
+              = link_to t("expense_gun.expense_line.edit"), expense_gun.edit_expense_expense_line_path(expense_line.expense, expense_line), class: "btn btn-default"
+              = link_to t("expense_gun.expense_line.destroy"), expense_gun.expense_expense_line_path(expense_line.expense, expense_line), class: "btn btn-danger", "data-method" => "delete", "data-confirm" => "Confirm ?"
           .col-md-6
             p
-              strong = "Employee payback :"
+              strong = t("labels.employee_payback") + " : "
               = "#{expense_line.employee_payback} €"
             p
-              strong = "Deductible VAT :"
+              strong = t("labels.deductible_vat") + " : "
               = "#{expense_line.total_vat_deductible} €"
 
   hr
@@ -71,14 +76,14 @@
     .panel-body
       .row
         .col-md-6
-          strong = "Total :"
+          strong = t("labels.total") + " : "
         .col-md-6
           p
-            strong = "Total all taxes :"
+            strong = t("labels.total_all_taxes") + " : "
             = "#{@expense.total_all_taxes} €"
           p
-            strong = "Employee payback :"
+            strong = t("labels.employee_payback") + " : "
             = "#{@expense.total_employee_payback} €"
           p
-            strong = "Deductible VAT :"
+            strong = t("labels.deductible_vat") + " : "
             = "#{@expense.total_vat_deductible} €"

data/config/locales/expense_gun.fr.yml

@@ -0,0 +1,72 @@
+fr:
+  expense_gun:
+    expense:
+      label  : "Note de frais"
+      list   : "Liste des notes de frais"
+      new    : "Nouvelle note de frais"
+      edit   : "Modifier la note"
+      print  : "Imprimer"
+      show   : "Afficher"
+      edit   : "Modifier"
+      submit : "Soumettre"
+      accept : "Accepter"
+      refuse : "Refuser"
+      cancel : "Annuler"
+      flash:
+        created  : "La note de frais a été créée."
+        updated  : "La note de frais a été mise à jour."
+        submited : "La note de frais a été soumise."
+        accepted : "La note de frais a été acceptée."
+        refused  : "La note de frais a été refusée."
+        canceled : "La note de frais a été annulée."
+    
+    expense_line:
+      label           : "Frais"
+      new             : "Nouveau frais"
+      edit            : "Modifier"
+      destroy         : "Supprimer"
+      back_to_expense : "Retour à la note"
+      flash:
+        created   : "Le frais a été ajouté."
+        updated   : "Le frais a été modifié."
+        destroyed : "Le frais a été supprimé."
+  
+  labels: &labels
+      name             : "Nom"
+      date             : "Date"
+      category         : "Catégorie"
+      category_id      : "Catégorie"
+      total_all_taxes  : "Total TTC"
+      vat              : "TVA"
+      company_part     : "Part entreprise"
+      employee         : "Employé"
+      state            : "État"
+      employee_payback : "Remboursement employé"
+      deductible_vat   : "TVA déductible"
+      total            : "Total"
+      
+      states:
+        all      : "Toutes"
+        new      : "Nouvelle"
+        submited : "Soumise"
+        accepted : "Accepée"
+        refused  : "Refusée"
+        canceled : "Annulée" 
+  
+  simple_form:
+    "yes" : 'Oui'
+    "no"  : 'Non'
+    
+    required:
+      text: 'Requis'
+      mark: '*'
+    
+    error_notification:
+      default_message: "Merci de vérifier les problèmes ci-desous :"
+    
+    labels:
+      defaults:
+        <<: *labels
+    
+    options:
+      defaults:

data/lib/expense_gun/admin/category.rb

@@ -1,12 +1,12 @@
 ActiveAdmin.register ExpenseGun::Category do
   scope :all, default: true
   
-  permit_params :name, :code, :tax_deductible
+  permit_params :name, :code, :vat_deductible
   
   index do
     column :name
     column :code
-    column :tax_deductible
+    column :vat_deductible
     actions
   end
 end

data/lib/expense_gun/version.rb

@@ -1,3 +1,3 @@
 module ExpenseGun
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/dummy/config/application.rb

@@ -17,7 +17,7 @@ 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
+    config.i18n.default_locale = :fr
   end
 end
 

data/spec/dummy/config/initializers/simple_form.rb

@@ -0,0 +1,2 @@
+require "agilidee_commons/simple_form"
+require "agilidee_commons/simple_form_bootstrap"

data/spec/models/expense_line_spec.rb

@@ -40,7 +40,7 @@ describe ExpenseGun::ExpenseLine do
   it "#vat should be decimal" do
     expense_line = FactoryGirl.build(:expense_line, vat: 123)
     expect(expense_line.valid?).to be false
-    expect(expense_line.vat).to be 123.0
+    expect(expense_line.vat).to eq 123.0
   end
   
   it "#company_part should be present" do
@@ -53,29 +53,29 @@ describe ExpenseGun::ExpenseLine do
   
   it "#company_part should be 100 as default" do
     expense_line = ExpenseGun::ExpenseLine.new
-    expect(expense_line.company_part).to be 100.0
+    expect(expense_line.company_part).to eq 100.0
   end
   
   it "#employee_payback should be correct" do
     expense_line = ExpenseGun::ExpenseLine.new(total_all_taxes: 100, company_part: 100)
-    expect(expense_line.employee_payback).to be 100.0
+    expect(expense_line.employee_payback).to eq 100.0
     
     expense_line = ExpenseGun::ExpenseLine.new(total_all_taxes: 250, company_part: 50)
-    expect(expense_line.employee_payback).to be 125.0
+    expect(expense_line.employee_payback).to eq 125.0
     
     expense_line = ExpenseGun::ExpenseLine.new(total_all_taxes: 200, company_part: 80)
-    expect(expense_line.employee_payback).to be 160.0
+    expect(expense_line.employee_payback).to eq 160.0
   end
   
   it "#total_vat_deductible should be #vat if categorie is vat_decuctible" do
     category     = FactoryGirl.build(:category, vat_deductible: true)
     expense_line = FactoryGirl.build(:expense_line, category: category)
-    expect(expense_line.total_vat_deductible).to be expense_line.vat
+    expect(expense_line.total_vat_deductible).to eq expense_line.vat
   end
   
   it "#total_vat_deductible should be 0 if categorie is non vat_decuctible" do
     category     = FactoryGirl.build(:category, vat_deductible: false)
     expense_line = FactoryGirl.build(:expense_line, category: category)
-    expect(expense_line.total_vat_deductible).to be 0.0
+    expect(expense_line.total_vat_deductible).to eq 0.0
   end
 end

data/spec/models/expense_spec.rb

@@ -142,14 +142,14 @@ describe ExpenseGun::Expense do
     expense = FactoryGirl.build(:expense, expense_lines: [])
     expense.expense_lines << FactoryGirl.build(:expense_line, total_all_taxes: 10)
     expense.expense_lines << FactoryGirl.build(:expense_line, total_all_taxes: 10)
-    expect(expense.total_all_taxes).to be 20.0
+    expect(expense.total_all_taxes).to eq 20.0
   end
   
   it "#total_employee_payback should return sum of lines" do
     expense = FactoryGirl.build(:expense, expense_lines: [])
     expense.expense_lines << FactoryGirl.build(:expense_line, total_all_taxes: 10, company_part: 100)
     expense.expense_lines << FactoryGirl.build(:expense_line, total_all_taxes: 10, company_part: 50)
-    expect(expense.total_employee_payback).to be 15.0
+    expect(expense.total_employee_payback).to eq 15.0
   end
   
   it "#total_vat_deductible  should return sum of lines" do
@@ -158,7 +158,7 @@ describe ExpenseGun::Expense do
     category2 = FactoryGirl.build(:category, vat_deductible: false)
     expense.expense_lines << FactoryGirl.build(:expense_line, vat: 10, category: category1)
     expense.expense_lines << FactoryGirl.build(:expense_line, vat: 10, category: category2)
-    expect(expense.total_vat_deductible).to be 10.0
+    expect(expense.total_vat_deductible).to eq 10.0
   end
   
   it "#may_edit? should return false unless expense is not submited" do
@@ -168,4 +168,14 @@ describe ExpenseGun::Expense do
     expect(ExpenseGun::Expense.new(state: :refused).may_edit?).to be false
     expect(ExpenseGun::Expense.new(state: :canceled).may_edit?).to be false
   end
+  
+  it "destroy an expense should destroy associated expense lines" do
+    expense          = FactoryGirl.create(:expense)
+    expense_line_ids = expense.expense_lines.map(&:id)
+    expect(expense_line_ids.any?).to be true
+    expense.destroy
+    expense_line_ids.map do |id|
+      expect(ExpenseGun::ExpenseLine.exists?(id)).to be false
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+ENV["RAILS_ENV"] = 'test'
+require 'spec_helper'
+require File.expand_path("../dummy/config/environment", __FILE__)
+require 'rspec/rails'
+
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expense_gun
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - AGILiDEE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: formtastic-bootstrap
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -182,7 +182,7 @@ files:
 - app/views/kaminari/bootstrap3/_page.html.slim
 - app/views/kaminari/bootstrap3/_paginator.html.slim
 - config/cucumber.yml
-- config/initializers/formtastic.rb
+- config/locales/expense_gun.fr.yml
 - config/routes.rb
 - db/migrate/20141201092102_create_expense_gun_expenses.rb
 - db/migrate/20141201100548_expenses_add_state.rb
@@ -225,6 +225,7 @@ files:
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/simple_form.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
@@ -296,6 +297,7 @@ test_files:
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/simple_form.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb

data/config/initializers/formtastic.rb

@@ -1,78 +0,0 @@
-# encoding: utf-8
-
-# Set the default text field size when input is a string. Default is nil.
-# Formtastic::FormBuilder.default_text_field_size = 50
-
-# Set the default text area height when input is a text. Default is 20.
-Formtastic::FormBuilder.default_text_area_height = nil
-
-# Set the default text area width when input is a text. Default is nil.
-Formtastic::FormBuilder.default_text_area_width = nil
-
-# Should all fields be considered "required" by default?
-# Defaults to true.
-Formtastic::FormBuilder.all_fields_required_by_default = false
-
-# Should select fields have a blank option/prompt by default?
-# Defaults to true.
-Formtastic::FormBuilder.include_blank_for_select_by_default = false
-
-# Set the string that will be appended to the labels/fieldsets which are required
-# It accepts string or procs and the default is a localized version of
-# '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
-# in your locale, it will replace the abbr title properly. But if you don't want to use
-# abbr tag, you can simply give a string as below
-Formtastic::FormBuilder.required_string = "*"
-
-# Set the string that will be appended to the labels/fieldsets which are optional
-# Defaults to an empty string ("") and also accepts procs (see required_string above)
-# Formtastic::FormBuilder.optional_string = "(optional)"
-
-# Set the way inline errors will be displayed.
-# Defaults to :sentence, valid options are :sentence, :list, :first and :none
-# Formtastic::FormBuilder.inline_errors = :sentence
-# Formtastic uses the following classes as default for hints, inline_errors and error list
-
-# If you override the class here, please ensure to override it in your stylesheets as well
-# Formtastic::FormBuilder.default_hint_class = "inline-hints"
-# Formtastic::FormBuilder.default_inline_error_class = "inline-errors"
-# Formtastic::FormBuilder.default_error_list_class = "errors"
-
-# Set the method to call on label text to transform or format it for human-friendly
-# reading when formtastic is used without object. Defaults to :humanize.
-# Formtastic::FormBuilder.label_str_method = :humanize
-
-# Set the array of methods to try calling on parent objects in :select and :radio inputs
-# for the text inside each @<option>@ tag or alongside each radio @<input>@. The first method
-# that is found on the object will be used.
-# Defaults to ["to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
-# Formtastic::FormBuilder.collection_label_methods = [
-#   "to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
-
-# Specifies if labels/hints for input fields automatically be looked up using I18n.
-# Default value: true. Overridden for specific fields by setting value to true,
-# i.e. :label => true, or :hint => true (or opposite depending on initialized value)
-Formtastic::FormBuilder.i18n_lookups_by_default = {label: true, hint: true}
-
-# Specifies if I18n lookups of the default I18n Localizer should be cached to improve performance.
-# Defaults to true.
-Formtastic::FormBuilder.i18n_cache_lookups = false
-
-# Specifies the class to use for localization lookups. You can create your own
-# class and use it instead by subclassing Formtastic::Localizer (which is the default).
-# Formtastic::FormBuilder.i18n_localizer = MyOwnLocalizer
-
-# You can add custom inputs or override parts of Formtastic by subclassing Formtastic::FormBuilder and
-# specifying that class here.  Defaults to Formtastic::FormBuilder.
-Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
-
-# You can opt-in to Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>` 
-# and `<textarea>` tags by setting this to false (defaults to true).
-Formtastic::FormBuilder.use_required_attribute = false
-
-# You can opt-in to new HTML5 browser validations (for things like email and url inputs) by setting
-# this to false. Doing so will add a `novalidate` attribute to the `<form>` tag.
-# See http://diveintohtml5.org/forms.html#validation for more info.
-# Formtastic::FormBuilder.perform_browser_validations = true
-
-Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false