biovision-base 0.8.170916 → 0.8.171029

data/config/locales/users-ru.yml

@@ -11,6 +11,12 @@ ru:
     few: "%{count} активации"
     many: "%{count} активаций"
     other: "%{count} активаций"
+  age_year_count:
+    zero: "%{count} лет"
+    one: "%{count} год"
+    few: "%{count} года"
+    many: "%{count} лет"
+    other: "%{count} лет"
   invalid_code: "Недействительный код"
   could_not_log_in: "Не удалось выполнить вход"
   logout: "Выйти"
@@ -137,6 +143,8 @@ ru:
       privileges:
         title: "Привилегии пользователя %{user}"
         heading: "Привилегии пользователя"
+      filter:
+        search: "Искать"
     tokens:
       nav_item:
         text: "Жетоны доступа (сессии пользователей)"
@@ -303,6 +311,7 @@ ru:
         update_password: "Изменить пароль"
         no_code: "Нет кода для сброса пароля?"
         send_code: "Отправить код"
+        receive_code: "Получить код"
     confirmations:
       create:
         set_email: "Пожалуйста, заполните адрес электронной почты"

data/config/routes.rb

@@ -12,7 +12,7 @@ Rails.application.routes.draw do
     get 'tos' => :tos
   end
 
-  scope 'u/:slug', controller: :profiles do
+  scope 'u/:slug', controller: :profiles, constraints: { slug: /[^\/]+/ } do
     get '/' => :show, as: :user_profile
   end
 

data/db/migrate/20170301000001_create_metrics.rb

@@ -1,4 +1,4 @@
-class CreateMetrics < ActiveRecord::Migration[5.0]
+class CreateMetrics < ActiveRecord::Migration[5.1]
   def up
     unless Metric.table_exists?
       create_table :metrics do |t|

data/db/migrate/20170301000002_create_metric_values.rb

@@ -1,4 +1,4 @@
-class CreateMetricValues < ActiveRecord::Migration[5.0]
+class CreateMetricValues < ActiveRecord::Migration[5.1]
   def up
     unless MetricValue.table_exists?
       create_table :metric_values do |t|

data/db/migrate/20170301000101_create_browsers.rb

@@ -1,4 +1,4 @@
-class CreateBrowsers < ActiveRecord::Migration[5.0]
+class CreateBrowsers < ActiveRecord::Migration[5.1]
   def up
     unless Browser.table_exists?
       create_table :browsers do |t|

data/db/migrate/20170301000102_create_agents.rb

@@ -1,4 +1,4 @@
-class CreateAgents < ActiveRecord::Migration[5.0]
+class CreateAgents < ActiveRecord::Migration[5.1]
   def up
     unless Agent.table_exists?
       create_table :agents do |t|

data/db/migrate/20170301000201_create_regions.rb

@@ -10,12 +10,15 @@ class CreateRegions < ActiveRecord::Migration[5.1]
         t.float :latitude
         t.float :longitude
         t.string :slug, null: false
-        t.string :long_slug, null: false
+        t.string :long_slug, null: false, index: true
         t.string :name, null: false
         t.string :short_name
         t.string :locative
         t.string :image
         t.string :header_image
+        t.string :image_url
+        t.text :map_geometry
+        t.text :svg_geometry
         t.string :parents_cache, default: '', null: false
         t.integer :children_cache, array: true, default: [], null: false
       end

data/db/migrate/20170302000001_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration[5.0]
+class CreateUsers < ActiveRecord::Migration[5.1]
   def up
     unless User.table_exists?
       create_table :users do |t|
@@ -15,6 +15,7 @@ class CreateUsers < ActiveRecord::Migration[5.0]
         t.integer :upvote_count, default: 0, null: false
         t.integer :downvote_count, default: 0, null: false
         t.integer :vote_result, default: 0, null: false
+        t.integer :balance, default: 0, null: false
         t.boolean :super_user, default: false, null: false
         t.boolean :deleted, default: false, null: false
         t.boolean :bot, default: false, null: false

data/db/migrate/20170302000003_create_tokens.rb

@@ -1,4 +1,4 @@
-class CreateTokens < ActiveRecord::Migration[5.0]
+class CreateTokens < ActiveRecord::Migration[5.1]
   def up
     unless Token.table_exists?
       create_table :tokens do |t|

data/db/migrate/20170302000005_create_codes.rb

@@ -1,4 +1,4 @@
-class CreateCodes < ActiveRecord::Migration[5.0]
+class CreateCodes < ActiveRecord::Migration[5.1]
   def up
     unless Code.table_exists?
       create_table :codes do |t|

data/db/migrate/20170302000101_create_privileges.rb

@@ -1,4 +1,4 @@
-class CreatePrivileges < ActiveRecord::Migration[5.0]
+class CreatePrivileges < ActiveRecord::Migration[5.1]
   def up
     unless Privilege.table_exists?
       create_table :privileges do |t|

data/db/migrate/20170302000102_create_user_privileges.rb

@@ -1,4 +1,4 @@
-class CreateUserPrivileges < ActiveRecord::Migration[5.0]
+class CreateUserPrivileges < ActiveRecord::Migration[5.1]
   def up
     unless UserPrivilege.table_exists?
       create_table :user_privileges do |t|

data/db/migrate/20170302000103_create_privilege_groups.rb

@@ -1,4 +1,4 @@
-class CreatePrivilegeGroups < ActiveRecord::Migration[5.0]
+class CreatePrivilegeGroups < ActiveRecord::Migration[5.1]
   def up
     unless PrivilegeGroup.table_exists?
       create_table :privilege_groups do |t|

data/db/migrate/20170302000104_create_privilege_group_privileges.rb

@@ -1,4 +1,4 @@
-class CreatePrivilegeGroupPrivileges < ActiveRecord::Migration[5.0]
+class CreatePrivilegeGroupPrivileges < ActiveRecord::Migration[5.1]
   def up
     unless PrivilegeGroupPrivilege.table_exists?
       create_table :privilege_group_privileges do |t|

data/db/migrate/20170320000000_create_editable_pages.rb

@@ -1,10 +1,13 @@
-class CreateEditablePages < ActiveRecord::Migration[5.0]
+class CreateEditablePages < ActiveRecord::Migration[5.1]
   def up
     unless EditablePage.table_exists?
       create_table :editable_pages do |t|
         t.timestamps
+        t.integer :priority, limit: 2, default: 1, null: false
         t.string :slug, null: false
         t.string :name, null: false
+        t.string :nav_group
+        t.string :url
         t.string :image
         t.string :title, default: '', null: false
         t.string :keywords, default: '', null: false

data/db/migrate/20170425000001_create_foreign_sites.rb

@@ -1,4 +1,4 @@
-class CreateForeignSites < ActiveRecord::Migration[5.0]
+class CreateForeignSites < ActiveRecord::Migration[5.1]
   def up
     unless ForeignSite.table_exists?
       create_table :foreign_sites do |t|

data/db/migrate/20170425000002_create_foreign_users.rb

@@ -1,4 +1,4 @@
-class CreateForeignUsers < ActiveRecord::Migration[5.0]
+class CreateForeignUsers < ActiveRecord::Migration[5.1]
   def up
     unless ForeignUser.table_exists?
       create_table :foreign_users do |t|

data/db/migrate/20171025222222_add_new_fields_171026.rb

@@ -0,0 +1,29 @@
+class AddNewFields171026 < ActiveRecord::Migration[5.1]
+  def up
+    unless column_exists?(:regions, :image_url)
+      change_table :regions do |t|
+        t.string :image_url
+        t.text :map_geometry
+        t.text :svg_geometry
+      end
+    end
+
+    unless column_exists?(:editable_pages, :url)
+      change_table :editable_pages do |t|
+        t.integer :priority, limit: 2, default: 1, null: false
+        t.string :url
+        t.string :nav_group
+      end
+    end
+
+    unless column_exists?(:users, :balance)
+      change_table :users do |t|
+        t.integer :balance, default: 0, null: false
+      end
+    end
+  end
+
+  def down
+  #   No need to rollback
+  end
+end

data/lib/biovision/base/engine.rb

@@ -13,6 +13,11 @@ module Biovision
           require_dependency(c)
         end
       end
+
+      config.generators do |g|
+        g.test_framework :rspec
+        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      end
     end
 
     require 'kaminari'

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.8.170916'
+    VERSION = '0.8.171029'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.8.170916
+  version: 0.8.171029
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,7 +164,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Base components for Biovision applications. Locales, some JS and SCSS
+description: Base components for Biovision applications. Models, Controllers, locales,
+  some JS and SCSS
 email:
 - maxim.km@gmail.com
 executables: []
@@ -392,6 +393,7 @@ files:
 - app/views/application/unauthorized.jbuilder
 - app/views/authentication/_form.html.erb
 - app/views/authentication/new.html.erb
+- app/views/authentication/new.jbuilder
 - app/views/browsers/_form.html.erb
 - app/views/browsers/edit.html.erb
 - app/views/browsers/new.html.erb
@@ -454,6 +456,7 @@ files:
 - app/views/regions/_form.html.erb
 - app/views/regions/edit.html.erb
 - app/views/regions/new.html.erb
+- app/views/shared/_breadcrumbs.html.erb
 - app/views/shared/_counters.html.erb
 - app/views/shared/_flash_messages.html.erb
 - app/views/shared/_list_of_errors.html.erb
@@ -506,6 +509,7 @@ files:
 - db/migrate/20170425000002_create_foreign_users.rb
 - db/migrate/20170629120000_create_login_attempts.rb
 - db/migrate/20170823000001_create_stored_values.rb
+- db/migrate/20171025222222_add_new_fields_171026.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb