office_clerk 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56d6271f7a086331b09afec3ae09a147a9597258
-  data.tar.gz: 30ebd8fbf11b488f2a05d00d316ee64c8f693e3f
+  metadata.gz: 1ddc45855a851af3f02607825a7d2fd94ed802c9
+  data.tar.gz: ddfab4362620b9043574d8eb7d97793b8a49132b
 SHA512:
-  metadata.gz: aa365643d22ae66f4c82b55d9d6715122dfca353c6cdb6684dcb7d0f57800caef83b910889d769108be317e4bc6c666a96a2d7e20e497aa34c7b4f93b591a3ee
-  data.tar.gz: 15932e74f50c0fca75818e3e2ef099c5d6b33370f72b0796ddfcad556dae7f02dd32cb43c41396fda97f10267277ccf2db224abbc61fe94635f1487e71c7e6aa
+  metadata.gz: 51b6b48dfcabe21eef92716f31fe282d571b440ce453ebd73a77e7995c8e15c7b2bdfdad080d0497b6df434fcd70efe5604a90df40897dda1b994cbdb9fe55a2
+  data.tar.gz: bdf6744c2b0c661b66ce56d04e6f1f4dc2ff3109d7dafc1fc1f4d71c3f76c4900628ec5e66da41828501cc63d72328611952feee2e93b06ece5765ee09d1236b

data/ChangeLog.md

@@ -0,0 +1,15 @@
+### 0.6
+
+- Remove simpleform
+- Fix some date-formats
+- improve searching for non-existing fields
+- introduce product/category summary field (for lists)
+- Start to unse gon and make other clerks independant
+- ssl configuration possible
+- better payment/shipment for orders (tbc)
+- second production site
+
+### prior 0.5
+
+Basic core has been stable and in produciton for 9 months.
+Since no gem realease were done before production versions go quite quickly towards 1

data/Gemfile

@@ -4,30 +4,18 @@ gem "office_clerk" , :path => "../"
 
 gem 'sqlite3'
 
-# template
-gem "ransack", github: "activerecord-hackery/ransack", branch: "rails-4"
-
-#misc
-gem "valid_email" , :require => 'valid_email/email_validator' #no mx checking
-gem 'db_fixtures_dump' , :github => 'rubyclerks/db_fixtures_dump' #backup
-
 #asset / production reelated
 gem "therubyracer" 
 gem "libv8" , "3.16.14.3"
 gem "rb-readline"
 gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails'
 
 group :development do
   gem 'better_errors' , :platforms=>[:mri_20, :mri_21, :rbx]
   gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :mri_21,:rbx]
-  gem "i18n-tasks"
   gem 'quiet_assets'
-#  gem "jeweler", "> 1.6.4"
 end
 group :test do
-#  gem "poltergeist"
-#  gem "phantomjs"
   gem "codeclimate-test-reporter"
   gem 'rspec-rails'
   gem 'capybara'
@@ -36,7 +24,6 @@ group :test do
   gem "factory_girl_rails"
   gem 'email_spec'
   gem 'i18n-spec'
-  gem 'guard-bundler'
   gem 'guard-rails'
   gem 'guard-rspec'
 end

data/Gemfile.lock

@@ -1,21 +1,3 @@
-GIT
-  remote: git://github.com/activerecord-hackery/ransack.git
-  revision: d1fc95b3c21c8294e69c70e3995459d11dabfd67
-  branch: rails-4
-  specs:
-    ransack (1.2.3)
-      actionpack (>= 4.0)
-      activerecord (>= 4.0)
-      activesupport (>= 4.0)
-      i18n
-      polyamorous (~> 1.1)
-
-GIT
-  remote: git://github.com/rubyclerks/db_fixtures_dump.git
-  revision: 2d00815c8cb4a9bf143564a8a1de082b6e30282c
-  specs:
-    db_fixtures_dump (0.0.9)
-
 PATH
   remote: ../
   specs:
@@ -30,40 +12,44 @@ PATH
       jquery-ui-rails (~> 5.0)
       kramdown (~> 1.5)
       paperclip (~> 4.1)
-      rails (~> 4.0, >= 4.0.1)
+      rails (~> 4.1, <= 4.2)
       rails-i18n (~> 4.0)
+      ransack (>= 1.5.1)
       sass-rails (~> 4.0)
+      valid_email
       will_paginate-bootstrap (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.11)
-      actionpack (= 4.0.11)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.11)
-      activesupport (= 4.0.11)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.11)
-      activesupport (= 4.0.11)
-      builder (~> 3.1.0)
-    activerecord (4.0.11)
-      activemodel (= 4.0.11)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.11)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.11)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
+      arel (~> 5.0.0)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
-    arel (4.0.2)
+    arel (5.0.1.20140414130214)
     bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
@@ -76,7 +62,7 @@ GEM
     bootstrap-sass (3.3.1.0)
       sass (~> 3.2)
     bootstrap_form (2.2.0)
-    builder (3.1.4)
+    builder (3.2.2)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -96,7 +82,7 @@ GEM
     codeclimate-test-reporter (0.4.1)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
@@ -108,10 +94,6 @@ GEM
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    easy_translate (0.5.0)
-      json
-      thread
-      thread_safe
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
@@ -135,9 +117,6 @@ GEM
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-bundler (2.0.0)
-      bundler (~> 1.0)
-      guard (~> 2.2)
     guard-rails (0.7.0)
       guard (~> 2.0)
     guard-rspec (4.3.1)
@@ -145,21 +124,11 @@ GEM
       rspec (>= 2.14, < 4.0)
     haml (4.0.5)
       tilt
