bruno 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b5d6cfae46b2ac02726fbd6ac66c9b79d5527011
-  data.tar.gz: d05f086e46249d0b8ee33d084b7f83b0a4ef30bb
+SHA256:
+  metadata.gz: 94569696331e1bbe5c72e3eae5754ed38a5c85fce3c6a1146728fd11cff97d11
+  data.tar.gz: '081f36a280059288d2eaebeb0bb251f96fd209c49cb6fe7c1932984c4c612fac'
 SHA512:
-  metadata.gz: 6173d509f006861e0ea898fb1bf7e5bd074c8d46a2290858c2d2e43639e4c1f334122f7244b58d644b2dfb80f5716d1ce283a7fdf1c0fcdcbc6f5f2a60782c23
-  data.tar.gz: 5d2b4b0a6bca51cd7462c7eeb9c96a1c90eebfad7894cbff52a432c73f2f3e91f5ed1a226e6a387cf1a77d24f95ad057a663912ca4286dacf9d6e5b11681d535
+  metadata.gz: 440cf0fb11cf40d24c754bb374e997eee9998ba7de9f522d54da30b7a75b5cdf6b1caaf217825c9a4ea885918a51ea96fa02244c615a985e7d366ab17b06cb1a
+  data.tar.gz: fbf6b4ea99516e01f11996e0e15eb53b8c3aecbd29ed71f80e4cd031ca8bd33f8fb8c97e16d5be940453fb0559e877d130038882940cc2de276e8a31dba12696

data/bin/bruno

@@ -22,11 +22,8 @@ command :convert do |c|
     raise 'You must provide an input file' if options[:in].nil?
     raise 'You must provide an output file' if options[:out].nil?
 
-    # If you have any errors, just raise them
-    #raise "that command made no sense"
+    Bruno::Converter.convert(options[:in], options[:out])
 
-    strings_file = Bruno::StringsFile.new(options[:in])
-    strings_file.transform(options[:out])
     puts "convert command ran"
   end
 end

data/lib/bruno/android_file.rb

@@ -0,0 +1,30 @@
+require 'nokogiri'
+
+class Bruno::AndroidFile < Bruno::I18nFile
+  def self.is_android?(content)
+    !(content =~ /<string name=".*">.*<\/string>/).nil?
+  end
+
+  def self.read(content)
+    strings = []
+    xml = Nokogiri::XML(content)
+    xml.root.xpath('string').each do |string|
+      strings << {:key => string.attribute('name').value, :value => string.content}
+    end
+
+    strings
+  end
+
+  def write(path)
+    file = File.new(path, 'w+')
+    builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+      xml.resources {
+        @strings.each do |string|
+          xml.string({:name => string[:key]}) { xml.text string[:value] }
+        end
+      }
+    end
+    file.write(builder.to_xml)
+    file.close
+  end
+end

data/lib/bruno/converter.rb

@@ -0,0 +1,7 @@
+module Bruno
+  class Converter
+    def self.convert(in_path, out_path)
+      I18nFile.read(in_path).write(out_path)
+    end
+  end
+end

data/lib/bruno/i18n_file.rb

@@ -0,0 +1,25 @@
+module Bruno
+  class I18nFile
+    attr_writer :strings
+
+    def initialize(strings)
+      @strings = strings
+    end
+
+    def self.read(path)
+      if File.readable?(path)
+        content = File.read(path)
+
+        if IOSFile.is_ios?(content)
+          return AndroidFile.new(IOSFile.read(content))
+        elsif AndroidFile.is_android?(content)
+          return IOSFile.new(AndroidFile.read(content))
+        else
+          raise 'Format of the file is not correct'
+        end
+      else
+        raise 'File is not readable'
+      end
+    end
+  end
+end

data/lib/bruno/ios_file.rb

