sample_core_api 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5abf9f1aa3ad1476094adca42ab1d1b1ec26d4ff
-  data.tar.gz: 85f6c2bc749250447471ef412eaaef49abeca044
+SHA256:
+  metadata.gz: 68ecb98d9ffc306169575a50fd4f2ebf1d260926b673867252ea73d29b115685
+  data.tar.gz: 91bc5d365ccc71c597d9669a7a1b614f8902711a397f1a0fbd6d14dc2eec48a0
 SHA512:
-  metadata.gz: a3a8b0ecb8091abef6053ad05f6da90a393c1f5bf0db14c2b5af506a59f21703eac03b35da3a13a3806360abbb17f3317dbdb0bfeb387d507d9c5711f8b20884
-  data.tar.gz: 85f77a3a5f91c73913a2020425671d5eeb8a78166c122c339d21497336eb560fe7ae7369f89a715a4a9e28ff8c10270cedfe4244b3bdedfe108125256bb8ac17
+  metadata.gz: f0465b78f64b99eab510fb078ec7a7c665afab80d8ad62b5d56fa1cc49d3cce6159f40de608b46aa404b605663507170be19562724faa27427d8fc3b6835592d
+  data.tar.gz: 0aad292b94b8d642c0219256fb6ed958f64de7fb22753be5171347c9fb15848d21c454509e5c36794dc293d07ec8da9667dfa5d13ca6e3cbf5cc38dd99f3d619

data/lib/application_configuration.rb

@@ -1,25 +1,48 @@
+require 'securerandom'
+
 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"
+      rest: config_rest,
+      consul: config_consul
+    }
+  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",
+          tls_skip_verify: false,
+          method: "GET",
+          interval: "10s",
+          timeout: "1s"
+        }
       },
+      consul_check_http: "health-check-new"
     }
+    config_consul[:consul_check_http] = config_rest[:consul_check_http]
+    config_consul[:consul_service_data][:port] = config_rest[:port]
+    config_consul[:consul_service_data][:check][:http] = "http://#{config_rest[:host]}:#{config_rest[:port]}/#{config_rest[:consul_check_http]}"
+    config_consul
+  end
+
+  def config_rest
+    config_rest = {
+      host: 'localhost:9292',
+      path: '/api/v1',
+      consul_check_http: random_name
+    }
+  end
+
+  def random_name
+    "/health-check-#{SecureRandom.urlsafe_base64(8)}"
   end
 end

data/lib/cassandra/cassandra_service.rb

@@ -1,5 +1,5 @@
 require 'cassandra'
-require_relative '../container'
+require_relative '../ioc/container'
 require_relative 'abstracted_cassandra_repository'
 
 class CassandraService
@@ -28,5 +28,4 @@ class CassandraService
     end
 	end
 end
-
-registerService CassandraService.new
+Service CassandraService

data/lib/consul/consul_configuration.rb

@@ -19,8 +19,9 @@ module ConsulConfiguration
 			  interval: "10s",
 			  timeout: "1s"
 			}
-		}
-	}.merge( ConsulConfiguration.config[:consul] )
+		},
+		consul_check_http: "health-check"
+	}.merge( ConsulConfiguration.config_consul )
 
 	def configure
 		Diplomat.configure do |config|

data/lib/consul/consul_service.rb

@@ -1,23 +1,25 @@
 require 'diplomat'
-require_relative '../container'
+require_relative '../ioc/container'
 require_relative 'consul_configuration'
+require_relative '../rest/rest_service'
 
 class ConsulService
-	extend ::ConsulConfiguration
+	extend ConsulConfiguration
 
 	attr_accessor :consul_service_data
 
-	def initialize
+	def initialize(option=nil)
 		puts 'init consul'
-		self.consul_service_data = ConsulService::configure
+		self.consul_service_data = ConsulService.configure
   end
 
 	def start
 		puts 'start consul'
-		if !consul_service_data
-			consul_service_data = ConsulService::configure
-		end
+		puts ConsulConfiguration::CONFIG[:consul_check_http]
+		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
+		RestService.start_consul_check_http(ConsulConfiguration::CONFIG[:consul_check_http])
 	end
 
 	def stop
@@ -25,5 +27,4 @@ class ConsulService
     Diplomat::Service.deregister(consul_service_data[:id])
 	end
 end
-
-registerService ConsulService.new
+Service ConsulService

data/lib/container.rb

@@ -1,11 +1,12 @@
 require "dry-container"
 require "dry-auto_inject"
+require "dry/inflector"
 
+Inflector = Dry::Inflector.new
 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
+def Service clazz, name = nil
+  name = name.nil? ? (clazz.name[0, 1].downcase + clazz.name[1..-1]) : name
+  Container.register(Inflector.underscore(name), clazz.new)
+end

data/lib/decoractors/authenticate.rb

