lit 0.2.3 → 0.2.4

data/README.md

@@ -7,6 +7,8 @@ translating app by non-technicals.
 
 Highly inspired by Copycopter by thoughtbot.
 
+![travis status](https://travis-ci.org/prograils/lit.svg)
+
 ### Features
 
 1. Runs with your app - no need for external services

data/Rakefile

@@ -4,6 +4,7 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
 begin
   require 'rdoc/task'
 rescue LoadError
@@ -12,6 +13,7 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
+
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Lit'
@@ -23,13 +25,12 @@ end
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
+  puts "Storage: #{ENV['LIT_STORAGE'] || 'redis'}"
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
@@ -37,4 +38,3 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-task :default => :test

data/app/assets/stylesheets/lit/application.css

@@ -48,3 +48,6 @@ padding: 5px 7px;
 .well label{
   font-weight: normal;
 }
+.localization_row em{
+  color: #bbb;
+}

data/app/controllers/lit/dashboard_controller.rb

@@ -3,7 +3,7 @@ require_dependency "lit/application_controller"
 module Lit
   class DashboardController < ::Lit::ApplicationController
     def index
-      @locales = Lit::Locale.ordered
+      @locales = Lit::Locale.ordered.visible
     end
   end
 end

data/app/models/lit/incomming_localization.rb

@@ -50,6 +50,20 @@ module Lit
       self.destroy
     end
 
+    def is_duplicate?(val)
+      set_localization_id unless localization.present?
+      if localization
+        translated_value = localization.read_attribute_before_type_cast('translated_value')
+        if localization.is_changed? && !translated_value.nil?
+          translated_value == val
+        else
+          localization.read_attribute_before_type_cast('default_value') == val
+        end
+      else
+        false
+      end
+    end
+
     private
       def set_localization_id
         if self.locale.present? and self.localization_key.present?

data/app/models/lit/source.rb

@@ -36,7 +36,7 @@ module Lit
         if result.is_a?(Array)
           result.each do |r|
             il = IncommingLocalization.new
-            if ::Rails::VERSION::MAJOR<4
+            if ::Rails::VERSION::MAJOR < 4
               il = IncommingLocalization.where(:incomming_id=>r["id"]).first_or_initialize
             else
               il = IncommingLocalization.find_or_initialize_by(:incomming_id=>r["id"])
@@ -46,20 +46,23 @@ module Lit
             il.locale = Locale.where(:locale=>il.locale_str).first
             il.localization_key_str = r["localization_key_str"]
             il.localization_key = LocalizationKey.where(:localization_key=>il.localization_key_str).first
-            il.save!
-            IncommingLocalization.where(:id=>il.id).update_all ['translated_value=?', r["value"]]
+            unless il.is_duplicate?(r['value'])
+              il.save!
+              IncommingLocalization.where(:id=>il.id).
+                update_all ['translated_value=?', r["value"]]
+            end
           end
-          lc = get_last_change
-          lc = DateTime.parse(lc) unless lc.nil?
-          touch_last_updated_at(lc)
-          self.save
+          last_change = get_last_change
+          last_change = DateTime.parse(last_change) unless last_change.nil?
+          touch_last_updated_at(last_change)
+          save
         end
       end
     end
 
     def touch_last_updated_at!
       touch_last_updated_at
-      self.save
+      save
     end
 
     private

data/app/views/lit/localization_keys/_localization_row.html.erb

@@ -1,11 +1,14 @@
-<%- la = localization -%>
-<% if la.is_a?(Array) %>
+<% if localization.is_a?(Array) %>
   <ul>
-    <% la.each do |l| %>
+    <% localization.each do |l| %>
       <li><%= l %></li>
     <% end %>
   </ul>
 <% else %>
-  <%= la %>
+  <% if localization.nil? %>
+    <em title="<%= t('.value_not_yet_translated', default: 'Value not yet translated') %>">null</em>
+  <% else %>
+    <%= localization %>
+  <% end %>
 <% end %>
 

data/lib/generators/lit/install/templates/initializer.rb

@@ -22,7 +22,7 @@ Lit.humanize_key = false
 
 # Decide if missing translations will fallback to first found translated value
 # (same key, different language)
-Lit.fallback = true
+Lit.fallback = false
 
 # API enabled? API allows third party browsing your translations, as well as
 # synchronizing them between environments

data/lib/lit.rb

@@ -16,18 +16,26 @@ module Lit
     attr_accessor :loader
   end
   def self.init
-    @@table_exists ||= Lit::Locale.table_exists?
+    @@table_exists ||= self.check_if_table_exists
     if self.loader.nil? && @@table_exists
       self.loader ||= Loader.new
-      Lit.humanize_key = true if Lit.humanize_key.nil?
-      #if loading all translations on start, migrations have to be performed
-      #already, fails on first deploy
-      #self.loader.cache.load_all_translations
+      Lit.humanize_key = false if Lit.humanize_key.nil?
+      # if loading all translations on start, migrations have to be already
+      # performed, fails on first deploy
+      # self.loader.cache.load_all_translations
       Lit.storage_options ||= {}
     end
     self.loader
   end
 
+  def self.check_if_table_exists
+    begin
+      Lit::Locale.table_exists?
+    rescue
+      false
+    end
+  end
+
   def self.get_key_value_engine
     case Lit.key_value_engine
         when 'redis'

data/lib/lit/adapters/redis_storage.rb

@@ -2,7 +2,7 @@ require 'redis'
 module Lit
   extend self
   def redis
-    $redis = Redis.connect unless $redis
+    $redis = Redis.new(url: ENV['REDIS_URL']) unless $redis
     $redis
   end
   class RedisStorage
@@ -82,4 +82,4 @@ module Lit
         _prefix+"nil_flags:"+key.to_s
       end
   end
-end
+end

data/lib/lit/cache.rb

@@ -202,8 +202,9 @@ module Lit
                   end
                 end
               end
-              value = key_without_locale.split('.').last.humanize if value.nil? &&
-                                                                    Lit.humanize_key
+              if value.nil? && Lit.humanize_key
+                value = key_without_locale.split('.').last.humanize
+              end
             end
             localization.update_default_value(value)
           end

data/lib/lit/i18n_backend.rb

@@ -20,7 +20,12 @@ module Lit
     end
 
     def available_locales
-      Lit::Locale.ordered.visible.map{|l| l.locale.to_sym }
+      locales = ::Rails.configuration.i18n.available_locales
+      if locales and !locales.empty?
+        locales
+      else
+        Lit::Locale.ordered.visible.map{|l| l.locale.to_sym }
+      end
     end
 
     # Stores the given translations.

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -91,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 description: ! 'Translate your apps with pleasure (sort of...) and for free. It''s
   simple i18n web interface, build on top of twitter bootstrap, that one may find
   helpful in translating app by non-technicals. '