catalogs 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 578ee6b1d66a1950c1d44bba7c7079e6635474e13ce47db9094c714451c6c605
-  data.tar.gz: 2c9d181fe9aa495f70c9b3d219f99fdbefe2dc78bc53797d7ab2c8033c19f679
+  metadata.gz: 7db2c7ac39e8295f21d24ad6092a6746f65e520564e58ca95d6e97ec7d573691
+  data.tar.gz: aee2be8107cd8f55a89f541fd64acd6bdd30d8ec04f04c6fe368deec1583163a
 SHA512:
-  metadata.gz: fd39526a1605fa2715af8decd318b6a62b310db7ff57d334db0c1351c02828d5cab31e07a72fa8a8b1dcf7b494bad205474849ccc0357f8cbbda03c141f464b3
-  data.tar.gz: 145f8606f3788f73df8da459fb71581ee260e76f50b4673c562d9d12ee61e42349dd7ad2284821dda43757cba389e0517bdc3634a126d5a92f080b05adb14a1c
+  metadata.gz: 1e1db9181ce9884c61f9ed9b253a76997f32a2a82311e493d655e5298e539bbadc98d25179c900f8ad248492315f589889cb0637a6f76fd1aa23fc11817b3c6b
+  data.tar.gz: ca4823a25a5261bd51b8158c9ca858c8415d42bd1acac665c9929f9cd177a89eea0863fa053a26f4553df938435230be2e364fa98cde459f6da3599f69d9796f

data/app/helpers/catalogs/catalogs_helper.rb

@@ -10,9 +10,15 @@ module Catalogs
         return instance_variable_get(memoized_variable_name)
       end
 
-      options = Catalogs::Catalog.where(model: model, field: field).pluck(:label, :value)
+      options = Catalogs::Catalog.where(model: model, field: field, active: true).pluck(:label, :value, :internationalizable)
 
       internationalized_options = options.map do |option|
+        if option[0].nil?
+          option[0] = option[1]
+        end
+
+        return [option[0], option[1]] unless option[2]
+
         [
           I18n.t("catalogs.#{model}.#{field}.labels.#{option[0]}", default: option[0]),
           I18n.t("catalogs.#{model}.#{field}.values.#{option[1]}", default: option[1])

data/app/models/catalogs/catalog.rb

@@ -2,7 +2,7 @@
 
 module Catalogs
   class Catalog < ApplicationRecord
-    validates_presence_of :model, :field, :label, :value
+    validates_presence_of :model, :field, :value
     validates_uniqueness_of :label, :value, scope: %i[model field]
   end
 end

data/db/migrate/20190922014006_add_active_to_catalogs.rb

@@ -0,0 +1,5 @@
+class AddActiveToCatalogs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :catalogs_catalogs, :active, :boolean, default: true
+  end
+end

data/db/migrate/20190922014546_add_internationalizable_to_catalogs.rb

@@ -0,0 +1,5 @@
+class AddInternationalizableToCatalogs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :catalogs_catalogs, :internationalizable, :boolean, default: true
+  end
+end

data/db/migrate/20190922015554_remove_null_constraint_from_label.rb

@@ -0,0 +1,5 @@
+class RemoveNullConstraintFromLabel < ActiveRecord::Migration[6.0]
+  def change
+    change_column :catalogs_catalogs, :label, :string, null: true
+  end
+end

data/lib/catalogs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: catalogs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Eduardo Figarola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,9 @@ files:
 - app/views/layouts/catalogs/application.html.erb
 - config/routes.rb
 - db/migrate/20190919172839_create_catalogs_catalogs.rb
+- db/migrate/20190922014006_add_active_to_catalogs.rb
+- db/migrate/20190922014546_add_internationalizable_to_catalogs.rb
+- db/migrate/20190922015554_remove_null_constraint_from_label.rb
 - lib/catalogs.rb
 - lib/catalogs/engine.rb
 - lib/catalogs/version.rb