centaman 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7e0b74f83cf29c8b7538e6da0db66f662bc45aab23f981e0af149d2ff28e78
-  data.tar.gz: 8a114ee36ae2a275aaa9f5c1e652f0b12c6c7bb174bb6aca22c70f95ea853403
+  metadata.gz: a516b332a9ca51cb83da3ffd9d9de78e38625dc27704813165e10a0d7ef711f7
+  data.tar.gz: 5e01b2f1771df4f856f42fda69d8b048a2e474c4f521103f8497807d7b90829f
 SHA512:
-  metadata.gz: ef044272a2a7afdaf8b63e12f143567c2f4ffc0cdbbdb94eb47a57bd8d1e15834f38d8224f2af96b404db9a90442d71bdf1cfa9af2457e301cfdf31bdaea0530
-  data.tar.gz: 88ee3afa86e3e55ed71e6ce9e6cf061175a3e5310f6be527cc652184ef8f7902a0e72fc1ec00e8c73de84e6012ed9ee172ea51074757425d4c7369f042b093d2
+  metadata.gz: b88526829eb9a3ddeac10ea782cd7b0024bd69f8bcdd6747f9fe5efc88dd0c45fa90fbedbe8348247fe313ba43bf16a9706f86a2cf1a5e08e9d3a136f67a8130
+  data.tar.gz: d7c67e8abb8d75d1f6139f2ee5af4c5cf9e5f49f8945b42758b9f1543c0a185f975074c6271db3bc9d17907fcc1bf8d0cc57e2a2722cb3f18bef253f1aef48c6

data/lib/centaman.rb

@@ -41,6 +41,16 @@ require 'centaman/object/membership_type'
 require 'centaman/object/add_on'
 require 'centaman/object/purchased_ticket'
 require 'centaman/object/ticket_type'
+require 'centaman/configuration'
 
 module Centaman
+  class << self  
+    def configuration
+      @config ||= Centaman::Configuration.new
+    end
+
+    def config
+      yield configuration
+    end
+  end
 end

data/lib/centaman/configuration.rb

@@ -0,0 +1,9 @@
+module Centaman
+  class Configuration
+    attr_accessor :object_overrides
+
+    def initialize
+      @object_overrides = {}
+    end
+  end
+end

data/lib/centaman/json_wrapper.rb

@@ -9,14 +9,14 @@ module Centaman
     def build_objects(resp)
       return [] unless resp.respond_to?(:map)
       @tickets = resp.map do |ticket_hash|
-        object_class.new(ticket_hash.merge(additional_hash_to_serialize_after_response))
+        final_object_class.new(ticket_hash.merge(additional_hash_to_serialize_after_response))
       end
     end
 
     # i.e. from GET of a show or POST
     def build_object(resp)
       return resp unless resp.respond_to?(:merge)
-      @build_object ||= object_class.new(resp.merge(additional_hash_to_serialize_after_response))
+      @build_object ||= final_object_class.new(resp.merge(additional_hash_to_serialize_after_response))
     end
 
     def additional_hash_to_serialize_after_response
@@ -26,5 +26,12 @@ module Centaman
     def object_class
       raise "object_class is required for #{self.class.name}"
     end
+
+    def final_object_class
+      name = self.class.name.split('::').last
+      override = Centaman.configuration.object_overrides[name]
+      override_class = override.constantize if override
+      override_class || object_class
+    end
   end
 end

data/lib/centaman/service.rb

@@ -1,32 +1,14 @@
-require 'timeout'
-
 module Centaman
   #:nodoc:
   class Service < Wrapper
-    DEFAULT_TIMEOUT_TIME = 15
-
     def after_init(args)
       # overwritten by subclasses
     end
 
-    def wrap_request_in_case_of_timeout(proc, options = {})
-      time = options.fetch(:timeout_time, DEFAULT_TIMEOUT_TIME)
-      resp = nil
-      begin
-        resp = Timeout.timeout(time) do
-          proc.call
-        end
-      rescue Timeout::Error
-        p "*** CENTAMAN GEM TIMEOUT ***"
-        raise Exceptions::CentamanTimeout
-      end
-      resp
-    end
-
     def fetch_all
       @get_request ||= begin
         req = Proc.new do
-          self.class.get(endpoint, payload(:get))
+          self.class.get("#{api_url}#{endpoint}", payload(:get))
         end
         resp = wrap_request_in_case_of_timeout(req, timeout_time: 20)
 
@@ -39,7 +21,7 @@ module Centaman
     def post
       @post_request ||= begin
         req = Proc.new do
-          self.class.post(endpoint, payload(:post))
+          self.class.post("#{api_url}#{endpoint}", payload(:post))
         end
         resp = wrap_request_in_case_of_timeout(req)
         self.respond_to?(:build_object) ? after_post(resp) : resp
@@ -49,7 +31,7 @@ module Centaman
     def put
       @put_request ||= begin
         req = Proc.new do
