android-xml 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373201221b34be3484b637d003c5730a57d6958e
-  data.tar.gz: e1699c3541c9cc6e97dd7897062fd76e924b384a
+  metadata.gz: 116b00e3b218d57210b245664cdba74ad0547f0c
+  data.tar.gz: 5ab7355d8a8a2f23c9c2761a9605d9278ba17fa7
 SHA512:
-  metadata.gz: 7ea719959bda0618c546c97691d86491c55607be2363b1cacfeca817addbc229c0eef946a91060dbca017e9383ec8dde8d3817f705311c0fccf77f8435a4ec16
-  data.tar.gz: b85efa4cffe94f32c4f06f132c92840df35b3675d9020bc7ea6aa343ab71b8cbb2a464bf86065b41986ff67d773f24e97e627f32bf661ee8cb57ede51b8cd2ad
+  metadata.gz: a20f4da341b687a4e74aaa756090a24327bb71ac7ab977c2ee03c85b8598a6e0edbc2a371a234c8e63ee9bf686681558979069996e389235808cd0f0b55378c7
+  data.tar.gz: a1b3d59da9a73fc2ea24d80460f94898420fbfb585a2322fea6ec3e543b54e66e154781546bc299af392fe8e2c15fca4c8099ba8a94d6106152334e24896c62f

data/lib/android-xml/setup.rb

@@ -81,7 +81,7 @@ module AndroidXml
       end
 
       def defaults(attrs)
-        tags[@context][:defaults].merge!(attrs)
+        tags[@context][:defaults].merge!(Tag.flatten_attrs(attrs))
       end
 
     end

data/lib/android-xml/tag.rb

@@ -3,43 +3,7 @@ module AndroidXml
   class Tag
     attr_accessor :is_root
 
-    def initialize(tag, attrs={}, &block)
-      @buffer = []
-      @attrs = {}.merge(flatten_attrs(attrs))
-      @raw_tag = tag.to_s
-
-      if rename = Setup.tags[tag.to_s][:rename]
-        @tag = rename
-      else
-        @tag = tag.to_s.gsub('_', '-')
-      end
-
-      @generate = block
-    end
-
-    def method_missing(method_name, attrs={}, &block)
-      tag = Tag.new(method_name, attrs, &block)
-      include tag
-      tag
-    end
-
-    def clone(attrs={}, &block)
-      block ||= @generate
-      Tag.new(@tag, @attrs.merge(flatten_attrs(attrs)), &block)
-    end
-
-    def include(tag, &block)
-      if tag.is_a?(Tag)
-        if block_given?
-          tag = tag.clone(&block)
-        end
-        @buffer << tag
-      else
-        super
-      end
-    end
-
-    def flatten_attrs(attrs, prefix='')
+    def self.flatten_attrs(attrs, prefix='')
       flattened = {}
       attrs.each do |key, value|
         key = "#{prefix}#{key}"
@@ -53,21 +17,7 @@ module AndroidXml
       flattened
     end
 
-    def generate_attrs(whitespace)
-      attrs = {}
-
-      attrs.merge!(Setup.all_tag[:defaults])
-      if is_root
-        attrs.merge!(Setup.root_tag[:defaults])
-      end
-
-      attrs.merge!(Setup.tags[@raw_tag][:defaults])
-      attrs.merge!(@attrs)
-
-      format_attrs(@tag, attrs, whitespace)
-    end
-
-    def format_attrs(tag, attrs, whitespace)
+    def self.format_attrs(tag, attrs, whitespace)
       output = ''
       is_first = true
       attrs.each do |key, value|
@@ -117,6 +67,56 @@ module AndroidXml
       value
     end
 
+    def initialize(tag, attrs={}, &block)
+      @buffer = []
+      @attrs = {}.merge(Tag.flatten_attrs(attrs))
+      @raw_tag = tag.to_s
+
+      if rename = Setup.tags[tag.to_s][:rename]
+        @tag = rename
+      else
+        @tag = tag.to_s.gsub('_', '-')
+      end
+
+      @generate = block
+    end
+
+    def method_missing(method_name, attrs={}, &block)
+      tag = Tag.new(method_name, attrs, &block)
+      include tag
+      tag
+    end
+
+    def clone(attrs={}, &block)
+      block ||= @generate
+      Tag.new(@tag, @attrs.merge(Tag.flatten_attrs(attrs)), &block)
+    end
+
+    def include(tag, &block)
+      if tag.is_a?(Tag)
+        if block_given?
+          tag = tag.clone(&block)
+        end
+        @buffer << tag
+      else
+        super
+      end
+    end
+
+    def generate_attrs(whitespace)
+      attrs = {}
+
+      attrs.merge!(Setup.all_tag[:defaults])
+      if is_root
+        attrs.merge!(Setup.root_tag[:defaults])
+      end
+
+      attrs.merge!(Setup.tags[@raw_tag][:defaults])
+      attrs.merge!(@attrs)
+
+      Tag.format_attrs(@tag, attrs, whitespace)
+    end
+
     def generate(tab='')
       whitespace = "#{tab}  #{' ' * @tag.length}"
       output = "#{tab}<#{@tag}#{generate_attrs(whitespace)}"

data/lib/android-xml/version.rb

@@ -1,3 +1,3 @@
 module AndroidXml
-  Version = '1.3.1'
+  Version = '1.3.2'
 end

data/spec/setup_spec.rb

@@ -0,0 +1,50 @@
+require 'android-xml'
+
+
+describe 'Android menu files' do
+
+  before do
+    AndroidXml.reset
+    AndroidXml.setup do
+      tag :application do
+        defaults screenOrientation: 'portrait', allowBackup: false
+      end
+    end
+  end
+
+  it 'should include defaults' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      application
+    end
+
+    expect(xml.to_s).to eql <<-XML
+<!-- Do not edit this file. It was generated by AndroidXml. -->
+<application android:screenOrientation="portrait"
+             android:allowBackup="false" />
+XML
+  end
+
+  it 'should override defaults' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      application allowBackup: true
+    end
+
+    expect(xml.to_s).to eql <<-XML
+<!-- Do not edit this file. It was generated by AndroidXml. -->
+<application android:screenOrientation="portrait"
+             android:allowBackup="true" />
+XML
+  end
+
+  it 'should remove nil values' do
+    xml = AndroidXml.file('tmp/test.xml') do
+      application screenOrientation: nil
+    end
+
+    expect(xml.to_s).to eql <<-XML
+<!-- Do not edit this file. It was generated by AndroidXml. -->
+<application android:allowBackup="false" />
+XML
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: android-xml
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Colin T.A. Gray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -54,6 +54,7 @@ files:
 - spec/factory_spec.rb
 - spec/generate_spec.rb
 - spec/inc_tag_spec.rb
+- spec/setup_spec.rb
 - spec/string_spec.rb
 - spec/write_to_file_spec.rb
 homepage: https://github.com/colinta/android-xml
@@ -91,5 +92,6 @@ test_files:
 - spec/factory_spec.rb
 - spec/generate_spec.rb
 - spec/inc_tag_spec.rb
+- spec/setup_spec.rb
 - spec/string_spec.rb
 - spec/write_to_file_spec.rb