gillbus 0.16.7 → 0.16.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd0ac869d9d605b0344ae93bc7c0f26c8dce47a
-  data.tar.gz: c625a743ef866ce2cdd2671696afca22b29c396b
+  metadata.gz: c31563ca394a9b38057c5aceae871ffdb9dd524c
+  data.tar.gz: 5195a899582e383ad2b364beda39cb580cd61f04
 SHA512:
-  metadata.gz: 857e79e6e0b3865f781693b3ad69cde047afacb98a344b2419348f25facfe3fd1ed3898012de843688c6ab2281bacdce2aa2da489688f6527d1d4eec3b079145
-  data.tar.gz: f7b1c07c2cef34801f585b497069228c10f144a766d2a2ccc829079cce93fcdfcc07bf89ee85293e3727ae3cdd2afbbd2182ff1a07413e7c09bb39d092521af1
+  metadata.gz: d790d9c12625b44300dc4dbb754d0bb69ad5c8ac7257a113baf1d52adebac4905e2bd581bdfc644729d7f29db4d84aeba9de7ce27370cbc83e5116735fc30538
+  data.tar.gz: ab80e525e02f95bbacb0bee58fa52e2e7899f6dd827d00fcb5cd2ca7d6c84a7fd2deded4d5c2866ed5647ffb51779190e460cd646878a423f1e82b900eb1e2e9

data/.rubocop.yml

@@ -0,0 +1,88 @@
+AllCops:
+  TargetRubyVersion: 2.3
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  Exclude:
+    - 'script/*'
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/ClassLength:
+  Max: 125
+
+Metrics/MethodLength:
+  Max: 20
+  Exclude:
+    - 'test/*'
+
+Style/DateTime:
+  Exclude:
+    - 'test/*'
+
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'test/*'
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/MultilineMethodCallBraceLayout:
+  EnforcedStyle: new_line
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/SingleLineMethods:
+  Enabled: false
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/WordArray:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/PerlBackrefs:
+   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Lint/CircularArgumentReference:
+  Enabled: false

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.pattern = "test/*_test.rb"
+  t.pattern = 'test/*_test.rb'
   t.warning = false
 end
 
-task :default => :test
+task default: :test

data/gillbus.gemspec

@@ -1,31 +1,32 @@
-# coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gillbus/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "gillbus"
+  spec.name          = 'gillbus'
   spec.version       = Gillbus::VERSION
-  spec.authors       = [%q{Alexey "codesnik" Trofimenko}, %q{Kirill Platonov}]
-  spec.email         = ["aronaxis@gmail.com", "mail@kirillplatonov.com"]
-  spec.summary       = %q{Driver for Gillbus IDS API}
+  spec.authors       = ['Alexey "codesnik" Trofimenko', 'Kirill Platonov']
+  spec.email         = ['aronaxis@gmail.com', 'mail@kirillplatonov.com']
+  spec.summary       = 'Driver for Gillbus IDS API'
   # spec.description   = %q{gillbus.com}
-  spec.homepage      = "http://gillbus.com/"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://gillbus.com/'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency 'multi_xml'
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'faraday'
-  spec.add_dependency 'money'
   spec.add_dependency 'monetize'
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'money'
+  spec.add_dependency 'multi_xml'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop', '~> 0.51.0'
 end

data/lib/gillbus.rb

@@ -1,12 +1,12 @@
-require "gillbus/version"
-require "faraday"
+require 'gillbus/version'
+require 'faraday'
 
 class Gillbus
-
   # driver: e.g. Faraday.new(url: 'http://demo.gillbus.com')
-  def initialize(driver:, session_id: nil)
+  def initialize(driver:, session_id: nil, timezone: nil)
     @driver = driver
     @session_id = session_id
+    @timezone = timezone
   end
 
   # Faraday instance
@@ -19,17 +19,18 @@ class Gillbus
     self
   end
 
-  def self.register klass, method_name
+  def self.register(klass, method_name)
     define_method method_name do |*args|
       request_class = klass::Request
       response_class = klass::Response
       request = request_class.new(*args)
-      headers = {'Cookie' => "JSESSIONID=#{session_id}"} if session_id
+      headers = { 'Cookie' => "JSESSIONID=#{session_id}" } if session_id
       request_time_start = Time.now
-      http_response = driver.public_send( request.method, request.path, request.params, headers )
+      http_response = driver.public_send(request.method, request.path, request.params, headers)
       request_time_end = Time.now
-      result = response_class.parse_string(http_response.body.force_encoding('utf-8'))
-      if cookie_string = http_response.headers["Set-Cookie"]
+      result = response_class.parse_string(http_response.body.force_encoding('utf-8'), timezone: timezone)
+      cookie_string = http_response.headers['Set-Cookie']
+      if cookie_string
         returned_session_id = CGI::Cookie.parse(cookie_string)['JSESSIONID'].first
         self.session_id = returned_session_id
       end

data/lib/gillbus/base_request.rb

@@ -2,8 +2,7 @@ require 'date'
 
 class Gillbus
   class BaseRequest
-
-    def initialize(attrs={})
+    def initialize(attrs = {})
       attrs.each do |k, v|
         send "#{k}=", v
       end
@@ -25,31 +24,31 @@ class Gillbus
 
     def list(items)
       return if items.nil?
-      Array(items).join(";")
+      Array(items).join(';')
     end
 
     def date(date)
       return if date.nil?
-      date.strftime("%d.%m.%Y")
+      date.strftime('%d.%m.%Y')
     end
 
     def bool(bool)
       return if bool.nil?
