sample_core_api 0.0.8 → 0.0.9.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68ecb98d9ffc306169575a50fd4f2ebf1d260926b673867252ea73d29b115685
-  data.tar.gz: 91bc5d365ccc71c597d9669a7a1b614f8902711a397f1a0fbd6d14dc2eec48a0
+  metadata.gz: ffbc9ce42646170555907763750ce5bc3f538eb679f44b77340eb5567b796b68
+  data.tar.gz: af2c9277493b7ce60deeb45bff4c58cd82965b06c2c96f547b31dd912d043051
 SHA512:
-  metadata.gz: f0465b78f64b99eab510fb078ec7a7c665afab80d8ad62b5d56fa1cc49d3cce6159f40de608b46aa404b605663507170be19562724faa27427d8fc3b6835592d
-  data.tar.gz: 0aad292b94b8d642c0219256fb6ed958f64de7fb22753be5171347c9fb15848d21c454509e5c36794dc293d07ec8da9667dfa5d13ca6e3cbf5cc38dd99f3d619
+  metadata.gz: 072f69955dbc3e9765a38a61958b77e9d5ea09d864329bcbc839fe28fef266419088b2400086bb72249738dc1b27f95542f7b10bd6a7e3c1c11b7ee90819221d
+  data.tar.gz: fded44fd29b6edfd37c0f5cfb8fc0f7eef22b86268ab8976c5bdf92d560cb0ab7a629b2e4ddffef87da1e7cae8f39f6124b0fca68a6c02eb79d8482c4725baf3

data/lib/app_service.rb

@@ -0,0 +1,20 @@
+require_relative 'consul/consul_service'
+require_relative 'cassandra/cassandra_service'
+
+class AppService < Injector
+  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

@@ -19,30 +19,28 @@ module ApplicationConfiguration
         check: {
           id: "bluesky-api",
           name: "HTTP Health Check API on port 9292",
-          http: "http://localhost:9292/health-check",
+          http: "http://localhost:9292/health-check-new",
           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[:consul_service_data][:check][:http] = "http://#{config_rest[:host]}:#{config_rest[:port].to_s}/#{random_name}"
     config_consul
   end
 
   def config_rest
     config_rest = {
-      host: 'localhost:9292',
-      path: '/api/v1',
-      consul_check_http: random_name
+      host: 'localhost',
+      port: 9292,
+      path: '/api/v1'
     }
   end
 
   def random_name
-    "/health-check-#{SecureRandom.urlsafe_base64(8)}"
+    "health-check-#{SecureRandom.urlsafe_base64(8)}"
   end
 end

data/lib/cassandra/cassandra_service.rb

@@ -1,10 +1,12 @@
 require 'cassandra'
-require_relative '../ioc/container'
+require_relative '../ioc/injector'
 require_relative 'abstracted_cassandra_repository'
 
-class CassandraService
+class CassandraService < Injector
   include ::AbstractedCassandraRepository
 
+  injector
+
 	attr_accessor :cassandra_cluster
 
 	def initialize
@@ -28,4 +30,3 @@ class CassandraService
     end
 	end
 end
-Service CassandraService

data/lib/consul/consul_configuration.rb

@@ -19,8 +19,7 @@ module ConsulConfiguration
 			  interval: "10s",
 			  timeout: "1s"
 			}
-		},
-		consul_check_http: "health-check"
+		}
 	}.merge( ConsulConfiguration.config_consul )
 
 	def configure

data/lib/consul/consul_service.rb

@@ -1,11 +1,13 @@
 require 'diplomat'
-require_relative '../ioc/container'
+require_relative '../ioc/injector'
 require_relative 'consul_configuration'
 require_relative '../rest/rest_service'
 
-class ConsulService
+class ConsulService < Injector
 	extend ConsulConfiguration
 
+	injector
+
 	attr_accessor :consul_service_data
 
 	def initialize(option=nil)
@@ -15,16 +17,17 @@ class ConsulService
 
 	def start
 		puts 'start consul'
-		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])
+		consul_check_route = "/" + consul_service_data[:check][:http].split('/').last
+		RestService.start_consul_check_http(consul_check_route)
 	end
 
 	def stop
 		puts 'stop consul'
-    Diplomat::Service.deregister(consul_service_data[:id])
+		consul_service_id = self.consul_service_data.try(:id) || ConsulConfiguration::CONFIG[:consul_service_data][:id]
+    Diplomat::Service.deregister(consul_service_id)
 	end
 end
-Service ConsulService

data/lib/decoractors/authenticate.rb

@@ -1,28 +1,44 @@
-require "method_decorators"
+require_relative '../ioc/injector'
 require_relative '../security/security_context_holder'
 
+class Authenticator < Injector
 
-class Authenticate < MethodDecorators::Decorator
-  def initialize(authorize_function, arguments)
-    @authorize_function = authorize_function
-    @arguments = arguments
-  end
+  injector
 
