blsk_ruby_core_api 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed6885f230796c1b7f0664cea542b2aec244866bdebb9a79f35d86686c7a4d8b
-  data.tar.gz: d644be1e38c280fc3ae580e236d3fb22f3d2c50c7c0a9d0afb1c7750181a868b
+  metadata.gz: 0fe7e0229df8e0580b3039705f41eb4af7d2b2d6a871d145b5625f49e170230c
+  data.tar.gz: e6d1b9449833e454492a84336b79cb521d0d356ee5daa0b4e02e175536535c2a
 SHA512:
-  metadata.gz: 3610e147b375a010883c0b740aa03b9dae3c29fbc2897f97874d6b622bff1c49317a7a59523d6bf0576629cbc2ef97441e199dd14f27c7dbc324d115678f8cbd
-  data.tar.gz: 47e1cb86ed3d348c83cde044661b658b0e1f614358ee14ce32c3169486d93f4825c5c92e1fbe0272624b4d22e034debcdf554807888c19169fa866dfdcf675b6
+  metadata.gz: 125a0ad82c6bfaa33495d1e43fa35606e1fec7a76139ce24ee5e04414ca2277f1adeee332f928e82e563028be232fb2576bf8db99b25920ec8e7dfb105674206
+  data.tar.gz: 2072564a283c4a484e7940c1866e3bdf2320e30b4aedde1ab7223da23c5aed503410fe5f849d6f74df4f95d44d8d068644b5408e95f95f8c8fdefc1710e9f895

data/src/application.rb

@@ -0,0 +1,47 @@
+require 'yaml'
+require_relative 'application_configuration'
+require_relative 'application_service'
+
+
+
+class Application
+  DEFAULT_SERVICES = [ConsulService, CassandraService]
+
+  def initialize(config_path='', rests=[], services=[])
+    @config = get_config(config_path)
+    @rests = rests
+    @services = services
+  end
+
+  def get_config(config_path='')
+    file = File.expand_path( config_path )
+    unless File.file? file
+      file = File.expand_path( File.join File.dirname(__FILE__), "./config.yml" )
+    end
+
+    YAML.load_file(file)
+  end
+
+  def start
+    puts 'starting application'
+    Container.register('application_configuration', ApplicationConfiguration.new(@config))
+    application_service = DEFAULT_SERVICES + @services
+    application_service.each do |service|
+      service_name = service.name[0, 1].downcase + service.name[1..-1]
+      Container.register(Inflector.underscore(service_name), service.extend(Injector).new.start)
+    end
+    start_rest_service
+  end
+
+  def start_rest_service
+    rests = @rests
+    Container.register('rest', RestService.start(rests))
+    return Container['rest']
+  end
+
+  def stop
+    consul_service.stop
+    cassandra_service.stop
+    # Container['application_service'].stop
+  end
+end

data/src/application_configuration.rb

@@ -0,0 +1,42 @@
+require_relative 'cassandra/cassandra_configuration'
+require_relative 'consul/consul_configuration'
+require_relative 'rest/rest_configuration'
+
+class LogConfiguration < Model
+	attribute :host, String.default('localhost')
+	attribute :port, Integer.default(24224)
+end
+
+class ApplicationConfiguration < Model
+	attribute :name, String.default('bluesky-seed-service')
+	attribute :host, String.default('127.0.0.1')
+	attribute :tags, Array.default(['seed'])
+  attribute :cassandra, CassandraConfiguration
+  attribute :consul, ConsulConfiguration
+  attribute :rest, RestConfiguration
+  attribute :log, LogConfiguration
+
+  def cassandra_config
+		{
+			hosts: cassandra.hosts,
+			port: cassandra.port
+		}
+  end
+
+  def consul_service_config
+	  {
+			name: name,
+			id: name,
+			port: consul.port,
+			check: {
+				id: name,
+				name: name,
+				http: "http://#{host}:#{rest.port}#{consul.service.health_check_path}",
+				tls_skip_verify: false,
+				method: "GET",
+				interval: consul.service.health_check_interval,
+				timeout: "1s"
+			}
+	  }
+  end
+end

data/src/application_service.rb

@@ -0,0 +1,10 @@
+require_relative 'consul/consul_service'
+require_relative 'cassandra/cassandra_service'
+
+class ApplicationService
+  def start
+  end
+
+  def stop
+  end
+end

data/src/bluesky_service_core.rb

@@ -0,0 +1,13 @@
+require 'bundler/setup'
+require 'sinatra/base'
+require 'request_store'
+
+require_relative 'ioc/index'
+require_relative 'models/index'
+require_relative 'application'
+require_relative 'rest/index'
+require_relative 'cassandra/index'
+require_relative 'consul/index'
+require_relative 'security/index'
+require_relative 'validation/index'
+

data/src/cassandra/cassandra_configuration.rb

@@ -0,0 +1,5 @@
+class CassandraConfiguration < Model
+	attribute :hosts, Array.default(['172.16.15.3'])
+	attribute :port, Integer.default(9042)
+	attribute :keyspace, String.default('ltran_test')
+end

data/{lib/cassandra/abstracted_cassandra_repository.rb → src/cassandra/cassandra_dao.rb}

@@ -1,4 +1,4 @@
-module AbstractedCassandraRepository
+module CassandraDao
 	def find_by_id(id=nil, keyspace_name=nil, table_name=nil)
 		# puts 'find_by_id'
 		if keyspace_name && table_name

data/src/cassandra/cassandra_service.rb

@@ -0,0 +1,30 @@
+require 'cassandra'
+require 'query_builder'
+require_relative 'cassandra_dao'
+
+class CassandraService
+  include CassandraDao
+
+	attr_accessor :cassandra_cluster
+
+	def initialize
+		# puts 'init cassandra'
+    self.cassandra_cluster = Cassandra.cluster(Container['application_configuration'].cassandra_config)
+	end
+
+	def start
+		# puts 'start cassandra, create cluster'
+		if !cassandra_cluster
+			cassandra_cluster = Cassandra.cluster(Container['application_configuration'].cassandra_config)
+    end
+    return self
+	end
+
+	def stop
+		# puts 'stop cassandra'
+		if cassandra_cluster
+			# puts 'closing'
+    	cassandra_cluster.close
+    end
+	end
+end

data/src/cassandra/index.rb

@@ -0,0 +1,3 @@
+require_relative 'cassandra_configuration'
+require_relative 'cassandra_dao'
+require_relative 'cassandra_service'

data/src/config.yml

@@ -0,0 +1,27 @@
+name: "bluesky-seed-service"
+host: "127.0.0.1"
+tags:
+  - "seed"
+
+rest:
+  port: 8080
+  context: '/api'
+
+consul:
+  host: "localhost" #'172.16.15.3'
+  port: 8500
+  service:
+    health_check_path: "/health_check"
+    health_check_interval: 10s
+  client:
+    service_watch_interval: 10s
+
+cassandra:
+  hosts:
+    - "172.16.15.3"
+  port: 9042
+  keyspace: "ltran_test"
+
+log:
+  host: "localhost"
+  port: 24224

data/src/consul/consul_configuration.rb

@@ -0,0 +1,15 @@
+class ConsulClientConfig < Model
+	attribute :service_watch_interval, String.default("10s")
+end
+
+class ConsulServiceConfig < Model
+	attribute :health_check_path, String.default("/health-check")
+	attribute :health_check_interval, String.default("10s")
+end
+
+class ConsulConfiguration < Model
+	attribute :host, String.default("localhost")
+	attribute :port, Integer.default(8500)
+	attribute :service, ConsulServiceConfig
+	attribute :client, ConsulClientConfig
+end

data/src/consul/consul_rest.rb

@@ -0,0 +1,14 @@
+require_relative '../rest/rest_base'
+
+class ConsulRest < RestBase
+  # Health Check for Consul, run when start Consul
+  def self.start_consul_check_http(url)
+    get url do
+      'The service is healthy!'
+    end
+  end
+  #Register the routes here
+  def self.init_routes
+    return self
+  end
+end

data/src/consul/consul_service.rb

@@ -0,0 +1,41 @@
+require 'diplomat'
+require_relative 'consul_configuration'
+require_relative 'consul_rest'
+
+class ConsulService
+	attr_accessor :consul_service_data
+
+	def initialize(option=nil)
+		# puts 'init consul'
+		self.consul_service_data = Container['application_configuration'].consul_service_config
+  end
+
+	def start
+		# puts 'start consul'
+		consul_configuration = Container['application_configuration'].consul
+		consul_service_data = Container['application_configuration'].consul_service_config if consul_service_data.nil?
+
+		Diplomat.configure do |config|
+		  # Set up a custom Consul URL
+		  config.url = "http://#{consul_configuration.host}:#{consul_configuration.port.to_s}"
+		  # Set up a custom Faraday Middleware
+		  # config.middleware = MyCustomMiddleware
+		  # Connect into consul with custom access token (ACL)
+		  # config.acl_token = "qwertyui-asdf-zxcv-1234-123456789012"
+		  # Set extra Faraday configuration options
+		  # config.options = {ssl: { version: :TLSv1_2 }}
+		end
+		Diplomat::Service.register(consul_service_data)
+
+		# start url for consul to check health
+		consul_check_route = consul_configuration.service.health_check_path
+		ConsulRest.start_consul_check_http(consul_check_route)
+		return self
+	end
+
+	def stop
+		# puts 'stop consul'
+		consul_service_id = Container['application_configuration'].name
+    Diplomat::Service.deregister(consul_service_id)
+	end
+end

data/src/consul/index.rb

@@ -0,0 +1,3 @@
+require_relative 'consul_configuration'
+require_relative 'consul_rest'
+require_relative 'consul_service'

data/src/ioc/index.rb

@@ -0,0 +1,2 @@
+require_relative 'container'
+require_relative 'injector'

data/{lib → src}/ioc/injector.rb

@@ -17,11 +17,36 @@ module Injector
 
   def decorate name, decorators
     if @@decorators[name].nil?
-      @@decorators[name] = []
+      @@decorators[name] = {:is_processed => false, :decorators => []}
     end
     @@decorators[name] = {:is_processed => false, :decorators => decorators}
   end
 
+  def validate name, decorators=[]
+    if @@decorators[name].nil?
+      @@decorators[name] = {:is_processed => false, :decorators => []}
+    end
+    @@decorators[name][:is_processed] = false
+    @@decorators[name][:decorators] << Validator.validate_model
+    if decorators.any?
+      decorators.each do |decorator|
+        @@decorators[name][:decorators] << decorator
+      end
+    end
+  end
+
+  def authorize name, decorators=[]
+    if @@decorators[name].nil?
+      @@decorators[name] = {:is_processed => false, :decorators => []}
+    end
+    @@decorators[name][:is_processed] = false
+    if decorators.any?
+      decorators.each do |decorator|
+        @@decorators[name][:decorators] << decorator
+      end
+    end
+  end
+
   def method_added(name)
     super
     orig_method = instance_method(name)

data/src/models/index.rb

@@ -0,0 +1 @@
+require_relative 'model'

data/{lib/rest/rest_common_error.rb → src/rest/errors/common_error.rb}

@@ -1,25 +1,29 @@
 module CommonError
   class InvalidToken < Exception
+    # Status Code 401
     def initialize(msg = 'InvalidToken')
       super
     end
   end
 
   class PermissionDenied < Exception
+    # Status Code 403
     def initialize(msg = 'PermissionDenied')
       super
     end
   end
 
   class EntityNotFound < Exception
+    # Status Code 404
     def initialize(msg = 'EntityNotFound')
       super
     end
   end
 
   class InvalidData < Exception
+    # Status Code 422
     def initialize(msg = 'InvalidData')
       super
     end
   end
-end
+end

data/src/rest/index.rb

@@ -0,0 +1,5 @@
+require_relative 'errors/common_error'
+require_relative 'models/response_model'
+require_relative 'rest_configuration'
+require_relative 'rest_base'
+require_relative 'rest_service'

data/src/rest/models/response_model.rb

@@ -0,0 +1,35 @@
+class ResponseModel < Model
+  attribute :status, String.optional
+  attribute :status_code, Integer.optional
+
+  def self.ok
+    response_model = ResponseModel.new({status: 'OK', status_code: 200})
+    response_model
+  end
+
+  def response(data=nil)
+    attributes[:data] = data unless data.nil?
+    attributes
+  end
+
+  def self.failed(errors=nil)
+    response_model = ResponseModel.new({status: 'FAILED', status_code: 401})
+    response_model.attributes[:errors] = errors if !errors.nil? && errors.any?
+    response_model
+  end
+
+  def status(status_message='OK')
+    self.attributes[:status] = status_message
+    self
+  end
+
+  def status_code(status_code=200)
+    self.attributes[:status_code] = status_code
+    self
+  end
+
+  def raise_error(exception_class)
+    RestBase.init_and_raise_error(exception_class, self.attributes[:status_code], attributes)
+  end
+
+end

data/src/rest/rest_base.rb

@@ -0,0 +1,57 @@
+require 'sinatra/base'
+require "sinatra/namespace"
+require_relative 'errors/common_error'
+require_relative 'models/response_model'
+
+
+class RestBase < Sinatra::Base
+  register Sinatra::Namespace
+
+  set :server, :puma
+  disable  :raise_errors
+  disable  :show_exceptions
+  set :dump_errors, true
+  set :show_exceptions, :after_handler
+
+  before '/*' do
+    # puts 'before routes - set local thread'
+    RequestStore.store[:user] = "Nhuan Lai" #get the user by access_token
+    if request.env['CONTENT_TYPE'] == 'application/json'
+      body_content = JSON.load(request.body)
+      request.params[:body] = JSON.parse( body_content ) unless body_content.nil?
+    end
+  end
+
+  after '/*' do
+    response.body = response.body.to_json
+  end
+
+  # for handling error
+  def self.init_and_raise_error(exception_class, status_code, response_model)
+    error exception_class do
+      status status_code
+      response_model
+    end
+    raise exception_class
+  end
+
+  # register the routes here
+  def self.init_routes
+    # # Example API route
+    # namespace Container["application_configuration"].rest.context do
+    #   get '/seed_1' do
+    #     'Seed 1 API'
+    #   end
+    # end
+    return self
+  end
+end
+
+# # Example for handling response
+# get '/health' do
+#   # success case
+#   ResponseModel.ok.response
+#   # error case
+#   errors = ['errors_block']
+#   ResponseModel.failed(errors).status_code(422).raise_error(CommonError::InvalidData)
+# end

data/src/rest/rest_configuration.rb

@@ -0,0 +1,4 @@
+class RestConfiguration < Model
+  attribute :port, Integer.default(8080)
+  attribute :context, String.default('/')
+end

data/src/rest/rest_service.rb

@@ -0,0 +1,11 @@
+class RestService
+
+	def self.start(rests=nil)
+		return Sinatra.new {
+      rests.each {|a| use a.init_routes}
+      not_found do
+        ResponseModel.failed.status_code(404).raise_error(CommonError::EntityNotFound)
+      end
+    }
+	end
+end

data/{lib/decoractors → src/security/decorators}/authenticate.rb

@@ -1,8 +1,7 @@
-require_relative '../rest/rest_base'
-require_relative '../security/security_context_holder'
+require_relative '../security_context_holder'
 
