create_custom_attributes 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7018b4e9074371f1263c36a537695fd2d9b92165
-  data.tar.gz: ba70ed21c53fa7b2363959714627e2a0f7f90651
+  metadata.gz: dc552dc1d4611f73fe12579a4ce65aea76a4a3bc
+  data.tar.gz: 8bbbdc05b0261609125ce0cc6b25f1efcf2b90e7
 SHA512:
-  metadata.gz: 151eca8d70347c7318b44c92cc90aa3a808db5b82351630020704424798a859c99c2814356e45291d8d5738a81d5c88d39a2171d4b368eee8e28aab1123ac5de
-  data.tar.gz: 46ce57830f19bca3f35a33d68a8da4a9b32bcdc02760311cbd4284d3479e117343c07cafd2fe8a1cc7200f3d91ff38f938b31adae8b4d25d0dedae5fa5ba038e
+  metadata.gz: 694b6a66cae8731de68d98833ed5d40d176d2d0a94824e53cf95b0c1453e2d776eaa254d6f5ac8827aa9500100e0f145848b8b6f593a923779c9b0b6a597bb72
+  data.tar.gz: 4d37e57058d2ae9e5f2f8f3587203b3acc32019f879274d0d485252e9aa7321ef18950ccda7485681f2c5bcdb0c99b0e36dc8c59e4b293489215cdce5047eff1

data/lib/custom_attributes.rb

@@ -26,9 +26,10 @@ require 'custom_attributes/concerns/searchable'
 module CustomAttributes
   # Gem configuration credits to: https://stackoverflow.com/questions/6233124/where-to-place-access-config-file-in-gem#10112179
   @config = {
-    search_user: 'elastic',
-    search_pass: 'changeme',
-    search_host: 'localhost:9200'
+    search_user: ENV["ELASTICSEARCH_USER"] || 'elastic',
+    search_pass: ENV["ELASTICSEARCH_PASSWORD"] || 'changeme',
+    search_host: ENV["ELASTICSEARCH_HOST"] || 'localhost:9200',
+    search_index_prefix: ENV["ELASTICSEARCH_INDEX_PREFIX"] || 'es'
   }
 
   @valid_config_keys = @config.keys
@@ -40,19 +41,6 @@ module CustomAttributes
     after_configuration
   end
 
-  # Configure through yaml file
-  def self.configure_with(path_to_yaml_file)
-    begin
-      config = YAML.safe_load(IO.read(path_to_yaml_file))
-    rescue Errno::ENOENT
-      log(:warning, "YAML configuration file couldn't be found. Using defaults."); return
-    rescue Psych::SyntaxError
-      log(:warning, 'YAML configuration file contains invalid syntax. Using defaults.'); return
-    end
-
-    configure(config)
-  end
-
   def self.config
     @config
   end

data/lib/custom_attributes/concerns/searchable.rb

@@ -8,7 +8,7 @@ module CustomAttributes
     included do
       include Elasticsearch::Model
 
-      index_name "#{name.downcase.pluralize}-#{Rails.env}"
+      index_name "#{CustomAttributes.config[:search_index_prefix]}-#{name.downcase.pluralize}-#{Rails.env}"
 
       # For ActiveRecord-based models, use the after_commit callback to
       # protect your data against inconsistencies caused by transaction rollbacks

data/lib/custom_attributes/field_types/bool_field_type.rb

@@ -17,6 +17,14 @@ module CustomAttributes
       [[::I18n.t(:general_text_Yes), '1'], [::I18n.t(:general_text_No), '0']]
     end
 
+    def validate_single_value(_custom_field, value, _customizable = nil)
+      if value == '0' || value == '1'
+        []
+      else
+        [::I18n.t('activerecord.errors.messages.not_a_boolean')]
+      end
+    end
+
     # Boolean supports either checkbox, radiobutton or select field as edit tag
     def edit_tag(view, tag_id, tag_name, custom_value, options = {})
       case custom_value.custom_field.edit_tag_style

data/lib/custom_attributes/version.rb

@@ -1,3 +1,3 @@
 module CustomAttributes
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: create_custom_attributes
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Daniel Grützmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails