biovision-regions 0.1.180316 → 0.2.180419

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fb6438d3fe3a89b3c390f468b6418aa7f2afd8085a81097d3d113799421d7e6
-  data.tar.gz: 9d6fe63322491f8c3b2e32f63291468d1a3600bb3cab18cf8977c1a0c641f0b6
+  metadata.gz: ef8d872c992f6cbe52c52491f72b11dc2c8b22383fd4ab25fd1c3139825b1e84
+  data.tar.gz: 799d93c776c2e189cfd31d6e788125faa327c64e8f8b906e8f468eaaf4b00321
 SHA512:
-  metadata.gz: 638a7c6aff83aa3f85f4150013208c586fe03f1e51c3cee699f7041e5157759b7d0464ccaed7e3ef8ab69499b2f9d6662a446399a56fce602d04bc706a91b275
-  data.tar.gz: 77bc866cacac56908b051e42bd6d8d168a88b5acc32b1e2bd266099bef741b99717617c9e07b2086867efa031db03f590e7b3ff6c49737705a87928ee79aff9f
+  metadata.gz: bb8316732d0777858197867b8e649beae50324fa95f9dad839383f6be2400a816cc289ad8a60cab488670af6917be1df69586b7cb9dd910a7025ac6ffa238d27
+  data.tar.gz: 48546040871b82df582ad4b9aad6fb4716b487d5e5aa5d39a6f56ad38df9b2256f46b9e70d6be64442b62ee487a324575bd32c8f07853ac7167ba36ef339fcab

data/app/controllers/regions_controller.rb

@@ -14,7 +14,7 @@ class RegionsController < ApplicationController
   def create
     @entity = Region.new(creation_parameters)
     if @entity.save
-      form_processed_ok(admin_region_path(@entity.id))
+      form_processed_ok(admin_region_path(id: @entity.id))
     else
       form_processed_with_error(:new)
     end
@@ -34,7 +34,7 @@ class RegionsController < ApplicationController
   # patch /regions/:id
   def update
     if @entity.update(entity_parameters)
-      form_processed_ok(admin_region_path(@entity.id))
+      form_processed_ok(admin_region_path(id: @entity.id))
     else
       form_processed_with_error(:edit)
     end
@@ -70,7 +70,7 @@ class RegionsController < ApplicationController
 
   def restrict_editing
     if @entity.locked? || !@entity.editable_by?(current_user)
-      redirect_to admin_region_path(@entity.id), alert: t('regions.edit.forbidden')
+      redirect_to admin_region_path(id: @entity.id), alert: t('regions.edit.forbidden')
     end
   end
 

data/app/helpers/biovision_regions_helper.rb

@@ -1,7 +1,7 @@
 module BiovisionRegionsHelper
   # @param [Region] entity
   def admin_region_link(entity)
-    link_to(entity.name, admin_region_path(entity.id))
+    link_to(entity.name, admin_region_path(id: entity.id))
   end
 
   # @param [Region] entity

data/app/views/admin/privileges/entity/_region.html.erb

@@ -4,7 +4,7 @@
   <%= label_tag element_id, region.name %>
 </div>
 <% if region.children_cache.any? %>
-    <ul class="regions" data-url="<%= regions_admin_privilege_path(privilege.id, parent_id: region.id, user_id: user.id) %>">
+    <ul class="regions" data-url="<%= regions_admin_privilege_path(id: privilege.id, parent_id: region.id, user_id: user.id) %>">
       <li>
         <button class="add_regions" type="button"><%= t('.deeper_level') %></button>
       </li>

data/app/views/admin/regions/entity/_in_list.html.erb

@@ -9,12 +9,12 @@
   <div class="secondary info">
     <%= t(:user_count, count: entity.users_count) %>
   </div>
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_region_path(entity.id) } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_region_path(id: entity.id) } %>
 
   <ul class="actions">
     <li class="lockable <%= (entity.editable_by?(current_user) && !entity.locked?) ? '' : 'hidden' %>">
-      <%= edit_icon edit_region_path(entity) %>
+      <%= edit_icon edit_region_path(id: entity.id) %>
     </li>
-    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_region_path(entity) } %>
+    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_region_path(id: entity.id) } %>
   </ul>
 </div>

data/app/views/admin/regions/show.html.erb

@@ -13,7 +13,7 @@
   <ul class="actions">
     <li><%= back_icon(admin_regions_path) %></li>
     <% if @entity.editable_by?(current_user) && !@entity.locked? %>
-        <li><%= edit_icon edit_region_path(@entity.id) %></li>
+        <li><%= edit_icon edit_region_path(id: @entity.id) %></li>
     <% end %>
   </ul>
 

data/app/views/regions/_region.jbuilder

@@ -4,8 +4,8 @@ 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)
+  json.self region_path(id: region.id, format: :json)
+  json.children children_region_path(id: region.id)
 end
 json.meta do
   json.child_count region.children_cache.count

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

@@ -12,7 +12,7 @@
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_region_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_region_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 

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

@@ -9,7 +9,7 @@
 
   <% unless @entity.parent.nil? %>
       <ul class="actions">
-        <li><%= return_icon(admin_region_path(@entity.parent_id)) %></li>
+        <li><%= return_icon(admin_region_path(id: @entity.parent_id)) %></li>
       </ul>
   <% end %>
 

data/config/routes.rb

@@ -1,21 +1,24 @@
 Rails.application.routes.draw do
+  scope '(:locale)', constraints: { locale: /ru|en/ } do
+    namespace :admin do
+      resources :regions, only: [:index, :show] do
+        member do
+          post 'priority', defaults: { format: :json }
+          post 'toggle', defaults: { format: :json }
+          put 'lock', defaults: { format: :json }
+          delete 'lock', action: :unlock, defaults: { format: :json }
+        end
+      end
+
+      # get 'privileges/:id/regions' => 'privileges#regions', as: :regions_admin_privilege, defaults: { format: :json }
+    end
 
-  namespace :admin do
-    resources :regions, only: [:index, :show] do
+    resources :regions, except: [:update, :destroy] do
       member do
-        post 'priority', defaults: { format: :json }
-        post 'toggle', defaults: { format: :json }
-        put 'lock', defaults: { format: :json }
-        delete 'lock', action: :unlock, defaults: { format: :json }
+        get 'children', defaults: { format: :json }
       end
     end
-
-    # get 'privileges/:id/regions' => 'privileges#regions', as: :regions_admin_privilege, defaults: { format: :json }
   end
 
-  resources :regions do
-    member do
-      get 'children', defaults: { format: :json }
-    end
-  end
+  resources :regions, only: [:update, :destroy]
 end

data/lib/biovision/regions/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-regions
 version: !ruby/object:Gem::Version
-  version: 0.1.180316
+  version: 0.2.180419
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Regional module for biovision-based application