iye 1.0.2 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 726ab6075869c596ef587416dd1a1150e703454c
+  data.tar.gz: 1aa23bd0ef6399eb05bdff363a0dd696ed434806
+SHA512:
+  metadata.gz: 84db15448835dff74e8345cd2de525e63ab3302818f87205523428c87ed5bd43c2d8a6a1178cd4244f0bc7fceef7fd2eee1d3174c83821652e074d7a1366a315
+  data.tar.gz: 5a4dc380f329e9979a2c3f50e68ad7c75070924557f75eeb9dbe325c7a9269112358f8e7df484a16a9038cacce7ee2eec3f4f93978bea504eafee8ce5a6e7a9d

data/README.md

@@ -42,7 +42,16 @@ The source ships with a `config.ru` suitable for development use with `shotgun(1
     
     shotgun -p 5050
 
+To run tests:
+
+    bundle install
+    bundle exec rake
+
 ## Troubleshooting
 
 **``psych.rb:203:in `parse': wrong number of arguments(2 for 1) (ArgumentError)``**
 : This is caused by a mismatch of the `psych` in standard library and the gem. The bug is fixed in Ruby 1.9.3-p194.
+
+## Build status
+
+![](https://travis-ci.org/firmafon/iye.svg?branch=master)

data/iye.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "iye"
-  s.version  = "1.0.2"
-  s.date     = "2013-11-12"
+  s.version  = "1.1.0"
+  s.date     = "2015-04-17"
   s.summary  = "I18n Yaml Editor"
   s.email    = "hv@firmafon.dk"
   s.homepage = "http://github.com/firmafon/iye"

data/lib/i18n_yaml_editor/transformation.rb

@@ -25,9 +25,9 @@ module I18nYamlEditor
           keys = key.split(".")
           keys.each_with_index {|k, idx|
             if keys.size - 1 == idx
-              sub_result[k.to_sym] = value
+              sub_result[k.to_s] = value
             else
-              sub_result = (sub_result[k.to_sym] ||= {})
+              sub_result = (sub_result[k.to_s] ||= {})
             end
           }
         rescue => e

data/lib/i18n_yaml_editor/translation.rb

@@ -2,12 +2,25 @@
 
 module I18nYamlEditor
   class Translation
-    attr_accessor :name, :file, :text
+    attr_accessor :name, :file
+    attr_writer :text
 
     def initialize attributes={}
       @name, @file, @text = attributes.values_at(:name, :file, :text)
     end
 
+    def text
+      if @text.is_a?(String)
+        if @text.match(/\A\s*\z/)
+          nil
+        else
+          @text.gsub(/\r\n/, "\n")
+        end
+      else
+        @text
+      end
+    end
+
     def key
       @key ||= self.name.split(".")[1..-1].join(".")
     end
@@ -15,5 +28,13 @@ module I18nYamlEditor
     def locale
       @locale ||= self.name.split(".").first
     end
+
+    def number_of_lines
+      if text
+        text.scan(/\n/).size + 1
+      else
+        1
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require "minitest/autorun"
 require "i18n_yaml_editor"
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
   include I18nYamlEditor
 end

data/test/unit/test_app.rb

@@ -3,5 +3,5 @@
 require "test_helper"
 require "i18n_yaml_editor/app"
 
-class TestApp < MiniTest::Unit::TestCase
+class TestApp < Minitest::Test
 end

data/test/unit/test_category.rb

@@ -3,5 +3,5 @@
 require "test_helper"
 require "i18n_yaml_editor/category"
 
-class TestCategory < MiniTest::Unit::TestCase
+class TestCategory < Minitest::Test
 end

data/test/unit/test_key.rb

@@ -3,7 +3,7 @@
 require "test_helper"
 require "i18n_yaml_editor/key"
 
-class TestKey < MiniTest::Unit::TestCase
+class TestKey < Minitest::Test
   def test_category
     key = Key.new(name: "session.login")
     assert_equal "session", key.category

data/test/unit/test_store.rb

@@ -3,7 +3,7 @@
 require "test_helper"
 require "i18n_yaml_editor/store"
 
-class TestStore < MiniTest::Unit::TestCase
+class TestStore < Minitest::Test
   def test_add_translations
     store = Store.new
     translation = Translation.new(:name => "da.session.login")
@@ -125,23 +125,24 @@ class TestStore < MiniTest::Unit::TestCase
   def test_to_yaml
     expected = {
       "/tmp/session.da.yml" => {
-        da: {
-          session: {
-            login: "Log ind",
-            logout: "Log ud"
+        "da" => {
+          "session" => {
+            "login" => "Log ind",
+            "logout" => "Log ud"
           }
         }
       },
       "/tmp/session.en.yml" => {
-        en: {
-          session: {
-            login: "Sign in"
+        "en" => {
+          "session" => {
+            "login" => "Sign in"
           }
         }
       },
       "/tmp/da.yml" => {
-        da: {
-          app_name: "Oversætter"
+        "da" => {
+          "app_name" => "Oversætter",
+          "empty_string" => nil
         }
       }
     }
@@ -151,6 +152,7 @@ class TestStore < MiniTest::Unit::TestCase
     store.add_translation Translation.new(name: "en.session.login", text: "Sign in", file: "/tmp/session.en.yml")
     store.add_translation Translation.new(name: "da.session.logout", text: "Log ud", file: "/tmp/session.da.yml")
     store.add_translation Translation.new(name: "da.app_name", text: "Oversætter", file: "/tmp/da.yml")
+    store.add_translation Translation.new(name: "da.empty_string", text: "", file: "/tmp/da.yml")
 
     assert_equal expected, store.to_yaml
   end

data/test/unit/test_transformation.rb

@@ -3,14 +3,14 @@
 require "test_helper"
 require "i18n_yaml_editor/transformation"
 
-class TestTransformation < MiniTest::Unit::TestCase
+class TestTransformation < Minitest::Test
   def test_flatten_hash
     input = {
-      da: {
-        session: {login: "Log ind", logout: "Log ud"}
+      "da" => {
+        "session" => {"login" => "Log ind", "logout" => "Log ud"}
       },
-      en: {
-        session: {login: "Log in", logout: "Log out"}
+      "en" => {
+        "session" => {"login" => "Log in", "logout" => "Log out"}
       }
     }
     expected = {
@@ -31,11 +31,11 @@ class TestTransformation < MiniTest::Unit::TestCase
       "en.session.logout" => "Log out"
     }
     expected = {
-      da: {
-        session: {login: "Log ind", logout: "Log ud"}
+      "da" => {
+        "session" => {"login" => "Log ind", "logout" => "Log ud"}
       },
-      en: {
-        session: {login: "Log in", logout: "Log out"}
+      "en" => {
+        "session" => {"login" => "Log in", "logout" => "Log out"}
       }
     }
 

data/test/unit/test_translation.rb

@@ -3,7 +3,52 @@
 require "test_helper"
 require "i18n_yaml_editor/translation"
 
-class TestTranslation < MiniTest::Unit::TestCase
+class TestTranslation < Minitest::Test
+  def test_text
+    translation = Translation.new(text: "Some string")
+    assert_equal "Some string", translation.text
+  end
+
+  def test_empty_text_is_nil
+    translation = Translation.new(text: "")
+    assert_nil translation.text
+  end
+
+  def test_text_with_space_is_nil
+    translation = Translation.new(text: " ")
+    assert_nil translation.text
+  end
+
+  def test_text_with_tab_is_nil
+    translation = Translation.new(text: "\t")
+    assert_nil translation.text
+  end
+
+  def test_text_is_array
+    translation = Translation.new(text: %w(a b c))
+    assert_equal %w(a b c), translation.text
+  end
+
+  def test_text_normalize_newlines
+    translation = Translation.new(text: "foo\r\nbar")
+    assert_equal "foo\nbar", translation.text
+  end
+
+  def test_number_of_lines_nil
+    translation = Translation.new(text: nil)
+    assert_equal 1, translation.number_of_lines
+  end
+
+  def test_number_of_lines_single_line
+    translation = Translation.new(text: "foo")
+    assert_equal 1, translation.number_of_lines
+  end
+
+  def test_number_of_lines_multiple_lines
+    translation = Translation.new(text: "foo\nbar\nbaz")
+    assert_equal 3, translation.number_of_lines
+  end
+
   def test_key
     translation = Translation.new(name: "da.session.login")
     assert_equal "session.login", translation.key

data/views/layout.erb

@@ -63,7 +63,7 @@
         width: 300px;
       }
 
-      table.locales td.value input {
+      table.locales td.value textarea {
         width: 600px;
       }
 

data/views/translations.html.erb

@@ -19,7 +19,7 @@
                 <td class="locale"><%= translation.locale %>:</td>
                 <td class="value">
                   <% if translation.text.nil? || translation.text.is_a?(String) %>
-                    <input type="text" name="translations[<%= translation.name %>]" value="<%= Rack::Utils.escape_html translation.text %>" />
+                    <textarea cols=80 rows=<%= translation.number_of_lines %> name="translations[<%= translation.name %>]"><%= Rack::Utils.escape_html translation.text %></textarea>
                   <% else %>
                     [read only]
                     <%= translation.text.class.name %>
@@ -41,4 +41,4 @@
   $('#save-on-top').click(function() {
     $('#updateform').submit();
   });
-</script>
+</script>

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: iye
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Harry Vangberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
 description: I18n YAML Editor
@@ -68,8 +61,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- iye.gemspec
 - bin/iye
+- iye.gemspec
 - lib/i18n_yaml_editor.rb
 - lib/i18n_yaml_editor/app.rb
 - lib/i18n_yaml_editor/category.rb
@@ -78,9 +71,6 @@ files:
 - lib/i18n_yaml_editor/transformation.rb
 - lib/i18n_yaml_editor/translation.rb
 - lib/i18n_yaml_editor/web.rb
-- views/layout.erb
-- views/categories.html.erb
-- views/translations.html.erb
 - test/test_helper.rb
 - test/unit/test_app.rb
 - test/unit/test_category.rb
@@ -88,29 +78,31 @@ files:
 - test/unit/test_store.rb
 - test/unit/test_transformation.rb
 - test/unit/test_translation.rb
+- views/categories.html.erb
+- views/layout.erb
+- views/translations.html.erb
 homepage: http://github.com/firmafon/iye
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: I18n Yaml Editor
 test_files:
 - test/test_helper.rb
@@ -120,4 +112,3 @@ test_files:
 - test/unit/test_store.rb
 - test/unit/test_transformation.rb
 - test/unit/test_translation.rb
-has_rdoc: