csv2strings 0.2.1 → 0.2.2

data/test/csvconverter/commands/test_command_csv2strings.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+class TestCommand < Test::Unit::TestCase
+
+	def test_csv2strings_with_multiple_2_languages
+    options = {
+    	:filename => "test/data/test_data_multiple_langs.csv",
+    	:langs => {"English" => "en", "French" => "fr"}
+    }
+    CSV2StringsCommand.new([], options).csv2strings
+
+		assert File.exist?("./en.lproj/Localizable.strings")
+		assert File.exist?("./fr.lproj/Localizable.strings")
+
+		#clean up
+		system("rm -rf ./en.lproj/")
+		system("rm -rf ./fr.lproj/")
+	end
+
+	def test_csv2strings_with_default_path
+		options = {
+    	:filename => "test/data/test_data_multiple_langs.csv",
+    	:langs => {"English" => "en", "French" => "fr"},
+    	:default_path => "mynewlocation"
+    }
+    CSV2StringsCommand.new([], options).csv2strings
+
+		# testing
+		assert File.exist?("./mynewlocation/en.lproj/Localizable.strings"), "can't find output file for English"
+		assert File.exist?("./mynewlocation/fr.lproj/Localizable.strings"), "can't find output file for French"
+
+		#clean up
+		system("rm -rf ./mynewlocation")
+	end
+
+end
+

data/test/csvconverter/commands/test_command_strings2csv.rb

@@ -0,0 +1,77 @@
+require 'test_helper'
+class TestCommand < Test::Unit::TestCase
+
+  def test_strings2csv
+    options = {:filenames => ["test/data/test_data.strings"]}
+    Strings2CSVCommand.new([], options).strings2csv
+
+    assert File.exist?("translations.csv")
+
+    #clean up
+    system("rm -f translations.csv")
+  end
+
+  def test_strings2csv_with_dryrun_option
+    options = {:filenames => ["test/data/test_data.strings"], :dryrun => true}
+    Strings2CSVCommand.new([], options).strings2csv
+
+    assert !File.exist?("translations.csv")
+
+    #clean up
+    system("rm -f translations.csv")
+  end
+
+  def test_strings2csv_with_output_file
+    options = {:filenames => ["test/data/test_data.strings"], :csv_filename => "myfile.csv"}
+    # -i, -o
+    Strings2CSVCommand.new([], options).strings2csv
+
+    assert File.exist?("myfile.csv")
+
+    #clean up
+    system("rm -f myfile.csv")
+  end
+
+  def test_strings2csv_with_headers
+    options = {:filenames => ["test/data/test_data.strings"], :headers => ["constants", "english"]}
+    # -i, -h
+    Strings2CSVCommand.new([], options).strings2csv
+
+    #TODO assertion or move test on at lib level
+
+    #clean up
+    system("rm -f translations.csv")
+  end
+
+  def test_strings2csv_with_two_files
+    options = {
+      :filenames => ["test/data/test_en.strings", "test/data/test_fr.strings"],
+      :headers => %w{Constants English French},
+      :csv_filename => "enfr.csv"
+    }
+    # --filenames, --headers, -o
+    Strings2CSVCommand.new([], options).strings2csv
+
+    #TODO assertion
+
+    #clean up
+    system("rm -f enfr.csv")
+  end
+
+  def test_strings2csv_with_empty_lines
+    options = {
+      :filenames => ["test/data/test_with_nil.strings"],
+      :csv_filename => "test_with_nil.csv"
+    }
+    # -i, -o
+
+
+    assert_nothing_raised do
+      Strings2CSVCommand.new([], options).strings2csv
+    end
+    assert system("diff test_with_nil.csv test/data/test_with_nil.csv"), "no difference on output"
+
+    #clean up
+    system("rm -f test_with_nil.csv")
+  end
+end

data/test/{csv2strings/converter_test.rb → csvconverter/test_csv2strings.rb}

@@ -1,11 +1,9 @@
-require File.expand_path('../../../lib/csv2strings/converter', __FILE__)
-require File.expand_path('../../test_helper', __FILE__)
+require 'test_helper'
+class TestCSV2Strings < Test::Unit::TestCase
 
-class CSV2Strings::ConverterTest < Test::Unit::TestCase
-  
 	def test_converting_csv_to_dotstrings
 		csv_file = "test/data/test_data.csv"
-		converter = CSV2Strings::Converter.new(csv_file, 'English' => [:en])
+		converter = CSV2Strings.new(csv_file, 'English' => [:en])
 		converter.csv_to_dotstrings
 		assert File.exists?("en.lproj/Localizable.strings"), "the ouptut file does not exist"
 	end
@@ -13,10 +11,10 @@ class CSV2Strings::ConverterTest < Test::Unit::TestCase
 	def test_converting_csv_to_dotstrings_one_output_option
 		csv_file = "test/data/test_data.csv"
 		single_file = 'myApp.strings'
-		converter = CSV2Strings::Converter.new(csv_file, 
+		converter = CSV2Strings.new(csv_file,
 										{'English' => [:en]},
 										 :output_file => single_file)
 		converter.csv_to_dotstrings
 		assert File.exists?(single_file), "the ouptut file does not exist"
 	end
-end
+end

data/test/{strings2csv/converter_test.rb → csvconverter/test_strings2csv.rb}

@@ -1,15 +1,13 @@
-require File.expand_path('../../../lib/strings2csv/converter', __FILE__)
-require File.expand_path('../../test_helper', __FILE__)
+require 'test_helper'
+class TestStrings2CSV < Test::Unit::TestCase
 
-class Strings2CSV::ConverterTest < Test::Unit::TestCase
-  
   def test_parse_dotstrings_line_with_good_string
     input = String.new(<<-EOS)
     "MY_CONSTANT" = "This is ok";
     EOS
     expected_output = {"MY_CONSTANT"=>"This is ok"}
 
-    output = Strings2CSV::Converter.new.parse_dotstrings_line input
+    output = Strings2CSV.new.parse_dotstrings_line input
     assert_equal output, expected_output
   end
 
@@ -19,7 +17,7 @@ class Strings2CSV::ConverterTest < Test::Unit::TestCase
     EOS
     expected_output = {"MY_CONSTANT"=>"This 'is' ok"}
 
-    output = Strings2CSV::Converter.new.parse_dotstrings_line input
+    output = Strings2CSV.new.parse_dotstrings_line input
     assert_equal output, expected_output
   end
 
@@ -29,7 +27,7 @@ class Strings2CSV::ConverterTest < Test::Unit::TestCase
     EOS
     expected_output = {"MY_CONSTANT"=>"This \"is\" ok"}
 
-    output = Strings2CSV::Converter.new.parse_dotstrings_line input
+    output = Strings2CSV.new.parse_dotstrings_line input
     assert_equal output, expected_output
   end
 
@@ -38,39 +36,44 @@ class Strings2CSV::ConverterTest < Test::Unit::TestCase
     "MY_CONSTANT" = "wrong syntax"
     EOS
 
-    output = Strings2CSV::Converter.new.parse_dotstrings_line input
+    output = Strings2CSV.new.parse_dotstrings_line input
     assert_nil output, "output should be nil with wrong syntax"
   end
 
   def test_load_strings_with_wrong_file
     assert_raise(Errno::ENOENT) do
-      output = Strings2CSV::Converter.new.load_strings "file that does not exist.strings"
+      output = Strings2CSV.new.load_strings "file that does not exist.strings"
     end
   end
 
   def test_load_strings
     expected_output = {"ERROR_HANDLER_WARNING_DISMISS" => "OK", "ANOTHER_STRING" => "hello"}
-    output = Strings2CSV::Converter.new.load_strings "test/data/test_data.strings"
+    output = Strings2CSV.new.load_strings "test/data/test_data.strings"
     assert_equal expected_output, output
   end
 
+  def test_load_strings_with_empty_lines
+    assert_nothing_raised do
+      output = Strings2CSV.new.load_strings "test/data/test_with_nil.strings"
+    end
+  end
+
   def test_dotstrings_to_csv
-    converter = Strings2CSV::Converter.new(:filenames => ["test/data/test_data.strings"])
-    keys, lang_order, strings = converter.dotstrings_to_csv(false)
-    assert_equal ["test_data".to_sym], lang_order
+    converter = Strings2CSV.new(:filenames => ["test/data/test_data.strings"])
+    keys, strings = converter.dotstrings_to_csv(false)
     assert_equal ["ERROR_HANDLER_WARNING_DISMISS", "ANOTHER_STRING"], keys
-    expected_strings = {lang_order[0] => {"ERROR_HANDLER_WARNING_DISMISS" => "OK", "ANOTHER_STRING" => "hello"}}
+    expected_strings = {"test/data/test_data.strings" => {"ERROR_HANDLER_WARNING_DISMISS" => "OK", "ANOTHER_STRING" => "hello"}}
     assert_equal expected_strings, strings
   end
 
   def test_create_csv_file
     keys = ["ERROR_HANDLER_WARNING_DISMISS", "ANOTHER_STRING"]
-    lang_order = [:"test_data"]
-    strings = {lang_order[0] => {"ERROR_HANDLER_WARNING_DISMISS" => "OK", "ANOTHER_STRING" => "hello"}}
-    
-    converter = Strings2CSV::Converter.new(:headers => %w{variables english})
+    filename = "test_data"
+    strings = {filename => {"ERROR_HANDLER_WARNING_DISMISS" => "OK", "ANOTHER_STRING" => "hello"}}
 
-    converter.create_csv_file(keys, lang_order, strings)
+    converter = Strings2CSV.new(:headers => %w{variables english}, :filenames => [filename])
+
+    converter.create_csv_file(keys, strings)
     assert File.exist?(converter.csv_filename)
   end
 
@@ -78,7 +81,7 @@ class Strings2CSV::ConverterTest < Test::Unit::TestCase
     csv_filename = "file.csv"
     filenames = %w{"french.strings english.strings"}
     headers = %w{"constants french english"}
-    converter = Strings2CSV::Converter.new({
+    converter = Strings2CSV.new({
         :csv_filename => csv_filename,
         :headers => headers,
         :filenames => filenames
@@ -90,7 +93,8 @@ class Strings2CSV::ConverterTest < Test::Unit::TestCase
   end
 
   def test_initialize_with_default_values
-    converter = Strings2CSV::Converter.new
+    converter = Strings2CSV.new
     assert_not_nil converter.csv_filename
   end
-end
+
+end

data/test/data/test_with_nil.csv

@@ -0,0 +1,3 @@
+Variables,test/data/test_with_nil.strings
+GREETINGS,Hello
+ANOTHER_STRING,testEN

data/test/data/test_with_nil.strings

@@ -0,0 +1,4 @@
+"GREETINGS" = "Hello";
+
+"ANOTHER_STRING" = "testEN";
+

data/test/test_helper.rb

@@ -1,7 +1,10 @@
 begin
   require 'simplecov'
-  SimpleCov.start do 
-     add_filter "test"
+  require 'coveralls'
+
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+     add_filter '/test/'
   end
 rescue LoadError
   puts 'Coverage disabled, enable by installing simplecov'
@@ -9,3 +12,6 @@ end
 
 require 'test/unit'
 
+require 'csvconverter'
+require "csvconverter/commands/strings2csv_command"
+require "csvconverter/commands/csv2strings_command"

metadata

@@ -1,183 +1,222 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: csv2strings
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
-authors:
-- François Benaiteau
+authors: 
+- "Fran\xC3\xA7ois Benaiteau"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-30 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: fastercsv
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 5
+        - 10
         version: 1.5.10
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: orderedhash
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.10
-- !ruby/object:Gem::Dependency
-  name: google_drive
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.6
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: google_drive
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 3
+        - 6
         version: 0.3.6
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: test-unit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: simplecov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ruby script converts a CSV file of translations to Localizable.strings
-  files and vice-versa
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+description: ruby script converts a CSV file of translations to Localizable.strings files and vice-versa
 email: francois.benaiteau@gmail.com
-executables:
+executables: 
 - csv2strings
 - strings2csv
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .csvconverter.sample
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/csv2strings
 - bin/strings2csv
 - csv2strings.gemspec
-- lib/command.rb
-- lib/csv2strings/converter.rb
-- lib/csv2strings_command.rb
 - lib/csvconverter.rb
-- lib/google_doc.rb
-- lib/strings2csv/converter.rb
-- lib/strings2csv_command.rb
-- test/command_test.rb
-- test/csv2strings/converter_test.rb
+- lib/csvconverter/command.rb
+- lib/csvconverter/commands/csv2strings_command.rb
+- lib/csvconverter/commands/strings2csv_command.rb
+- lib/csvconverter/csv2strings.rb
+- lib/csvconverter/google_doc.rb
+- lib/csvconverter/strings2csv.rb
+- test/csvconverter/commands/test_command_csv2strings.rb
+- test/csvconverter/commands/test_command_strings2csv.rb
+- test/csvconverter/test_csv2strings.rb
+- test/csvconverter/test_strings2csv.rb
 - test/data/test_data.csv
 - test/data/test_data.strings
 - test/data/test_data_multiple_langs.csv
 - test/data/test_en.strings
 - test/data/test_fr.strings
-- test/google_doc_test.rb
-- test/strings2csv/converter_test.rb
+- test/data/test_with_nil.csv
+- test/data/test_with_nil.strings
 - test/test_helper.rb
+has_rdoc: true
 homepage: https://github.com/netbe/CSV-to-iOS-Localizable.strings-converter
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: CSV to iOS Localizable.strings converter
-test_files:
-- test/command_test.rb
-- test/csv2strings/converter_test.rb
+test_files: 
+- test/csvconverter/commands/test_command_csv2strings.rb
+- test/csvconverter/commands/test_command_strings2csv.rb
+- test/csvconverter/test_csv2strings.rb
+- test/csvconverter/test_strings2csv.rb
 - test/data/test_data.csv
 - test/data/test_data.strings
 - test/data/test_data_multiple_langs.csv
 - test/data/test_en.strings
 - test/data/test_fr.strings
-- test/google_doc_test.rb
-- test/strings2csv/converter_test.rb
+- test/data/test_with_nil.csv
+- test/data/test_with_nil.strings
 - test/test_helper.rb
-has_rdoc: