bbmb 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb90d7e562d23095d59b3843adea7a0f1a62f376
-  data.tar.gz: 19bd72a5567c15406e9614a20bf2cb215e14a2dd
+  metadata.gz: eaa30df636673ef2b0750209b94e560b321b1003
+  data.tar.gz: 722f5f6e81069348fd13ccfe66bca2baeda41030
 SHA512:
-  metadata.gz: bfd42913edd1a4a2af6e481512a385de3fe75147d3c8ccbaab92e3002086438a464587441bf0ee2d4b1ac495ac486328fb2c0bd6a3797825acddd977996f1cc2
-  data.tar.gz: 3f153e61f12038feb43c6045c289f1a3b799c19293fe5fbb5d558e1fa3a43bdd1d52112596f99490e7e3309321dd8b320481a0b64f1829dd36cea99a96e18675
+  metadata.gz: 6a18a4776e43b0532aa0d7f453fad64c9a17a586fe36d4c9001c34ccf8a848017ed71152c8bdf329794406c375d06cd5d5a2fbb3e1559b7b920e96ad4afaa5bb
+  data.tar.gz: 34b1eb5c2a44ec0c04d1f2cad8d9c5db9044cafe3ce7abcbd902e67a2b1214e2e513a4c57df5a96adb1146c3fae033dc22c141e2fa12c8bd1c4727e3804d6cf9

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.0.3 / 08.06.2016
+
+* Added a DEFAULT_FLAVOR sandoz to work without rockit
+* Various cleanups. Added state/init.rb und global_predefine.rb in analogy to ydim-html
+
 === 2.0.1 / 01.06.2016
 
 * Fixed getting git version

data/bin/admin

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # Admin -- bbmb -- 09.07.2003 -- hwyss@ywesee.com 
 
-$KCODE = 'u'
-
 require 'drb'
 require 'sbsm/drb'
 require 'bbmb'

data/bin/bbmbd

@@ -6,8 +6,10 @@ $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'drb'
 require 'logger'
+require 'ydim/invoice'
 require 'bbmb/config'
 require 'bbmb/util/server'
+require 'bbmb/util/server'
 require 'pp'
 
 module BBMB

data/bin/migrate_bbmb_to_utf_8

@@ -5,12 +5,6 @@ STDOUT.sync = true
 
 require 'syck'
 
-
-begin
-require 'pry'
-rescue LoadError
-end
-
 here = File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'lib'))
 $: << here
 require 'logger'
@@ -111,7 +105,6 @@ module YDIM
           child = child.force_encoding(Encoding::ISO_8859_1).clone.encode(Encoding::UTF_8)
           puts "force_encoding from ISO_8859_1 #{old}. is now #{child}"
         end
-        binding.pry unless child.valid_encoding?
         case child.encoding.to_s
         when /ASCII-8BIT|US-ASCII/
           # nothing todo
@@ -124,7 +117,6 @@ module YDIM
           puts "force_encoding from #{old}. is now #{child}"
         else
           puts "Unhandeled encoding #{child.encoding}"
-          # require 'pry'; binding.pry
         # child = child.force_encoding
         end
       when

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

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # Html::State::Customers -- bbmb.ch -- 18.09.2006 -- hwyss@ywesee.com
 
-require 'bbmb/html/state/global'
+require 'bbmb/html/state/global_predefine'
+require 'bbmb/html/state/customer'
 require 'bbmb/html/view/customers'
 require 'bbmb/model/customer'
 require 'ostruct'

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

@@ -1,19 +1,29 @@
 #!/usr/bin/env ruby
 # Html::State::Global -- bbmb.ch -- 18.09.2006 -- hwyss@ywesee.com
-
 require 'sbsm/state'
+require 'bbmb/html/state/global_predefine'
+require 'bbmb/html/state/init'
+require 'bbmb/html/state/change_password'
+require 'bbmb/html/state/current_order'
+require 'bbmb/html/state/customer'
+require 'bbmb/html/state/customers'
+require 'bbmb/html/state/favorites'
+require 'bbmb/html/state/favorites_result'
+require 'bbmb/html/state/history'
+require 'bbmb/html/state/info'
+require 'bbmb/html/state/json'
 require 'bbmb/html/state/login'
+require 'bbmb/html/state/order'
+require 'bbmb/html/state/orders'
+require 'bbmb/html/state/result'
+require 'bbmb/html/state/show_pass'
 
 module BBMB
   module Html
     module State
 class Global < SBSM::State
-  class << self
-    def mandatory(*keys)
-      define_method(:_mandatory) { keys }
-      define_method(:mandatory) { _mandatory }
-      define_method(:mandatory?) { |key| mandatory.include?(key) }
-    end
+  def initialize(first, second)
+    super(first, second)
   end
   def logout
     @session.logout

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

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# Html::State::Global -- ydim -- 12.01.2006 -- hwyss@ywesee.com
+
+require 'sbsm/state'
+module BBMB
+  module Html
+    module State
+      class Global < SBSM::State
+        class << self
+          def mandatory(*keys)
+            define_method(:_mandatory) { keys }
+            define_method(:mandatory) { _mandatory }
+            define_method(:mandatory?) { |key| mandatory.include?(key) }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'bbmb/html/state/customers'
+require 'bbmb/html/view/login'
+
+module BBMB
+  module Html
+    module State
+      class Init < SBSM::State
+        VIEW = Html::View::LoginForm
+        def login
+          if(res = @session.login)
+            Customers.new(@session, nil)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bbmb/html/util/session.rb

