tolk 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8edb38a512ec3f99ff77247e69aadc7165741877
-  data.tar.gz: 7ce3e97f58f4f7d5572ea4f66c087fa10a8e5c4a
+  metadata.gz: 9abfb538fd5b1496c475291c76eb390219c6e9a1
+  data.tar.gz: 94333e34720a9a3120c9fa366b8f2d17147cfc91
 SHA512:
-  metadata.gz: 590df61b41db838157c92acb7c54e6e24cfc0cdb23cd08e25df84e6230863d5e2a92638ec7036a09e550da25993ed63afdb3b942bac126e93194abe81a33f5bb
-  data.tar.gz: d48e97823d6fec8131c65b2df05340ba9ed356a3d2f1a64c94279ab729e09992e0869c3aa34a593c4dc6d7d88ec695ba7ba95b56c6d20d62b4ed76d96fbec0a7
+  metadata.gz: 8334be8d312ce698cadaad7e4c184a51a88648eb3b08a29e530de859620ca45a9baeb0735943d1e32fe570401a0eb9f75726f0901ec6a9954cf4523bf4d42402
+  data.tar.gz: 021100519c121daee3f8f852d7529442e94ed03c3c4ceb1dfbf9613f348658df4b9b2dd433e70ac41deeddd537b100e36833ff60f85e6a1ed2b66c66297a3b74

data/app/controllers/tolk/application_controller.rb

@@ -1,7 +1,10 @@
 require 'tolk/application_controller'
+require 'tolk/pagination'
 
 module Tolk
   class ApplicationController < ActionController::Base
+    include Tolk::Pagination::Methods
+
     helper :all
     protect_from_forgery
 

data/app/controllers/tolk/locales_controller.rb

@@ -10,10 +10,10 @@ module Tolk
     def show
       respond_to do |format|
         format.html do
-          @phrases = @locale.phrases_without_translation(params[:page])
+          @phrases = @locale.phrases_without_translation(params[pagination_param])
         end
 
-        format.atom { @phrases = @locale.phrases_without_translation(params[:page], :per_page => 50) }
+        format.atom { @phrases = @locale.phrases_without_translation(params[pagination_param]).per(50) }
 
         format.yaml do
           data = @locale.to_hash
@@ -30,11 +30,11 @@ module Tolk
     end
 
     def all
-      @phrases = @locale.phrases_with_translation(params[:page])
+      @phrases = @locale.phrases_with_translation(params[pagination_param])
     end
 
     def updated
-      @phrases = @locale.phrases_with_updated_translation(params[:page])
+      @phrases = @locale.phrases_with_updated_translation(params[pagination_param])
       render :all
     end
 

data/app/controllers/tolk/searches_controller.rb

@@ -3,7 +3,7 @@ module Tolk
     before_filter :find_locale
   
     def show
-      @phrases = @locale.search_phrases(params[:q], params[:scope].to_sym, params[:k], params[:page])
+      @phrases = @locale.search_phrases(params[:q], params[:scope].to_sym, params[:k], params[pagination_param])
     end
 
     private

data/app/helpers/tolk/application_helper.rb

@@ -1,5 +1,9 @@
+require 'tolk/pagination'
+
 module Tolk
   module ApplicationHelper
+    include Tolk::Pagination::ViewHelper
+
     def format_i18n_value(value)
       value = h(yaml_value(value))
       value = highlight_linebreaks(value)

data/app/models/tolk/locale.rb

@@ -1,7 +1,10 @@
 require 'tolk/config'
+require 'tolk/pagination'
 
 module Tolk
   class Locale < ActiveRecord::Base
+    include Tolk::Pagination::Methods
+
     self.table_name = "tolk_locales"
 
     def self._dump_path
@@ -95,13 +98,13 @@ module Tolk
       find_phrases_with_translations(page, :'tolk_translations.primary_updated' => true).count
     end
 
-    def phrases_without_translation(page = nil, options = {})
+    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
       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))
+      result = phrases.public_send(pagination_method, page)
       if Rails.version =~ /^4\.0/
         ActiveRecord::Associations::Preloader.new result, :translations
       else
@@ -111,7 +114,7 @@ module Tolk
       result
     end
 
-    def search_phrases(query, scope, key_query, page = nil, options = {})
+    def search_phrases(query, scope, key_query, page = nil)
       return [] unless query.present? || key_query.present?
 
       translations = case scope
@@ -125,11 +128,11 @@ module Tolk
       phrases = phrases.containing_text(key_query)
 
       phrases = phrases.where('tolk_phrases.id IN(?)', translations.map(&:phrase_id).uniq)
-      phrases.paginate({:page => page}.merge(options))
+      phrases.public_send(pagination_method, page)
     end
 
-    def search_phrases_without_translation(query, page = nil, options = {})
-      return phrases_without_translation(page, options) unless query.present?
+    def search_phrases_without_translation(query, page = nil)
+      return phrases_without_translation(page) unless query.present?
 
       phrases = Tolk::Phrase.all.order('tolk_phrases.key ASC')
 
@@ -137,7 +140,7 @@ module Tolk
       existing_ids = self.translations.select('tolk_translations.phrase_id').to_a.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.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))
+      result = phrases.public_send(pagination_method, page)
       if Rails.version =~ /^4\.0/
         ActiveRecord::Associations::Preloader.new result, :translations
       else
