rs_russian 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80452e0a70379a3be0c00f012348d6758ff8f7ee
-  data.tar.gz: 1cd940bfa860213f677628438a039a3a869ce7df
+  metadata.gz: 1115b061a56c17e49b2669ebed20e3e1c3204598
+  data.tar.gz: daac96ea23fb9044af33f4d1629daca1289e9d4e
 SHA512:
-  metadata.gz: 26f60135a60b34914a3c202e2ab856507013b99e22c3a2e3d1527558a539f18c7b5ffc2304b08e24743b0b110b24e8499cae75885ab50dfd3f6ba7672406be8f
-  data.tar.gz: 4c97a3aec46be40a4f6af5ea6c3f65a72036706c136d915fa9a35a4723d82418b5e284a7e134cd58428fe4b2400a89a7e6631ad13647c9a4fcf0588ad6bfad29
+  metadata.gz: 554ca6cc31d9403ddfd36c09eb5dd56785e706c95517c034a99ea716ac616f61d819d031eec5f735c57f570aeccaebbbbc052e222365a67a589eba6ba8143b5d
+  data.tar.gz: 4612f146f776c494ba2f4dba4526df6c50bf502667e36204de079153f9cfea5b88aab3fe2d370475932c3ce2049380fe87d67873709a7bfd8c1b775be6c98d72

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.5

data/Gemfile.lock

@@ -1,24 +1,25 @@
 PATH
   remote: .
   specs:
-    rs_russian (0.8.0)
+    rs_russian (0.8.1)
+      activesupport (>= 3.0.0, < 5.0.0)
       i18n (>= 0.6.0, < 0.8.0)
       unicode (~> 0.4.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     diff-lcs (1.2.5)
-    i18n (0.7.0.beta1)
+    i18n (0.7.0)
     json (1.8.1)
-    minitest (5.4.0)
-    rake (10.3.2)
+    minitest (5.5.0)
+    rake (10.4.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -30,13 +31,12 @@ GEM
     thread_safe (0.3.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode (0.4.4.1)
+    unicode (0.4.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.0.0, < 5.0.0)
   bundler (~> 1.7)
   rake
   rs_russian!

data/lib/russian/active_model_ext/custom_error_message.rb

@@ -8,63 +8,41 @@ if defined?(ActiveModel::Errors)
       #  Non-base messages are prefixed with the attribute name as usual UNLESS they begin with '^'
       #  in which case the attribute name is omitted.
       #  E.g. validates_acceptance_of :accepted_terms, :message => '^Please accept the terms of service'
-      #
-      # Переопределяет метод ActiveModel::Errors.full_messages. Сообщения об ошибках для атрибутов
-      # теперь не имеют префикса с названием атрибута если в сообщении об ошибке первым символом указан "^".
-      #
-      # Так, например,
-      #
-      #   validates_acceptance_of :accepted_terms, :message => 'нужно принять соглашение'
-      #
-      # даст сообщение
-      #
-      #   Accepted terms нужно принять соглашение
-      #
-      # однако,
-      #
-      #   validates_acceptance_of :accepted_terms, :message => '^Нужно принять соглашение'
-      #
-      # даст сообщение
-      #
-      #   Нужно принять соглашение
-      #
-      #
-      # Returns all the full error messages in an array.
-      #
-      #   class Company
-      #     validates_presence_of :name, :address, :email
-      #     validates_length_of :name, :in => 5..30
-      #   end
-      #
-      #   company = Company.create(:address => '123 First St.')
-      #   company.errors.full_messages # =>
-      #     ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Address can't be blank"]
-      def full_messages
-        full_messages = []
-
-        each do |attribute, messages|
-          messages = Array.wrap(messages)
-          next if messages.empty?
-
-          if attribute == :base
-            messages.each {|m| full_messages << m }
-          else
-            attr_name = attribute.to_s.gsub('.', '_').humanize
-            attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
-            options = { :attribute => attr_name, :default => "%{attribute} %{message}" }
-
-            messages.each do |m|
-              if m =~ /^\^/
-                full_messages << m[1..-1]
+      
+      def full_message(attribute, message)
+        return message if attribute == :base
+        attr_name = attribute.to_s.tr('.', '_').humanize
+        attr_name = @base.class.human_attribute_name(attribute, default: attr_name)
+        
+        if message =~ /^\^/
+          message[1..-1]
+        else
+          I18n.t(:"errors.format", {
+            default:  "%{attribute} %{message}",
+            attribute: attr_name,
+            message:   message
+          })
+        end
+      end
+      
+      def to_hash(full_messages = false)
+        if full_messages
+          self.messages.each_with_object({}) do |(attribute, array), messages|
+            messages[attribute] = array.map { |message| full_message(attribute, message) }
+          end
+        else
+          self.messages.dup.map do |k, vs|
+            m = vs.map do |v|
+              if v =~ /^\^/
+                v[1..-1]
               else
-                full_messages << I18n.t(:"errors.format", options.merge(:message => m))
+                v
               end
             end
-          end
+            {k => m}
+          end.reduce(:merge)
         end
-
-        full_messages
       end
     end
   end
-end # if defined?
+end

data/lib/russian/version.rb

@@ -1,3 +1,3 @@
 module Russian
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/russian.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'i18n', [">= 0.6.0", "< 0.8.0"]
   spec.add_dependency 'unicode', '~> 0.4.4'
+  spec.add_dependency 'activesupport', ['>= 3.0.0', '< 5.0.0']
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14'
-  spec.add_development_dependency 'activesupport', ['>= 3.0.0', '< 5.0.0']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs_russian
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -45,6 +45,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,26 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 description: Russian language support for Ruby and Rails
 email:
 - glebtv@gmail.com