weeler 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d74bf1a8c861ad71e165a61811adf25b4b702742
-  data.tar.gz: 72c0e430791b689a12e7e35b43cd7fef68290206
+  metadata.gz: 04354c614713ac3f01bbd9ef74db3d3adfbf6e5e
+  data.tar.gz: b7cb66aa043d0f4474d030fc8a3098c2f110eeb4
 SHA512:
-  metadata.gz: 26bc83df02c82b16027f4c355ea87ced1eed41d50ead778fb8d7bedf1be2673db0f3a0dbabc7a968e0ff0d2a74d85ed91527ac5b293a538b122d7be7c357f585
-  data.tar.gz: 813211cdb75e8717382e47a44f4b669de769a1f92f58f26126deda5b8887fc650cb4576f06c2795567bf8794213194d957547502bcecb41360d977b80f72363d
+  metadata.gz: 3995b5e005fae4e1d03fa0bcbee009fd7cfa0ace18d0be818250c690b6afec317ed9ee0b31f213a19c112308463aa039e1be74ea53dd420162833e6ff7e7cc8f
+  data.tar.gz: aca2e0510b49b00a85d99a8329eec36874b10105ead3cd20b13da590a68f38b0c43056ea6424265a3033c85c575b731b944044a02917e2124380416a02f31c84

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 1.4.0
+
+* Added translation usage stats
+* Fixed a transliteration bug
+
+### Contributors
+
+* Artis Raugulis
+
+## 1.3.0
+
+### Features & Enhancements
+
+* Added option to customize what happens after successful create, update, destroy
+
+### Contributors
+
+* Artis Raugulis
+
 ## 1.2.0
 
 ### Features & Enhancements
@@ -38,9 +57,9 @@
 
 ## 1.0.4
 
-### Bug Fixes 
+### Bug Fixes
 
-* Fixed seoable bug that called not weeler function. 
+* Fixed seoable bug that called not weeler function.
 
 ### Contributors
 

data/README.md

@@ -124,6 +124,21 @@ You can do this by overriding private methods in your controller.
       { action: :index }
     end
 
+Or you can override what happens after successful <tt>:create</tt>, <tt>:update</tt>, <tt>:destroy</tt> actions.
+You can do this by overriding private methods in your controller.
+        
+    def after_create_action
+      redirect_to( after_create_path, {:notice => "Successfully created item"} )
+    end
+
+    def after_update_action
+      redirect_to( after_update_path, {:notice => "Successfully updated item"} )
+    end
+
+    def after_destroy_action
+      redirect_to( after_destroy_path, {:notice => "Successfully destroyed item"})
+    end
+
 You should implement form file with your own active record attributes.
 To do that, create <tt>_form.html.haml</tt> in <tt>views/weeler/_YOUR_RESOURCE_/_form.html.haml</tt>
 where <tt>_YOUR_RESOURCE_</tt> is name of your resource.

data/app/controllers/weeler/translations_controller.rb

@@ -49,6 +49,13 @@ module Weeler
       redirect_to weeler_translations_path, flash: {success: "Translation succesfully removed."}
     end
 
+    def usage_stats
+      @used_keys = []
+      Weeler.i18n_cache.instance_variable_get(:@data).keys.each do |key|
+        @used_keys << [key, Weeler.i18n_cache.read(key)] if key.start_with?('usage_stats')
+      end
+    end
+
     def export
       respond_to do |format|
         format.xlsx do

data/app/views/layouts/weeler/base.html.haml

@@ -12,7 +12,7 @@
 
   %body{data: {controller: controller_name, action: action_name, name_space: 'weeler', tag: "#{yield :weeler_body_tag}" }}
     = render "header_navbar"
-    .container
+    .container-fluid
       = render "flash"
       .row.row-offcanvas.row-offcanvas-right
         = render "side_navbar"

data/app/views/weeler/translations/index.html.haml

@@ -11,7 +11,14 @@
             = link_to 'Show translations', weeler_translations_path(show_translation_keys: false)
           - else
             = link_to 'Show translation keys', weeler_translations_path(show_translation_keys: true)
-
+        %h1 Stats
+        %p.lead.text-muted
+          - if Settings.log_key_usage == 'true'
+            = 'Translation usage stat gathering is ON'
+          - else
+            = 'Translation usage stat gathering is OFF'
+        %p.lead.text-muted
+          = link_to 'Go to Stats', {action: :usage_stats}
 .row
   %nav.navbar.navbar-default{role: "navigation"}
     / Collect the nav links, forms, and other content for toggling

data/app/views/weeler/translations/usage_stats.html.haml

@@ -0,0 +1,28 @@
+.header.container
+  .row
+    .col-lg-12
+      .page-header
+        %h1 Translation stats
+        %p.lead.text-muted
+          - if Settings.log_key_usage == 'true'
+            = 'Translation usage stat gathering is ON'
+          - else
+            = 'Translation usage stat gathering is OFF'
+        %p.lead.text-muted
+          = link_to 'Back to Translation list', {action: :index}
+
+.container
+  .row
+    .col-lg-12
+      %table.table
+        %thead
+          %tr
+            %th Usage
+            %th Key
+            %th text
+        %tbody
+          - @used_keys.each do |key, usage|
+            %tr
+              %td= usage
+              %td= key.to_s.gsub('usage_stats/en/', '')
+              %td= t(key.to_s.gsub('usage_stats/en/', ''))

