jsql 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ea729fa8a9e6946d05e182820ce5cddbe6ed68e998cbfe860c93c807bcd46a
-  data.tar.gz: b69d80750a643bb02b8727375c5ec678c059eea65d95cc18e9c3416dec71e501
+  metadata.gz: d991a6a6172e56ee60a1a2a75946df88b41662ce0016a75727eaf51ae57bb955
+  data.tar.gz: 1908b61c2b15c30134aba0b1c0e5df1d4a54d2b6e4b7a690dd9e2d112de53c83
 SHA512:
-  metadata.gz: 25f11e8f9af75a9b27da5ca03d4ea6c777729188a8f8163906e18a9d8d9ef7313c056b7f74384d4856d822d134db106a05eb8ba2de54bc702b3ac795c56f6090
-  data.tar.gz: 997aff066a7093825459c53f63663ead87c3beb4593de8217d099265d74e52faf3d226d085a62f2ef4997b39a163ab01d43245fd32313bd1aa7c9d518222dbee
+  metadata.gz: d3e7032e21a19532cb119acf1fdc577f447223efce2d8e9fd4086446c29ad7a3765882104a445d9a13ee9eefcce7097c48b05e610aa35186414e728fc61c0417
+  data.tar.gz: 605a98db5053ac597e999d7429b27291f1a26dd00de8ff187ad3e6208bfc8d5bee3752e9a2e293c1bd77c3dd4ccfba65cb9950d73050197d0657931fad76b597

data/README.md

@@ -1,10 +1,17 @@
 # Jsql
-Short description and motivation.
+This is plugin for JSQL - sql with only front-end layer. 
 
 ## Usage
-How to use my plugin.
+Gem creates four end points for executing encoded sql queries.
+jsql/select, jsql/update, jsql/insert, jsql/delete, and one for 
+transactions : jsql/commit.
 
 ## Installation
