android-xml 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74fdc8cf167a00e6fc913368b39b225d0d4d0c1c
-  data.tar.gz: e50d23184c0a996f2b5d9557d468e97d4e7dd001
+  metadata.gz: 4509fa336291a4bd13e096f37d9b23f8b745bd07
+  data.tar.gz: 6ddf6a6eba7193d428d49c7c6a7dfe2f8f802596
 SHA512:
-  metadata.gz: 3cf9021c429ed0baa13e54e82f4c7f5c973b2ea5954da51a88222d3f8f0151d764593a913443350937a67631c9ff2306ee6d2c8ff554594921741709afddddc9
-  data.tar.gz: 5230c0bb21226467546661037a8899016fb87fde53b752798ea9462760c5fcda8d72c7ead82d01d6b413188dc513b150a33f18ad9fbfc59861edb8d23bbe7aba
+  metadata.gz: 0d50edfc8f5555fe8a8bc8b6c68c80ea3a3c2ad717ddebd90e0d69ccde953d8fff36b44e718facb895d938a8e120de9c64a8e5629ff4c9c448c7f9d4896c4bf2
+  data.tar.gz: f655177e4243493085c021fe585abd379b706b08ce5f8b6dd9b56d94ebdd7bc09f0867f92fef286d54879208563bd336fed31ed13c97500d20ad78dc6742456c

data/lib/android-xml/exts.rb

@@ -4,6 +4,14 @@ class Numeric
     "#{self}pt"
   end
 
+  def mm
+    "#{self}mm"
+  end
+
+  def in
+    "#{self}in"
+  end
+
   def px
     "#{self}px"
   end
@@ -12,4 +20,12 @@ class Numeric
     "#{self}dp"
   end
 
+  def dip
+    "#{self}dip"
+  end
+
+  def sp
+    "#{self}sp"
+  end
+
 end

data/lib/android-xml/string.rb

@@ -26,6 +26,30 @@ module AndroidXml
       tag
     end
 
+    def run_block(&block)
+      text = instance_exec(&block)
+      if text.is_a?(String)
+        text = Tag.format_string(text)
+      end
+      text
+    end
+
+    # isn't there a method that does this for me!?
+    def self.format_string(text)
+      text = text.dup
+      {
+        '\\' => '\\\\',
+        "\n" => '\n',
+        "\t" => '\t',
+        "\b" => '\b',
+        '"' => '\"',
+        "'" => "\\\\'",
+      }.each do |find, replace|
+        text.gsub!(find, replace)
+      end
+      text
+    end
+
   end
 
   module_function
@@ -34,7 +58,7 @@ module AndroidXml
     diff = Tag.found_strings - Tag.registered_strings
     unless diff.empty?
       diff.each do |name|
-        puts "  string(name='#{name}') { '#{name}' }"
+        puts "  string(name='#{Tag.format_string(name)}') { '#{Tag.format_string(name)}' }"
       end
     end
   end

data/lib/android-xml/tag.rb

@@ -50,15 +50,18 @@ module AndroidXml
       attrs.merge!(Setup.tags[@raw_tag][:defaults])
       attrs.merge!(@attrs)
 
+      format_attrs(@tag, attrs, whitespace)
+    end
+
+    def format_attrs(tag, attrs, whitespace, is_first=true)
       output = ''
-      is_first = true
       attrs.each do |key, value|
         next if value.nil?
 
         key = key.to_s
 
-        if Setup.tags[@tag][:attrs].key?(key)
-          xml_key = Setup.tags[@tag][:attrs][key]
+        if Setup.tags[tag][:attrs].key?(key)
+          xml_key = Setup.tags[tag][:attrs][key]
         elsif Setup.all_tag[:attrs].key?(key)
           xml_key = Setup.all_tag[:attrs][key]
         elsif key.to_s.include?(':')
@@ -71,16 +74,32 @@ module AndroidXml
           Tag.found_strings << $1
         end
 
+        quoted_value = Tag.quote_attr_value(value)
         if is_first
-          output << " #{xml_key}=\"#{value}\""
+          output << " #{xml_key}=\"#{quoted_value}\""
           is_first = false
         else
-          output << "\n#{whitespace}#{xml_key}=\"#{value}\""
+          output << "\n#{whitespace}#{xml_key}=\"#{quoted_value}\""
         end
       end
+
       output
     end
 
+    def self.quote_attr_value(value)
+      value = value.to_s.dup
+      {
+        '&' => '&amp;',
+        '\'' => '&apos;',
+        '"' => '&quot;',
+        '<' => '&lt;',
+        '>' => '&gt;',
+      }.each do |find, replace|
+        value.gsub!(find, replace)
+      end
+      value
+    end
+
     def generate(tab='')
       whitespace = "#{tab}  #{' ' * @tag.length}"
       output = "#{tab}<#{@tag}#{attrs(whitespace)}"
@@ -108,7 +127,7 @@ module AndroidXml
 
       output = ''
       if @generate
-        text = instance_exec(&@generate)
+        text = run_block(&@generate)
         @buffer.each do |tag|
           output << tag.generate(tab)
         end
@@ -124,6 +143,10 @@ module AndroidXml
       @block_output = output
     end
 
+    def run_block(&block)
+      instance_exec(&block)
+    end
+
     def to_s
       generate
     end

data/lib/android-xml/version.rb

@@ -1,3 +1,3 @@
 module AndroidXml
-  Version = '1.2.3'
+  Version = '1.2.4'
 end

data/spec/attrs_spec.rb

@@ -0,0 +1,26 @@
+require 'android-xml'
+
+
+describe 'tag attributes' do
+
+  before do
+    AndroidXml.reset
+  end
+
+  it 'should generate <any-tag tag="value" />' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      any_tag(tag: "value")
+    end
+
+    expect(xml.to_s).to match %r{<any-tag android:tag="value" />}
+  end
+
+  it 'should generate <any-tag tag="value-with-quotes" />' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      any_tag(tag: %q{value-"'<>&-with-quoted})
+    end
+
+    expect(xml.to_s).to match %r{<any-tag android:tag="value-&quot;&apos;&lt;&gt;&amp;-with-quoted" />}
+  end
+
+end

data/spec/string_spec.rb

@@ -0,0 +1,36 @@
+require 'android-xml'
+
+
+describe AndroidXml do
+
+  before do
+    AndroidXml.reset
+  end
+
+  it 'should quote strings' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      string(name: 'registered_string') { "newline \nsingle-quote ' double-quote \" tab\t"}
+    end
+
+    expect(xml.to_s).to include('newline \\nsingle-quote \\\' double-quote \\" tab\\t')
+  end
+
+  it 'should register strings' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      string(name: 'registered_string') { 'registered'}
+    end
+
+    xml.generate
+    expect(AndroidXml::Tag.registered_strings).to eql(['registered_string'])
+  end
+
+  it 'should find strings' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      any_tag(tag: '@string/found_string')
+    end
+
+    xml.generate
+    expect(AndroidXml::Tag.found_strings).to eql(['found_string'])
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: android-xml
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -47,11 +47,13 @@ files:
 - spec/android_manifest_spec.rb
 - spec/android_menu_spec.rb
 - spec/android_resources_spec.rb
+- spec/attrs_spec.rb
 - spec/clone_tag_spec.rb
 - spec/create_tag_spec.rb
 - spec/factory_spec.rb
 - spec/generate_spec.rb
 - spec/inc_tag_spec.rb
+- spec/string_spec.rb
 - spec/write_to_file_spec.rb
 homepage: https://github.com/colinta/android-xml
 licenses:
@@ -81,9 +83,11 @@ test_files:
 - spec/android_manifest_spec.rb
 - spec/android_menu_spec.rb
 - spec/android_resources_spec.rb
+- spec/attrs_spec.rb
 - spec/clone_tag_spec.rb
 - spec/create_tag_spec.rb
 - spec/factory_spec.rb
 - spec/generate_spec.rb
 - spec/inc_tag_spec.rb
+- spec/string_spec.rb
 - spec/write_to_file_spec.rb