@@ -219,7 +222,7 @@ module Tolk
     end
 
     def find_phrases_with_translations(page, conditions = {})
-      result = Tolk::Phrase.where({ :'tolk_translations.locale_id' => self.id }.merge(conditions)).joins(:translations).order('tolk_phrases.key ASC').paginate(:page => page)
+      result = Tolk::Phrase.where({ :'tolk_translations.locale_id' => self.id }.merge(conditions)).joins(:translations).order('tolk_phrases.key ASC').public_send(pagination_method, page)
 
       result.each do |phrase|
         phrase.translation = phrase.translations.for(self)

data/app/models/tolk/phrase.rb

@@ -4,8 +4,7 @@ module Tolk
 
     validates_uniqueness_of :key
 
-    cattr_accessor :per_page
-    self.per_page = 30
+    paginates_per 30
 
     has_many :translations, :class_name => 'Tolk::Translation', :dependent => :destroy do
       def primary

data/app/views/tolk/locales/all.html.erb

@@ -58,7 +58,7 @@
       <p><%= locale_form.submit "Save changes", :class => 'save' %></p>
     </div>
     <div class="paginate">
-      <%= will_paginate @phrases %>
+      <%= tolk_paginate @phrases %>
     </div>
   <% end %>
 <% else %>

data/app/views/tolk/locales/show.html.erb

@@ -54,7 +54,7 @@
       </div>
     <% end %>
     <div class="paginate">
-      <%= will_paginate @phrases %>
+      <%= tolk_paginate @phrases %>
     </div>
   <% else %>
     <p style="text-align: left">There aren't any missing or updated phrases that need translation.</p>

data/app/views/tolk/searches/show.html.erb

@@ -54,7 +54,7 @@
       </div>
     <% end %>
     <div class="paginate">
-      <%= will_paginate @phrases %>
+      <%= tolk_paginate @phrases %>
     </div>
   <% else %>
     <p style="text-align: left">No search results.</p>

data/lib/tolk.rb

@@ -1,4 +1,3 @@
-require 'will_paginate'
 require 'safe_yaml/load'
 require 'tolk/config'
 require 'tolk/engine'

data/lib/tolk/config.rb

@@ -14,7 +14,12 @@ module Tolk
       # primary locale to not be overriden by default locale in development mode
       attr_accessor :primary_locale_name
 
+      # exclude locales tokens from gems
+      attr_accessor :exclude_gems_token
+
       def reset
+        @exclude_gems_token = false
+
         @dump_path = Proc.new { "#{Rails.application.root}/config/locales" }
 
         @mapping = {

data/lib/tolk/engine.rb

@@ -7,5 +7,19 @@ module Tolk
     initializer :assets do |app|
       app.config.assets.precompile += ['tolk/libraries.js']
     end
+
+    # We need one of the two pagination engines loaded by this point.
+    # We don't care which one, just one of them will do.
+    begin
+      require 'kaminari'
+    rescue LoadError
+      begin
+        require 'will_paginate'
+      rescue LoadError
+       puts "Please add the kaminari or will_paginate gem to your application's Gemfile."
+       puts "The Tolk engine needs either kaminari or will_paginate in order to paginate."
+       exit
+      end
+    end
   end
 end

data/lib/tolk/pagination.rb

@@ -0,0 +1,28 @@
+module Tolk
+  module Pagination
+    module Methods
+      # Kaminari defaults page_method_name to :page, will_paginate always uses
+      # :page
+      def pagination_method
+        defined?(Kaminari) ? Kaminari.config.page_method_name : :page
+      end
+
+      # Kaminari defaults param_name to :page, will_paginate always uses :page
+      def pagination_param
+        defined?(Kaminari) ? Kaminari.config.param_name : :page
+      end
+    end
+
+    module ViewHelper
+      def tolk_paginate(collection, options = {})
+        if respond_to?(:will_paginate)
+          # If parent app is using Will Paginate, we need to use it also
+          will_paginate collection, options
+        else
+          # Otherwise use Kaminari
+          paginate collection, options
+        end
+      end
+    end
+  end
+end

data/lib/tolk/sync.rb

@@ -10,7 +10,14 @@ module Tolk
       end
 
       def load_translations
-        I18n.backend.send :init_translations unless I18n.backend.initialized? # force load
+        if Tolk.config.exclude_gems_token
+          # bypass default init_translations
+          I18n.backend.reload! if I18n.backend.initialized?
+          I18n.backend.instance_variable_set(:@initialized, true)
+          I18n.backend.load_translations(Dir[Rails.root.join('config', 'locales', "*.{rb,yml}")])
+        else
+          I18n.backend.send :init_translations unless I18n.backend.initialized? # force load 
+        end
         translations = flat_hash(I18n.backend.send(:translations)[primary_locale.name.to_sym])
         filter_out_i18n_keys(translations.merge(read_primary_locale_file))
       end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,20 +34,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  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
@@ -118,6 +104,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
   for Rails applications.
 email: david@loudthinking.com
@@ -160,6 +160,7 @@ files:
 - lib/tolk/engine.rb
 - lib/tolk/export.rb
 - lib/tolk/import.rb
+- lib/tolk/pagination.rb
 - lib/tolk/sync.rb
 - lib/tolk/version.rb
 - lib/tolk/yaml.rb
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files