data/lib/i18n/backend/weeler.rb

@@ -4,6 +4,7 @@ require 'i18n/backend/weeler/dedupe'
 require 'i18n/backend/weeler/html_checker'
 require 'i18n/backend/weeler/exporter'
 require 'i18n/backend/weeler/importer'
+require 'i18n/backend/weeler/usage_logger'
 
 module I18n
   module Backend
@@ -28,6 +29,7 @@ module I18n
       autoload :Translation, 'i18n/backend/weeler/translation'
       autoload :Exporter,    'i18n/backend/weeler/exporter'
       autoload :Importer,    'i18n/backend/weeler/importer'
+      autoload :UsageLogger, 'i18n/backend/weeler/usage_logger'
 
       module Implementation
         include Base, Flatten
@@ -57,6 +59,7 @@ module I18n
         protected
 
         def lookup(locale, key, scope = [], options = {})
+          return fallback_backend_translation locale, key if key.to_s.start_with?('i18n')
           key = normalize_flat_keys(locale, key, scope, options[:separator])
           return lookup_in_cache(locale, key, scope, options)
         end
@@ -67,6 +70,11 @@ module I18n
           # reload cache if cache timestamp differs from last translations update
           reload_cache if ((!ActiveRecord::Base.connection.table_exists?('settings')) || i18n_cache.read('UPDATED_AT') != Settings.i18n_updated_at)
 
+          # log locale/key usage for statistics
+          if Settings.log_key_usage == 'true'
+            log_key_usage(locale, key)
+          end
+
           return nil if i18n_cache.read([:missing, [locale, key]])
 
           keys = expand_keys key
@@ -75,7 +83,7 @@ module I18n
 
             result = i18n_cache.read([locale, check_key])
 
-            return result.value unless result.blank? 
+            return result.value unless result.blank?
           end
 
           # mark translation as missing
@@ -161,4 +169,3 @@ module I18n
     end
   end
 end
-

data/lib/i18n/backend/weeler/translation.rb

@@ -120,4 +120,3 @@ module I18n
     end
   end
 end
-

data/lib/i18n/backend/weeler/usage_logger.rb

@@ -0,0 +1,19 @@
+require 'active_record'
+
+module I18n
+  module Backend
+    class Weeler
+
+      module UsageLogger
+
+        def log_key_usage(locale, key)
+          existing = i18n_cache.read([:usage_stats, [locale, key]])
+          value = existing.present? ? (existing.to_i + 1) : 1
+          i18n_cache.write [:usage_stats, [locale, key]], value
+        end
+        
+        Weeler.send(:include, UsageLogger)
+      end
+    end
+  end
+end

data/lib/weeler/action_controller/acts/restful.rb

@@ -83,7 +83,7 @@ module Weeler
           def create
             @item = model.new(items_params)
             if @item.save
-              redirect_to( after_create_path, {:notice => "Successfully created item"} )
+              after_create_action
             else
               render :action => 'new'
             end
@@ -91,7 +91,7 @@ module Weeler
 
           def update
             if @item.update_attributes(items_params)
-              redirect_to( after_update_path, {:notice => "Successfully updated item"} )
+              after_update_action
             else
               render :action => 'edit'
             end
@@ -99,7 +99,7 @@ module Weeler
 
           def destroy
             @item.destroy
-            redirect_to( after_destroy_path, {:notice => "Successfully destroyed item"})
+            after_destroy_action
           end
 
           def remove_image
@@ -142,6 +142,18 @@ module Weeler
 
         private
 
+          def after_create_action
+            redirect_to( after_create_path, {:notice => "Successfully created item"} )
+          end
+
+          def after_update_action
+            redirect_to( after_update_path, {:notice => "Successfully updated item"} )
+          end
+
+          def after_destroy_action
+            redirect_to( after_destroy_path, {:notice => "Successfully destroyed item"})
+          end
+
           def after_create_path
             { action: :edit, id: @item.id }
           end

data/lib/weeler/action_dispatch/routing/mapper.rb

@@ -54,6 +54,7 @@ module Weeler
             collection do
               get :export
               post :import
+              get :usage_stats
             end
           end
           resources :seo_items

data/lib/weeler/version.rb

@@ -1,7 +1,7 @@
 module Weeler
   module VERSION
     MAJOR = 1
-    MINOR = 2
+    MINOR = 4
     TINY  = 0
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weeler
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Artūrs Braučs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -412,6 +412,7 @@ files:
 - app/views/weeler/translations/edit.html.haml
 - app/views/weeler/translations/index.html.haml
 - app/views/weeler/translations/new.html.haml
+- app/views/weeler/translations/usage_stats.html.haml
 - config/initializers/weeler_mime_types.rb
 - lib/.DS_Store
 - lib/generators/weeler/.DS_Store
@@ -433,6 +434,7 @@ files:
 - lib/i18n/backend/weeler/html_checker.rb
 - lib/i18n/backend/weeler/importer.rb
 - lib/i18n/backend/weeler/translation.rb
+- lib/i18n/backend/weeler/usage_logger.rb
 - lib/i18n/humanize_missing_translations.rb
 - lib/i18n/weeler.rb
 - lib/tasks/weeler.rake
@@ -540,7 +542,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: CMS for weby.lv projects.