accountant_clerk 0.6 → 0.7

data/Rakefile

@@ -4,3 +4,11 @@
 require File.expand_path('../test_app/config/application', __FILE__)
 
 TestApp::Application.load_tasks
+require 'bundler/gem_tasks'
+
+desc 'Rebuild test and run specs'
+task :full_test do
+  system("rake db:drop db:migrate RAILS_ENV=test && rspec")
+end
+
+task :default => 'full_test'

data/accountant_clerk.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'accountant_clerk'
-  s.version     = '0.6'
+  s.version     = '0.7'
   s.summary     = 'Simple reports for rubyclerks'
   s.description     = 'Simple reports that are not so simple anymore and let you analyse your shops performance'
   s.required_ruby_version = '>= 1.9.3'
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_runtime_dependency 'office_clerk', '~> 0.8'
+  s.add_runtime_dependency 'office_clerk', '~> 0.9'
   s.add_runtime_dependency 'flot-rails', '~> 0.0.6'
 end
-

data/app/assets/javascripts/accountant_report.js

@@ -0,0 +1,4 @@
+//= require 'jquery.flot'
+//= require 'jquery.flot.resize'
+//= require 'jquery.flot.time'
+//= require 'jquery.flot.stack'

data/app/assets/stylesheets/accountant_office.css

@@ -1,5 +1,3 @@
-//= require flotomatic
-
 div.flot_choice_label { font-variant: small-caps; font-weight: bold;}
 div.flot_canvas {width:600px; height:300px}
 div.flot_overview {width:600px; height:50px}

data/app/controllers/manage_controller_decorator.rb

@@ -4,13 +4,20 @@ ManageController.class_eval do
     search = params[:q] || {}
     search[:meta_sort] = "created_at asc"
     if search[:created_at_gt].blank?
-      search[:created_at_gt] = (Time.now - 3.months)
+      search[:created_at_gt] = short_date(Time.now - 3.months)
     else