-    highline (1.6.21)
     hike (1.2.3)
     hitimes (1.2.2)
     i18n (0.6.11)
     i18n-spec (0.6.0)
       iso
-    i18n-tasks (0.7.8)
-      activesupport
-      easy_translate (>= 0.5.0)
-      erubis
-      highline
-      i18n
-      slop (>= 3.5.0)
-      term-ansicolor
-      terminal-table
     iso (0.2.1)
       i18n
     jquery-rails (3.1.2)
@@ -172,7 +141,7 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.3)
-    listen (2.7.12)
+    listen (2.8.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -182,7 +151,7 @@ GEM
     method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.1)
-    minitest (4.7.5)
+    minitest (5.4.3)
     multi_json (1.10.1)
     nokogiri (1.6.4.1)
       mini_portile (~> 0.6.0)
@@ -202,23 +171,31 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.11)
-      actionmailer (= 4.0.11)
-      actionpack (= 4.0.11)
-      activerecord (= 4.0.11)
-      activesupport (= 4.0.11)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.11)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
     rails-i18n (4.0.3)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.0.11)
-      actionpack (= 4.0.11)
-      activesupport (= 4.0.11)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.0)
+    ransack (1.5.1)
+      actionpack (>= 3.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      i18n
+      polyamorous (~> 1.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -262,25 +239,21 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    terminal-table (1.4.5)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread (0.1.4)
     thread_safe (0.3.4)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
-    tins (1.3.3)
-    tzinfo (0.3.42)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -302,23 +275,17 @@ DEPENDENCIES
   capybara
   capybara-screenshot
   codeclimate-test-reporter
-  coffee-rails
   database_cleaner
-  db_fixtures_dump!
   email_spec
   factory_girl_rails
-  guard-bundler
   guard-rails
   guard-rspec
   i18n-spec
-  i18n-tasks
   libv8 (= 3.16.14.3)
   office_clerk!
   quiet_assets
-  ransack!
   rb-readline
   rspec-rails
   sqlite3
   therubyracer
   uglifier (>= 1.3.0)
-  valid_email

data/Guardfile

@@ -0,0 +1,28 @@
+command = "rspec"
+begin
+  require "rubygems"
+  require "spring/version" #safe to try
+  command = "spring rspec"
+rescue LoadError
+end
+guard :rspec , :cmd => command do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/app/controllers/admin_controller.rb

@@ -10,9 +10,13 @@ class AdminController < OfficeController
   def require_admin
     clerk = current_clerk
     return if clerk and clerk.admin
-    redirect_to sign_in_url
+    redirect_to sign_in
   end
-  
+
+  def sign_in
+    has_ssl? ? sign_in_path(:protocol => :https) : sign_in_url
+  end
+
   def clean_search
     q = params[:q]
     return unless q

data/app/controllers/baskets_controller.rb

@@ -27,6 +27,7 @@ class BasketsController < AdminController
   end
 
   def show
+    gon.basket_id = @basket.id
   end
 
   #as an action this order is meant as a verb, ie order this basket
@@ -150,7 +151,7 @@ class BasketsController < AdminController
   end
 
   def params_for_basket
-    return if params[:basket].blank? or params[:basket].empty?
+    return {} if params[:basket].blank? or params[:basket].empty?
     params.require(:basket).permit( :items_attributes => [:quantity , :price , :id] )
   end
 end

data/app/controllers/categories_controller.rb

@@ -64,7 +64,8 @@ class CategoriesController < AdminController
   end
 
   def params_for_model
-    params.require(:category).permit(:category_id,:name,:link,:main_picture,:extra_picture,:position, :online, :description)
+    params.require(:category).permit(:category_id,:name,:link,:main_picture,:extra_picture,:position, :online,
+                                    :summary, :description)
   end
 end
 

data/app/controllers/office_controller.rb

@@ -42,6 +42,11 @@ class OfficeController < ApplicationController
   end
 
   private
+  def has_ssl?
+    return false unless Rails.env.production?
+    OfficeClerk.config(:has_ssl) == true
+  end
+  
   # when the order is made and the basket locked, it's time to make a new one
   def new_basket
     session[:current_basket] = nil

data/app/controllers/products_controller.rb

@@ -66,7 +66,7 @@ class ProductsController < AdminController
   end
 
   def params_for_model
-    params.require(:product).permit(:price,:cost,:weight,:name,:description, :online,
+    params.require(:product).permit(:price,:cost,:weight,:name,:description, :online, :summary,
       :link,:ean,:tax,:properties,:scode,:product_id,:category_id,:supplier_id, :main_picture,:extra_picture
 )
   end

data/app/controllers/sessions_controller.rb

@@ -1,6 +1,8 @@
 class SessionsController < OfficeController
   layout "sales_clerk"
 
+  force_ssl :if => :has_ssl?
+
   def sign_in
   end
 
@@ -32,6 +34,9 @@ class SessionsController < OfficeController
       end
     end
   end
+
+  private
+
   def params_for_clerk
     params.require(:clerk).permit(:email,:password,:password_confirmation)
   end

data/app/helpers/shop_helper.rb

@@ -15,15 +15,4 @@ module ShopHelper
     prods.delete(product)
     prods.sample(get)
   end
-
-  # a short version of a desciption text. now we use markdown and often have a bold "header"
-  # so one can give a char sequence
-  def short text , chop = "**"
-    ind = text.index( chop , 10)
-    if ind
-      return text[0 .. ind + 1] 
-    else
-      return text[0 .. 100] 
-    end
-  end
 end