-module Authenticator
-  def has_roles roles
+class Authenticator
+  def self.has_roles roles
     lambda {|*args, &blk|
       # puts 'has_roles'
       check_role = true # check role here and return true/false
@@ -14,7 +13,7 @@ module Authenticator
     }
   end
 
-  def authenticate isAuthorized
+  def self.authenticate isAuthorized
     lambda {|self_model, *args, &blk|
       # puts "isAuthorized"
       # check authentication and authorization here, then return true/false

data/src/security/index.rb

@@ -0,0 +1,2 @@
+require_relative 'security_context_holder'
+require_relative 'decorators/authenticate'

data/src/validation/decorators/valid.rb

@@ -0,0 +1,34 @@
+class Validator
+	def self.validate_model params={}
+		lambda {|self_model, *args, &blk|
+			# puts "Validate"
+			seed_model = args[0]
+			valid_result = check_validate(seed_model) # check validation and return [true]/[false, errors]
+			if valid_result[0]
+				true
+			else
+				ResponseModel
+					.new({status: 'FAILED', status_code: 422})
+				  .error(CommonError::InvalidData, valid_result[1])
+			end
+		}
+	end
+
+	def self.check_validate(seed_model)
+		errors = seed_model.validate
+		if errors.empty?
+			[true]
+		else
+			errors_response = convert_errors_response(errors)
+			[false, errors_response]
+		end
+	end
+
+	def self.convert_errors_response(error_list)
+		errors = []
+		error_list.each do |key, value|
+			errors << {field: key, message: value}
+		end
+		errors
+	end
+end

data/src/validation/index.rb

@@ -0,0 +1 @@
+require_relative 'decorators/valid'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: blsk_ruby_core_api
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
-- Fusin Thang
+- blsk
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -250,31 +250,42 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
-description: Sample Core API gem
-email: fusinthang@gmail.com
+description: Code Skeleton for blsk Service Core
+email: support@blsk.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/app_service.rb
-- lib/application_configuration.rb
-- lib/blsk_ruby_core_api.rb
-- lib/cassandra/abstracted_cassandra_repository.rb
-- lib/cassandra/cassandra_configuration.rb
-- lib/cassandra/cassandra_service.rb
-- lib/consul/consul_configuration.rb
-- lib/consul/consul_service.rb
-- lib/decoractors/authenticate.rb
-- lib/decoractors/valid.rb
-- lib/ioc/container.rb
-- lib/ioc/injector.rb
-- lib/model/model.rb
-- lib/rest/rest_base.rb
-- lib/rest/rest_common_error.rb
-- lib/rest/rest_configuration.rb
-- lib/rest/rest_error_handler.rb
-- lib/rest/rest_response_model.rb
-- lib/security/security_context_holder.rb
+- src/application.rb
+- src/application_configuration.rb
+- src/application_service.rb
+- src/application_status.rb
+- src/bluesky_service_core.rb
+- src/cassandra/cassandra_configuration.rb
+- src/cassandra/cassandra_dao.rb
+- src/cassandra/cassandra_service.rb
+- src/cassandra/index.rb
+- src/config.yml
+- src/consul/consul_configuration.rb
+- src/consul/consul_rest.rb
+- src/consul/consul_service.rb
+- src/consul/index.rb
+- src/ioc/container.rb
+- src/ioc/index.rb
+- src/ioc/injector.rb
+- src/models/index.rb
+- src/models/model.rb
+- src/rest/errors/common_error.rb
+- src/rest/index.rb
+- src/rest/models/response_model.rb
+- src/rest/rest_base.rb
+- src/rest/rest_configuration.rb
+- src/rest/rest_service.rb
+- src/security/decorators/authenticate.rb
+- src/security/index.rb
+- src/security/security_context_holder.rb
+- src/validation/decorators/valid.rb
+- src/validation/index.rb
 homepage: http://rubygems.org/gems/blsk_ruby_core_api
 licenses:
 - MIT
@@ -282,7 +293,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- src
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -298,5 +309,5 @@ rubyforge_project:
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Sample Core Api
+summary: blsk Service Core
 test_files: []

data/lib/app_service.rb

@@ -1,20 +0,0 @@
-require_relative 'consul/consul_service'
-require_relative 'cassandra/cassandra_service'
-
-class AppService
-  include Inject['consul_service', 'cassandra_service']
-
-  injector
-
-  def start
-    # puts 'start app_service'
-    consul_service.start
-    cassandra_service.start
-  end
-
-  def stop
-    # puts 'stop app_service'
-    consul_service.stop
-    cassandra_service.stop
-  end
-end

data/lib/application_configuration.rb

@@ -1,56 +0,0 @@
-require 'securerandom'
-
-module ApplicationConfiguration
-  def config
-    {
-      rest: config_rest,
-      consul: config_consul,
-      cassandra: config_cassandra
-    }
-  end
-
-  def config_consul
-    config_consul = {
-      port: 8500,
-      path: "http://localhost",
-      consul_service_data: {
-        name: "Service-1",
-        id: "Service1",
-        port: 9292,
-        check: {
-          id: "bluesky-api",
-          name: "HTTP Health Check API on port 9292",
-          http: "http://localhost:9292/health-check-new",
-          tls_skip_verify: false,
-          method: "GET",
-          interval: "10s",
-          timeout: "1s"
-        }
-      }
-    }
-    config_consul[:consul_service_data][:port] = config_rest[:port]
-    config_consul[:consul_service_data][:check][:http] = "http://#{config_rest[:host]}:#{config_rest[:port].to_s}/#{random_name}"
-    config_consul
-  end
-
-  def config_rest
-    {
-      host: 'localhost',
-      port: 9292,
-      path: '/api/v1'
-    }
-  end
-
-  def config_cassandra
-    {
-      # user_name: '', # turn on if any
-      # password: '', # turn on if any
-      hosts: ['172.16.15.3'],
-      port: 9042
-    }
-  end
-
-  def random_name
-    "health-check-#{SecureRandom.urlsafe_base64(8)}"
-  end
-end

data/lib/blsk_ruby_core_api.rb

@@ -1,41 +0,0 @@
-require 'bundler/setup'
-require 'sinatra/base'
-require 'request_store'
-
-require_relative 'application_configuration'
-require_relative 'app_service'
-require_relative 'rest/rest_base'
-require_relative 'decoractors/authenticate'
-require_relative 'decoractors/valid'
-require_relative 'model/model'
-# Dir["#{File.dirname(__FILE__)}/**/*.rb"].each {|file| require file }
-
-
-class Application
-  extend ApplicationConfiguration
-
-  def initialize(rests=[], config={})
-    @config = config
-    @rests = rests
-  end
-
-  def init_rest_service
-    rests = @rests
-    return Sinatra.new {
-      rests.each {|a| use a}
-      not_found do
-        JSON RestBase.error_response('EntityNotFound')
-      end
-    }
-  end
-
-  def start
-    puts 'start'
-    Container['app_service'].start
-    init_rest_service
-  end
-
-  def stop
-    Container['app_service'].stop
-  end
-end

data/lib/cassandra/cassandra_configuration.rb

@@ -1,10 +0,0 @@
-module CassandraConfiguration
-	extend ApplicationConfiguration
-
-	CONFIG = {
-		# user_name: '', # turn on if any
-		# password: '', # turn on if any
-		hosts: [],
-		port: 9042
-	}.merge( CassandraConfiguration.config_cassandra )
-end

data/lib/cassandra/cassandra_service.rb

@@ -1,35 +0,0 @@
-require 'cassandra'
-require 'query_builder'
-require_relative '../ioc/injector'
-require_relative 'cassandra_configuration'
-require_relative 'abstracted_cassandra_repository'
-
-class CassandraService
-	extend CassandraConfiguration
-  include AbstractedCassandraRepository
-
-  injector
-
-	attr_accessor :cassandra_cluster
-
-	def initialize
-		# puts 'init cassandra'
-    self.cassandra_cluster = Cassandra.cluster(CassandraConfiguration::CONFIG)
-	end
-
-	def start
-		# puts 'start cassandra, create cluster'
-		if !cassandra_cluster
-			cassandra_cluster = Cassandra.cluster(CassandraConfiguration::CONFIG)
-    end
-    cassandra_cluster
-	end
-
-	def stop
-		# puts 'stop cassandra'
-		if cassandra_cluster
-			# puts 'closing'
-    	cassandra_cluster.close
-    end
-	end
-end

data/lib/consul/consul_configuration.rb

@@ -1,39 +0,0 @@
-require 'diplomat'
-
-module ConsulConfiguration
-	extend ApplicationConfiguration
-
-	CONFIG = {
-		port: 8500,
-		path: "http://localhost",
-		consul_service_data: {
-			name: "Service-1",
-			id: "Service1",
-			port: 9292,
-			check: {
-			  id: "bluesky-api",
-			  name: "HTTP Health Check API on port 9292",
-			  http: "http://localhost:9292/health-check",
-			  tls_skip_verify: false,
-			  method: "GET",
-			  interval: "10s",
-			  timeout: "1s"
-			}
-		}
-	}.merge( ConsulConfiguration.config_consul )
-
-	def configure
-		Diplomat.configure do |config|
-		  # Set up a custom Consul URL
-		  config.url = "#{CONFIG[:path]}:#{CONFIG[:port].to_s}"
-		  # Set up a custom Faraday Middleware
-		  # config.middleware = MyCustomMiddleware
-		  # Connect into consul with custom access token (ACL)
-		  # config.acl_token = "qwertyui-asdf-zxcv-1234-123456789012"
-		  # Set extra Faraday configuration options
-		  # config.options = {ssl: { version: :TLSv1_2 }}
-		end
-
-		CONFIG[:consul_service_data]
-	end
-end

data/lib/consul/consul_service.rb

@@ -1,33 +0,0 @@
-require 'diplomat'
-require_relative '../ioc/injector'
-require_relative 'consul_configuration'
-require_relative '../rest/rest_base'
-
-class ConsulService
-	extend ConsulConfiguration
-
-	injector
-
-	attr_accessor :consul_service_data
-
-	def initialize(option=nil)
-		# puts 'init consul'
-		self.consul_service_data = ConsulService.configure
-  end
-
-	def start
-		# puts 'start consul'
-		consul_service_data = ConsulConfiguration::CONFIG[:consul_service_data] if consul_service_data.nil?
-		Diplomat::Service.register(consul_service_data)
-
-		# start url for consul to check health
-		consul_check_route = "/" + consul_service_data[:check][:http].split('/').last
-		RestBase.start_consul_check_http(consul_check_route)
-	end
-
-	def stop
-		# puts 'stop consul'
-		consul_service_id = self.consul_service_data.try(:id) || ConsulConfiguration::CONFIG[:consul_service_data][:id]
-    Diplomat::Service.deregister(consul_service_id)
-	end
-end

data/lib/decoractors/valid.rb

@@ -1,35 +0,0 @@
-require_relative '../rest/rest_base'
-
-module Validator
-	def validate params={}
-		lambda {|self_model, *args, &blk|
-			# puts "Validate"
-			seed_model = args[0]
-			self_rest = args [1]
-			valid_result = check_validate(seed_model, self_rest) # check validation and return [true]/[false, errors]
-			if valid_result[0]
-				true
-			else
-				valid_result[2].response_with_error(CommonError::InvalidData, valid_result[1])
-			end
-		}
-	end
-
-	def check_validate(seed_model, self_rest)
-		errors = seed_model.validate
-		if errors.empty?
-			[true]
-		else
-			errors_response = convert_errors_response(errors)
-			[false, errors_response, self_rest]
-		end
-	end
-
-	def convert_errors_response(error_list)
-		errors = []
-		error_list.each do |key, value|
-			errors << {field: key, message: value}
-		end
-		errors
-	end
-end

data/lib/rest/rest_base.rb

@@ -1,73 +0,0 @@
-require 'sinatra/base'
-require "sinatra/namespace"
-require_relative 'rest_configuration'
-require_relative 'rest_error_handler'
-require_relative 'rest_common_error'
-require_relative 'rest_response_model'
-
-
-class RestApplication < Sinatra::Base
-  set :server, :puma
-  disable  :raise_errors
-  disable  :show_exceptions
-
-  set :dump_errors, true
-  set :show_exceptions, :after_handler
-
-  register Sinatra::Namespace
-
-  configure :production do
-    # ...
-  end
-
-  configure :development do
-    # ...
-  end
-end
-
-class RestBase < RestApplication
-  extend ::RestConfiguration
-  extend ::RestResponseModel
-
-  before '/*' do
-    # puts 'before routes - set local thread'
-    RequestStore.store[:user] = "Nhuan Lai" #get the user by access_token
-
-    if request.env['CONTENT_TYPE'] == 'application/json'
-      body_content = JSON.load(request.body)
-      request.params[:body] = JSON.parse( body_content ) unless body_content.nil?
-    end
-  end
-
-  after '/*' do
-    response.body = response.body.to_json
-  end
-
-  # Health Check for Consul, run when start Consul
-  def self.start_consul_check_http(url)
-    get url do
-      'The service is healthy!'
-    end
-  end
-  # # API route
-  # namespace RestConfiguration::CONFIG[:path] do
-  #   get '/seed_1' do
-  #     'Seed 1 API'
-  #   end
-  #   get '/seed_2' do
-  #     'Seed 2 API'
-  #   end
-  # end
-
-  # # Example for handling error
-  # get '/health' do
-  #   errors = [
-  #     {
-  #       field: 'error field',
-  #       code: 'error code',
-  #       message: 'error message'
-  #     }
-  #   ]
-  #   response_with_error(CommonError::InvalidData, errors)
-  # end
-end

data/lib/rest/rest_configuration.rb

@@ -1,10 +0,0 @@
-module RestConfiguration
-  extend ApplicationConfiguration
-
-  CONFIG = {
-    host: 'localhost',
-    port: 9292,
-    path: '/api/v1'
-  }.merge( RestConfiguration.config_rest )
-
-end

data/lib/rest/rest_error_handler.rb

@@ -1,33 +0,0 @@
-require 'sinatra/base'
-require_relative 'rest_common_error'
-require_relative 'rest_response_model'
-
-
-class RestApplication < Sinatra::Base
-	extend ::RestResponseModel
-
-	error CommonError::InvalidToken do
-	  status 401
-	  RestApplication.error_response('InvalidToken')
-	end
-
-	error CommonError::PermissionDenied do
-	  status 403
-	  RestApplication.error_response('PermissionDenied')
-	end
-
-	error CommonError::EntityNotFound do
-	  status 404
-	  RestApplication.error_response('EntityNotFound')
-	end
-
-	error CommonError::InvalidData do
-	  status 422
-	  RestApplication.error_response('InvalidData', @errors)
-	end
-
-	def response_with_error(exception_class, errors=[])
-		@errors = errors if !errors.empty?
-		raise exception_class
-	end
-end

data/lib/rest/rest_response_model.rb

@@ -1,17 +0,0 @@
-module RestResponseModel
-  def success_response(data=nil)
-    response = {
-      status: 'OK'
-    }
-    response[:data] = data if data
-    response
-  end
-
-  def error_response(error_code='FAILED', errors=[])
-    response = {
-      status: error_code
-    }
-    response[:errors] = errors if !errors.nil? && errors.any?
-    response
-  end
-end