-      search[:created_at_gt] = Time.zone.parse(search[:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
+      search[:created_at_gt] =
+        begin
+          short_date(Time.zone.parse(search[:created_at_gt]).beginning_of_day) 
+        rescue 
+          I18n.l(Time.zone.now.beginning_of_month)
+        end
     end
     unless search[:created_at_lt].blank?
-      search[:created_at_lt] =
-          Time.zone.parse(search[:created_at_lt]).end_of_day rescue search[:created_at_lt]
+      begin
+        search[:created_at_lt] = short_date(Time.zone.parse(search[:created_at_lt]).end_of_day) 
+      rescue 
+      end
     end
     @type = params[:type] || "Order"
     search[:basket_kori_type_eq] = @type
@@ -33,14 +40,19 @@ ManageController.class_eval do
         Item
       end
     @search = search_on.includes(:product).ransack(search)
-    gon.flot_options = { :series => {  :bars =>  { :show => true , :barWidth => @days * 24*60*60*1000 } , :stack => 0 } , 
+    gon.flot_options = { :series => {  :bars =>  { :show => true , :barWidth => @days * 24*60*60*1000 } , :stack => true } , 
                       :legend => {  :container => "#legend"} , 
                       :xaxis =>  { :mode => "time" }  
                     }
     group_data
-# csv ?      send_data( render_to_string( :csv , :layout => false) , :type => "application/csv" , :filename => "tilaukset.csv") 
   end
   
+  private
+  
+  def short_date d
+    d = d.to_date unless d.is_a? Date
+    I18n.l( d , :format => :default)
+  end
   def group_data
     @group_by = (params[:group_by] || "all" )
     all = @search.result(:distinct => true )
@@ -72,12 +84,9 @@ ManageController.class_eval do
     when "by_supplier"
       item.product.supplier.blank? ? "blank" : item.product.supplier.supplier_name
     when "by_product"
-      item.product.name
-    when "by_product_line"
-      return "Basket #{item.basket.id}" if item.product.line_item? and not item.product.product
-      return "Basket #{item.basket.id}" unless item.product
       item.product.full_name
-#      item.product.line_item? ? item.product.product.name : item.product.name
+    when "by_product_line"
+      item.product.product ? item.product.product.name : item.product.name
     else
       pps = item.product.properties.detect{|p,v| p == @group_by}
       pps ? pps.value : "blank"

data/app/views/manage/report.html.haml

@@ -1,7 +1,5 @@
 - content_for :head do
-  = javascript_include_tag 'jquery.flot'
-  = javascript_include_tag 'jquery.flot.resize'
-  = javascript_include_tag 'jquery.flot.time'
+  = javascript_include_tag 'accountant_report.js'
 .row
   .col-md-9
     #placeholder{:style => "width:800px;height:400px;"}
@@ -18,54 +16,54 @@
         .col-md-4
           = f.label :product_name_cont, t("name")
         .col-md-8
-          = f.text_field :product_name_cont, :size => 15 , :class => "form-control"
+          = f.text_field :product_name_or_product_product_name_cont, :size => 15 , :class => "form-control"
+      .form-group
         .col-md-4
           = f.label :supplier , t(:supplier)
         .col-md-8
-          = f.text_field :product_supplier_supplier_name_cont, :size => 15 , :class => "form-control"
-      .form-group.row
+          = f.collection_select :product_supplier_id_eq, Supplier.all, :id, :supplier_name, {:include_blank => true}, :class=>"form-control"
+      .form-group
         .col-md-4
           = f.label :category, t(:category)
         .col-md-8
-          = f.text_field :product_category_name_cont, :size => 15 , :class => "form-control"
+          = f.collection_select :product_category_id_eq, Category.all, :id, :name, {:include_blank => true}, :class=>"form-control"
+      .form-group
         .col-md-4
           = f.label :property , t(:property)
         .col-md-8
           = f.text_field :product_properties_cont, :size => 15 , :class => "form-control"
-      .form-group.row
-        .col-md-3
+      .form-group
+        .col-md-4
           = f.label :price , t(:price)
-        .col-md-3
-          = f.text_field :price_gt , :size => 6 , :class => "form-control"
-        .col-md-1
-          
-        .col-md-3
+        .col-md-4
+          = f.text_field :price_gt , :size => 6 , :class => "form-control"          
+        .col-md-4
           = f.text_field :price_lt , :size => 6 , :class => "form-control"
-      .form-group.row
+      .form-group
         %label= t("date_range")
         .date-range-filter
           .col-md-6
             = f.text_field :created_at_gt, :class => 'datepicker form-control' , :value => sort_date(:created_at_gt)
           .col-md-6
             = f.text_field :created_at_lt, :class => 'datepicker form-control', :value => sort_date(:created_at_lt)
-      .form-group.row
+      .form-group
         %label= t("group_by")
         %br/
         = select_tag :group_by,  options_for_select( group_options , @group_by) , :class => "form-control"
-      .form-group.row
-        .col-md-6
+      .form-group
+        .col-md-4
           = t(:price)
-          = radio_button_tag :price_or,  "total" , :total == @price_or
-        .col-md-6
+          = radio_button_tag :price_or,  :total , :total == @price_or
+        .col-md-4
+          = t(:profit)
+          = radio_button_tag :price_or,  :profit , :profit == @price_or
+        .col-md-4
           = t(:quantity)
-          = radio_button_tag :price_or,  "quantity" , :quantity == @price_or
-      .form-group.row
+          = radio_button_tag :price_or,  :quantity , :quantity == @price_or
+      .form-group
         .col-md-4
-          = button_tag( :name => 'period' , :value => :day ) do
-            %span Day
+          = f.submit :month , :class => "btn btn-success" , :name => 'period'
         .col-md-4
-          = button_tag( :name => 'period' , :value => :week ) do
-            %span Week
+          = f.submit :week , :class => "btn btn-success" , :name => 'period'
         .col-md-4
-          = button_tag( :name => 'period' , :value => :month ) do
-            %span Month
+          = f.submit :day , :class => "btn btn-success" , :name => 'period'

data/config/i18n-tasks.yml

@@ -0,0 +1,89 @@
+# i18n-tasks finds and manages missing and unused translations https://github.com/glebm/i18n-tasks
+
+base_locale: en
+## i18n-tasks detects locales automatically from the existing locale files
+## uncomment to set locales explicitly
+locales: [en, fi]
+
+## i18n-tasks report locale, default: en, available: en, ru
+# internal_locale: ru
+
+# Read and write locale data
+data:
+  ## by default, translation data are read from the file system, or you can provide a custom data adapter
+  # adapter: I18n::Tasks::Data::FileSystem
+
+  # Locale files to read from
+  read:
+    - config/locales/%{locale}.yml
+    # - config/locales/*.%{locale}.yml
+    # - config/locales/**/*.%{locale}.yml
+
+  # key => file routes, matched top to bottom
+  write:
+    ## E.g., write devise and simple form keys to their respective files
+    - ['{config}.*', 'config/locales/\1.%{locale}.yml']
+    # Catch-all
+    - config/locales/%{locale}.yml
+    # `i18n-tasks normalize -p` will force move the keys according to these rules
+
+  # YAML / JSON serializer options, passed to load / dump / parse / serialize
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+  json:
+    write:
+      # pretty print JSON
+      indent: '  '
+      space: ' '
+      object_nl: "\n"
+      array_nl: "\n"
+
+# Find translate calls
+search:
+  ## Default scanner finds t() and I18n.t() calls
+  # scanner: I18n::Tasks::Scanners::PatternWithScopeScanner
+
+  ## Paths to search in, passed to File.find
+  paths:
+    - app/
+
+  ## Root for resolving relative keys (default)
+  # relative_roots:
+  #   - app/views
+
+  ## File.fnmatch patterns to exclude from search (default)
+  # exclude: ["*.jpg", "*.png", "*.gif", "*.svg", "*.ico", "*.eot", "*.ttf", "*.woff", "*.pdf"]
+
+  ## Or, File.fnmatch patterns to include
+  # include: ["*.rb", "*.html.slim"]
+
+## Google Translate
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
+translation:
+  api_key: "AIzaSyCRjToD-btZK_eaaLeqKNmoh1fPoqhbAtQ"
+
+## Consider these keys not missing
+# ignore_missing:
+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+# - '{devise,simple_form}.*'
+
+## Consider these keys used
+# ignore_unused:
+# - 'activerecord.attributes.*'
+# - '{devise,kaminari,will_paginate}.*'
+# - 'simple_form.{yes,no}'
+# - 'simple_form.{placeholders,hints,labels}.*'
+# - 'simple_form.{error_notification,required}.:'
+
+## Exclude these keys from `i18n-tasks eq-base' report
+# ignore_eq_base:
+#   all:
+#     - common.ok
+#   fr,es:
+#     - common.brand
+
+## Exclude these keys from all of the reports
+#ignore:
+#  - kaminari.*

data/config/locales/en.yml

@@ -1,8 +1,7 @@
 en:
-  some: ho
-
-fi:
-  date_range: Päivämäärä
-  group_by: Ryhmitellä
-  all: Kaikki
-  property: Omaisuus
+  profit: Profit
+  date_range: Date
+  group_by: Group by
+  all: All
+  property: Property
+  

data/config/locales/fi.yml

@@ -0,0 +1,6 @@
+fi:
+  profit: Kate
+  date_range: Päivämäärä
+  group_by: Ryhmitellä
+  all: Kaikki
+  property: Omaisuus

data/lib/accountant_clerk/engine.rb

@@ -24,7 +24,7 @@ module AccountantClerk
       end
     end
     initializer "accountant.precompile", :group => :all do |app|
-      app.config.assets.precompile += ["accountant_office.css" , "accountant_office.js"]
+      app.config.assets.precompile += ["accountant_office.css" , "accountant_office.js" ,  "accountant_report.js" ]
     end
 
     config.to_prepare &method(:activate).to_proc

data/spec/controllers/orders_controller_spec.rb

@@ -5,7 +5,7 @@ describe OrdersController do
 
   before :all do
     create :admin  unless Clerk.where(:admin => true).first
-  end  
+  end
 
   # This should return the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
@@ -34,37 +34,9 @@ describe OrdersController do
     it "assigns a new order as @order" do
       get :new, {}, valid_session
       expect(assigns(:order)).to be_kind_of(Order)
-      expect(assigns(:order)).to be_new_record
-    end
-  end
-
-  describe "GET edit" do
-    it "assigns the requested order as @order" do
-      order = create :order
-      get :edit, {:id => order.to_param}, valid_session
-      expect(assigns(:order)).to eq(order)
     end
   end
 
-  describe "POST create" do
-
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved order as @order" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        allow_any_instance_of(Order).to receive(:save).and_return(false)
-        post :create, {:order => {  :paid_on => ""}}, valid_session
-        expect(assigns(:order)).to be_kind_of(Order)
-        expect(assigns(:order)).to be_new_record
-      end
-
-      it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        allow_any_instance_of(Order).to receive(:save).and_return(false)
-        post :create, {:order => {  :paid_on => ""}}, valid_session
-        expect(response).to render_template(:edit)
-      end
-    end
-  end
 
   describe "PUT update" do
     describe "with valid params" do

data/spec/i18n_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'i18n/tasks'
+require "i18n-spec"
+
+describe 'locale:' do
+
+  Dir.glob('config/locales/*.yml') do |locale_file|
+    next if locale_file == "config/locales/config.yml"
+    next if locale_file.include? "extra"
+    context locale_file do
+      it { is_expected.to be_parseable }
+      it { is_expected.to have_valid_pluralization_keys }
+      it { is_expected.not_to have_missing_pluralization_keys }
+      it { is_expected.to have_one_top_level_namespace }
+      it { is_expected.not_to have_legacy_interpolations }
+      it { is_expected.to have_a_valid_locale }
+      it { is_expected.to be_a_complete_translation_of 'config/locales/en.yml' }
+    end
+  end
+  context 'config/locales/en.yml' do
+    it { is_expected.to be_a_complete_translation_of 'config/locales/fi.yml' }
+  end
+end
+
+describe 'I18n' do
+  let(:i18n) { I18n::Tasks::BaseTask.new }
+  let(:missing_keys) { i18n.missing_keys }
+  let(:unused_keys) { i18n.unused_keys }
+
+  it 'does not have missing keys' do
+    # needs work
+#    expect(missing_keys).to be_empty,
+ #                           "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
+  end
+
+  it 'does not have unused keys' do
+    expect(i18n.unused_keys).to be_empty,
+                                "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
+  end
+end

data/spec/routing/orders_routing_spec.rb

@@ -16,10 +16,6 @@ describe OrdersController do
       expect(get("/orders/1")).to route_to("orders#show", :id => "1")
     end
 
-    it "routes to #edit" do
-      expect(get("/orders/1/edit")).to route_to("orders#edit", :id => "1")
-    end
-
     it "routes to #create" do
       expect(post("/orders")).to route_to("orders#create")
     end

data/test_app/config/application.rb

@@ -24,5 +24,6 @@ module TestApp
     # 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.active_record.raise_in_transactional_callbacks = true
   end
 end

data/test_app/config/environments/production.rb

@@ -20,7 +20,7 @@ TestApp::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/test_app/config/environments/test.rb

@@ -13,7 +13,7 @@ TestApp::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.