care 0.1.0 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14977cccfa8498c0a1f393c82b87cd82e17158f2d011a87cec06bfb1f985bf23
-  data.tar.gz: 925a627e30e5336da9831c25d81dfce770b824839f16a0339f3801e660974405
+  metadata.gz: e0d173cca687ef272ba0759ff347995723a34052af354aa01a22fac55614bbd9
+  data.tar.gz: f4975d1110fe9eed49cb1e1964a716be88d78fb012faba92472576371bfa7658
 SHA512:
-  metadata.gz: 0c436afc6b630ee40142a5d0548114c32df40611d50b2697b427c3c1bab94db2d4f08059aac3b0b9d229df128f1c69ebfd6b25ead68a4b0de01df23f97999ddf
-  data.tar.gz: 79c72894f82c9af2a30a152b3137e285c2b105fc5cbd9af7fb36ff22466ccbd39e7f3c2954225d663f318b15639afc4d8099e713c2c6162b4f83d3feb2ce0357
+  metadata.gz: db5fac70a2cf214bf2294077411da7924f6c25c6dd3b458d48eab4338cbbe4cf2a20fe5e37f69e55c9c9992fa28e3e319d7b2c33fdfccf3827bf99a78909a244
+  data.tar.gz: c8f3cd3169d948c88a1ec55fefc14fab39c74eed92e564e46e51e62dfcef832b72b7819d0da03888f7915592da59dda0c7ba1ea147553307c34d88de9e78eff5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    care (0.1.0)
+    care (0.1.6)
       active_model_serializers (~> 0.10.10)
       activerecord-import
       cancancan
@@ -19,49 +19,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.4.1)
-      actionview (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.0)
+      actionview (= 6.1.0)
+      activesupport (= 6.1.0)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.1)
-      activesupport (= 5.2.4.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.0)
+      activesupport (= 6.1.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.10)
-      actionpack (>= 4.1, < 6.1)
-      activemodel (>= 4.1, < 6.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    active_model_serializers (0.10.12)
+      actionpack (>= 4.1, < 6.2)
+      activemodel (>= 4.1, < 6.2)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      arel (>= 9.0)
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
     activerecord-import (1.0.7)
       activerecord (>= 3.2)
-    activesupport (5.2.4.1)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.1)
     bcrypt (3.1.16)
     builder (3.2.4)
-    cancancan (3.1.0)
+    cancancan (3.2.0)
     case_transform (0.2)
       activesupport
     centrifuge (1.2.0)
       httpclient
       multi_json
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
     database_cleaner (1.8.5)
     database_cleaner-active_record (1.8.0)
       activerecord
@@ -77,46 +76,46 @@ GEM
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
-    erubi (1.9.0)
+    erubi (1.10.0)
     factory_bot (5.2.0)
       activesupport (>= 4.2.0)
     factory_bot_rails (5.2.0)
       factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
-    faker (2.14.0)
+    faker (2.15.1)
       i18n (>= 1.6, < 2)
     httpclient (2.8.3)
-    i18n (1.7.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jsonapi-renderer (0.2.2)
     jwt (2.2.2)
-    kaminari (1.1.1)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    loofah (2.4.0)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.2)
     multi_json (1.15.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    parallel (1.19.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     prometheus-client (1.0.0)
-    rack (2.0.8)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -124,31 +123,31 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    railties (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.2)
+    rake (13.0.3)
+    regexp_parser (2.0.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-rails (4.0.1)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
@@ -157,7 +156,7 @@ GEM
       rspec-expectations (~> 3.9)
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
-    rspec-support (3.9.3)
+    rspec-support (3.10.0)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -167,18 +166,18 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
+    rubocop-ast (1.3.0)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     shoulda-matchers (4.4.1)
       activesupport (>= 4.2.0)
     thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/lib/care/auto_finder/searchable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require_relative 'searcher'
 
 module Care::AutoFinder
   #
@@ -25,7 +26,7 @@ module Care::AutoFinder
 
     def search(items)
       if params[:search].present?
-        Searcher.call(items: items, columns: columns, search: params[:search])
+        Care::AutoFinder::Searcher.call(items: items, columns: columns, search: params[:search])
       else
         items
       end

data/lib/care/seed.rb

@@ -5,13 +5,15 @@ module Care
         table_name = path.split("/").last.gsub(".json", "").gsub(/^\d*_/, "")
         puts "*** Преднаполнение таблицы #{table_name} ***"
         items = ActiveSupport::JSON.decode(File.read(path))
-        begin
-          items_class = table_name.classify.constantize
+        table_name = table_name.gsub('dictionary_', 'dictionary/') || table_name
+        if (items_class = table_name.classify.safe_constantize)
           items_class.import(items, on_duplicate_key_update: :all)
-        rescue NameError => _e # Не обнаружен класс с описанием модели
-          keys = items[0].keys.join(",")
+        else
+          keys = items[0].keys
+          v_keys = keys.join(",")
           values = items.map { |i| "(#{i.values.map { |v| "'#{v}'" }.join(",")})" }.join(",")
-          sql = "insert into #{table_name}(#{keys}) values #{values} on conflict (id) do nothing"
+          set_keys = keys.map{|k| "#{k} = excluded.#{k}"}.join(", ")
+          sql = "insert into #{table_name}(#{v_keys}) values #{values} on conflict (id) do update set #{set_keys}"
           puts sql
           ActiveRecord::Base.connection.execute sql
         end

data/lib/care/support/authorization_helper.rb

@@ -1,6 +1,7 @@
 RSpec.shared_context "set_authorization" do
 
-  let(:organization_id) { SecureRandom.uuid }
+  let(:'Organization-Id') { SecureRandom.uuid }
+  let(:organization_id) { send(:'Organization-Id') }
 
   let(:payload) do
     {

data/lib/care/support/parameters.rb

@@ -9,7 +9,7 @@ RSpec.shared_context "parameters" do |parameter_tags|
               required: true
   end
   if parameter_tags.include?(:organization_id)
-    parameter name: :organization_id,
+    parameter name: :'Organization-Id',
               description: "Organization ID текущей организации",
               in: :header,
               type: :string,

data/lib/care/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Care
-  VERSION = "0.1.0"
+  VERSION = "0.1.6"
 end

data/lib/patch/action_controller/concerns/authorization.rb

@@ -24,7 +24,7 @@ module Authorization
     end
 
     def current_organization_id
-      @current_organization_id ||= request.headers[:organization_id]
+      @current_organization_id ||= request.headers['organization-id']
     end
 
     def permissions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: care
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.6
 platform: ruby
 authors:
 - Валерий Маханов
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt