biovision-regions 0.1.180222 → 0.1.180316

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a79b81c7e1d6d771c1594476d4930a890fa9f8e47a7baad03b7444839109a60
-  data.tar.gz: 36f5a1f865a16424ef771ad0c201e47c1b1f8e7f935de6f7c7e5dbfc6e8cec70
+  metadata.gz: 2fb6438d3fe3a89b3c390f468b6418aa7f2afd8085a81097d3d113799421d7e6
+  data.tar.gz: 9d6fe63322491f8c3b2e32f63291468d1a3600bb3cab18cf8977c1a0c641f0b6
 SHA512:
-  metadata.gz: c5974037f36ac1524d0735fa521cfeef8bcea5a63cac8be5e57a352ea7f42da3f36e41d0910b85ce006a9c32e7373b6471707ec89194c853fa0f30e0c3d96030
-  data.tar.gz: 5d780758299aeef479e00756f069223b752d923ed9f301c6c1d0aa749d251c499ae840df50ebf3e46f674ee2f26fa4d0b85d6aba2d20021fc857a255a54636bd
+  metadata.gz: 638a7c6aff83aa3f85f4150013208c586fe03f1e51c3cee699f7041e5157759b7d0464ccaed7e3ef8ab69499b2f9d6662a446399a56fce602d04bc706a91b275
+  data.tar.gz: 77bc866cacac56908b051e42bd6d8d168a88b5acc32b1e2bd266099bef741b99717617c9e07b2086867efa031db03f590e7b3ff6c49737705a87928ee79aff9f

data/app/controllers/regions_controller.rb

@@ -1,19 +1,29 @@
-class RegionsController < AdminController
-  before_action :set_entity, only: [:edit, :update, :destroy]
+class RegionsController < ApplicationController
+  before_action :restrict_access, except: [:index, :show, :children]
+  before_action :set_entity, except: [:index, :new, :create]
   before_action :restrict_editing, only: [:edit, :update, :destroy]
 
+  layout 'admin', except: [:index, :show, :children]
+
+  # get /regions
+  def index
+    @collection = Region.visible.for_tree
+  end
+
   # post /regions
   def create
     @entity = Region.new(creation_parameters)
     if @entity.save
