schemaless_rest_api 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58b65be1caee8add0cb91dbfbc1b84bbbd16b374682ee950ae2c0b2646dca30a
-  data.tar.gz: 0f0758e772cae144cd38f321f561fcc39cf33bcb2a93b4655c4be637011d94de
+  metadata.gz: dbc856f4da6c97a932cf00591ae9330a8c11107f508394d7d17623bdba76427c
+  data.tar.gz: 1e3286aa8f268ccbb8ce21fb9cf155e213ecaaa7cbcb5c44253bc225829118b0
 SHA512:
-  metadata.gz: bcf04f3387d292ae0fdc144acda02603a4e712c8f4e0e5841bee098e307c5f051d590b025d5adf1542d16a41ff8e3eca8f538af81306fb660d55d1e3686112af
-  data.tar.gz: 17aeea57b9ac4655f9ba691a9f3b3452244ded19cc06ed124b6bd117bef7ef29c34be2cf19f9342076a9df2ddc56e0a282e0473312533cc8a044af3878346578
+  metadata.gz: '0875ee228c90497a905699ea7c33e85dd4885178533be0551cec74000bfa743cb21630c7bba96322f88336c23dfce045fb0d372a7813d9ec85f2baf19da7cb37'
+  data.tar.gz: 77402ef68678360df7cee76aa40b21c80eba52c9b90154cff13ce50a8600522147bbd807f248da79b7349ff2f6871c444985db73613fa327708dde9ae0f85f3e

data/exe/schemaless_rest_api

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require "schemaless_rest_api"
-
-RestServer.run!
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require "schemaless_rest_api"
+
+RestServer.run!

data/lib/schemaless_rest_api/entities.rb

@@ -1,9 +1,9 @@
-# frozen_string_literal: true
-
-# Entities mapped by environment variables
-class Entities
-  @models = {}
-  class << self
-    attr_accessor :models
-  end
-end
+# frozen_string_literal: true
+
+# Entities mapped by environment variables
+class Entities
+  @models = {}
+  class << self
+    attr_accessor :models
+  end
+end

data/lib/schemaless_rest_api/mongo_client.rb

@@ -0,0 +1,42 @@
+require 'mongo'
+
+module MongoClient
+  class << self
+    # @return Client to work with MongoDb
+    attr_accessor :client
+
+    def insert(model, data, id)
+      collection = MongoClient.client[model]
+      collection.insert_one({ id: id, data: data})
+    end
+
+    def find(model, id)
+      collection = MongoClient.client[model]
+      collection.find( { id: id } ).first
+    end
+
+    def get_all(model)
+      collection = MongoClient.client[model]
+      collection.find.collect { |match| match }
+    end
+
+    def find_all(model, query)
+      collection = MongoClient.client[model]
+      collection.find( query ).collect { |match| match }
+    end
+
+    def update(model, id, data)
+      collection = MongoClient.client[model]
+      collection.update_one({ id: id }, { '$set' => data })
+    end
+
+    def delete(model, id)
+      collection = MongoClient.client[model]
+      collection.delete_one({ id: id })
+    end
+  end
+end
+
+MongoClient.client = Mongo::Client.new(
+    [ "#{ENV['mongodb']}:27017" ],
+    :database => 'api')

data/lib/schemaless_rest_api/rest_server.rb

@@ -1,67 +1,97 @@
-# frozen_string_literal: true
-
-require "sinatra"
-require "puma"
-require 'route_downcaser'
-
-class RestServer < Sinatra::Base
-  set :server, :puma
-  enable :logging if ENV["debug"] == "true"
-  set :bind, "0.0.0.0"
-  use RouteDowncaser::DowncaseRouteMiddleware
-
-  def has_id?(model, id)
-    Entities.models[model].key?(id)
-  end
-
-  def not_found(id)
-    [404, JSON.generate({ error: "'#{id}' not found" })]
-  end
-
-  get "/" do
-    JSON.generate({ models: Entities.models.keys.to_s })
-  end
-
-  # get '*' do
-  #  Could do something like following to make case insensitive. Need all 1 method logic to be in 1 place
-  #   file_path = File.join(File.dirname(__FILE__), 'public',  request.path.downcase)
-  #   File.exist?(file_path) ? send_file(file_path) : halt 404
-  # end
-
-  Entities.models.each_key do |model|
-    post "/#{model.downcase}" do
-      id = SecureRandom.uuid
-      Entities.models[model][id] = JSON.parse(request.body.read)
-      [201, id]
-    end
-
-    get "/#{model.downcase}" do
-      puts request.path.downcase      
-      return [200, Entities.models[model].to_s] if params == {}
-
-      Entities.models[model].values.find_all { |val| val[params.keys[0]] == params.values[0] }
-    rescue Exception
-      [404, "Nothing found using #{params}. Only first param considered"]
-    end
-
-    get "/#{model.downcase}/:id" do |id|
-      return not_found(id) unless has_id?(model, id)
-
-      JSON.generate(Entities.models[model][id])
-    end
-
-    put "/#{model.downcase}/:id" do |id|
-      return not_found(id) unless has_id?(model, id)
-
-      Entities.models[model][id] = JSON.parse(request.body.read)
-      204
-    end
-
-    delete "/#{model.downcase}/:id" do |id|
-      return not_found(id) unless has_id?(model, id)
-
-      Entities.models[model].delete(id)
-      204
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "sinatra"
+require "puma"
+require 'route_downcaser'
+
+class RestServer < Sinatra::Base
+  set :server, :puma
+  enable :logging if ENV["debug"] == "true"
+  set :bind, "0.0.0.0"
+  use RouteDowncaser::DowncaseRouteMiddleware
+
+  def has_id?(model, id)
+    Entities.models[model].key?(id)
+  end
+
+  def not_have(id)
+    [404, JSON.generate({ error: "'#{id}' not found" })]
+  end
+
+  get "/" do
+    summary = { models: Entities.models.keys.to_s }
+    summary[:db] = MongoClient.client.summary.to_s if ENV['mongodb']
+    JSON.generate(summary)
+  rescue Exception => e
+    [500, e.message]
+  end
+
+  Entities.models.each_key do |model|
+    post "/#{model.downcase}" do
+      id = SecureRandom.uuid
+      data = JSON.parse(request.body.read)
+      if ENV['mongodb']
+        MongoClient.insert(model, data, id)
+      else
+        Entities.models[model][id] = data
+      end
+      [201, id]
+    end
+
+    get "/#{model.downcase}" do
+      puts request.path.downcase
+      if ENV['mongodb']
+        if params == {}
+          JSON.generate(MongoClient.get_all(model))
+        else
+          [200, JSON.generate(MongoClient.find_all(model, params))]
+        end
+      else
+        return [200, Entities.models[model].to_s] if params == {}
+
+        Entities.models[model].values.find_all { |val| val[params.keys[0]] == params.values[0] }
+      end
+    rescue Exception => e
+      [404, "Nothing found using #{params}. Only first param considered. #{e.message}"]
+    end
+
+    get "/#{model.downcase}/:id" do |id|
+      if ENV['mongodb']
+        results = MongoClient.find_all(model, { id: id})
+        return not_have(id) unless results
+        JSON.generate(results.first)
+      else
+        return not_have(id) unless has_id?(model, id)
+
+        JSON.generate(Entities.models[model][id])
+      end
+    end
+
+    put "/#{model.downcase}/:id" do |id|
+      data = JSON.parse(request.body.read)
+      if ENV['mongodb']
+        results = MongoClient.find(model, id)
+        return not_have(id) unless results.count > 0
+        MongoClient.update(model, id, data)
+      else
+        return not_have(id) unless has_id?(model, id)
+
+        Entities.models[model][id] = data
+      end
+      204
+    end
+
+    delete "/#{model.downcase}/:id" do |id|
+      if ENV['mongodb']
+        results = MongoClient.find(model, id)
+        return not_have(id) unless results.count > 0
+        MongoClient.delete(model, id)
+      else
+        return not_have(id) unless has_id?(model, id)
+
+        Entities.models[model].delete(id)
+      end
+      204
+    end
+  end
+end

data/lib/schemaless_rest_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SchemalessRestApi
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/schemaless_rest_api.rb

@@ -1,30 +1,36 @@
-# frozen_string_literal: true
-
-require_relative "schemaless_rest_api/version"
-require_relative "schemaless_rest_api/entities"
-
-require "json"
-require "securerandom"
-
-def extract_models
-  error_msg = "Make 'models' environment variable an array (e.g ['model1', 'model2'])"
-  raise "Please set 'models' ENV variable. #{error_msg}" if ENV["models"].nil?
-
-  models = eval(ENV["models"])
-  raise error_msg unless models.is_a? Array
-
-  models
-end
-
-extract_models.each do |model|
-  Entities.models[model.to_sym] = {}
-end
-
-puts "Modelling #{Entities.models.keys}"
-
-require_relative "schemaless_rest_api/rest_server"
-
-module SchemalessRestApi
-  class Error < StandardError; end
-  # Your code goes here...
-end
+# frozen_string_literal: true
+
+require_relative "schemaless_rest_api/version"
+require_relative "schemaless_rest_api/entities"
+
+require "json"
+require "securerandom"
+
+def extract_models
+  error_msg = "Make 'models' environment variable an array (e.g ['model1', 'model2'])"
+  raise "Please set 'models' ENV variable. #{error_msg}" if ENV["models"].nil?
+
+  models = eval(ENV["models"])
+  raise error_msg unless models.is_a? Array
+
+  models
+end
+
+extract_models.each do |model|
+  Entities.models[model.to_sym] = {}
+end
+
+puts "Modelling #{Entities.models.keys}"
+
+if ENV['mongodb']
+  require_relative 'schemaless_rest_api/mongo_client'
+else
+  puts "[INFO] Using in memory storage. Pass in 'mongodb' ENV variable to store
+in db"
+end
+require_relative "schemaless_rest_api/rest_server"
+
+module SchemalessRestApi
+  class Error < StandardError; end
+  # Your code goes here...
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: schemaless_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-docdsl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +107,7 @@ files:
 - exe/schemaless_rest_api
 - lib/schemaless_rest_api.rb
 - lib/schemaless_rest_api/entities.rb
+- lib/schemaless_rest_api/mongo_client.rb
 - lib/schemaless_rest_api/rest_server.rb
 - lib/schemaless_rest_api/version.rb
 homepage: https://gitlab.com/samuel-garratt/schemaless_rest_api
@@ -103,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: TSimple schema less rest API that have entities configured through environment