sample_core_api 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9871bcc82b21ca288bd84bb26e06242e75853db5ac3899f1ecb0af5ac909e377
-  data.tar.gz: 138d04f4a7644070009b1ad34fb9b1123bfb9312402041f4e270c2a4c2935951
+SHA1:
+  metadata.gz: 9ce57ddca1656c1c4b1cf29aff4790ac0874914f
+  data.tar.gz: a6094edffaa60dbaa866b2044173bbea3e5a0190
 SHA512:
-  metadata.gz: 44bb035ec4860a4d43998d744a6f0eca23ae8d104c3421f17936b6188180398e49ae9471352abda75d20aedb12e103fa6bd5c30fc0a7bef59554fe407c513b47
-  data.tar.gz: f65aaf76b3332c6b389dde316f648073818b2e918cd400ca60141efb4e44d02b844267167c03b55555bd6fa48e8d6f4919390a754b6fddee3941425b097afa83
+  metadata.gz: 55c16eca7f830487f48b5c0cbc2f73e8b49f5c4b54285144e0292b18b8c98d8ec0c179dd4edc93131f600eb2fd4dbce229ec7a054221539ab022d2e896f4d4cf
+  data.tar.gz: 3fce448044bc187baf19c9d909de0605f099fbe07bb727da775f7e8ca44de1cac83336c06f932db47ac7c4ebf6745ae352f89286cb886098fefa6c576d5ceb28

data/lib/application_configuration.rb

@@ -2,10 +2,23 @@ module ApplicationConfiguration
   def config
     {
       consul: {
-
+      	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"
+      		}
+      	}
       },
       rest: {
-
+      	consul_check_http: "/health-check-new"
       },
     }
   end

data/lib/cassandra/cassandra_service.rb

@@ -1,4 +1,5 @@
 require 'cassandra'
+require './lib/container'
 require_relative 'abstracted_cassandra_repository'
 
 class CassandraService
@@ -8,11 +9,11 @@ class CassandraService
 
 	def initialize
 		puts 'init cassandra'
-		self.cassandra_cluster = Cassandra.cluster
+    self.cassandra_cluster = Cassandra.cluster
 	end
 
-	def start(keyspace_name)
-		puts 'start cassandra, create cluster, session'
+	def start
+		puts 'start cassandra, create cluster'
 		if !cassandra_cluster
     	cassandra_cluster = Cassandra.cluster
     end
@@ -26,4 +27,6 @@ class CassandraService
     	cassandra_cluster.close
     end
 	end
-end
+end
+
+registerService CassandraService.new

data/lib/consul/consul_service.rb

@@ -1,4 +1,5 @@
 require 'diplomat'
+require './lib/container'
 require_relative 'consul_configuration'
 
 class ConsulService
@@ -9,7 +10,6 @@ class ConsulService
 	def initialize
 		puts 'init consul'
 		self.consul_service_data = ConsulService::configure
-		Diplomat::Service.register(consul_service_data)
   end
 
 	def start
@@ -17,10 +17,13 @@ class ConsulService
 		if !consul_service_data
 			consul_service_data = ConsulService::configure
 		end
+		Diplomat::Service.register(consul_service_data)
 	end
 
 	def stop
 		puts 'stop consul'
     Diplomat::Service.deregister(consul_service_data[:id])
 	end
-end
+end
+
+registerService ConsulService.new

data/lib/container.rb

@@ -0,0 +1,11 @@
+require "dry-container"
+require "dry-auto_inject"
+
+Container = Dry::Container.new
+Inject = Dry::AutoInject(Container)
+
+def registerService instance
+  class_name = instance.class.name
+  name = class_name.sub(class_name[0], class_name[0].downcase)
+  Container.register(name, instance)
+end

data/lib/rest/rest_configuration.rb

@@ -4,6 +4,7 @@ module RestConfiguration
   CONFIG = {
     host: 'localhost:9292',
     path: '/api/v1',
+    consul_check_http: "/health-check"
   }.merge( RestConfiguration.config[:rest] )
 
 end

data/lib/rest/rest_service.rb

@@ -30,7 +30,7 @@ class RestService < RestApplication
   extend ::RestResponseModel
 
   # Health Check for Consul
-  get '/health-check' do
+  get RestConfiguration::CONFIG[:consul_check_http] do
   	'The service is healthy!'
   end
 

data/lib/sample_core_api.rb

@@ -1,11 +1,32 @@
 require 'bundler/setup'
+require 'sinatra/base'
 require_relative 'application_configuration'
-# require_relative 'application_service'
-Dir["#{File.dirname(__FILE__)}/**/*.rb"].each {|file| require file }
+require_relative 'cassandra/cassandra_service'
+require_relative 'consul/consul_service'
+require_relative 'rest/rest_service'
+require_relative 'container'
+# Dir["#{File.dirname(__FILE__)}/**/*.rb"].each {|file| require file }
 
 class SampleCoreApi
-	extend ::ApplicationService
 	extend ::ApplicationConfiguration
-end
+  include Inject["consulService","cassandraService"]
+
+  def initialize(config)
+    @config = config
+  end
+
+  def run_rest_services
+    RestService.run!
+  end
 
-SampleCoreApi.load_services
+  def start
+    Container["consulService"].start
+    Container["cassandraService"].start
+    run_rest_services
+  end
+
+  def stop
+    consulService.stop
+    cassandraService.stop
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sample_core_api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Fusin Thang
@@ -10,6 +10,46 @@ bindir: bin
 cert_chain: []
 date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: dry-auto_inject
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -177,11 +217,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/application_configuration.rb
-- lib/application_service.rb
 - lib/cassandra/abstracted_cassandra_repository.rb
 - lib/cassandra/cassandra_service.rb
 - lib/consul/consul_configuration.rb
 - lib/consul/consul_service.rb
+- lib/container.rb
 - lib/rest/rest_common_error.rb
 - lib/rest/rest_configuration.rb
 - lib/rest/rest_error_handler.rb
@@ -208,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sample Core Api

data/lib/application_service.rb

@@ -1,15 +0,0 @@
-module ApplicationService
-  IMPORT_SERVICES = ['cassandra_service', 'consul_service']
-
-	def load_services
-    $service_list = {}
-		IMPORT_SERVICES.each do |service_name|
-      if !service_name.include?('rest_service')
-        puts "load_services #{service_name}"
-        class_name = service_name.split('_').map{|e| e.capitalize}.join
-        class_object = Object.const_get(class_name)
-        $service_list["#{service_name}"] = class_object.new
-      end
-		end
-	end
-end