stockpot 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ed98e155357c764f537d390bdf41db905bb5231e33bb7644639c1f309fde33
-  data.tar.gz: 0cd8008bef691299dc4c2e50343ef9d98002b9857703ca4f9a1cee55f2eed556
+  metadata.gz: d3e810f46e006579bd1532c1f2d2fc291110cec1f20fc432b1f073efb7f104f2
+  data.tar.gz: 8373caf574a7f15a48ae2139606d85541f91c3ce26b05b7295ef293ddb592974
 SHA512:
-  metadata.gz: 00e9c0c1eea751c8f01bdb925592f904a578dea35aa0430278bd93ec7923c564cd7d787499fb8ce77feb07b7f1aad78d67a68884974640b532428ac381e4aa4b
-  data.tar.gz: e66ffa80fc4138ca3b01e86ab4012043d7909f9735e877d4cc2391f63e34a2b1de066761eb61cea0e19e134f30165584a2d845f8f65e62653479416783407b78
+  metadata.gz: 486f9a8a802130c36c0528a9dffb4d7d7dc90686b170058ecc590c04d182a70fabacbebfc73d9f0feb445cbfa55e98c5ea7bb49cc4412748b6c84548a1a71e4d
+  data.tar.gz: b18a2ac9341c86fae9d69b91c9e6b008352bc4a5ec989bb14b6d31ed8d8982c01acf28da797f9afd8542667c8b5265891b8d032147343be7f64b82cd86563b82

data/README.md

@@ -79,7 +79,7 @@ Query for data. Accepts a array of objects that require at least a model name, b
 
 #### POST
 
-Create new data. Accepts an object specifying a single model with additional qualifiers.
+Create new data. Accepts an an array of objects specifying a single model with additional qualifiers.
 
 * factory (required) - Specify which factory to create a record with.
 * list (optional) - Specify a count of items to create, default: 1
@@ -87,7 +87,7 @@ Create new data. Accepts an object specifying a single model with additional qua
 * attributes (optional) - An array of objects allowing for the specification of data to be used when creating records. Array position matches with list order if multiple records are desired.
 
 ```javascript
-{
+[{
   factory: "user",
   traits: ["having_address"],
   attributes: [{
@@ -96,7 +96,7 @@ Create new data. Accepts an object specifying a single model with additional qua
     first_name: "Foo",
     last_name: "Bar"
   }]
-}
+}]
 ```
 
 #### DELETE
@@ -129,7 +129,7 @@ Clears Rails & Redis caches and truncates Active Records databases. No body requ
 ### `/stockpot/redis`
 
 #### GET
-  
+
 Query for data. Accepts key or field to use to search cache for record.
 
 ```javascript
@@ -139,6 +139,10 @@ Query for data. Accepts key or field to use to search cache for record.
 }
 ```
 
+#### GET - Keys
+
+Query for all keys within data. No body or argument required.
+
 #### POST - Create new data
 
 Accepts an object specifying a key, field, and value to be inserted into Redis cache.
@@ -168,7 +172,7 @@ Cypress.Commands.add("getRecords", args => {
 ```
 
 Our tests can then call this command like this
-  
+
 ```javascript
 cy.getRecords([{ model: "user", id: user.id }])
   .then(res => {

data/app/controllers/stockpot/helper/errors.rb

@@ -8,18 +8,18 @@ module Stockpot
 
         case error
         when NameError
-          return_error(error.to_s, error.backtrace.first(5), :bad_request)
+          return_error(error.message, error.backtrace.first(5), :bad_request)
         when PG::Error
-          return_error("Postgres error: #{error}", error.backtrace.first(5), :server_error)
-        when ActiveRecord::RecordInvalid, ActiveRecord::Validations
-          return_error("ActiveRecord error: #{error}", error.backtrace.first(5), :server_error)
+          return_error("Postgres error: #{error.message}", error.backtrace.first(5), :internal_server_error)
+        when ActiveRecord::RecordInvalid, ActiveRecord::Validations, ActiveRecord::RecordNotDestroyed
+          return_error("In #{error.record.class} class, #{error.message}", error.backtrace.first(5), :expectation_failed)
         else
-          return_error(error.to_s, error.backtrace.first(5),:server_error)
+          return_error(error.message, error.backtrace.first(5),:internal_server_error)
         end
       end
 
       def return_error(message, backtrace, status)
-        { json: { error: { status: status, backtrace: backtrace, message: message }}, status: status }
+        render json: { error: { status: status, backtrace: backtrace, message: message }}, status: status
       end
     end
   end

data/app/controllers/stockpot/main_controller.rb

@@ -5,8 +5,7 @@ module Stockpot
     include Helper::Errors
 
     rescue_from StandardError do |exception|
-      render rescue_error(exception)
+      rescue_error(exception)
     end
-    # protect_from_forgery with: :exception
   end
 end

data/app/controllers/stockpot/records_controller.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "factory_bot_rails"
+require "active_record/persistence"
 
 module Stockpot
   class RecordsController < MainController
@@ -10,58 +11,84 @@ module Stockpot
       return_error("You need to provide at least one model name as an argument", 400) if params.dig(:models).blank?
     end
     before_action only: %i[create] do
-      return_error("You need to provide at least one factory name as an argument", 400) if params.dig(:factory).blank?
+      return_error("You need to provide at least one factory name as an argument", 400) if params.dig(:factories).blank?
+    end
+    before_action do
+      @response_data = {}
     end
 
     def index
-      obj = {}
       models.each_with_index do |element, i|
-        model = element[:model].to_s
+        model = element[:model]
         class_name = find_correct_class_name(model)
+        formatted_model = pluralize(model).camelize(:lower).gsub("::", "")
 
-        obj[pluralize(model).camelize(:lower)] = class_name.constantize.where(models[i].except(:model))
+        @response_data[formatted_model] = [] unless @response_data.key?(formatted_model)
+        @response_data[formatted_model].concat(class_name.constantize.where(models[i].except(:model)))
+        @response_data[formatted_model].reverse!.uniq! { |obj| obj["id"] }
       end
-
-      render json: obj, status: :ok
+      render json: @response_data, status: :ok
     end
 
     def create
-      list = params[:list] || 1
       ActiveRecord::Base.transaction do
-        list.times do |n|
-          all_parameters = [ factory, *traits, attributes(n) ].compact
-          @factory = FactoryBot.create(*all_parameters)
+        factories.each do |element|
+          ids = []
+          list = element[:list] || 1
+          factory = element[:factory]
+          traits = element[:traits].map(&:to_sym) if element[:traits].present?
+          attributes = element[:attributes].to_h if element[:attributes].present?
+
+          list.times do
+            factory_arguments = [ factory, *traits, attributes ].compact
+            @factory_instance = FactoryBot.create(*factory_arguments)
+            ids << @factory_instance.id
+          end
+
+          factory_name = pluralize(factory).camelize(:lower)
+
+          @response_data[factory_name] = [] unless @response_data.key?(factory_name)
+          @response_data[factory_name].concat(@factory_instance.class.name.constantize.where(id: ids))
         end
       end
-      obj = @factory.class.name.constantize.last(list)
-
-      render json: obj, status: :created
+      render json: @response_data, status: :accepted
     end
 
     def destroy
-      obj = {}
       ActiveRecord::Base.transaction do
         models.each_with_index do |element, i|
-          model = element[:model].to_s
+          model = element[:model]
           class_name = find_correct_class_name(model)
-          obj[pluralize(model).camelize(:lower)] = class_name.constantize.where(models[i].except(:model)).destroy_all
+          formatted_model = pluralize(model).camelize(:lower).gsub("::", "")
+
+          class_name.constantize.where(models[i].except(:model)).each do |record|
+            record.destroy!
+            @response_data[formatted_model] = [] unless @response_data.key?(formatted_model)
+            @response_data[formatted_model] << record
+          end
         end
       end
-
-      render json: obj, status: :accepted
+      render json: @response_data, status: :accepted
     end
 
     def update
-      obj = {}
       ActiveRecord::Base.transaction do
         models.each_with_index do |element, i|
-          model = element[:model].to_s
+          model = element[:model]
           class_name = find_correct_class_name(model)
           update_params = params.permit![:models][i][:update].to_h
-          obj[pluralize(model).camelize(:lower)] = class_name.constantize.where(models[i].except(:model, :update)).update(update_params)
+          attributes_to_search = models[i].except(:model, :update)
+          formatted_model = pluralize(model).camelize(:lower).gsub("::", "")
+
+          class_name.constantize.where(attributes_to_search).each do |record|
+            record.update!(update_params)
+            @response_data[formatted_model] = [] unless @response_data.key?(formatted_model)
+            @response_data[formatted_model] << class_name.constantize.find(record.id)
+            @response_data[formatted_model].reverse!.uniq! { |obj| obj["id"] }
+          end
         end
       end
-      render json: obj, status: :accepted
+      render json: @response_data, status: :accepted
     end
 
     private
@@ -70,29 +97,19 @@ module Stockpot
       # We are getting the class name from the factory or we default to whatever we send in.
       # Something to keep in mind "module/class_name".camelize will translate into "Module::ClassName"
       # which is perfect for namespaces in case there is no factory associated with a specific model
-      FactoryBot.factories.registered?(model) ? FactoryBot.build_stubbed(model).class.name : model.camelize
-    end
-
-    def traits
-      return if params[:traits].blank?
-
-      params[:traits].map(&:to_sym)
-    end
-
-    def factory
-      params[:factory].to_sym
-    end
-
-    # rubocop:disable Naming/UncommunicativeMethodParamName
-    def attributes(n)
-      # rubocop:enable Naming/UncommunicativeMethodParamName
-      return if params[:attributes].blank?
-
-      params.permit![:attributes][n].to_h
+      if FactoryBot.factories.registered?(model)
+        FactoryBot.factories.find(model).build_class.to_s
+      else
+        model.camelize
+      end
     end
 
     def models
       params.permit![:models].map(&:to_h)
     end
+
+    def factories
+      params.permit![:factories].map(&:to_h)
+    end
   end
 end

data/app/controllers/stockpot/redis_controller.rb

@@ -24,5 +24,11 @@ module Stockpot
 
       render json: { status: 201 }
     end
+
+    def keys
+      record = REDIS.keys
+
+      render json: record.to_json, status: :ok
+    end
   end
 end

data/config/routes.rb

@@ -8,8 +8,9 @@ Stockpot::Engine.routes.draw do
 
   delete "/clean_database", to: "database_cleaner#index"
 
-  get "/redis", to: "redis#index"
   post "/redis", to: "redis#create"
+  get "/redis", to: "redis#index"
+  get "/redis/keys", to: "redis#keys"
 
   get "/healthz", to: "healthz#index"
 end

data/lib/stockpot/engine.rb

@@ -4,11 +4,5 @@ module Stockpot
   class Engine < ::Rails::Engine
     isolate_namespace Stockpot
     config.generators.api_only = true
-
-    config.generators do |generators|
-      generators.test_framework :rspec
-      generators.fixture_replacement :factory_bot
-      generators.factory_bot dir: 'spec/factories'
-    end
   end
 end

data/lib/stockpot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stockpot
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockpot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jayson Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails