bbmb 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2eb42efa3ac9ef669280070946e16ae722ef14c
-  data.tar.gz: 69a025978a868913d8080c42b4ce574a5a1a33aa
+  metadata.gz: 3dbe4ee9956c4b592fa58f23029b197bfddaab36
+  data.tar.gz: 7bcba109d2eb190ec0996bb4c6bba86ba201c174
 SHA512:
-  metadata.gz: 6aac0c230d1189d36609914bc5a8b495ed3543bf29ecf3563da1efe718ef486da98b8efe32d6924ed54651a5c1b03834ad50e6deb6b9cfb64026fd7847d622f0
-  data.tar.gz: e552995962a29f4765599c010b53823362198dac681a328bd2ef5ef4f1aab497312462b9c2bb5d92751a32a42b67fcdafd38f01d5d3add14365b4dfdceabf215
+  metadata.gz: a0d55dbfa2322c13e3611ced131d1ee6184e21441c297ae78e828e1f708b9a704fe3f750caa86ff04f336e014e091cbbe4a200d2cb8772a8ee7fe8aff1fd32fd
+  data.tar.gz: dd46d10aa2c1dc52ddd01569c178bb755ae12eb43570fb8366397e1bbd6e195aa1cdd60e7d1ddc237e1744b95268a1c770ab7f330e85cb96e5056c1b6d0f7a83

data/.travis.yml

@@ -8,13 +8,14 @@ sudo: false
 before_install:
   - gem --version
 
-script: bundle exec test/suite.rb
+script: bundle exec rake test
 
 rvm:
   - 2.2
   - 2.3.0
+  - 2.3.1
   - ruby-head
-  
+
 matrix:
   allow_failures:
     - rvm: ruby-head
@@ -23,3 +24,4 @@ notifications:
   email:
     recipients:
       - ngiger@ywesee.com
+      - yasaka@ywesee.com

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.0.9 / 20.07.2016
+
+* Add EAN-Code as search target
+* Create test suite by rake
+* Remove unnecessary require and shebang from test files
+
 === 2.0.8 / 18.07.2016
 
 * Replaced Thread.exclusive with Mutex#synchronize

data/Rakefile

@@ -1,12 +1,13 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bbmb/version'
+$:.unshift(lib) unless $:.include?(lib)
+
+require 'rake/testtask'
+require 'rake/clean'
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'bbmb/version'
 
-RSpec::Core::RakeTask.new(:spec)
+task :default => :test
 
 # dependencies are now declared in bbmb.gemspec
 
@@ -16,6 +17,16 @@ task :gem => :build do
 end
 
 task :spec => :clean
-
-require 'rake/clean'
 CLEAN.include FileList['pkg/*.gem']
+
+# rspec
+RSpec::Core::RakeTask.new(:spec)
+
+# unit test
+dir = File.dirname(__FILE__)
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = Dir.glob("#{dir}/test/**/test_*.rb")
+  t.warning = false
+  t.verbose = false
+end

data/lib/bbmb/html/state/customers.rb

@@ -1,5 +1,3 @@
-# Html::State::Customers -- bbmb.ch -- 18.09.2006 -- hwyss@ywesee.com
-
 require 'ostruct'
 require 'bbmb/html/state/global_predefine'
 require 'bbmb/html/state/customer'
@@ -9,74 +7,78 @@ require 'bbmb/model/customer'
 module BBMB
   module Html
     module State