@@ -0,0 +1,28 @@
+require "method_decorators"
+require_relative '../security/security_context_holder'
+
+
+class Authenticate < MethodDecorators::Decorator
+  def initialize(authorize_function, arguments)
+    @authorize_function = authorize_function
+    @arguments = arguments
+  end
+
+  def call(wrapped, this, *args, &blk)
+    puts "before authentication"
+    puts "user #" + SecurityContextHolder.get_user()
+    if self.send(@authorize_function, @arguments, *args, &blk)
+      result = wrapped.call(*args, &blk)
+    else
+      raise CommonError::InvalidToken
+    end
+    puts "after authentication"
+
+    result
+  end
+
+  def has_roles(roles, *args, &blk)
+    # check roles here
+    return true
+  end
+end

data/lib/decoractors/valid.rb

@@ -0,0 +1,25 @@
+require "method_decorators"
+
+class Valid < MethodDecorators::Decorator
+	def initialize(validate_function, arguments)
+	  @validate_function = validate_function
+	  @arguments = arguments
+	end
+
+	def call(wrapped, this, *args, &blk)
+	  puts "before validation"
+	  if self.send(@validate_function, @arguments, *args, &blk)
+	    result = wrapped.call(*args, &blk)
+	  else
+	    raise CommonError::InvalidData
+	  end
+	  puts "after validation"
+	  result
+	end
+
+	def validate(arguments, *args, &blk)
+	  # check validation here
+	  return true
+	end
+
+end

data/lib/ioc/base_service.rb

@@ -0,0 +1,5 @@
+require "method_decorators"
+
+class BaseService
+  extend MethodDecorators
+end

data/lib/ioc/container.rb

@@ -0,0 +1,13 @@
+require "dry-container"
+require "dry-auto_inject"
+require "dry/inflector"
+
+Inflector = Dry::Inflector.new
+Container = Dry::Container.new
+Inject = Dry::AutoInject(Container)
+
+
+def Service clazz, name = nil
+  name = name.nil? ? clazz.name[0, 1].downcase + clazz.name[1..-1] : name
+  Container.register(Inflector.underscore(name), clazz.new)
+end

data/lib/rest/rest_configuration.rb

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

data/lib/rest/rest_service.rb

@@ -29,11 +29,12 @@ class RestService < RestApplication
   extend ::RestConfiguration
   extend ::RestResponseModel
 
-  # Health Check for Consul
-  get RestConfiguration::CONFIG[:consul_check_http] do
-  	'The service is healthy!'
+  # 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
@@ -55,8 +56,4 @@ class RestService < RestApplication
   #   ]
   #   raise CommonError::InvalidData
   # end
-
-  not_found do
-    JSON RestService.error_response('EntityNotFound')
-  end
 end

data/lib/sample_core_api.rb

@@ -1,32 +1,44 @@
 require 'bundler/setup'
 require 'sinatra/base'
+require_relative 'ioc/container'
 require_relative 'application_configuration'
 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 ::ApplicationConfiguration
-  include Inject["consulService","cassandraService"]
 
-  def initialize(config)
+class Application
+	extend ApplicationConfiguration
+
+  def initialize(rests=[], config={})
     @config = config
+    @rests = rests
   end
 
-  def run_rest_services
-    RestService.run!
+  def init_rest_service
+    rests = @rests
+    return Sinatra.new {
+      # before '/*' do
+      #   puts "set local thread"
+      #   # Thread.current[:user] = "ltran"
+      # end
+      rests.each {|a| use a}
+      not_found do
+        JSON RestService.error_response('EntityNotFound')
+      end
+    }
   end
 
   def start
-    Container["consulService"].start
-    Container["cassandraService"].start
-    run_rest_services
+    puts 'start'
+    Container["consul_service"].start
+    Container["cassandra_service"].start
+    init_rest_service
   end
 
   def stop
-    consulService.stop
-    cassandraService.stop
+    Container["consul_service"].stop
+    Container["cassandra_service"].stop
   end
 end

data/lib/security/security_context_holder.rb

@@ -0,0 +1,7 @@
+require 'request_store'
+
+class SecurityContextHolder
+  def self.get_user
+  	RequestStore.store[:user]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sample_core_api
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Fusin Thang
@@ -11,45 +11,25 @@ cert_chain: []
 date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.10.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.10.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
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +110,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: method_decorators
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -222,12 +242,17 @@ files:
 - lib/consul/consul_configuration.rb
 - lib/consul/consul_service.rb
 - lib/container.rb
+- lib/decoractors/authenticate.rb
+- lib/decoractors/valid.rb
+- lib/ioc/base_service.rb
+- lib/ioc/container.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/rest/rest_service.rb
 - lib/sample_core_api.rb
+- lib/security/security_context_holder.rb
 homepage: http://rubygems.org/gems/sample_core_api
 licenses:
 - MIT
@@ -248,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sample Core Api