railspp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e6f7c34e88a8709e1cf932d8bbe1ef6f994601349b91ecc49dc76e7161f1d7
-  data.tar.gz: f6843abd128722e9480ab99580b29a34adcad06cca7cd18a63fe1294d433726b
+  metadata.gz: 65047ba2296e1a10247976a0652895892dbc4cfafbc52ce3eec4e368b3a95275
+  data.tar.gz: 6bf4edfeed47661342c1b71b3a60e4b5afebd66c839b4593440956fbe9c17cb5
 SHA512:
-  metadata.gz: 8cd644a00d15a557889b70aa8cd8e247e178312f8b5f1ecbaaeb97f3f1a39b2df3cbc48573664fce0b3bd8e67de9a3e83a9825f5b0e0e299e8ebfd39fd7770a4
-  data.tar.gz: 4ee799382461b7c864fc2d458f477ebce87d11206b7a7a52d15e7b9ec12f85ae45a0b029f7933e119605c692785ead92a04364d904a09fc964075de3c9107d35
+  metadata.gz: c65e5067ff212106566bcd1588489e9338f64e555788caf8a9360fce4064d1f9da62f5cbef8871ab1906c10af6821e84ce5260e0e97c1652bc16ceef19346a29
+  data.tar.gz: 3332b64f99cabbd733085ea13a171c9d5e7735fc9e9f443b53ae06fe7f6a4b9ad852721a2638d878e24d69a1c04c0ca2ba13ecabca2f7fb7dd12399f14e43eba

data/lib/commands/update_version.rb

@@ -10,6 +10,9 @@ class UpdateVersionCommand < MoreUtils
             gc_template = get_file_str("#{this_dir}/../templates/global_controller.txt")
             write_file("#{root}/app/controllers/global_controller.rb", gc_template)
 
+            gc_template = get_file_str("#{this_dir}/../templates/response.txt")
+            write_file("#{root}/app/controllers/concerns/response.rb", gc_template)
+
             # dc_template = get_file_str("#{this_dir}/../templates/documentation_controller.txt")
             # write_file("#{root}/app/controllers/documentation_controller.rb", dc_template)
 

data/lib/templates/global_controller.txt

@@ -1,199 +1,211 @@
 class GlobalController < ApplicationController
-
   include ExceptionHandler
   include Response
 
   def default_per_page
-      25
+    25
   end
 
   def model
-      self.class.to_s.split('::').select { |e| /Controller/.match(e) }.first.chomp('Controller').singularize.constantize
+    self.class.to_s.split("::").select {|e| /Controller/.match(e) }.first.chomp("Controller").singularize.constantize
   end
 
   def index
-      resp = index_response
-      past_pages = resp[:last_page] < resp[:current_page]
-      error = { error: 'Past the amount of pages available' }
-      status = past_pages ? 400 : 200
-      data = past_pages ? error : resp
-      data = handle_includes(data) if params[:include] && !past_pages
-      render_json(data, status)
+    resp = index_response
+    past_pages = resp[:last_page] < resp[:current_page]
+    error = {error: "Past the amount of pages available"}
+    status = past_pages ? 400 : 200
+    data = past_pages ? error : resp
+    data = handle_includes(data) if params[:include] && !past_pages
+    render_json(data, status)
   end
 
   def show
-      data = model.find(params[:id] || 0)
-      data = data.includes(*get_includes) if params[:include]
-      data = handle_includes(data) if params[:include]
-      render_json(data, 200)
+    data = model.find(params[:id] || 0)
+    data = handle_includes(data) if params[:include]
+    render_json(data, 200)
   end
 
   def create
-      data = model.create(create_params)
-      render_json(data, 201)
+    data = model.create(create_params)
+    render_json(data, 201)
   end
 
   def update
-      data = model.where(id: params[:id] || 0).update(update_params).first
-      render_json(data, 200)
+    data = model.where(id: params[:id] || 0).update(update_params).first
+    render_json(data, 200)
   end
 
   def destroy
-      model.destroy(params[:id] || 0)
-      render_json(nil, 204)
+    model.destroy(params[:id] || 0)
+    render_json(nil, 204)
   end
 
   def bulk_csv_create
-      data = model.create(csv_to_json)
-      render_json(data, 201)
+    data = model.create(csv_to_json)
+    render_json(data, 201)
   end
 
   def bulk_create
-      data = model.create(bulk_create_params)
-      render_json(data, 201)
+    data = model.create(bulk_create_params[:bulk])
+    render_json(data, 201)
   end
 
   def bulk_update
-      data = model.where(id: bulk_update_params[:id]).update(bulk_update_params)
-      render_json(data, 201)
+    data = model.where(id: bulk_update_params[:bulk].map {|e| e[:id] }).update(bulk_update_params[:bulk])
+    render_json(data, 201)
   end
 
   def bulk_destory
