android-xml 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4509fa336291a4bd13e096f37d9b23f8b745bd07
-  data.tar.gz: 6ddf6a6eba7193d428d49c7c6a7dfe2f8f802596
+  metadata.gz: b6ed93865b0f2b7c5327619514216e72ce8d5084
+  data.tar.gz: 586579b119a845fc2df419087a4cb3db1ca15e7f
 SHA512:
-  metadata.gz: 0d50edfc8f5555fe8a8bc8b6c68c80ea3a3c2ad717ddebd90e0d69ccde953d8fff36b44e718facb895d938a8e120de9c64a8e5629ff4c9c448c7f9d4896c4bf2
-  data.tar.gz: f655177e4243493085c021fe585abd379b706b08ce5f8b6dd9b56d94ebdd7bc09f0867f92fef286d54879208563bd336fed31ed13c97500d20ad78dc6742456c
+  metadata.gz: cc7d414cfa666b698777cccbfac4da9cf518c95cca6e41ab30d9972bb6540c63e1f64047dd37d316117a54912e1a18f789259b6461a500fcb139fb0fa8250c14
+  data.tar.gz: 89d67db87446b6f936daa05a3cb38809c0ba18d505457312d35b387b79f9d81d37a79141ccddda4f2dc9fddd306fd0aba6a29f5f31f5c6b5df3db20352982535

data/lib/android-xml/tag.rb

@@ -5,7 +5,7 @@ module AndroidXml
 
     def initialize(tag, attrs={}, &block)
       @buffer = []
-      @attrs = {}.merge(attrs)
+      @attrs = {}.merge(flatten_attrs(attrs))
       @raw_tag = tag.to_s
 
       if rename = Setup.tags[tag.to_s][:rename]
@@ -25,7 +25,7 @@ module AndroidXml
 
     def clone(attrs={}, &block)
       block ||= @generate
-      Tag.new(@tag, @attrs.merge(attrs), &block)
+      Tag.new(@tag, @attrs.merge(flatten_attrs(attrs)), &block)
     end
 
     def include(tag, &block)
@@ -39,7 +39,21 @@ module AndroidXml
       end
     end
 
-    def attrs(whitespace)
+    def flatten_attrs(attrs, prefix='')
+      flattened = {}
+      attrs.each do |key, value|
+        key = "#{prefix}#{key}"
+        if value.is_a?(Hash)
+          flattened.merge!(flatten_attrs(value, "#{key}_"))
+        else
+          flattened[key] = value
+        end
+      end
+
+      flattened
+    end
+
+    def generate_attrs(whitespace)
       attrs = {}
 
       attrs.merge!(Setup.all_tag[:defaults])
@@ -53,10 +67,13 @@ module AndroidXml
       format_attrs(@tag, attrs, whitespace)
     end
 
-    def format_attrs(tag, attrs, whitespace, is_first=true)
+    def format_attrs(tag, attrs, whitespace)
       output = ''
+      is_first = true
       attrs.each do |key, value|
-        next if value.nil?
+        if value.nil?
+          next
+        end
 
         key = key.to_s
 
@@ -102,7 +119,7 @@ module AndroidXml
 
     def generate(tab='')
       whitespace = "#{tab}  #{' ' * @tag.length}"
-      output = "#{tab}<#{@tag}#{attrs(whitespace)}"
+      output = "#{tab}<#{@tag}#{generate_attrs(whitespace)}"
       if @generate
         inside = generate_block(tab + Setup.tab)
         if !inside || inside.strip.empty?

data/lib/android-xml/version.rb

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

data/spec/attrs_spec.rb

@@ -23,4 +23,59 @@ describe 'tag attributes' do
     expect(xml.to_s).to match %r{<any-tag android:tag="value-&quot;&apos;&lt;&gt;&amp;-with-quoted" />}
   end
 
+  it 'should generate prefixed attributes when using a hash' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      any_tag(layout: {
+          width: 'match_parent',
+          height: 'match_parent',
+          padding: 6.dp,
+        })
+    end
+
+    expect(xml.to_s).to eql <<-XML
+<!-- Do not edit this file. It was generated by AndroidXml. -->
+<any-tag android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:layout_padding="6dp" />
+XML
+  end
+
+  it 'should properly clone a tag with nested attrs' do
+    any_tag = AndroidXml.any_tag(layout: {
+      width: 'match_parent',
+      height: 'match_parent',
+      padding: 6.dp,
+    })
+
+    xml = AndroidXml.file('tmp/test.xml') do
+      resources do
+        include any_tag.clone
+        include any_tag.clone layout_height: 'wrap_content'
+      end
+    end
+
+    expect(any_tag.to_s).to eql <<-XML
+<any-tag android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:layout_padding="6dp" />
+XML
+    expect(any_tag.clone(layout_height: 'wrap_content').to_s).to eql <<-XML
+<any-tag android:layout_width="match_parent"
+         android:layout_height="wrap_content"
+         android:layout_padding="6dp" />
+XML
+
+    expect(xml.to_s).to eql <<-XML
+<!-- Do not edit this file. It was generated by AndroidXml. -->
+<resources>
+    <any-tag android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_padding="6dp" />
+    <any-tag android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:layout_padding="6dp" />
+</resources>
+XML
+  end
+
 end

data/spec/ext_spec.rb

@@ -0,0 +1,19 @@
+describe 'Numeric extensions' do
+
+  %w{
+    pt
+    mm
+    in
+    px
+    dp
+    dip
+    sp
+  }.each do |ext|
+    it "should support ###.#{ext}" do
+      [0, 1, 1.5].each do |num|
+        expect(num.send(ext)).to eql("#{num}#{ext}")
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: android-xml
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -50,6 +50,7 @@ files:
 - spec/attrs_spec.rb
 - spec/clone_tag_spec.rb
 - spec/create_tag_spec.rb
+- spec/ext_spec.rb
 - spec/factory_spec.rb
 - spec/generate_spec.rb
 - spec/inc_tag_spec.rb
@@ -86,6 +87,7 @@ test_files:
 - spec/attrs_spec.rb
 - spec/clone_tag_spec.rb
 - spec/create_tag_spec.rb
+- spec/ext_spec.rb
 - spec/factory_spec.rb
 - spec/generate_spec.rb
 - spec/inc_tag_spec.rb