@@ -1,18 +1,19 @@
 #!/usr/bin/env ruby
-# Html::Util::Session -- bbmb.ch -- 15.09.2006 -- hwyss@ywesee.com
+# encoding: utf-8
 
 require 'bbmb/config'
-require 'bbmb/html/util/known_user'
-require 'bbmb/html/state/login'
 require 'sbsm/session'
-require 'sbsm/redirector'
+require 'bbmb/html/state/global'
+require 'bbmb/html/util/lookandfeel'
+require 'bbmb/html/util/known_user'
+
 
 module BBMB
   module Html
     module Util
 class Session < SBSM::Session
-  include SBSM::Redirector
   DEFAULT_LANGUAGE = 'de'
+  DEFAULT_FLAVOR = "sandoz"
   DEFAULT_STATE = State::Login
   EXPIRES = BBMB.config.session_timeout
   PERSISTENT_COOKIE_NAME = "bbmb-barcodereader"
@@ -25,6 +26,7 @@ class Session < SBSM::Session
     @app.logout(@user.auth_session) if(@user.respond_to?(:auth_session))
     super
   end
+
   def lookandfeel
     if(@lookandfeel.nil? \
       || (@lookandfeel.language != persistent_user_input(:language)))
@@ -34,7 +36,7 @@ class Session < SBSM::Session
     @lookandfeel
   end
   def process(request)
-    begin 
+    begin
       if(@user.is_a?(KnownUser) && @user.auth_session.expired?)
         logout
       end

data/lib/bbmb/html/util/validator.rb

@@ -47,7 +47,7 @@ class Validator < SBSM::Validator
     match[0]
   end
   def perform_validation(key, value)
-    super(key, u(value))
+    super(key, value)
   end
 end
     end

data/lib/bbmb/html/view/customer.rb

@@ -72,7 +72,7 @@ class CustomerForm < HtmlGrid::Form
       form = "document.#{formname}"
       button.onclick = "#{form}.event.value='change_pass';#{form}.submit();"
       button.value = @lookandfeel.lookup("change_pass")
-      matrix = components.index(:change_pass)
+      matrix = components.key(:change_pass)
       @grid.set_colspan(*matrix)
       button
     end
@@ -91,7 +91,7 @@ class CustomerForm < HtmlGrid::Form
         button = HtmlGrid::Button.new(:generate_pass, model, @session, self)
         form = "document.#{formname}"
         button.onclick = "#{form}.event.value='generate_pass';#{form}.submit();"
-        matrix = components.index(:change_pass)
+        matrix = components.key(:change_pass)
         @grid.set_colspan(*matrix)
         button
       end

data/lib/bbmb/version.rb

@@ -2,5 +2,5 @@
 # Bbmb -- bbmb.ch -- 17.12.2019 -- zdavatz@ywesee.com
 
 module BBMB
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/test/util/test_invoicer.rb

@@ -3,7 +3,7 @@
 
 
 $: << File.expand_path('..', File.dirname(__FILE__))
-$: << File.expand_path('../lib', File.dirname(__FILE__))
+$: << File.expand_path('../../lib', File.dirname(__FILE__))
 
 
 require "minitest/autorun"
@@ -80,7 +80,6 @@ class TestInvoicer < Minitest::Test
     }
     range = Time.local(2006,9)...Time.local(2006,10)
     result = Invoicer.create_invoice(range, Util::Money.new(24), [order1, order2], today)
-    skip('Why does this test fail?')
     assert_equal(invoice, result)
     assert_equal("01.09.2006 - 30.09.2006", invoice.description)
     assert_equal(today, invoice.date)
@@ -99,7 +98,7 @@ class TestInvoicer < Minitest::Test
     @ydim_server.should_receive(:logout).and_return { |client|
       assert_equal(session, client)
     }
-    skip('this test failes')
+    skip('this test fails')
     Invoicer.send_invoice(123)
   end
   def test_run

data/test/util/test_mail.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # Util::TestMail -- bbmb.ch -- 27.09.2006 -- hwyss@ywesee.com
 
-
-$: << File.expand_path('../lib', File.dirname(__FILE__))
+$: << File.expand_path('../../lib', File.dirname(__FILE__))
 
 require "minitest/autorun"
 require 'flexmock/test_unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -349,8 +349,10 @@ files:
 - lib/bbmb/html/state/favorites.rb
 - lib/bbmb/html/state/favorites_result.rb
 - lib/bbmb/html/state/global.rb
+- lib/bbmb/html/state/global_predefine.rb
 - lib/bbmb/html/state/history.rb
 - lib/bbmb/html/state/info.rb
+- lib/bbmb/html/state/init.rb
 - lib/bbmb/html/state/json.rb
 - lib/bbmb/html/state/login.rb
 - lib/bbmb/html/state/order.rb