office_clerk 0.8 → 0.9

data/config/routes.rb

@@ -2,12 +2,12 @@ OfficeClerk::Engine.routes.draw do
 
   get "sign_out" => "sessions#sign_out"
   get "sign_in"  => "sessions#sign_in"
-  post "create_session"  => "sessions#create" 
+  post "create_session"  => "sessions#create"
   match "sign_up" => "sessions#sign_up" , :via => [:get ,:post]
 
   resources :purchases do
     collection do
-      match "search" => "purchases#index", :via => [:get, :post]
+      get "search" => "purchases#index"
     end
     member do
       get :order
@@ -18,7 +18,7 @@ OfficeClerk::Engine.routes.draw do
 
   resources :baskets do
     collection do
-      match "search" => "baskets#index", :via => [:get, :post]
+      get "search" => "baskets#index"
     end
     member do
       get :discount
@@ -26,24 +26,27 @@ OfficeClerk::Engine.routes.draw do
       get :order
       get :purchase
       get :checkout
+      get :zero
     end
   end
 
-  resources :orders do
+  resources :orders , :except => [:edit] do
     collection do
-      match "search" => "orders#index", :via => [:get, :post]
+      get "search" => "orders#index"
     end
     member do
       get "mail/:act" , :action => :mail , :as => :mail
       get :pay
+      get :shipment
       get :ship
-      patch :ship
+      get :cancel
+      patch :shipment
     end
   end
 
   resources :items do
     collection do
-      match "search" => "items#index", :via => [:get, :post]
+      get "search" => "items#index"
     end
     member do
     end
@@ -51,7 +54,7 @@ OfficeClerk::Engine.routes.draw do
 
   resources :categories do
     collection do
-      match "search" => "categories#index", :via => [:get, :post]
+      get "search" => "categories#index"
     end
     member do
     end
@@ -59,7 +62,7 @@ OfficeClerk::Engine.routes.draw do
 
   resources :products do
     collection do
-      match "search" => "products#index", :via => [:get, :post]
+      get "search" => "products#index"
     end
     member do
       get :delete
@@ -68,7 +71,7 @@ OfficeClerk::Engine.routes.draw do
 
   resources :clerks do
     collection do
-      match "search" => "clerks#index", :via => [:get, :post]
+      get "search" => "clerks#index"
     end
     member do
     end
@@ -76,18 +79,18 @@ OfficeClerk::Engine.routes.draw do
 
   resources :addresses do
     collection do
-      match "search" => "addresses#index", :via => [:get, :post]
+      get "search" => "addresses#index"
     end
   end
 
   resources :suppliers do
     collection do
-      match "search" => "suppliers#index", :via => [:get, :post]
+      get "search" => "suppliers#index"
     end
     member do
     end
   end
 
-  match "manage/all" => "manage#all", :via => [:get, :post]
-    
-end
+  get "manage/all" => "manage#all"
+
+end

data/db/migrate/20131226143612_categories.rb

@@ -4,8 +4,8 @@ class Categories < ActiveRecord::Migration
       t.references  :category
       t.boolean     :online, :default => false
       t.string      :name
-      t.text        :description , :default => ""
-      t.text        :summary      , :default => ""
+      t.text        :description
+      t.text        :summary     
       t.integer     :position , :default => 1
       t.string      :link
       t.attachment  :main_picture

data/db/migrate/20131226151332_products.rb

@@ -3,9 +3,9 @@ class Products < ActiveRecord::Migration
     create_table :products do |t|
       t.float       :price      , :null => false
       t.string      :name       , :null => false
-      t.string      :link        
-      t.text        :description , :default => ""
-      t.text        :summary      , :default => ""
+      t.string      :link
+      t.text        :description
+      t.text        :summary      
       t.attachment  :main_picture
       t.attachment  :extra_picture
       t.boolean     :online ,       :default => false

data/lib/office_clerk/engine.rb