-  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
+  def has_roles roles
+    lambda {|roles|
+      true
+    }
   end
 
-  def has_roles(roles, *args, &blk)
-    # check roles here
-    return true
+  def authenticate isAuthorized
+    lambda {|wrapped, this, *args, &blk|
+      puts "isAuthorized"
+    }
   end
-end
+end
+
+# 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

@@ -1,25 +1,35 @@
-require "method_decorators"
+require_relative '../ioc/injector'
 
-class Valid < MethodDecorators::Decorator
-	def initialize(validate_function, arguments)
-	  @validate_function = validate_function
-	  @arguments = arguments
-	end
+class Validator < Injector
 
-	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
+	injector
 
-	def validate(arguments, *args, &blk)
-	  # check validation here
-	  return true
+	def valid
+	  lambda {|wrapped, this, *args, &blk|
+	    puts "Valid"
+	  }
 	end
+end
+
+# 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
 
-end
+# 	def validate(arguments, *args, &blk)
+# 	  # check validation here
+# 	  return true
+# 	end
+# end

data/lib/ioc/container.rb

@@ -1,13 +1,5 @@
 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/ioc/injector.rb

@@ -0,0 +1,53 @@
+require_relative "container"
+require "dry/inflector"
+
+Inflector = Dry::Inflector.new
+def injector name=nil, instance_method=nil
+  name = name.nil? ? self.name[0, 1].downcase + self.name[1..-1] : name
+  instance_method = instance_method.nil? ? self.new : instance_method
+  Container.register(Inflector.underscore(name), instance_method)
+end
+
+class Injector
+  class << self
+    @@decorators = Hash.new
+
+    def decorators
+      @@decorators
+    end
+
+    def decorate name, decorators
+      if @@decorators[name].nil?
+        @@decorators[name] = []
+      end
+      @@decorators[name] = {:is_processed => false, :decorators => decorators}
+    end
+
+    def method_added(name)
+      super
+      orig_method = instance_method(name)
+      decorators = self.decorators[name]
+      return if decorators.nil? || decorators[:is_processed] == true
+
+      if private_method_defined?(name);
+        visibility = :private
+      elsif protected_method_defined?(name);
+        visibility = :protected
+      else
+        visibility = :public
+      end
+
+      decorators[:is_processed] = true
+      define_method(name) do |*args, &blk|
+        orig_method.bind(self).call(*args, &blk)
+      end
+
+      case visibility
+      when :protected;
+        protected name
+      when :private;
+        private name
+      end
+    end
+  end
+end

data/lib/rest/rest_configuration.rb

@@ -2,9 +2,9 @@ module RestConfiguration
   extend ApplicationConfiguration
 
   CONFIG = {
-    host: 'localhost:9292',
-    path: '/api/v1',
-    consul_check_http: "/health-check"
+    host: 'localhost',
+    port: 9292,
+    path: '/api/v1'
   }.merge( RestConfiguration.config_rest )
 
 end

data/lib/sample_core_api.rb

@@ -1,15 +1,15 @@
 require 'bundler/setup'
 require 'sinatra/base'
-require_relative 'ioc/container'
+require 'request_store'
+
 require_relative 'application_configuration'
-require_relative 'cassandra/cassandra_service'
-require_relative 'consul/consul_service'
+require_relative 'app_service'
 require_relative 'rest/rest_service'
 # Dir["#{File.dirname(__FILE__)}/**/*.rb"].each {|file| require file }
 
 
 class Application
-	extend ApplicationConfiguration
+  extend ApplicationConfiguration
 
   def initialize(rests=[], config={})
     @config = config
@@ -19,10 +19,6 @@ class Application
   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')
@@ -32,13 +28,11 @@ class Application
 
   def start
     puts 'start'
-    Container["consul_service"].start
-    Container["cassandra_service"].start
+    Container['app_service'].start
     init_rest_service
   end
 
   def stop
-    Container["consul_service"].stop
-    Container["cassandra_service"].stop
+    Container['app_service'].stop
   end
 end

data/lib/security/security_context_holder.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sample_core_api
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9.pre.1
 platform: ruby
 authors:
 - Fusin Thang
@@ -110,26 +110,6 @@ 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
@@ -236,16 +216,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/app_service.rb
 - lib/application_configuration.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/decoractors/authenticate.rb
 - lib/decoractors/valid.rb
-- lib/ioc/base_service.rb
 - lib/ioc/container.rb
+- lib/ioc/injector.rb
 - lib/rest/rest_common_error.rb
 - lib/rest/rest_configuration.rb
 - lib/rest/rest_error_handler.rb
@@ -268,9 +248,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7

data/lib/container.rb

@@ -1,12 +0,0 @@
-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/ioc/base_service.rb

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