office_clerk 0.8 → 0.9

data/test_app/config/environments/test.rb

@@ -1,4 +1,4 @@
-TestApp::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
@@ -12,9 +12,9 @@ TestApp::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -31,6 +31,9 @@ TestApp::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 

data/test_app/config/initializers/assets.rb

@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )

data/test_app/config/initializers/cookies_serializer.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal

data/test_app/config/initializers/mime_types.rb

@@ -2,4 +2,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone

data/test_app/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-TestApp::Application.config.session_store :cookie_store, key: '_test_app_session'
+Rails.application.config.session_store :cookie_store, key: '_test_app_session'

data/test_app/config/routes.rb

@@ -1,6 +1,5 @@
-TestApp::Application.routes.draw do
+Rails.application.routes.draw do
 
-  get '/group/:link' , :to => 'office#group', :as => :shop_group
   mount OfficeClerk::Engine => "/"
   root :to => 'sessions#sign_in' , :as => :root
 

data/test_app/config/secrets.yml

@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: cf8e25bbf17be7ac7443f71c414c569fe5d7f0a7e82374e32c4a900060d7793482956f338716291edbb506587aa2b9a8e66d2ef22715a2a63011d12e5f593617
+
+test:
+  secret_key_base: 5eabcb9e778e345cc6670fce0ba34fc445b4742e4afecb9567cd68416d85de1d6e24beb1d68dc44ed12441e34bdef5e2ee27275e8809018f81a1fab64d291b41
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/test_app/db/migrate/20141114205526_suppliers.office.rb

@@ -4,7 +4,7 @@ class Suppliers < ActiveRecord::Migration
     create_table :suppliers do |t|
       t.string      :supplier_name
       t.string      :address
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/test_app/db/migrate/20141114205527_categories.office.rb

@@ -4,14 +4,14 @@ 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
       t.attachment  :extra_picture
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :categories, :link,                :unique => true
 

data/test_app/db/migrate/20141114205528_items.office.rb

@@ -9,7 +9,7 @@ class Items < ActiveRecord::Migration
       t.references  :product
       t.references  :basket
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/test_app/db/migrate/20141114205529_orders.office.rb

@@ -17,7 +17,7 @@ class Orders < ActiveRecord::Migration
       t.float       :shipment_tax   , :default => 0
       t.string      :address
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/test_app/db/migrate/20141114205530_baskets.office.rb

@@ -7,7 +7,7 @@ class Baskets < ActiveRecord::Migration
       t.decimal     :total_price , :default => 0.0
       t.decimal     :total_tax ,   :default => 0.0
       t.date        :locked
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/test_app/db/migrate/20141114205531_purchases.office.rb

@@ -6,7 +6,7 @@ class Purchases < ActiveRecord::Migration
       t.date :ordered_on
       t.date :received_on
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/test_app/db/migrate/20141114205532_products.office.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
@@ -21,7 +21,7 @@ class Products < ActiveRecord::Migration
       t.references  :product,        index: true
       t.references  :category,       index: true
       t.references  :supplier,       index: true
-      t.timestamps
+      t.timestamps :null => false
     end
     add_index :products, :link
   end

data/test_app/db/schema.rb

@@ -13,22 +13,22 @@
 
 ActiveRecord::Schema.define(version: 20141114205532) do
 
-  create_table "baskets", force: true do |t|
+  create_table "baskets", force: :cascade do |t|
     t.integer  "kori_id"
     t.string   "kori_type"
     t.decimal  "total_price", default: 0.0
     t.decimal  "total_tax",   default: 0.0
     t.date     "locked"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
-  create_table "categories", force: true do |t|
+  create_table "categories", force: :cascade do |t|
     t.integer  "category_id"
     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.string   "main_picture_file_name"
@@ -39,13 +39,13 @@ ActiveRecord::Schema.define(version: 20141114205532) do
     t.string   "extra_picture_content_type"
     t.integer  "extra_picture_file_size"
     t.datetime "extra_picture_updated_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                 null: false
+    t.datetime "updated_at",                                 null: false
   end
 
   add_index "categories", ["link"], name: "index_categories_on_link", unique: true
 