-          self.class.put(endpoint, payload(:put))
+          self.class.put("#{api_url}#{endpoint}", payload(:put))
         end
         resp = wrap_request_in_case_of_timeout(req)
         self.respond_to?(:build_object) ? after_post(resp) : resp
@@ -59,14 +41,5 @@ module Centaman
     def after_post(response)
       build_object(response)
     end
-
-    def payload(request_type = :get)
-      hash = { payload_key(request_type) => options_hash }
-      hash.merge(headers: headers)
-    end
-
-    def payload_key(request_type)
-      request_type == :get ? :query : :body
-    end
   end
 end

data/lib/centaman/version.rb

@@ -1,3 +1,3 @@
 module Centaman
-  VERSION = "5.0.3"
+  VERSION = "5.0.4"
 end

data/lib/centaman/wrapper.rb

@@ -1,20 +1,28 @@
+require 'timeout'
+
 module Centaman
   #:nodoc:
   class Wrapper
+    DEFAULT_TIMEOUT_TIME = 15
     include HTTParty
 
-    if ENV['FIXIE_URL']
-      FIXIE = URI.parse(ENV['FIXIE_URL'])
-      http_proxy FIXIE.host, FIXIE.port, FIXIE.user, FIXIE.password
-    end
-
-    attr_reader :api_username, :api_password, :api_token
+    attr_reader :api_username, :api_password, :api_token, :api_url,
+                :proxie_host, :proxie_port, :proxie_user, :proxie_password
 
     def initialize(args = {})
-      @api_username = ENV['CENTAMAN_API_USERNAME']
-      @api_password = ENV['CENTAMAN_API_PASSWORD']
-      @api_token = ENV.fetch('CENTAMAN_API_TOKEN', generate_token)
-      self.class.base_uri ENV['CENTAMAN_API_URL']
+      # required
+      @api_username = args.fetch(:api_username) { ENV['CENTAMAN_API_USERNAME'] }
+      @api_password = args.fetch(:api_password) { ENV['CENTAMAN_API_PASSWORD'] }
+      @api_url = args.fetch(:api_url) { ENV['CENTAMAN_API_URL'] }
+      
+      # optional
+      @api_token = args.fetch(:api_token) { ENV['CENTAMAN_API_TOKEN'] || generate_token }      
+      fixie_url = args.fetch(:fixie_url) { ENV['FIXIE_URL'] }
+      fixie = fixie_url ? URI.parse(fixie_url) : nil
+      @proxie_host = args.fetch(:proxie_host) { fixie.try(:host) }
+      @proxie_port = args.fetch(:proxie_port) { fixie.try(:port) }
+      @proxie_user = args.fetch(:proxie_user) { fixie.try(:user) }
+      @proxie_password = args.fetch(:proxie_password) { fixie.try(:password) }
       after_init(args)
     end
 
@@ -42,5 +50,38 @@ module Centaman
     def after_init(args = {})
       # hook method for subclasses
     end
+
+    def payload(request_type = :get)
+      hash = { payload_key(request_type) => options_hash }
+      hash.merge(headers: headers).merge(proxy_hash)
+    end
+
+    def payload_key(request_type)
+      request_type == :get ? :query : :body
+    end
+
+    def proxy_hash
+      return {} unless proxie_host
+      {
+        http_proxyaddr: proxie_host,
+        http_proxyport: proxie_port,
+        http_proxyuser: proxie_user,
+        http_proxypass: proxie_password,
+      }
+    end
+    
+    def wrap_request_in_case_of_timeout(proc, options = {})
+      time = options.fetch(:timeout_time, DEFAULT_TIMEOUT_TIME)
+      resp = nil
+      begin
+        resp = Timeout.timeout(time) do
+          proc.call
+        end
+      rescue Timeout::Error
+        p "*** CENTAMAN GEM TIMEOUT ***"
+        raise Exceptions::CentamanTimeout
+      end
+      resp
+    end    
   end
 end

data/lib/generators/centaman/install_generator.rb

@@ -0,0 +1,13 @@
+module Centaman
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc "Creates a Centaman initializer in your application."
+
+      def copy_initializer
+        copy_file "initializer.rb", "config/initializers/centaman.rb"
+      end
+    end
+  end
+end

data/lib/generators/centaman/templates/initializer.rb

@@ -0,0 +1,4 @@
+Centaman.config do |config|
+  # { 'GeneralAdmissionTicket' => 'CentamanExt::Object::GeneralAdmissionTicket' }
+  config.object_overrides = {}
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centaman
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - francirp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - dump.rdb
 - lib/centaman.rb
 - lib/centaman/attribute.rb
+- lib/centaman/configuration.rb
 - lib/centaman/exceptions.rb
 - lib/centaman/filter.rb
 - lib/centaman/json_wrapper.rb
@@ -129,6 +130,8 @@ files:
 - lib/centaman/service/update_member.rb
 - lib/centaman/version.rb
 - lib/centaman/wrapper.rb
+- lib/generators/centaman/install_generator.rb
+- lib/generators/centaman/templates/initializer.rb
 homepage: https://github.com/LaunchPadLab/centaman
 licenses:
 - MIT