@@ -5,28 +5,25 @@ module OfficeClerk
     engine_name "office"
 
     config.autoload_paths += %W(#{config.root}/lib)
-#    config.assets.paths += 
+#    config.assets.paths +=
     config.exceptions_app = self.routes
     initializer "office_clerk.assets.precompile" do |app|
       app.config.assets.precompile += %w(office_clerk.css office_clerk.js)
     end
 
-    I18n.enforce_available_locales = false
-    I18n.default_locale = :fi
+    config.i18n.enforce_available_locales = false
+    config.i18n.available_locales = [:fi , :en , :config]
+    config.i18n.default_locale = :fi
     # for testing this makes engine factories available
     initializer "model_core.factories", :after => "factory_girl.set_factory_paths" do
       FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
     end
 
     # have to init the BestInPlace first to be able to include helpers
-    config.railties_order = [BestInPlace::Railtie , OfficeClerk::Engine  , :all  ] 
+    config.railties_order = [BestInPlace::Railtie , OfficeClerk::Engine  , :all  ]
     config.after_initialize do
       BestInPlace::ViewHelpers.extend OfficeHelper
     end
 
-    config.paperclip_defaults =  {  :styles => {:thumb => '48x48>', :list => '150x150>', :product  => '600x600>' },
-                                :default_style => :list,
-                                :url => "/images/:id/:style/:basename.:extension",
-                                :default_url => "/images/missing/:style.png"      }
   end
 end

data/lib/office_clerk/shipping_method.rb

@@ -8,9 +8,17 @@ module OfficeClerk
     end
     attr_reader :data , :name , :type , :description
 
+    # the relevant interface for a shipping method is 
+    # a) whether it applies to the order (basket) : available?
+    # b) how much sendin costs, price_for(basket)
     def price_for(basket)
       raise "Not implemented in #{self}"
     end
+    def available?(basket)
+      true
+    end
+
+    ## class stuff after here, global list etc
     @@methods = nil
     def self.all
       return @@methods if @@methods 
@@ -20,10 +28,10 @@ module OfficeClerk
         begin
           clas_name = method[:class]
           clas = clas_name.constantize
-          @@methods[key] = clas.new( method.merge(:type => key) )
         rescue
           puts "No such Class #{method[:class]}, check config.yml"
         end
+        @@methods[key] = clas.new( method.merge(:type => key) )
       end
       @@methods
     end
@@ -40,5 +48,8 @@ module OfficeClerk
     def price_for(basket)
       0.0
     end
+    def available?(basket)
+      true
+    end
   end
 end

data/lib/office_clerk/version.rb

@@ -1,3 +1,3 @@
 module OfficeClerk
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

data/office_clerk.gemspec

@@ -23,22 +23,22 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = false
 
-  s.add_runtime_dependency 'rails', '~> 4.1', '< 4.2'
-  s.add_runtime_dependency 'ransack', '~> 1.5', '>= 1.5.1'
+  s.add_runtime_dependency 'rails', '~> 4.2', '< 5.0'
+  s.add_runtime_dependency 'ransack', '~> 1.7'
   s.add_runtime_dependency "valid_email" ,  '~> 0.0', '>= 0.0.10'
-  s.add_runtime_dependency 'sass-rails' , '~> 4.0'
+  s.add_runtime_dependency 'sass-rails' , '~> 5.0'
   s.add_runtime_dependency "haml" , '~> 4.0'
   s.add_runtime_dependency "jquery-rails" , '~> 3.1'
   s.add_runtime_dependency 'coffee-rails' , '~> 4.0'
   s.add_runtime_dependency 'gon' , '~> 5.2'
   s.add_runtime_dependency 'jquery-ui-rails' , '~> 5.0'
   s.add_runtime_dependency "kramdown" , '~> 1.5'
-  s.add_runtime_dependency "best_in_place" , '~> 0'
+  s.add_runtime_dependency "best_in_place" , '~> 3.0'
 
   s.add_runtime_dependency 'will_paginate-bootstrap' , '~> 1.0'
   s.add_runtime_dependency 'bootstrap-sass', '~> 3.1'
   s.add_runtime_dependency 'bootstrap_form' , '~> 2.2'
-  s.add_runtime_dependency "paperclip" , '~> 4.1'
+  s.add_runtime_dependency "paperclip" , '~> 4.0'
   s.add_runtime_dependency 'rails-i18n' , '~> 4.0'
 
   s.add_runtime_dependency "bcrypt-ruby" , '~> 3.1'

data/spec/controllers/baskets_controller_spec.rb

@@ -12,7 +12,7 @@ describe BasketsController do
   # BasketsController. Be sure to keep this updated.
   before :all do
     create :admin  unless Clerk.where(:admin => true).first
-  end  
+  end
   let(:valid_session) { { :clerk_email => Clerk.where(:admin => true).first.email } }
 
   describe "GET index" do
@@ -80,7 +80,7 @@ describe BasketsController do
       it "redirects to the basket" do
         basket = create :basket
         put :update, {:id => basket.to_param, :basket => attributes_for(:basket)}, valid_session
-        expect(response).to redirect_to( :action => :edit , :id => basket.id)
+        expect(response).to redirect_to( edit_basket_path(basket))
       end
     end
 

data/spec/controllers/orders_controller_spec.rb

@@ -34,35 +34,6 @@ 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
 

data/spec/controllers/products_controller_spec.rb

@@ -10,7 +10,7 @@ describe ProductsController 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
@@ -122,16 +122,17 @@ describe ProductsController do
   end
 
   describe "DELETE destroy" do
+    routes { OfficeClerk::Engine.routes }
     it "deletes the requested product" do
       product = create :product_without_inventory
       before = Product.count
-      delete :delete, {:id => product.to_param}, valid_session
+      delete :destroy, {:id => product.to_param}, valid_session
       expect(Product.count).to be  before - 1
     end
 
     it "does not delete with inventory" do
       product = Product.create! valid_attributes
-      delete :delete, {:id => product.to_param}, valid_session
+      delete :destroy, {:id => product.to_param}, valid_session
       expect(response).to redirect_to(product_path(product))
     end
   end

data/spec/controllers/purchases_controller_spec.rb

@@ -38,14 +38,13 @@ describe PurchasesController do
     it "assigns a new purchase as @purchase" do
       get :new, {}, valid_session
       expect(assigns(:purchase)).to be_kind_of(Purchase)
-      expect(assigns(:purchase)).to be_new_record
     end
   end
 
   describe "GET edit" do
     it "assigns the requested purchase as @purchase" do
       purchase = Purchase.create! valid_attributes
-      get :edit, {:id => purchase.to_param}, valid_session
+      get :show, {:id => purchase.to_param}, valid_session
       expect(assigns(:purchase)).to eq(purchase)
     end
   end
@@ -83,7 +82,7 @@ describe PurchasesController do
         # Trigger the behavior that occurs when invalid params are submitted
         allow_any_instance_of(Purchase).to receive(:save).and_return(false)
         post :create, {:purchase => {  :supplier_id => nil }}, valid_session
-        expect(response).to render_template(:edit)
+        expect(response).to render_template(:show)
       end
     end
   end
@@ -117,7 +116,7 @@ describe PurchasesController do
         # Trigger the behavior that occurs when invalid params are submitted
         allow_any_instance_of(Purchase).to receive(:save).and_return(false)
         put :update, {:id => purchase.to_param, :purchase => {  :supplier_id => nil }}, valid_session
-        expect(response).to render_template(:edit)
+        expect(response).to render_template(:show)
       end
     end
   end

data/spec/factories/orders.rb

@@ -3,6 +3,7 @@
 FactoryGirl.define do
   factory :order do
     sequence( :email) { |n| "test#{n}@test.com" }
+    ordered_on Date.today
     shipment_tax 0
     basket { create :basket_with_item }
     factory :order_ordered do
@@ -10,10 +11,14 @@ FactoryGirl.define do
       factory :order_paid do
         paid_on "2013-12-26"
       end
-      factory :order_shippped do
+      factory :order_shipped do
         shipped_on "2013-12-26"
         shipment_price 10.0
         shipment_tax 20.0
+        after(:create) do |o|
+          o.basket.locked = Date.today
+          o.save
+        end
       end
     end
   end

data/spec/factories/products.rb

@@ -14,6 +14,9 @@ FactoryGirl.define do
         prod.category = cat
         prod.save!
       end
+      factory :shop_product_without_inventory do
+        inventory 0
+      end
     end
     factory :product_line do
       after(:create) do |prod| 

data/spec/features/baskets/edit_spec.rb

@@ -35,9 +35,14 @@ describe "edit baskets" do
   it "discounts basket" do
     basket = create :basket_with_item
     total = basket.total_price
-    visit discount_basket_path(basket , :discount => "10")
+    visit office.discount_basket_path(basket , :discount => "10")
     expect_basket_total total * 0.9
   end
+  it "zeros basket" do
+    basket = create :basket_with_item
+    visit zero_basket_path(basket)
+    expect_basket_total 0.0
+  end
   it "discounts item" do
     basket = create :basket_2_items
     total = basket.total_price - basket.items.first.price*0.1

data/spec/features/baskets/index_spec.rb

@@ -13,6 +13,7 @@ describe "Basket index/search page" do
     create :purchase_received
     create :order_ordered
     create :order_paid
+    create :order_shipped
     visit_path baskets_path
   end
 end

data/spec/features/baskets/search_spec.rb

@@ -30,4 +30,4 @@ describe "Basket search functionality" do
     expect(td).to have_content(p.name) # added the product, yes!
   end
 
-end
+end

data/spec/features/orders/filter_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "Order index" do
+  before(:each) do
+    sign_in
+  end
+  it "lists orders" do
+    visit_path orders_path
+  end
+  it "creates new order" do
+    visit_path orders_path
+    find(".new_order").click
+  end
+  it "filters by email" do
+    order_ab :email =>[ "torsten@villataika.fi", "raisa@villataika.fi"]
+    fill_in("q[email_cont]" , :with => "torsten")
+    expect(order_count).to eq 1
+  end
+end