-      next_page = admin_region_path(@entity.id)
-      respond_to do |format|
-        format.html { redirect_to next_page }
-        format.json { render json: { links: { self: next_page } } }
-        format.js { render js: "document.location.href = '#{next_page}'" }
-      end
+      form_processed_ok(admin_region_path(@entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
+    end
+  end
+
+  # get /regions/:id
+  def show
+    unless @entity.visible
+      handle_http_404('Region is not visible')
     end
   end
 
@@ -24,18 +34,13 @@ class RegionsController < AdminController
   # patch /regions/:id
   def update
     if @entity.update(entity_parameters)
-      next_page = admin_region_path(@entity.id)
-      respond_to do |format|
-        format.html { redirect_to next_page, notice: t('regions.update.success') }
-        format.json { render json: { links: { self: next_page } } }
-        format.js { render js: "document.location.href = '#{next_page}'" }
-      end
+      form_processed_ok(admin_region_path(@entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 
-  # delete /post_categories/:id
+  # delete /regions/:id
   def destroy
     if @entity.destroy
       flash[:notice] = t('regions.destroy.success')
@@ -43,6 +48,13 @@ class RegionsController < AdminController
     redirect_to admin_regions_path
   end
 
+  # get /regions/:id/children
+  def children
+    @collection = Region.visible.for_tree(@entity.country_id, @entity.id)
+
+    render :index
+  end
+
   protected
 
   def restrict_access

data/app/models/region.rb

@@ -1,11 +1,12 @@
 class Region < ApplicationRecord
   include Toggleable
 
-  SLUG_PATTERN   = /\A[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\z/
-  PER_PAGE       = 20
-  NAME_LIMIT     = 70
-  SLUG_LIMIT     = 63
-  PRIORITY_RANGE = (1..32767)
+  SLUG_PATTERN      = /\A[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\z/
+  SLUG_PATTERN_HTML = '^[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$'
+  PER_PAGE          = 20
+  NAME_LIMIT        = 70
+  SLUG_LIMIT        = 63
+  PRIORITY_RANGE    = (1..32767)
 
   toggleable :visible
 

data/app/views/regions/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_with(model: entity, html: { id: 'region-form' }) do |f| %>
+<%= form_with(model: entity, html: { id: "#{entity.class.to_s.underscore}-form" }) do |f| %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
   <dl>
@@ -15,9 +15,9 @@
           <%=
             f.file_field(
                 :image,
-                id: :region_image,
+                id:     :region_image,
                 accept: 'image/jpeg,image/png',
-                data: { image: 'region-image' }
+                data:   { image: 'region-image' }
             )
           %>
         </figcaption>
@@ -36,9 +36,9 @@
           <%=
             f.file_field(
                 :header_image,
-                id: :region_header_image,
+                id:     :region_header_image,
                 accept: 'image/jpeg,image/png',
-                data: { image: 'region-header-image' }
+                data:   { image: 'region-header-image' }
             )
           %>
           <div class="guideline"><%= t('.guidelines.header_image') %></div>
@@ -51,9 +51,9 @@
       <%=
         f.text_field(
             :name,
-            id: :region_name,
-            required: true,
-            size: nil,
+            id:        :region_name,
+            required:  true,
+            size:      nil,
             maxlength: Region::NAME_LIMIT
         )
       %>
@@ -64,9 +64,9 @@
       <%=
         f.text_field(
             :short_name,
-            id: :region_short_name,
-            required: true,
-            size: nil,
+            id:        :region_short_name,
+            required:  true,
+            size:      nil,
             maxlength: Region::NAME_LIMIT
         )
       %>
@@ -80,10 +80,10 @@
       <%=
         f.text_field(
             :locative,
-            id: :region_locative,
-            required: true,
-            size: nil,
-            maxlength: Region::NAME_LIMIT,
+            id:          :region_locative,
+            required:    true,
+            size:        nil,
+            maxlength:   Region::NAME_LIMIT,
             placeholder: t('.placeholders.locative')
         )
       %>
@@ -97,9 +97,9 @@
       <%=
         f.text_field(
             :slug,
-            id: :region_slug,
-            required: true,
-            size: nil,
+            id:        :region_slug,
+            required:  true,
+            size:      nil,
             maxlength: Region::SLUG_LIMIT
         )
       %>

data/app/views/regions/_region.jbuilder

@@ -0,0 +1,12 @@
+json.id region.id
+json.type region.class.table_name
+json.attributes do
+  json.(region, :parent_id, :name, :short_name, :priority, :slug, :long_slug)
+end
+json.links do
+  json.self region_path(region.id, format: :json)
+  json.children children_region_path(region.id)
+end
+json.meta do
+  json.child_count region.children_cache.count
+end

data/app/views/regions/index.jbuilder

@@ -0,0 +1,3 @@
+json.data @collection do |entity|
+  json.partial! entity
+end

data/app/views/regions/show.jbuilder

@@ -0,0 +1,3 @@
+json.data do
+  json.partial! @entity
+end

data/config/routes.rb

@@ -13,5 +13,9 @@ Rails.application.routes.draw do
     # get 'privileges/:id/regions' => 'privileges#regions', as: :regions_admin_privilege, defaults: { format: :json }
   end
 
-  resources :regions, except: [:index, :show]
+  resources :regions do
+    member do
+      get 'children', defaults: { format: :json }
+    end
+  end
 end

data/lib/biovision/regions/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Regions
-    VERSION = '0.1.180222'
+    VERSION = '0.1.180316'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-regions
 version: !ruby/object:Gem::Version
-  version: 0.1.180222
+  version: 0.1.180316
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -201,10 +201,11 @@ files:
 - app/views/admin/regions/show.html.erb
 - app/views/layouts/biovision/regions/application.html.erb
 - app/views/regions/_form.html.erb
+- app/views/regions/_region.jbuilder
 - app/views/regions/edit.html.erb
-- app/views/regions/edit.js.erb
+- app/views/regions/index.jbuilder
 - app/views/regions/new.html.erb
-- app/views/regions/new.js.erb
+- app/views/regions/show.jbuilder
 - config/locales/regions-en.yml
 - config/locales/regions-ru.yml
 - config/routes.rb

data/app/views/regions/edit.js.erb

@@ -1 +0,0 @@
-<%= render partial: 'shared/forms/list_of_errors', locals: { entity: @entity, form_id: 'region-form' } %>

data/app/views/regions/new.js.erb

@@ -1 +0,0 @@
-<%= render partial: 'shared/forms/list_of_errors', locals: { entity: @entity, form_id: 'region-form' } %>