uuid_parameter 0.2.0.pre.alpha.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7718b5d84a19a25b9ce316d23919ef34a13a31a50aa46993578f18f59a81eed
-  data.tar.gz: d7be3d70a50ecda0d8fe7db471ab36f948618b56f09acba4af076e2f6da62f15
+  metadata.gz: 276b01d703d6a657be6b878402fd58c598a7f297442c6976b5b124fa206f15e4
+  data.tar.gz: 7ef3b621857adfe47db0f06673dadc5866f531cfce25c3aba60aabad389d08c0
 SHA512:
-  metadata.gz: 7906c3a3529293eabb7c51a0c6bc97e4d6e2eb8a81ab19f3d717e2c67fb2caec9fbb38c8e5cfd9ca05d56ddfd73c02352338f7618995e8de7adfc32faafa8279
-  data.tar.gz: 28ae550b9f0288cdaf292045f1c4f924167a3d2108dc5babdb03e5ba3db0b70590920feb8e875da937abe5a95e4fca127955d0081c3159b4a0313ad114141e15
+  metadata.gz: bc73c09cdb1b543f95fdc487b6b969d4edd5875cf58bd072e22a1f9e3348a7029ec95007e8bcea799925d44ef7e2bf42556c2b467611c86d6b01b1052d533848
+  data.tar.gz: 84fcc1bd03aead0c609cde7d90e8aa8bcdd302fa38416ce71834c9c22824b0769a9e6ce7dd5b13d4dbc7cea8846dcba8af5bbef641ed7db93392769fd4560fe7

data/config/locale/en.yml

@@ -0,0 +1,18 @@
+en:
+  errors:
+    messages:
+      not_a_uuid_v4: "must be a random UUID (v4)"
+  activerecord:
+    errors:
+      models:
+        attributes:
+          uuid:
+            not_a_uuid_v4: 'not a UUID v4'
+    attributes:
+      user:
+        uuid: 'UUIDv4'
+    errors:
+      user:
+        attributes:
+          uuid:
+            not_a_uuid_v4: 'LAAAAAAAAAAAAAAAAAA in uuid_parameter/locale'

data/lib/uuid_parameter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # TODO: move this to the right place... But where?
-I18n.load_path << File.expand_path("locale/en.yml", __dir__)
+I18n.load_path += Dir[File.join(__dir__, '../config/locale/*.yml')]
 
 # == UUIDParameter
 #
@@ -28,43 +28,6 @@ I18n.load_path << File.expand_path("locale/en.yml", __dir__)
 # user.reload.uuid  # => '8bb96d58-2efd-45df-833b-119971a19fea' (unchanged)
 # user.to_param     # => '8bb96d58-2efd-45df-833b-119971a19fea'
 #
-module UUIDParameter
-  extend ActiveSupport::Concern
 
-  # Note the static '4' in the third group: that's the UUID version.
-  UUID_V4_REGEX = %r[\A[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}\z]
-
-  included do
-    validates :uuid,
-              presence: true,
-              uniqueness: true,
-              format: { with: UUID_V4_REGEX, message: :not_a_uuid_v4 }
-
-    before_validation :assign_uuid
-    before_save :recover_uuid
-
-    def to_param
-      uuid.to_s
-    end
-
-    private
-
-    def assign_uuid
-      self.uuid ||= SecureRandom.uuid
-    end
-
-    def existing_uuid_changed?
-      !new_record? && !uuid_was.nil? && uuid_changed?
-    end
-
-    def recover_uuid
-      self.uuid = uuid_was if existing_uuid_changed?
-      reset_uuid! unless UUID_V4_REGEX.match?(self.uuid)
-    end
-
-    def reset_uuid!
-      self.uuid = nil
-      assign_uuid
-    end
-  end
-end
+require 'uuid_parameter/railtie'
+require 'uuid_parameter/concern'

data/lib/uuid_parameter/#error.rb#

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module UUIDParameter
+
+
+end

data/lib/uuid_parameter/concern.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module UUIDParameter
+  extend ActiveSupport::Concern
+
+  # Note the static '4' in the third group: that's the UUID version.
+  UUID_V4_REGEX = %r[\A[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}\z]
+
+  class InvalidRandomUUIDError < ActiveModel::Errors; end
+
+  included do
+    validates :uuid,
+              presence: true,
+              uniqueness: true,
+              # format: { with: UUID_V4_REGEX, message: :not_a_uuid_v4 }
+              with: :uuid4_validator
+    
+
+    before_validation :assign_uuid
+    before_save :recover_uuid
+
+    def to_param
+      uuid.to_s
+    end
+
+    private
+
+    def assign_uuid
+      self.uuid ||= SecureRandom.uuid
+    end
+
+    def existing_uuid_changed?
+      !new_record? && !uuid_was.nil? && uuid_changed?
+    end
+
+    def recover_uuid
+      self.uuid = uuid_was if existing_uuid_changed?
+      reset_uuid! unless UUID_V4_REGEX.match?(self.uuid)
+    end
+
+    def reset_uuid!
+      self.uuid = nil
+      assign_uuid
+    end
+
+    def uuid4_validator
+      errors.add(:uuid, :invalid_random_uuid, message: :not_a_uuid_v4) unless uuid =~ UUID_V4_REGEX
+    end
+  end
+end

data/lib/uuid_parameter/railtie.rb

@@ -1,12 +1,31 @@
 # frozen_string_literal: true
 
+require 'rails'
+
 module UUIDParameter
-  class Railtie < ::Rails::Railtie
+  class Engine < ::Rails::Engine; end
+
+  class Railtie < ::Rails::Railtie # :nodoc:
     config.uuid_parameter = ActiveSupport::OrderedOptions.new
 
-    initializer 'uuid_parameter.set_locales' do |app|
-      app.config.i18n.load_paths << File.expand_path('../locale', __DIR__)
-      app.config.i18n.available_locales = [:en, :fr].freeze
+    initializer 'uuid_parameter-i18n' do |app|
+      UUIDParameter::Railtie.instance_eval do
+        pattern = pattern_from app.config.i18n.available_locales
+
+        add("config/locale/#{pattern}.yml")
+      end
+    end
+
+    protected
+
+    def self.add(pattern)
+      files = Dir[File.join(__dir__, '../..', pattern)]
+      I18n.load_path.concat(files)
+    end
+
+    def self.pattern_from(args)
+      array = Array(args || [])
+      array.blank? ? '*' : "#{array.join(',')}"
     end
   end
 end

data/lib/uuid_parameter/version.rb

@@ -1,3 +1,3 @@
 module UUIDParameter
-  VERSION = '0.2.0-alpha.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuid_parameter
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.alpha.1
+  version: 0.2.0
 platform: ruby
 authors:
 - hellekin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,9 +76,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/locale/en.yml
-- lib/locale/fr.yml
+- config/locale/en.yml
+- config/locale/fr.yml
 - lib/uuid_parameter.rb
+- lib/uuid_parameter/#error.rb#
+- lib/uuid_parameter/concern.rb
 - lib/uuid_parameter/railtie.rb
 - lib/uuid_parameter/version.rb
 homepage: https://gitlab.com/incommon.cc/uuid_parameter
@@ -96,9 +98,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/lib/locale/en.yml

@@ -1,4 +0,0 @@
-en:
-  errors:
-    messages:
-      not_a_uuid_v4: "must be a random UUID (v4)"