tolk 1.3.13 → 1.4.00

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 57eb35843ee250a90a52f00f01d993d22f589a9f
-  data.tar.gz: 432d8ae03e83e6a97ccd7618f8f36aff8ef0b0ea
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDI5NjM5ZWYxNzY0YmJkNmI3ZDM3ZmY2MzdjZmM2MmM5YmMxODRkOA==
+  data.tar.gz: !binary |-
+    MzY0ZmU1ZGU4ZGRmYmZmMDQ0NDU5MzQ0MjMzMDI4YjE3NGM4OTE4OA==
 SHA512:
-  metadata.gz: a6deeaba57c92ecb285f306bc25c0bb1c970df94caad148d0fd31ca19232becdbb58196093e9aae0ec10b571f0d14f268a69d5f0aa7527cb8862d91883d6c050
-  data.tar.gz: 1f2b892fc8960ed5cc32a3bd2ac72db481499f0e0bf214176be5be4da72095d7758bc43170201258f8289df9565124f5e918a51639ff9944fe7b0055ef8141eb
+  metadata.gz: !binary |-
+    NDA4YzMwOWU0ZjdhZDA0Y2QyNmNiYmMzOGI1ZjcyYTY4NmE2MzkwY2ZkNmRl
+    NWViYjMwYmY5MGFlYzk2ODlhYzkzYmU3OWRlOTkwM2EyOTNmMGFkM2QyYTg5
+    YTYzOTM1ZTE4ZWRkYjhkY2M4ZDlkMTUxNjgyNmY1OTkwZTBhNGI=
+  data.tar.gz: !binary |-
+    NTIzZjY4MGQyOGIyY2Y0ODgwM2VmNTZkZmM5NjhjYWQ0YjIzZjdjNDg1ZTZm
+    NGVjYTA3Zjg5M2UwOTJmNGQ0ZTNkZTViNTQxZTVhMjI5MTZlODNkMDU5YjU1
+    MWRjZTg5NGM3ZTU3OGViMDQzMzE1YjBkNmY3MGUxYzU5YjQ0ZDM=

data/app/controllers/tolk/application_controller.rb

@@ -9,7 +9,8 @@ module Tolk
     before_filter :authenticate
 
     def authenticate
-      self.authenticator.bind(self).call if self.authenticator && self.authenticator.respond_to?(:call)
+#      self.authenticator.bind(self).call if self.authenticator && self.authenticator.respond_to?(:call)
+      instance_exec(nil, &self.authenticator) if self.authenticator && self.authenticator.respond_to?(:instance_exec)
     end
 
     def ensure_no_primary_locale

data/app/models/tolk/locale.rb

@@ -39,7 +39,7 @@ module Tolk
         @_primary_locale = nil if reload
         @_primary_locale ||= begin
           raise "Primary locale is not set. Please set Locale.primary_locale_name in your application's config file" unless self.primary_locale_name
-          find_or_create_by_name(self.primary_locale_name)
+          find_or_create_by(name: self.primary_locale_name)
         end
       end
 
@@ -82,7 +82,7 @@ module Tolk
     end
 
     def count_phrases_without_translation
-      existing_ids = self.translations.all(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
+      existing_ids = self.translations(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
       Tolk::Phrase.count - existing_ids.count
     end
 
@@ -91,10 +91,10 @@ module Tolk
     end
 
     def phrases_without_translation(page = nil, options = {})
-      phrases = Tolk::Phrase.scoped(:order => 'tolk_phrases.key ASC')
+      phrases = Tolk::Phrase.all.order('tolk_phrases.key ASC')
 
-      existing_ids = self.translations.all(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
-      phrases = phrases.scoped(:conditions => ['tolk_phrases.id NOT IN (?)', existing_ids]) if existing_ids.present?
+      existing_ids = self.translations(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
+      phrases = phrases.where('tolk_phrases.id NOT IN (?)', existing_ids) if existing_ids.present?
 
       result = phrases.paginate({:page => page, :per_page => Phrase.per_page}.merge(options))
       ActiveRecord::Associations::Preloader.new result, :translations
@@ -111,22 +111,22 @@ module Tolk
         self.translations.containing_text(query)
       end
 
-      phrases = Tolk::Phrase.scoped(:order => 'tolk_phrases.key ASC')
+      phrases = Tolk::Phrase.all.order('tolk_phrases.key ASC')
       phrases = phrases.containing_text(key_query)
 
-      phrases = phrases.scoped(:conditions => ['tolk_phrases.id IN(?)', translations.map(&:phrase_id).uniq])
+      phrases = phrases.where('tolk_phrases.id IN(?)', translations.map(&:phrase_id).uniq)
       phrases.paginate({:page => page}.merge(options))
     end
 
     def search_phrases_without_translation(query, page = nil, options = {})
       return phrases_without_translation(page, options) unless query.present?
 
-      phrases = Tolk::Phrase.scoped(:order => 'tolk_phrases.key ASC')
+      phrases = Tolk::Phrase.all.order('tolk_phrases.key ASC')
 
       found_translations_ids = Tolk::Locale.primary_locale.translations.all(:conditions => ["tolk_translations.text LIKE ?", "%#{query}%"], :select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
       existing_ids = self.translations.all(:select => 'tolk_translations.phrase_id').map(&:phrase_id).uniq
-      phrases = phrases.scoped(:conditions => ['tolk_phrases.id NOT IN (?) AND tolk_phrases.id IN(?)', existing_ids, found_translations_ids]) if existing_ids.present?
-
+#      phrases = phrases.scoped(:conditions => ['tolk_phrases.id NOT IN (?) AND tolk_phrases.id IN(?)', existing_ids, found_translations_ids]) if existing_ids.present?
+      phrases = phrases.where(['tolk_phrases.id NOT IN (?) AND tolk_phrases.id IN(?)', existing_ids, found_translations_ids]) if existing_ids.present?
       result = phrases.paginate({:page => page}.merge(options))
       ActiveRecord::Associations::Preloader.new result, :translations
       result

data/app/models/tolk/phrase.rb

@@ -21,8 +21,10 @@ module Tolk
 
     attr_accessor :translation
 
+#scope :red, -> { where(color: 'red') } rather than scope :red, -> { { conditions: { color: 'red' } } }
+
     scope :containing_text, lambda { |query|
-      { :conditions => ["tolk_phrases.key LIKE ?", "%#{query}%"] }
+      where("tolk_phrases.key LIKE ?", "%#{query}%")
     }
   end
 end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.3.13"
+  VERSION = "1.4.00"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.4.00
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,54 +12,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: protected_attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
@@ -70,6 +64,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
+- config/routes.rb
+- init.rb
+- lib/generators/tolk/install_generator.rb
+- lib/generators/tolk/templates/initializer.erb
+- lib/generators/tolk/templates/migration.rb
+- lib/generators/tolk/utils.rb
+- lib/tasks/tolk_tasks.rake
+- lib/tolk/config.rb
+- lib/tolk/engine.rb
+- lib/tolk/export.rb
+- lib/tolk/import.rb
+- lib/tolk/sync.rb
+- lib/tolk/version.rb
+- lib/tolk.rb
 - app/assets/javascripts/tolk/actions.js
 - app/assets/javascripts/tolk/application.js
 - app/assets/javascripts/tolk/interpolations.js
@@ -93,20 +101,6 @@ files:
 - app/views/tolk/locales/show.html.erb
 - app/views/tolk/searches/_form.html.erb
 - app/views/tolk/searches/show.html.erb
-- config/routes.rb
-- init.rb
-- lib/generators/tolk/install_generator.rb
-- lib/generators/tolk/templates/initializer.erb
-- lib/generators/tolk/templates/migration.rb
-- lib/generators/tolk/utils.rb
-- lib/tasks/tolk_tasks.rake
-- lib/tolk.rb
-- lib/tolk/config.rb
-- lib/tolk/engine.rb
-- lib/tolk/export.rb
-- lib/tolk/import.rb
-- lib/tolk/sync.rb
-- lib/tolk/version.rb
 homepage: http://github.com/tolk/tolk
 licenses:
 - MIT
@@ -117,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files