tolk 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90462539c407ff422fdf13f5fbac68457c8c2807
-  data.tar.gz: cb5c5bc05f5a99a785c7d75261de04aceddf4d80
+  metadata.gz: d28cc93fabb8286338fbdd1cd8715df10f4a76b1
+  data.tar.gz: 32cb9e4dc582a1d92091bb6a49f5b0dff1ac47bf
 SHA512:
-  metadata.gz: ab4f1e9ad6b85a8baef406004c20814397eaf725c6271970043929a08c24a10c8de6dcf1d265673db61d1ea5a97f9c6ba0fe61eb110465ea1a3d94fc43fb7545
-  data.tar.gz: 43907b282e5a3eda7f190b9eb7d0bab377ebb3b6bf166fcddcfbdd66b1d1eb38a50271b0475035eebe4fc76101c03232392898901b62d001e44793961a94ae17
+  metadata.gz: cf75b9e6e531e9eac234b348b0bcdfc709389d7236102e6fbf8d8f34c8a2707290d79f245a0f93f8c233874c5e0f0f8c28fc02d7e666b509b7edf4a00b16e969
+  data.tar.gz: 2a1d268fc7027215f7642e59857f9b0651b8af9adf3828db557dc03ae310a65e8f1eae7bfbe4fab5af39bf027bfb74928d2d2aed8a6d3f67155120b6fcab17eb

data/app/models/tolk/locale.rb

@@ -12,8 +12,8 @@ module Tolk
       @dump_path ||= Tolk.config.dump_path.is_a?(Proc) ? instance_eval(&Tolk.config.dump_path) : Tolk.config.dump_path
     end
 
-    has_many :phrases, :through => :translations, :class_name => 'Tolk::Phrase'
     has_many :translations, :class_name => 'Tolk::Translation', :dependent => :destroy
+    has_many :phrases, :through => :translations, :class_name => 'Tolk::Phrase'
 
     accepts_nested_attributes_for :translations, :reject_if => proc { |attributes| attributes['text'].blank? }
     before_validation :remove_invalid_translations_from_target, :on => :update
@@ -36,6 +36,8 @@ module Tolk
     cattr_accessor :special_keys
     self.special_keys = ['activerecord.models']
 
+    PLURALIZATION_KEYS = ['none', 'zero', 'one', 'two', 'few', 'many', 'other']
+
     class << self
       def primary_locale(reload = false)
         @_primary_locale = nil if reload
@@ -66,7 +68,7 @@ module Tolk
       end
 
       # http://cldr.unicode.org/index/cldr-spec/plural-rules - TODO: usage of 'none' isn't standard-conform
-      PLURALIZATION_KEYS = ['none', 'zero', 'one', 'two', 'few', 'many', 'other']
+
       def pluralization_data?(data)
         keys = data.keys.map(&:to_s)
         keys.all? {|k| PLURALIZATION_KEYS.include?(k) }
@@ -90,7 +92,7 @@ module Tolk
     end
 
     def count_phrases_without_translation
-      existing_ids = self.translations(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
+      existing_ids = self.translations.pluck(&:phrase_id).uniq
       Tolk::Phrase.count - existing_ids.count
     end
 
@@ -101,7 +103,7 @@ module Tolk
     def phrases_without_translation(page = nil)
       phrases = Tolk::Phrase.all.order('tolk_phrases.key ASC')
 
-      existing_ids = self.translations(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
+      existing_ids = self.translations.pluck(:phrase_id).uniq
       phrases = phrases.where('tolk_phrases.id NOT IN (?)', existing_ids) if existing_ids.present?
 
       result = phrases.public_send(pagination_method, page)

data/lib/tolk/import.rb

@@ -49,7 +49,7 @@ module Tolk
 
     def read_locale_file
       locale_file = "#{self.locales_config_path}/#{self.name}.yml"
-      raise "Locale file #{locale_file} does not exists" unless File.exists?(locale_file)
+      raise "Locale file #{locale_file} does not exists" unless File.exist?(locale_file)
 
       puts "[INFO] Reading #{locale_file} for locale #{self.name}"
       begin

data/lib/tolk/sync.rb

@@ -35,7 +35,7 @@ module Tolk
 
       def read_primary_locale_file
         primary_file = "#{self.locales_config_path}/#{self.primary_locale_name}.yml"
-        if File.exists?(primary_file)
+        if File.exist?(primary_file)
           flat_hash(Tolk::YAML.load_file(primary_file)[self.primary_locale_name])
         else
           {}
@@ -62,7 +62,7 @@ module Tolk
         primary_locale = self.primary_locale
 
         # Handle deleted phrases
-        translations.present? ? Tolk::Phrase.destroy_all(["tolk_phrases.key NOT IN (?)", translations.keys]) : Tolk::Phrase.destroy_all
+        translations.present? ? Tolk::Phrase.where(["tolk_phrases.key NOT IN (?)", translations.keys]).destroy_all : Tolk::Phrase.destroy_all
 
         phrases = Tolk::Phrase.all
 

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files