-      model.where(id: bulk_destroy_params)
-      render_json(nil, 204)
+    model.where(id: bulk_destroy_params[:bulk])
+    render_json(nil, 204)
   end
 
   private
 
-      def csv_to_json param_key = :file, separated_by = ','
-          lines = params[param_key].split("\n")
-          keys = lines[0].split(separated_by)
-          rows = lines.slice(1).map { |e| e.split(separated_by) }
-          rows.map { |e| e.each_with_index.inject({}) { |acc, (e, i)| acc.merge("#{keys[i]}": e) } }
-      end
-
-      def create_params
-          bl = array_to_hash(black_list_create)
-          params.permit(*get_model_key.reject { |e| bl[e.to_sym] })
-      end
-
-      def update_params
-          bl = array_to_hash(black_list_update)
-          params.permit(*get_model_key.reject { |e| bl[e.to_sym] })
-      end
-
-      def bulk_create_params
-          params.permit(bulk: get_model_key)
-      end
-
-      def bulk_update_params
-          params.permit(bulk: get_model_key)
-      end
-
-      def bulk_destroy_params
-          params.permit(bulk: [:id])
-      end
-
-      def black_list_create
-          [:id, :created_at, :updated_at]
-      end
-
-      def black_list_update
-          [:id, :created_at, :updated_at]
-      end
-
-      def array_to_hash array
-          array.each_with_object({}) do |e, acc|
-              acc[e] = true
-              acc
-          end
-      end
-
-      def handle_pagination
-          limit = (params[:limit] || default_per_page).to_i
-          offset = (params[:offset] || 0).to_i
-          page = (params[:page] || 1).to_i
-
-          data = model.limit(limit).offset(offset).offset((page - 1) * limit)
-          data = data.where(get_where) if params[:where]
-          data = data.includes(*get_includes) if params[:include]
-          data = data.order(get_order) if params[:order]
-          data = data.all
-          data
-      end
-
-      def handle_pagination_count
-          data = model
-          data = data.where(get_where) if params[:where]
-          data.count
-      end
-
-      def handle_includes data
-          data.to_json({ include: get_includes })
-      end
-
-      def index_response
-          page = (params[:page] || 1).to_i
-          per_page = (params[:limit] || default_per_page).to_i
-          total = handle_pagination_count
-          path = request.original_url
-          path_path = add_pg_qs(path)
-          last = (total / per_page.to_f).ceil
-          nxt = (page + 1) > last ? nil : (page + 1)
-          prev = (page - 1) == 0 ? nil : (page - 1)
-          last = last == 0 ? 1 : last
-          data = handle_pagination
-          data_first = data.first
-          data_last = data.last
-
-          {
-              data: data,
-              from: data_first ? data_first.id : nil,
-              to: data_last ? data_last.id : nil,
-              total: total,
-              path: path,
-              current_page: page,
-              per_page: per_page,
-              last_page: last,
-              first_page_url: path_path + '1',
-              last_page_url: path_path + last.to_s,
-              next_page_url: nxt ? (path_path + nxt.to_s) : nil,
-              prev_page_url: prev ? (path_path + prev.to_s) : nil,
-          }
-      end
-
-      def add_pg_qs str
-          has_qs = /\?/.match(str)
-          return "#{str}?page=" unless has_qs
-          before_qs, after = str.split('?')
-          after_qs = after.split('&').reject { |e| /page\=/.match(e) }
-          after_qs.push('page=')
-          "#{before_qs}?#{after_qs.join('&')}"
-      end
-
-      def get_includes
-          comma_separated(:include).map(&:to_sym)
-      end
-
-      def get_order
-          params[:order].split(',').flat_map { |e| e.split(':') }.join(' ')
-      end
-
-      def get_where
-          arrays = params[:where].split(',').map { |e| e.split(':') }
-          arrays.inject({}) do |acc, item|
-              key, val = item
-              acc[key] = val
-              acc
-          end
-      end
-
-      def comma_separated key
-          params[key].split(',')
-      end
-
-      def get_model_key
-          model.columns.map { |e| e.name.to_sym }
-      end
+  def csv_to_json param_key=:file, separated_by=","
+    lines = params[param_key].split("\n")
+    keys = lines[0].split(separated_by)
+    rows = lines.slice(1).map {|e| e.split(separated_by) }
+    rows.map {|e| e.each_with_index.inject({}) {|acc, (e, i)| acc.merge(:"#{keys[i]}" => e) } }
+  end
+
+  def create_params
+    bl = array_to_hash(black_list_create)
+    params.permit(*get_model_key.reject {|e| bl[e.to_sym] })
+  end
+
+  def update_params
+    bl = array_to_hash(black_list_update)
+    params.permit(*get_model_key.reject {|e| bl[e.to_sym] })
+  end
+
+  def bulk_create_params
+    params.permit(bulk: get_model_key)
+  end
+
+  def bulk_update_params
+    params.permit(bulk: get_model_key)
+  end
+
+  def bulk_destroy_params
+    params.permit(bulk: [:id])
+  end
+
+  def black_list_create
+    %i[id created_at updated_at]
+  end
+
+  def black_list_update
+    %i[id created_at updated_at]
+  end
+
+  def array_to_hash array
+    array.each_with_object({}) do |e, acc|
+      acc[e] = true
+      acc
+    end
+  end
+
+  def handle_pagination
+    limit = (params[:limit] || default_per_page).to_i
+    offset = (params[:offset] || 0).to_i
+    page = (params[:page] || 1).to_i
+    order = params[:order] ? get_order : "id ASC"
+
+    data = model.limit(limit).offset(offset).offset((page - 1) * limit)
+    data = data.where(get_where) if params[:where]
+    data = data.includes(*get_includes) if params[:include]
+    data = data.order(order)
+    data = data.all
+    data
+  end
+
+  def handle_pagination_count
+    data = model
+    data = data.where(get_where) if params[:where]
+    data.count
+  end
+
+  def handle_includes data
+    data.to_json(include: get_includes)
+  end
+
+  def index_response
+    page = (params[:page] || 1).to_i
+    per_page = (params[:limit] || default_per_page).to_i
+    total = handle_pagination_count
+    path = request.original_url
+    path_path = add_pg_qs(path)
+    last = (total / per_page.to_f).ceil
+    nxt = (page + 1) > last ? nil : (page + 1)
+    prev = (page - 1) == 0 ? nil : (page - 1)
+    last = last == 0 ? 1 : last
+    data = handle_pagination
+    data_first = data.first
+    data_last = data.last
+
+    {
+      data:           data,
+      from:           data_first ? data_first.id : nil,
+      to:             data_last ? data_last.id : nil,
+      total:          total,
+      path:           path,
+      current_page:   page,
+      per_page:       per_page,
+      last_page:      last,
+      first_page_url: path_path + "1",
+      last_page_url:  path_path + last.to_s,
+      next_page_url:  nxt ? (path_path + nxt.to_s) : nil,
+      prev_page_url:  prev ? (path_path + prev.to_s) : nil
+    }
+  end
+
+  def add_pg_qs str
+    has_qs = /\?/.match(str)
+    return "#{str}?page=" unless has_qs
+
+    before_qs, after = str.split("?")
+    after_qs = after.split("&").reject {|e| /page\=/.match(e) }
+    after_qs.push("page=")
+    "#{before_qs}?#{after_qs.join('&')}"
+  end
+
+  def get_includes
+    comma_separated(:include).map do |e|
+      semi = e.split(":")
+      semi.length > 1 ? array_depth(semi) : semi.first.to_sym
+    end
+  end
+
+  def array_depth(array, acc={})
+    if array.length > 2
+      key = array.shift
+      acc[key.to_sym] = array_depth(array, {})
+    else
+      key, val = array
+      acc[key.to_sym] = val.to_sym
+    end
+    acc
+  end
+
+  def get_order
+    params[:order].split(",").flat_map {|e| e.split(":") }.join(" ")
+  end
 
+  def get_where
+    arrays = params[:where].split(",").map {|e| e.split(":") }
+    arrays.each_with_object({}) do |item, acc|
+      key, val = item
+      acc[key] = val
+    end
+  end
+
+  def comma_separated key
+    params[key].split(",")
+  end
+
+  def get_model_key
+    model.columns.map {|e| e.name.to_sym }
+  end
 end

data/lib/templates/response.txt

@@ -1,7 +1,30 @@
 module Response
+  def render_json data, status
+    data = JSON.parse(data) if data.is_a?(String)
+    data[:data] = data[:data].map {|e| object_delete(e) } if data && data[:data] && !data[:data].empty?
+    data = object_delete(data) if data && !data[:data]
+    render json: data, status: status
+  end
 
-    def render_json data, status
-        render json: data, status: status
-    end
+  private
+
+  def black_list
+    [
+      :password_digest
+    ]
+  end
 
+  def object_delete(hash)
+    json = JSON.parse(hash.to_json).symbolize_keys
+    black_list.each do |e|
+      if json[e].is_a?(Hash)
+        json[e] = object_delete(json[e])
+      elsif json[e].is_a?(Array)
+        json[e] = json[e].map {|i| object_delete(i) }
+      elsif json[e]
+        json.delete(e)
+      end
+    end
+    json
+  end
 end

data/lib/utils/strings.rb

@@ -21,7 +21,7 @@ class MoreUtils
     class << self
 
         def gem_version
-            "0.3.0"
+            "0.3.1"
         end
 
         def get_file_str path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railspp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Layne Faler