-  create_table "clerks", force: true do |t|
+  create_table "clerks", force: :cascade do |t|
     t.string   "email",              default: "",    null: false
     t.boolean  "admin",              default: false
     t.string   "encrypted_password"
@@ -57,18 +57,18 @@ ActiveRecord::Schema.define(version: 20141114205532) do
 
   add_index "clerks", ["email"], name: "index_clerks_on_email", unique: true
 
-  create_table "items", force: true do |t|
+  create_table "items", force: :cascade do |t|
     t.integer  "quantity",   default: 1
     t.float    "price",      default: 0.0
     t.float    "tax",        default: 0.0
     t.string   "name"
     t.integer  "product_id"
     t.integer  "basket_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
-  create_table "orders", force: true do |t|
+  create_table "orders", force: :cascade do |t|
     t.string   "number"
     t.string   "note",           default: ""
     t.string   "email"
@@ -83,16 +83,16 @@ ActiveRecord::Schema.define(version: 20141114205532) do
     t.float    "shipment_price", default: 0.0
     t.float    "shipment_tax",   default: 0.0
     t.string   "address"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                   null: false
+    t.datetime "updated_at",                   null: false
   end
 
-  create_table "products", force: true do |t|
+  create_table "products", force: :cascade do |t|
     t.float    "price",                                      null: false
     t.string   "name",                                       null: false
     t.string   "link"
-    t.text     "description",                default: ""
-    t.text     "summary",                    default: ""
+    t.text     "description"
+    t.text     "summary"
     t.string   "main_picture_file_name"
     t.string   "main_picture_content_type"
     t.integer  "main_picture_file_size"
@@ -114,8 +114,8 @@ ActiveRecord::Schema.define(version: 20141114205532) do
     t.integer  "product_id"
     t.integer  "category_id"
     t.integer  "supplier_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                 null: false
+    t.datetime "updated_at",                                 null: false
   end
 
   add_index "products", ["category_id"], name: "index_products_on_category_id"
@@ -123,19 +123,19 @@ ActiveRecord::Schema.define(version: 20141114205532) do
   add_index "products", ["product_id"], name: "index_products_on_product_id"
   add_index "products", ["supplier_id"], name: "index_products_on_supplier_id"
 
-  create_table "purchases", force: true do |t|
+  create_table "purchases", force: :cascade do |t|
     t.string   "name"
     t.date     "ordered_on"
     t.date     "received_on"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
   end
 
-  create_table "suppliers", force: true do |t|
+  create_table "suppliers", force: :cascade do |t|
     t.string   "supplier_name"
     t.string   "address"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: office_clerk
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Torsten Rüger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,40 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: valid_email
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -174,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -230,14 +224,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +282,9 @@ files:
 - app/assets/images/down-icon.png
 - app/assets/images/hue.png
 - app/assets/images/missing.png
+- app/assets/images/missing_list.png
+- app/assets/images/missing_product.png
+- app/assets/images/missing_thumb.png
 - app/assets/images/office_clerk/baskets-2.jpg
 - app/assets/images/office_clerk/baskets.jpg
 - app/assets/images/office_clerk/categories-2.jpg
@@ -361,10 +358,9 @@ files:
 - app/views/order_mailer/confirm.text.erb
 - app/views/order_mailer/paid.text.erb
 - app/views/order_mailer/shipped.text.erb
-- app/views/orders/edit.html.haml
 - app/views/orders/index.csv.erb
 - app/views/orders/index.html.haml
-- app/views/orders/ship.haml
+- app/views/orders/shipment.haml
 - app/views/orders/show.html.haml
 - app/views/products/_head.haml
 - app/views/products/_line.html.haml
@@ -374,7 +370,6 @@ files:
 - app/views/products/edit.html.haml
 - app/views/products/index.html.haml
 - app/views/products/show.html.haml
-- app/views/purchases/edit.html.haml
 - app/views/purchases/index.html.haml
 - app/views/purchases/show.html.haml
 - app/views/sessions/sign_in.haml
@@ -393,11 +388,13 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
+- config/i18n-tasks.yml
 - config/initializers/backtrace_silencers.rb
 - config/initializers/filter_parameter_logging.rb
 - config/initializers/inflections.rb
 - config/initializers/migrate.rb
 - config/initializers/mime_types.rb
+- config/initializers/paperclip.rb
 - config/initializers/session_store.rb
 - config/initializers/wrap_parameters.rb
 - config/locales/config.yml
@@ -453,13 +450,17 @@ files:
 - spec/features/categories_search_spec.rb
 - spec/features/categories_spec.rb
 - spec/features/clerks_spec.rb
-- spec/features/orders_spec.rb
+- spec/features/orders/filter_spec.rb
+- spec/features/orders/inventory_spec.rb
+- spec/features/orders/ordering_spec.rb
+- spec/features/paginate_spec.rb
 - spec/features/products/edit_spec.rb
 - spec/features/products/header_spec.rb
 - spec/features/products/index_spec.rb
 - spec/features/purchases_spec.rb
 - spec/features/sessions_spec.rb
 - spec/features/suppliers_spec.rb
+- spec/i18n_spec.rb
 - spec/mailers/order_mailer_spec.rb
 - spec/models/baskets/inventory_spec.rb
 - spec/models/baskets/items_spec.rb
@@ -470,7 +471,6 @@ files:
 - spec/models/clerk/misc_spec.rb
 - spec/models/clerk/password_spec.rb
 - spec/models/item_spec.rb
-- spec/models/locale_spec.rb
 - spec/models/order_spec.rb
 - spec/models/product_spec.rb
 - spec/models/purchase_spec.rb
@@ -500,6 +500,7 @@ files:
 - test_app/bin/bundle
 - test_app/bin/rails
 - test_app/bin/rake
+- test_app/bin/setup
 - test_app/config.ru
 - test_app/config/application.rb
 - test_app/config/boot.rb
@@ -508,7 +509,9 @@ files:
 - test_app/config/environments/development.rb
 - test_app/config/environments/production.rb
 - test_app/config/environments/test.rb
+- test_app/config/initializers/assets.rb
 - test_app/config/initializers/backtrace_silencers.rb
+- test_app/config/initializers/cookies_serializer.rb
 - test_app/config/initializers/filter_parameter_logging.rb
 - test_app/config/initializers/inflections.rb
 - test_app/config/initializers/mime_types.rb
@@ -518,6 +521,7 @@ files:
 - test_app/config/locales/config.yml
 - test_app/config/locales/en.yml
 - test_app/config/routes.rb
+- test_app/config/secrets.yml
 - test_app/db/migrate/20141114205525_clerks.office.rb
 - test_app/db/migrate/20141114205526_suppliers.office.rb
 - test_app/db/migrate/20141114205527_categories.office.rb
@@ -555,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Backend of rubyclerks, a simple way to manage a buisness
@@ -585,13 +589,17 @@ test_files:
 - spec/features/categories_search_spec.rb
 - spec/features/categories_spec.rb
 - spec/features/clerks_spec.rb
-- spec/features/orders_spec.rb
+- spec/features/orders/filter_spec.rb
+- spec/features/orders/inventory_spec.rb
+- spec/features/orders/ordering_spec.rb
+- spec/features/paginate_spec.rb
 - spec/features/products/edit_spec.rb
 - spec/features/products/header_spec.rb
 - spec/features/products/index_spec.rb
 - spec/features/purchases_spec.rb
 - spec/features/sessions_spec.rb
 - spec/features/suppliers_spec.rb
+- spec/i18n_spec.rb
 - spec/mailers/order_mailer_spec.rb
 - spec/models/baskets/inventory_spec.rb
 - spec/models/baskets/items_spec.rb
@@ -602,7 +610,6 @@ test_files:
 - spec/models/clerk/misc_spec.rb
 - spec/models/clerk/password_spec.rb
 - spec/models/item_spec.rb
-- spec/models/locale_spec.rb
 - spec/models/order_spec.rb
 - spec/models/product_spec.rb
 - spec/models/purchase_spec.rb