@@ -0,0 +1,34 @@
+class Bruno::IOSFile < Bruno::I18nFile
+  def self.is_ios?(content)
+    !(content =~ /".*" = ".*";/).nil?
+  end
+  
+  def self.read(content)
+    strings = []
+    content.each_line do |line|
+      match_key = line.match(/\"([^\"]+)\"/)
+      match_value = line.match(/= \"([^\"]+)\";/) #"
+      strings << {:key => match_key[1], :value => match_value[1]}
+    end
+    strings
+  end
+
+  def write(path)
+    file = File.new(path,'w+')
+
+    @strings.each_with_index do |string, index|
+      file.write(compose_line(string[:key], string[:value]))
+
+      if index != @strings.length - 1
+        file.write("\n")
+      end
+    end
+    file.close
+  end
+
+
+  private
+  def compose_line(key, value)
+    '"' + key + '" = "' + value + '";'
+  end
+end

data/lib/bruno/version.rb

@@ -1,3 +1,3 @@
 module Bruno
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/bruno.rb

@@ -1,5 +1,5 @@
 require 'bruno/version'
-require 'bruno/strings_file'
-
-# Add requires for other files you add to your project here, so
-# you just need to require this one file in your bin file
+require 'bruno/i18n_file'
+require 'bruno/android_file'
+require 'bruno/ios_file'
+require 'bruno/converter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bruno
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - José M. Gilgado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.8.4
 description: Bruno is a small tool to convert your Localizable.strings (iOS) files
   into strings.xml (Android) and viceversa.
 email: jm.gilgado@gmail.com
@@ -88,9 +88,12 @@ extra_rdoc_files: []
 files:
 - bin/bruno
 - lib/bruno.rb
-- lib/bruno/strings_file.rb
+- lib/bruno/android_file.rb
+- lib/bruno/converter.rb
+- lib/bruno/i18n_file.rb
+- lib/bruno/ios_file.rb
 - lib/bruno/version.rb
-homepage: http://github.com/josem/bruno
+homepage: https://github.com/josem/bruno
 licenses:
 - MIT
 metadata: {}
@@ -111,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Convert your i18n files between Android and iOS

data/lib/bruno/strings_file.rb

@@ -1,92 +0,0 @@
-require 'nokogiri'
-
-module Bruno
-  class StringsFile
-    def initialize(file_path)
-      if File.readable?(file_path)
-        @content = File.read(file_path)
-      else
-        raise 'File is not readable'
-      end
-    end
-
-    def transform(path)
-      if is_ios?
-        to_android(path)
-      elsif is_android?
-        to_ios(path)
-      end
-    end
-
-    def is_ios?
-      !(@content =~ /".*" = ".*";/).nil?
-    end
-
-    def is_android?
-      !(@content =~ /<string name=".*">.*<\/string>/).nil?
-    end
-
-    def to_ios(ios_file_path)
-      return if @content == ''
-      strings = get_strings_from_android
-      write_ios_file(ios_file_path, strings)
-    end
-
-    def to_android(android_file_path)
-      return if @content == ''
-      strings = get_strings_from_ios
-      write_android_file(android_file_path, strings)
-    end
-
-    private
-    def get_strings_from_android
-      strings = []
-      xml = Nokogiri::XML(@content)
-      xml.root.xpath('string').each do |string|
-        strings << {:key => string.attribute('name').value, :value => string.content}
-      end
-
-      strings
-    end
-
-    def get_strings_from_ios
-      strings = []
-      @content.each_line do |line|
-        match_key = line.match(/\"([^\"]+)\"/)
-        match_value = line.match(/= \"([^\"]+)\";/)
-        strings << {:key => match_key[1], :value => match_value[1]}
-      end
-      strings
-    end
-
-    def compose_ios_line(key, value)
-      '"' + key + '" = "' + value + '";'
-    end
-
-    def write_ios_file(path, strings)
-      ios_file = File.new(path,'w+')
-
-      strings.each_with_index do |string, index|
-        ios_file.write(compose_ios_line(string[:key], string[:value]))
-
-        if index != strings.length - 1
-          ios_file.write("\n")
-        end
-      end
-      ios_file.close
-    end
-
-    def write_android_file(path, strings)
-      android_file = File.new(path, 'w+')
-      builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
-        xml.resources {
-          strings.each do |string|
-            xml.string({:name => string[:key]}) { xml.text string[:value] }
-          end
-        }
-      end
-      android_file.write(builder.to_xml)
-      android_file.close
-    end
-  end
-end