blsk_ruby_core_api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b62f0a05339dd11dcdf67bef08df3ff21bbe79c70584147172c56a7377b3749
-  data.tar.gz: fef2b9fcbe9a974914cc3e22c1c0957fa5aa932d541c5a6999e5925d80156fbe
+  metadata.gz: 7b3b215fa09bf2314a87a1c65dd89bd2831d6e9fe5d3d1c0c029b4191c269b61
+  data.tar.gz: af3303db5efecd8196d61199003fd81a9359e06794d5f70c443f5de4d30228a9
 SHA512:
-  metadata.gz: acfc64d3a0f15b22513f434d11709740c484921f9da039b1cf5b810b10adc49253e2f037a51f5e11d734db4d6b128701c813e176cda61c85294f43139be057ad
-  data.tar.gz: f688ca59afa69fbae5b2d9b162c331d62404af913806f0cb150e825dc62f6c5ca464991234a6162d09816fc0b37a588967fa4fa68df5b63c8d1ad025dd796427
+  metadata.gz: de76b2ceba5a1bed4548863b5fbc5446f333b23b4867a24c532afa3db4c1727bb2637c82255ab52be7a00b05393b7f467d6861d6755c60becb7a1b24d612d6dd
+  data.tar.gz: eb2a7d559858d29f8f46f1496574ff030a5a66cc0d7793bcca72baeb8960a27922168163724855a027339f0334a51ec6643cc2958f5230bcf52c2af1d5e36695

data/lib/application_configuration.rb

@@ -4,7 +4,8 @@ module ApplicationConfiguration
   def config
     {
       rest: config_rest,
-      consul: config_consul
+      consul: config_consul,
+      cassandra: config_cassandra
     }
   end
 
@@ -33,13 +34,22 @@ module ApplicationConfiguration
   end
 
   def config_rest
-    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

data/lib/cassandra/abstracted_cassandra_repository.rb

@@ -15,12 +15,12 @@ module AbstractedCassandraRepository
 		end
 	end
 
-	def create(value_hashes={}, keyspace_name=nil, table_name=nil)
+	def create(cql_query='', keyspace_name=nil, table_name=nil)
 		# puts 'create'
 		if keyspace_name && table_name
 			session = cassandra_cluster.connect(keyspace_name)
-			cql = '' # Building the cql using 'INSERT INTO' with 'IF NOT EXISTS'
-			result = session.execute(cql)
+			# Building the cql using 'INSERT INTO' with 'IF NOT EXISTS'
+			result = session.execute(cql_query)
 		end
 	end
 
@@ -28,8 +28,8 @@ module AbstractedCassandraRepository
 		# puts 'update'
 		if keyspace_name && table_name
 			session = cassandra_cluster.connect(keyspace_name)
-			cql = '' # Building the cql using UPDATE
-			result = session.execute(cql)
+			# Building the cql using UPDATE
+			result = session.execute(cql_query)
 		end
 	end
 
@@ -37,8 +37,8 @@ module AbstractedCassandraRepository
 		# puts 'save'
 		if keyspace_name && table_name
 			session = cassandra_cluster.connect(keyspace_name)
-			cql = '' # Building the cql using 'INSERT INTO' without 'IF NOT EXISTS'
-			result = session.execute(cql)
+			# Building the cql using 'INSERT INTO' without 'IF NOT EXISTS'
+			result = session.execute(cql_query)
 		end
 	end
 
@@ -49,4 +49,11 @@ module AbstractedCassandraRepository
 			result = session.execute("DELETE FROM #{table_name} WHERE id = ?", arguments: [id])
 		end
 	end
+
+	def run_cql(cql_query='', keyspace_name=nil, table_name=nil)
+		if keyspace_name && table_name
+			session = cassandra_cluster.connect(keyspace_name)
+			result = session.execute(cql_query)
+		end
+	end
 end

data/lib/cassandra/cassandra_configuration.rb

@@ -0,0 +1,10 @@
+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,9 +1,12 @@
 require 'cassandra'
+require 'query_builder'
 require_relative '../ioc/injector'
+require_relative 'cassandra_configuration'
 require_relative 'abstracted_cassandra_repository'
 
 class CassandraService
-  include ::AbstractedCassandraRepository
+	extend CassandraConfiguration
+  include AbstractedCassandraRepository
 
   injector
 
@@ -11,13 +14,13 @@ class CassandraService
 
 	def initialize
 		# puts 'init cassandra'
-    self.cassandra_cluster = Cassandra.cluster
+    self.cassandra_cluster = Cassandra.cluster(CassandraConfiguration::CONFIG)
 	end
 
 	def start
 		# puts 'start cassandra, create cluster'
 		if !cassandra_cluster
-    	cassandra_cluster = Cassandra.cluster
+    	cassandra_cluster = Cassandra.cluster(CassandraConfiguration::CONFIG)
     end
     cassandra_cluster
 	end

data/lib/decoractors/valid.rb

@@ -2,17 +2,17 @@ require_relative '../rest/rest_service'
 
 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
+		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
+		}
 	end
 
 	def check_validate(seed_model, self_rest)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsk_ruby_core_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Fusin Thang
@@ -110,6 +110,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: query_builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +260,7 @@ files:
 - 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