+Jsql gem works with Ruby version under 2.6.0 and Rails 5.2.2
+If you don't have Rails installed yet you have to type in your console:
+```bash
+$ gem install rails
+```
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -22,7 +29,14 @@ $ gem install jsql
 ```
 
 ## Contributing
-Contribution directions go here.
-
+In your application.rb file you have to add this code:
+```ruby
+Jsql.configure do |config|
+      config.api_key = 'your_api_key'
+      config.member_key = 'your_member_key'
+    end
+    
+```
+To get your api and member key you have to register on jsql.it.
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/controllers/jsql_controller.rb

@@ -3,25 +3,27 @@ require 'timeout'
 class JSQLController < ActionController::API
   @@transaction = Array.new
   @@database_type = nil
+
   def perform_method(method)
     manager = nil
+    puts Jsql.configuration.member_key
+    puts Jsql.configuration.api_key
     puts "@database_type"
     puts @@database_type
     puts "@@transaction"
     puts @@transaction
     puts Time::now.tv_sec
     begin
-      Timeout::timeout(10) do
-        request_body = JSON.parse(request.body.string)
-        delete_manager_time
-        manager = transaction_control
 
+      request_body = JSON.parse(request.body.string)
+      delete_manager_time
+      manager = transaction_control
 
-        query = create_query(request_body)
+      query = create_query(request_body)
+
+      query = params_switcher(query, request_body)
+      query_method_compare(query, method)
 
-        query = params_switcher(query, request_body)
-        query_method_compare(query, method)
-      end
     rescue Timeout::Error
       rollback_manager(manager)
     end
@@ -92,13 +94,23 @@ class JSQLController < ActionController::API
     token = request_body['token']
 
     if token.class == Array
+
       for i in 0..token.size - 1
         if i > 0
           query += " "
         end
         query += get_queries(token[i])
+        puts "query.class"
+        puts query.class
+        puts "query"
         puts query
+        if query.include? "code"
+          query
+          break
+        end
       end
+
+
     else
       query = get_queries(token.to_s)
       puts query
@@ -112,8 +124,8 @@ class JSQLController < ActionController::API
     base_url = 'http://softwarecartoon.com:'
     port = '9291'
     queries = '/api/request/queries'
-    member_key = 'Z6kEovODxAv2I5hKekMyUw=='
-    api_key = '==iSqF8rKvVeSgqudKDOXpjiFgGMJh1PbeouIz9IW/YQ==9CI8ox66gogpoSXm6yrU'
+    member_key = Jsql.configuration.member_key
+    api_key = Jsql.configuration.api_key
     url = base_url + port + queries
     database_type((base_url + port), member_key, api_key)
 #parsing token into right regex
@@ -122,7 +134,8 @@ class JSQLController < ActionController::API
     query = HTTP
                 .headers('Content-Type' => 'application/json', 'memberKey' => member_key, 'apiKey' => api_key)
                 .post(url, :body => token).body.to_s
-
+    puts "query"
+    puts query
 #parsing response to json
 
     header = HTTP
@@ -131,9 +144,16 @@ class JSQLController < ActionController::API
     puts header.class
 
     no_such_hash = "Cannot get property 'query' on null object"
-    if (JSON.parse(query)[0] == nil || JSON.parse(query)[0]['query'] == nil) && JSON.parse(query)['message'] == no_such_hash
-      render_error_msg("No such hash for given ApiKey and MemberKey")
-    else
+    begin
+      if (JSON.parse(query)[0] == nil || JSON.parse(query)[0]['query'] == nil) && JSON.parse(query)['message'] == no_such_hash
+        puts query
+        render_error_msg("No such hash for given ApiKey and MemberKey")
+      elsif JSON.parse(query)['code'] != 200
+        query
+      else
+        (JSON.parse(query)[0]['query'])
+      end
+    rescue
       (JSON.parse(query)[0]['query'])
     end
   end
@@ -144,7 +164,13 @@ class JSQLController < ActionController::API
       response = HTTP
                      .headers('Content-Type' => 'application/json', 'memberKey' => member_key, 'apiKey' => api_key)
                      .get(url).body.to_s
-      @@database_type = JSON.parse(response)['data']['databaseDialect']
+      puts response
+      if JSON.parse(response)['code'] != 200
+        render_error_msg(JSON.parse(response)['description'])
+      else
+        @@database_type = JSON.parse(response)['data']['databaseDialect']
+      end
+
     end
   end
 
@@ -207,7 +233,7 @@ class JSQLController < ActionController::API
       begin
         if method == 'insert'
           if @@database_type == 'POSTGRES'
-            query+=" returning *"
+            query += " returning *"
           end
           #puts response.class
           #puts response
@@ -217,7 +243,7 @@ class JSQLController < ActionController::API
           render json: {status: 'OK', lastId: last_id}, status: :ok
         elsif method == 'delete'
           if @@database_type == 'POSTGRES'
-            query+=" returning *"
+            query += " returning *"
           end
           response = ActiveRecord::Base.connection.execute(query).as_json
           if response.empty?

data/lib/jsql.rb

@@ -1,5 +1,23 @@
 require "jsql/engine"
-
+require 'jsql/configuration'
 module Jsql
   # Your code goes here...
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset
+    @configuration = Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
 end
+
+

data/lib/jsql/configuration.rb

@@ -0,0 +1,10 @@
+module Jsql
+  class Configuration
+    attr_accessor :member_key, :api_key
+
+    def initialize
+      @member_key = nil
+      @api_key = nil
+    end
+  end
+end

data/lib/jsql/version.rb

@@ -1,3 +1,3 @@
 module Jsql
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsql
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Adam Radecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -65,6 +65,7 @@ files:
 - app/views/layouts/jsql/application.html.erb
 - config/routes.rb
 - lib/jsql.rb
+- lib/jsql/configuration.rb
 - lib/jsql/engine.rb
 - lib/jsql/version.rb
 - lib/tasks/jsql_tasks.rake