-      bool ? "1" : "0"
+      bool ? '1' : '0'
     end
 
     def translated_locale(locale)
       return if locale.nil?
       {
-        "ru" => "rus",
-        "en" => "lat",
-        "uk" => "ukr",
-        "th" => "tai",
-        "pl" => "pol",
+        'ru' => 'rus',
+        'en' => 'lat',
+        'uk' => 'ukr',
+        'th' => 'tai',
+        'pl' => 'pol',
 
         # temporary, until changed in busfor
-        "ua" => "ukr",
-      }[ locale.to_s ] || locale.to_s
+        'ua' => 'ukr',
+      }[locale.to_s] || locale.to_s
     end
 
     MODES = {
@@ -77,27 +76,26 @@ class Gillbus
       connections_only: 9,
       # 13 - автобусно-лодочный микс
       bus_boat: 13,
-    }
+    }.freeze
 
     def modes(items)
       list(
-        Array(items).map { |item|
+        Array(items).map do |item|
           if item.is_a? Symbol
-            MODES[item] or
-              fail ArgumentError, "unknown search mode #{item.inspect}", caller
+            MODES[item] ||
+              raise(ArgumentError, "unknown search mode #{item.inspect}", caller)
           else
             item
           end
-        }
+        end,
       )
     end
 
     def compact(hash)
-      hash.each do |k,v|
+      hash.each do |k, v|
         hash.delete k if v.nil?
       end
       hash
     end
-
   end
 end

data/lib/gillbus/base_response.rb

@@ -2,7 +2,6 @@ require 'multi_xml'
 
 class Gillbus
   class BaseResponse
-
     extend Fields
     include UpdateAttrs
 
@@ -15,32 +14,31 @@ class Gillbus
     attr_accessor :request_time
 
     def error?
-      ! error_code.nil?
+      !error_code.nil?
     end
 
-    def self.parse(data, instance=new)
+    def self.parse(data, instance: new, options: options)
       # ugly
-      if data["MESSAGE"]
-        instance.error_code = data["MESSAGE"]["CODE"].to_i
-        instance.error_message = data["MESSAGE"]["TEXT"]
-        instance.external_error_message = data["MESSAGE"]["EXT_TEXT"]
+      if data['MESSAGE']
+        instance.error_code = data['MESSAGE']['CODE'].to_i
+        instance.error_message = data['MESSAGE']['TEXT']
+        instance.external_error_message = data['MESSAGE']['EXT_TEXT']
       else
-        super(data, instance)
+        super(data, instance: instance, options: options)
       end
       # for debugging?
       instance.data = data
       instance
     end
 
-    def self.parse_string(xml_string)
+    def self.parse_string(xml_string, **options)
       xml = MultiXml.parse(xml_string)
       # <DATA/> is a valid response
-      xml.key?("DATA") or return ParseError.new(xml_string)
-      data = xml["DATA"] || {}
-      parse(data)
+      return ParseError.new(xml_string) unless xml.key?('DATA')
+      data = xml['DATA'] || {}
+      parse(data, instance: new, options: options)
     rescue MultiXml::ParseError, ArgumentError
       ParseError.new(xml_string)
     end
-
   end
 end

data/lib/gillbus/buy_booking.rb

@@ -1,10 +1,8 @@
 class Gillbus
   module BuyBooking
-
     Gillbus.register self, :buy_booking
 
     class Request < BaseRequest
-
       def path; '/online2/buyBooking' end
 
       # paymentMethod (не обязательный)
@@ -45,16 +43,13 @@ class Gillbus
           paymentMethod: payment_method,
           ticketCount: ticket_count,
           **numbers,
-          **orders
+          **orders,
         )
       end
-
     end
 
     class Response < BaseResponse
-
       class TicketConfirmation
-
         extend Fields
 
         field :number, :int
@@ -63,12 +58,9 @@ class Gillbus
         field :order_id
         field :confirmation, :yesno_bool
         field :position_numbers, [:int], key: 'POSITION_NUMBER'
-
       end
 
       field :ticket, TicketConfirmation
-
     end
-
   end
 end

data/lib/gillbus/buy_tickets.rb

@@ -1,10 +1,8 @@
 class Gillbus
   module BuyTickets
-
     Gillbus.register self, :buy_tickets
 
     class Request < BaseRequest
-
       def path; '/online2/buyTickets' end
 
       # orderId
@@ -12,25 +10,20 @@ class Gillbus
       attr_accessor :order_id
 
       def params
-        {orderId: order_id}
+        { orderId: order_id }
       end
     end
 
     class Response < BaseResponse
-
       class TicketConfirmation
-
         extend Fields
         # String. пока не выяснится, в какой таймзоне это значение и зачем
         field :date
         field :order_id
         field :confirmation, :yesno_bool
-
       end
 
       field :ticket, TicketConfirmation
-
     end
-
   end
 end

data/lib/gillbus/cancel_order.rb

@@ -1,10 +1,8 @@
 class Gillbus
   module CancelOrder
-
     Gillbus.register self, :cancel_order
 
     class Request < BaseRequest
-
       def path; '/online2/cancelOrder' end
 
       # orderNumber
@@ -21,14 +19,10 @@ class Gillbus
           cancelReason: cancel_reason,
         )
       end
-
     end
 
-
     class Response < BaseResponse
-
       class OrderCancel
-
         extend Fields
 
         # The order number
@@ -43,13 +37,9 @@ class Gillbus
         # The request’s performing date
         # String. FIXME (Kiiv timezone?)
         field :date
-
       end
 
       field :order_cancel, OrderCancel
-
     end
-
   end
-
 end