-class Customers < Global
-  DIRECT_EVENT = :customers
-  VIEW = View::Customers
-  FILTER = [ :customer_id, :organisation, :plz, :city, :email ]
-  def init
-    start = Time.now
-    @model  = BBMB.persistence.all(Model::Customer)
-    @sortby = [:organisation]
-    BBMB.logger.debug('State') {
-      sprintf("Customers#init: loaded %i customers in %1.5fs",
-              @model.size, Time.now - start)
-    }
-    @filter = make_filter
-  end
-  def page(model)
-    page = OpenStruct.new
-    index = @session.user_input(:index).to_i
-    step = @session.user.pagestep || BBMB.config.pagestep
-    page.index = index
-    page.first = index + 1
-    page.step = step
-    page.total = model.size
-    page.customers = model[index, step]
-    page.last = index + page.customers.size
-    page
-  end
-  private
-  def make_filter
-    Proc.new { |model|
-      input = @session.event_bound_user_input(:filter)
-      if input
-        pattern = Regexp.new(input.gsub('*', '.*'), 'ui')
-        model = model.select { |customer|
-          FILTER.any? { |key|
-            value = customer.send(key).to_s
-            next if value.empty?
-            begin
-              pattern.match(value)
-            rescue ArgumentError
-              false
+      class Customers < Global
+        DIRECT_EVENT = :customers
+        VIEW         = View::Customers
+        FILTER       = %i{customer_id ean13 organisation plz city email}
+
+        def init
+          start = Time.now
+          @model  = BBMB.persistence.all(Model::Customer)
+          @sortby = [:organisation]
+          BBMB.logger.debug('State') {
+            sprintf("Customers#init: loaded %i customers in %1.5fs",
+                    @model.size, Time.now - start)
+          }
+          @filter = make_filter
+        end
+
+        private
+
+        def make_filter
+          Proc.new { |model|
+            input = @session.event_bound_user_input(:filter)
+            if input
+              pattern = Regexp.new(input.gsub('*', '.*'), 'ui')
+              model = model.select { |customer|
+                FILTER.any? { |key|
+                  value = customer.send(key).to_s
+                  next if value.empty?
+                  begin; pattern.match(value); rescue ArgumentError; false; end
+                }
+              }
+            end
+            get_sortby!
+            if @sortby.include?(:valid) || @sortby.include?(:last_login)
+              # decorates customer objects with (yus) session
+              model = model.map { |m| CustomerDecorator.new(m, @session) }
             end
+            model.sort! { |a, b| compare_entries(a, b) }
+            @sort_reverse && model.reverse!
+            page(model)
           }
-        }
+        end
+
+        def page(model)
+          index = @session.user_input(:index).to_i
+          step  = @session.user.pagestep || BBMB.config.pagestep
+          page = OpenStruct.new
+          page.index     = index
+          page.first     = index + 1
+          page.step      = step
+          page.total     = model.size
+          page.customers = model[index, step]
+          page.last      = index + page.customers.size
+          page
+        end
       end
-      get_sortby!
-      if @sortby.include?(:valid) || @sortby.include?(:last_login)
-        # decorates customer objects with (yus) session
-        model = model.map { |m| CustomerDecorator.new(m, @session) }
+
+      class CustomerDecorator < SimpleDelegator
+
+        def initialize(model, session)
+          @source  = model
+          @session = session
+          self.__setobj__(@source)
+        end
+
+        def last_login
+          @last_login ||= @session.user.last_login(email)
+        end
+
+        def valid
+          @valid ||= @session.user.entity_valid?(email).to_s
+        end
       end
-      model.sort! { |a, b| compare_entries(a, b) }
-      @sort_reverse && model.reverse!
-      page(model)
-    }
-  end
-end
-class CustomerDecorator < SimpleDelegator
-  def initialize(model, session)
-    @source  = model
-    @session = session
-    self.__setobj__(@source)
-  end
-  def last_login
-    @last_login ||= @session.user.last_login(email)
-  end
-  def valid
-    @valid ||= @session.user.entity_valid?(email).to_s
-  end
-end
     end
   end
 end

data/lib/bbmb/version.rb

@@ -1,6 +1,3 @@
-#!/usr/bin/env ruby
-# Bbmb -- bbmb.ch -- 17.12.2019 -- zdavatz@ywesee.com
-
 module BBMB
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

data/test/html/state/test_customers.rb

@@ -0,0 +1,87 @@
+require 'test_helper'
+
+require 'htmlgrid/list'
+require 'bbmb/config'
+require 'bbmb/model/customer'
+require 'bbmb/html/state/viral/admin'
+require 'bbmb/html/state/customers'
+
+module BBMB
+  module Html
+    module State
+      class TestCustomers < Minitest::Test
+        include FlexMock::TestCase
+
+        def setup
+          super
+          BBMB.config = flexmock('config')
+          BBMB.logger = flexmock('logger')
+          BBMB.logger.should_receive(:debug)
+          BBMB.persistence = flexmock('persistence', :all => [])
+          app      = flexmock('app')
+          user     = flexmock('user', :pagestep => 1)
+          @session = flexmock('session', :app => app, :user => user)
+          @model   = flexmock('model')
+        end
+
+        def test_filter_finds_customer_by_ean13
+          search_input = '7999999999999'
+          valid_customer = flexmock(
+            :customer_id  => '1',
+            :organisation => '',
+            :plz          => '',
+            :city         => '',
+            :email        => '',
+            :ean13        => '7999999999999'
+          )
+          unknown_customer = flexmock(
+            :customer_id  => '99',
+            :organisation => '',
+            :plz          => '',
+            :city         => '',
+            :email        => '',
+            :ean13        => ''
+          )
+          flexmock(Customers).new_instances
+            .should_receive(:page).with([valid_customer]).once
+          @session.should_receive(:event_bound_user_input)
+            .and_return(search_input)
+          @session.should_receive(:user_input).and_return(search_input)
+          state = Customers.new(@session, @model)
+          state.init
+          filter = state.instance_variable_get(:@filter)
+          filter.call([valid_customer, unknown_customer])
+        end
+
+        def test_filter_finds_customer_by_customer_name
+          search_input = 'Company'
+          valid_customer = flexmock(
+            :customer_id  => '1',
+            :organisation => 'Test Company',
+            :plz          => '',
+            :city         => '',
+            :email        => '',
+            :ean13        => ''
+          )
+          unknown_customer = flexmock(
+            :customer_id  => '99',
+            :organisation => '',
+            :plz          => '',
+            :city         => '',
+            :email        => '',
+            :ean13        => ''
+          )
+          flexmock(Customers).new_instances
+            .should_receive(:page).with([valid_customer]).once
+          @session.should_receive(:event_bound_user_input)
+            .and_return(search_input)
+          @session.should_receive(:user_input).and_return(search_input)
+          state = Customers.new(@session, @model)
+          state.init
+          filter = state.instance_variable_get(:@filter)
+          filter.call([valid_customer, unknown_customer])
+        end
+      end
+    end
+  end
+end

data/test/model/test_customer.rb

@@ -1,15 +1,7 @@
-#!/usr/bin/env ruby
-# Model::TestCustomer -- bbmb.ch -- 22.09.2006 -- hwyss@ywesee.com
+require 'test_helper'
 
-$: << File.expand_path('..', File.dirname(__FILE__))
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
-require 'bbmb'
 require 'bbmb/model/customer'
 require 'bbmb/model/order'
-require 'stub/persistence'
 
 module BBMB
   module Model

data/test/model/test_order.rb

@@ -1,10 +1,4 @@
-#!/usr/bin/env ruby
-# Model::TestOrder -- bbmb.ch -- 22.09.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
+require 'test_helper'
 require 'bbmb/model/order'
 require 'date'
 

data/test/model/test_product.rb

@@ -1,10 +1,4 @@
-#!/usr/bin/env ruby
-# Model::TestProduct -- bbmb.ch -- 14.09.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
+require 'test_helper'
 require 'bbmb/model/product'
 require 'bbmb/model/promotion'
 

data/test/model/test_promotion.rb

@@ -1,10 +1,3 @@
-#!/usr/bin/env ruby
-# Model::TestPromotion -- bbmb -- 14.08.2007 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
 require 'bbmb/model/promotion'
 
 module BBMB

data/test/{stub → support/stub}/persistence.rb

@@ -1,6 +1,3 @@
-#!/usr/bin/env ruby
-# Persistence::Test -- bbmb.ch -- 14.09.2006 -- hwyss@ywesee.com
-
 require 'bbmb/model/customer'
 require 'bbmb/model/product'
 

data/test/test_bbmb.rb

@@ -1,10 +1,4 @@
-#!/usr/bin/env ruby
-# TestBbmb -- bbmb.ch -- 15.09.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'bbmb'
+require 'test_helper'
 
 module BBMB
   class TestBbmb < Minitest::Test

data/test/test_helper.rb

@@ -0,0 +1,16 @@
+require 'pathname'
+
+root_dir = Pathname.new(__FILE__).realpath.parent.parent
+lib_dir  = root_dir.join('lib')
+test_dir = root_dir.join('test')
+
+$:.unshift(root_dir) unless $:.include?(root_dir)
+$:.unshift(lib_dir)  unless $:.include?(lib_dir)
+$:.unshift(test_dir) unless $:.include?(test_dir)
+
+require 'minitest/autorun'
+require 'flexmock/test_unit'
+
+require 'bbmb/config'
+
+Dir[root_dir.join('test/support/**/*.rb')].each { |f| require f }

data/test/util/test_invoicer.rb

@@ -1,18 +1,8 @@
-#!/usr/bin/env ruby
-# Util::TestInvoicer -- bbmb.ch -- 05.10.2006 -- hwyss@ywesee.com
-
-
-$: << File.expand_path('..', File.dirname(__FILE__))
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
+require 'test_helper'
+require 'ostruct'
 require 'bbmb/config'
 require 'bbmb/util/invoicer'
 require 'bbmb/util/numbers'
-require 'ostruct'
-require 'stub/persistence'
 
 module BBMB
   module Util

data/test/util/test_mail.rb

@@ -1,10 +1,5 @@
-#!/usr/bin/env ruby
-# Util::TestMail -- bbmb.ch -- 27.09.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
+require 'test_helper'
+require 'bbmb/config'
 require 'bbmb/util/mail'
 
 module BBMB

data/test/util/test_money.rb

@@ -1,10 +1,4 @@
-#!/usr/bin/env ruby
-# Util::TestMoney -- bbmb.ch -- 14.09.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
+require 'test_helper'
 require 'bbmb/util/numbers'
 
 module BBMB

data/test/util/test_password_generator.rb

@@ -1,10 +1,4 @@
-#!/usr/bin/env ruby
-# Util::TestPasswordGenerator -- bbmb.ch -- 19.10.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
+require 'test_helper'
 require 'bbmb/util/password_generator'
 
 module BBMB

data/test/util/test_polling_manager.rb

@@ -1,12 +1,6 @@
-#!/usr/bin/env ruby
-# Util::TestPollingManager -- bbmb.ch -- 14.09.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
-require 'bbmb/util/polling_manager'
+require 'test_helper'
 require 'fileutils'
+require 'bbmb/util/polling_manager'
 
 module BBMB
   module Util

data/test/util/test_server.rb

@@ -1,15 +1,5 @@
-#!/usr/bin/env ruby
-# Util::TestServer -- bbmb.ch -- 22.09.2006 -- hwyss@ywesee.com
-
-$: << File.expand_path('../../lib', File.dirname(__FILE__))
-$: << File.expand_path('..', File.dirname(__FILE__))
-
-require "minitest/autorun"
-require 'flexmock/test_unit'
-require 'bbmb'
+require 'test_helper'
 require 'bbmb/util/server'
-require 'stub/persistence'
-require 'flexmock'
 
 module BBMB
   module Util

data/test/util/test_target_dir.rb

@@ -1,13 +1,6 @@
-#!/usr/bin/env ruby
-# Util::TestTargetDir -- bbmb -- 19.04.2007 -- hwyss@ywesee.com
-
-
-$: << File.expand_path('../lib', File.dirname(__FILE__))
-
-require 'minitest/autorun'
-require 'flexmock/test_unit'
-require 'bbmb/util/target_dir'
+require 'test_helper'
 require 'fileutils'
+require 'bbmb/util/target_dir'
 
 module BBMB
   module Util

data/test/util/test_transfer_dat.rb

@@ -1,11 +1,6 @@
-#!/usr/bin/env ruby
-# Util::TestTargetDir -- bbmb -- 19.04.2007 -- hwyss@ywesee.com
-$: << File.expand_path('../lib', File.dirname(__FILE__))
-require 'minitest/autorun'
-require 'flexmock/test_unit'
-require 'bbmb'
-require 'bbmb/util/transfer_dat'
+require 'test_helper'
 require 'stringio'
+require 'bbmb/util/transfer_dat'
 
 module BBMB
   module Util

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -427,13 +427,14 @@ files:
 - lib/bbmb/version.rb
 - readme.md
 - test/data/ydim.yml
+- test/html/state/test_customers.rb
 - test/model/test_customer.rb
 - test/model/test_order.rb
 - test/model/test_product.rb
 - test/model/test_promotion.rb
-- test/stub/persistence.rb
-- test/suite.rb
+- test/support/stub/persistence.rb
 - test/test_bbmb.rb
+- test/test_helper.rb
 - test/util/test_invoicer.rb
 - test/util/test_mail.rb
 - test/util/test_money.rb
@@ -468,13 +469,14 @@ specification_version: 4
 summary: ywesee distributed invoice manager
 test_files:
 - test/data/ydim.yml
+- test/html/state/test_customers.rb
 - test/model/test_customer.rb
 - test/model/test_order.rb
 - test/model/test_product.rb
 - test/model/test_promotion.rb
-- test/stub/persistence.rb
-- test/suite.rb
+- test/support/stub/persistence.rb
 - test/test_bbmb.rb
+- test/test_helper.rb
 - test/util/test_invoicer.rb
 - test/util/test_mail.rb
 - test/util/test_money.rb

data/test/suite.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-# suite.rb -- oddb -- 08.09.2006 -- hwyss@ywesee.com 
-
-here = File.expand_path(File.dirname(__FILE__))
-$: << here
-
-require 'find'
-
-failures =  []
-okay =  []
-Find.find(here) do |file|
-  next if /test_invoicer/.match(file)
-  if /test_.*\.rb$/o.match(file)
-    short =  File.basename(file, '.rb')
-    if false # Run them all as a simple
-      require file
-    else
-      log = short + '.log'
-      cmd = "bash -c 'bundle exec #{file} --seed 62766  2>&1 | tee #{log}; ( exit ${PIPESTATUS[0]} )'"
-      puts cmd
-      res = system(cmd)
-      if res
-        puts "No problem executing #{short}"
-        okay << short
-        FileUtils.rm_f(log)
-      else
-        failures << short
-      end
-    end
-  end
-end
-puts
-puts "The following tests showed no problems #{okay}"
-puts
-puts "The following tests had problems #{failures}"
-puts "Skipped test_invoicer"
-# --seed 33839 hangs
-# --seed 62766 passed
-exit(failures.size)