apfel 0.0.4 → 0.0.5

data/.gitignore

@@ -0,0 +1,29 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+vendor
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# JetBrains
+.idea
+
+# mac
+.DS_Store
+__MACOSX
+
+# emacs turds
+(.*/)?\#[^/]*\#$
+

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    apfel (0.0.4)
+    apfel (0.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.0.8)
-    diff-lcs (1.1.3)
+    coderay (1.0.9)
+    diff-lcs (1.2.2)
     method_source (0.8.1)
-    pry (0.9.10)
+    pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rake (0.9.2.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    slop (3.3.3)
+      slop (~> 3.4)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    slop (3.4.4)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -6,11 +6,6 @@ rescue LoadError
 end
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ["--color", '--order rand']
-end
-
 desc "Run all tests and documentation checks"
 task :qa => [:spec]
 

data/lib/apfel.rb

@@ -11,6 +11,6 @@ require 'apfel/dot_strings_parser'
   end
 
   def self.read(file)
-   Reader.read(file)
+    Reader.read(file)
   end
 end

data/lib/apfel/reader.rb

@@ -4,14 +4,16 @@ module Apfel
     # Reads in a file and returns an array consisting of each line of input
     # cleaned of new line characters
     def self.read(file)
-      File.open(file, "r") do |f|
-      content_array=[]
-      content = f.read
-        content.each_line do |line|
+      File.open(file, 'r') do |f|
+        content = f.read.force_encoding('UTF-8')
+        # remove the BOM that can be found at char 0 in UTF8 strings files
+        if content.chars.first == "\xEF\xBB\xBF".force_encoding('UTF-8')
+          content.slice!(0)
+        end
+        content.each_line.inject([]) do |content_array, line|
           line.gsub!("\n","")
           content_array.push(line)
         end
-        content_array
       end
     end
   end

data/lib/apfel/version.rb

@@ -1,3 +1,3 @@
 module Apfel
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/apfel_spec.rb

@@ -4,7 +4,7 @@ require 'apfel/parsed_dot_strings'
 
 describe Apfel do
   describe '::parse_file' do
-    context 'when given a valid DotStrings file'do
+    context 'when given an ASCII DotStrings file'do
 
       let(:parsed_file) do
         Apfel.parse(valid_file)
@@ -13,16 +13,43 @@ describe Apfel do
       it 'returns a ParsedDotStrings object' do
         parsed_file.should be_a(Apfel::ParsedDotStrings)
       end
+
+      it 'should have the correct keys' do
+        parsed_file.keys.should include 'key_number_one'
+        parsed_file.keys.should include 'key_number_two'
+        parsed_file.keys.should include 'key_number_three'
+      end
+
+      it 'should have the correct values' do
+        parsed_file.values.should include 'value number one'
+        parsed_file.values.should include 'value number two'
+        parsed_file.values.should include 'value number three'
+      end
+
+      describe 'should have the correct comments' do
+        it 'should have the correct comment for first' do
+          parsed_file.comments(with_keys: false).should include 'This is the first comment'
+        end
+
+        it 'should have the correct comment for second' do
+          parsed_file.comments['key_number_two'].should == 'This is a multiline comment'
+        end
+
+
+        it 'should have the correct comment for third' do
+          parsed_file.comments(with_keys: false).should include 'This is comment number 3'
+        end
+      end
     end
 
     context 'when given an invalid strings file' do
       context 'missing a semicolon' do
 
         let(:invalid_file_semicolon) do
-          create_temp_file(  <<-EOS
+          create_temp_file('ascii',  <<-EOS
 /* This is the first comment */
 "key_number_one" = "value number one"
-            EOS
+          EOS
           )
         end
 
@@ -35,7 +62,7 @@ describe Apfel do
 
       context 'not closed comment' do
         let(:invalid_file_comment) do
-          create_temp_file(<<-EOS
+          create_temp_file('ascii', <<-EOS
 /* This is the first comment
 "key_number_one" = "value number one";
 
@@ -54,5 +81,108 @@ multiline comment */
         end
       end
     end
+
+    context 'when given a file in us-ascii encoding'do
+
+      let(:ascii_file) do
+        './spec/fixtures/ascii.strings'
+      end
+      it 'the file should be ascii' do
+
+        # use unix file instead of File.open because
+        # File.open(file, 'r') <==> File.open(file, 'r:UTF-8')
+        file_info = `file  -I #{ascii_file}`
+        file_info.should include('charset=us-ascii')
+      end
+
+      let(:parsed_file) do
+        Apfel.parse(ascii_file)
+      end
+
+      it 'returns a ParsedDotStrings object' do
+        parsed_file.should be_a(Apfel::ParsedDotStrings)
+      end
+
+      it 'should have the correct keys' do
+        parsed_file.keys[0].should == 'avoided social event'
+        parsed_file.keys[1].should == 'binged'
+        parsed_file.keys[2].should == 'called a friend'
+      end
+
+      it 'should have the correct values' do
+        parsed_file.values[0].should == 'vermieden soziales Ereignis'
+        parsed_file.values[1].should == 'gegessen exzessiv'
+        parsed_file.values[2].should == 'Telefon ein Freund'
+      end
+
+      describe 'should have the correct comments' do
+        it 'should have the correct comment for avoided social event' do
+          parsed_file.comments['avoided social event'].should == 'like a hack-a-thon'
+        end
+
+        it 'should have the correct comment for binged' do
+          parsed_file.comments['binged'].should == 'one too many lieb kochen'
+        end
+
+        it 'should have the correct comment for called a friend' do
+          parsed_file.comments['called a friend'].should == 'or maybe you just skyped'
+        end
+      end
+    end
+
+    context 'when given a UTF8 .strings file'do
+
+      let(:utf8_file) do
+        './spec/fixtures/utf8.strings'
+      end
+
+      it 'the file should be utf-8' do
+        # use unix file instead of File.open because
+        # File.open(file, 'r') <==> File.open(file, 'r:UTF-8')
+        file_info = `file  -I #{utf8_file}`
+        file_info.should include('charset=utf-8')
+      end
+
+      it 'the file should have the BOM as the 0 char' do
+        File.open(utf8_file, 'r') do |f|
+          content = f.read.force_encoding('UTF-8')
+          content.chars.first == "\xEF\xBB\xBF".force_encoding('UTF-8')
+        end
+      end
+
+      let(:parsed_file) do
+        Apfel.parse(utf8_file)
+      end
+
+      it 'returns a ParsedDotStrings object' do
+        parsed_file.should be_a(Apfel::ParsedDotStrings)
+      end
+
+      it 'should have the correct keys' do
+        parsed_file.keys[0].should == 'anger'
+        parsed_file.keys[1].should == 'anxiety'
+        parsed_file.keys[2].should == 'boredom'
+      end
+
+      it 'should have the correct values' do
+        parsed_file.values[0].should == 'Zorn'
+        parsed_file.values[1].should == 'Sorge'
+        parsed_file.values[2].should == 'Langeweile'
+      end
+
+      describe 'should have the correct comments' do
+        it 'should have the correct comment for anger' do
+          parsed_file.comments['anger'].should ==  'when the toast falls butter-side down'
+        end
+
+        it 'should have the correct comment for anxiety' do
+          parsed_file.comments['anxiety'].should == 'when you realize you left the oven on'
+        end
+
+        it 'should have the correct comment for boredom' do
+          parsed_file.comments['boredom'].should == 'ennui'
+        end
+      end
+    end
   end
 end

data/spec/fixtures/ascii.strings

@@ -0,0 +1,9 @@
+/* like a hack-a-thon */
+"avoided social event" = "vermieden soziales Ereignis";
+
+/* one too many lieb kochen */
+"binged" = "gegessen exzessiv";
+
+/* or maybe you just skyped */
+"called a friend" = "Telefon ein Freund";
+

data/spec/fixtures/utf8.strings

@@ -0,0 +1,8 @@
+/* when the toast falls butter-side down */
+"anger" = "Zorn";
+
+/* when you realize you left the oven on  */
+"anxiety" = "Sorge";
+
+/* ennui */
+"boredom" = "Langeweile";

data/spec/parsed_dot_strings_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'apfel'
-require 'parsed_dot_strings'
+require 'apfel/parsed_dot_strings'
 
 module Apfel
   describe ParsedDotStrings do

data/spec/reader_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
-require 'reader'
+require 'apfel/reader'
 
 module Apfel
   describe Reader do
     describe '#read' do
       let(:temp_file) do
-        create_temp_file(<<-EOS
+        create_temp_file('ascii', <<-EOS
 This is a file with some lines.
 Roses are red, violets are blue.
 This text is really boring,

data/spec/spec_helper.rb

@@ -1,13 +1,14 @@
 require 'tempfile'
 require 'json'
-def create_temp_file(string)
-  temp_file = Tempfile.new('temp')
+
+def create_temp_file(encoding, string)
+  temp_file = Tempfile.new([encoding, 'temp'])
   temp_file << string
   temp_file.flush
 end
 
-def valid_file
-  create_temp_file(<<-EOS
+def valid_file(encoding='ascii')
+  create_temp_file(encoding, <<-EOS
 /* This is the first comment */
 "key_number_one" = "value number one";
 
@@ -18,6 +19,6 @@ multiline comment */
 "key_number_two"   =   "value number two";
 /* This is comment number 3 */
 "key_number_three" = " value number three ";
-          EOS
+  EOS
   )
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apfel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -80,6 +81,8 @@ files:
 - lib/apfel/reader.rb
 - lib/apfel/version.rb
 - spec/apfel_spec.rb
+- spec/fixtures/ascii.strings
+- spec/fixtures/utf8.strings
 - spec/parsed_dot_strings_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
@@ -97,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2757969226826093779
+      hash: 2059895837407952673
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,15 +109,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2757969226826093779
+      hash: 2059895837407952673
 requirements: []
 rubyforge_project: apfel
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple parser for DotStrings Files
 test_files:
 - spec/apfel_spec.rb
+- spec/fixtures/ascii.strings
+- spec/fixtures/utf8.strings
 - spec/parsed_dot_strings_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb