representative 0.1.2 → 0.1.3

data/Rakefile

@@ -2,10 +2,6 @@ require "rubygems"
 require "rake"
 require "rake/clean"
 
-require File.dirname(__FILE__) + "/lib/representative/version.rb"
-
-task :default => :spec
-
 def with_gem(gem_name, lib = gem_name)
   begin
     require(lib)
@@ -16,22 +12,6 @@ def with_gem(gem_name, lib = gem_name)
   yield
 end
 
-with_gem "jeweler" do
-  
-  Jeweler::Tasks.new do |gem|
-    gem.name = "representative"
-    gem.version = Representative::VERSION
-    gem.summary = "Builds XML representations of your Ruby objects"
-    gem.email = "mdub@dogbiscuit.org"
-    gem.homepage = "http://github.com/mdub/representative"
-    gem.authors = ["Mike Williams"]
-    gem.add_dependency("activesupport", ">= 2.2.2")
-  end
-  
-  Jeweler::GemcutterTasks.new
-
-end
-
 require "spec/rake/spectask"
 
 Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -39,6 +19,8 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
+task :default => :spec
+
 Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']

data/lib/representative/object_inspector.rb

@@ -0,0 +1,15 @@
+module Representative
+  
+  class ObjectInspector
+    
+    def get_value(object, attribute_name)
+      object.send(attribute_name)
+    end
+
+    def get_metadata(object, attribute_name)
+      {}
+    end
+    
+  end
+  
+end

data/lib/representative/version.rb

@@ -1,3 +1,3 @@
 module Representative
-  VERSION = "0.1.2"
+  VERSION = "0.1.3".freeze
 end

data/lib/representative/xml.rb

@@ -1,14 +1,17 @@
+require "active_support/core_ext/array"
+require "active_support/core_ext/string"
 require "builder"
-require "active_support"
 require "representative/empty"
+require "representative/object_inspector"
 
 module Representative
 
   class Xml < BlankSlate
 
-    def initialize(xml_builder, subject = nil)
+    def initialize(xml_builder, subject = nil, options = {})
       @xml = xml_builder
       @subjects = [subject]
+      @inspector = options[:inspector] || ObjectInspector.new
       yield self if block_given?
     end
 
@@ -16,7 +19,7 @@ module Representative
       if name.to_s =~ /!$/
         super
       else
-        property!(name, *args, &block)
+        attribute!(name, *args, &block)
       end
     end
 
@@ -24,18 +27,25 @@ module Representative
       @subjects.last
     end
     
-    def property!(property_name, *args, &block)
+    def attribute!(subject_attribute_name, *args, &block)
 
-      attributes = args.extract_options!
-      value_generator = args.empty? ? property_name : args.shift
+      element_attributes = args.extract_options!
+      value_generator = if args.empty? 
+        lambda do |subject|
+          @inspector.get_value(subject, subject_attribute_name)
+        end
+      else 
+        args.shift
+      end
       raise ArgumentError, "too many arguments" unless args.empty?
 
-      element_name = property_name.to_s.dasherize
+      element_name = subject_attribute_name.to_s.dasherize
 
-      value = resolve(value_generator)
-      resolved_attributes = resolve_attributes(attributes, value)
+      value = resolve_value(value_generator)
+      resolved_element_attributes = resolve_element_attributes(element_attributes, value)
+      resolved_element_attributes.merge!(@inspector.get_metadata(subject!, subject_attribute_name))
 
-      element!(element_name, value, resolved_attributes, &block)
+      element!(element_name, value, resolved_element_attributes, &block)
 
     end
 
@@ -59,36 +69,40 @@ module Representative
       @xml.tag!(element_name, *tag_args, &content_generator)
     end
 
-    def list_of!(property_name, *args, &block)
+    def list_of!(attribute_name, *args, &block)
 
       options = args.extract_options!
-      value_generator = args.empty? ? property_name : args.shift
+      value_generator = args.empty? ? attribute_name : args.shift
       raise ArgumentError, "too many arguments" unless args.empty?
 
-      list_name = property_name.to_s.dasherize
-      list_attributes = options[:list_attributes] || {}
+      list_name = attribute_name.to_s.dasherize
+      list_element_attributes = options[:list_attributes] || {}
       item_name = options[:item_name] || list_name.singularize
-      item_attributes = options[:item_attributes] || {}
+      item_element_attributes = options[:item_attributes] || {}
+
+      items = resolve_value(value_generator)
+      if items.nil?
+        return @xml.tag!(list_name)
+      end
 
-      items = resolve(value_generator)
-      resolved_list_attributes = resolve_attributes(list_attributes, items)
+      resolved_list_element_attributes = resolve_element_attributes(list_element_attributes, items)
 
-      @xml.tag!(list_name, resolved_list_attributes.merge(:type => "array")) do
+      @xml.tag!(list_name, resolved_list_element_attributes.merge(:type => "array")) do
         items.each do |item|
-          resolved_item_attributes = resolve_attributes(item_attributes, item)
-          element!(item_name, item, resolved_item_attributes, &block)
+          resolved_item_element_attributes = resolve_element_attributes(item_element_attributes, item)
+          element!(item_name, item, resolved_item_element_attributes, &block)
         end
       end
 
     end
 
-    def empty!(property_name, *args)
-      property!(property_name, *args, &Representative::EMPTY)
+    def empty!(attribute_name, *args)
+      attribute!(attribute_name, *args, &Representative::EMPTY)
     end
       
     private 
 
-    def resolve(value_generator, subject = subject!)
+    def resolve_value(value_generator, subject = subject!)
       if value_generator == :self
         subject
       elsif value_generator.respond_to?(:to_proc)
@@ -98,16 +112,16 @@ module Representative
       end
     end
 
-    def resolve_attributes(attributes, subject)
-      if attributes
-        attributes.inject({}) do |resolved, (k,v)|
-          resolved_value = resolve(v, subject)
-          resolved[k.to_s.dasherize] = resolved_value unless resolved_value.nil?
+    def resolve_element_attributes(element_attributes, subject)
+      if element_attributes
+        element_attributes.inject({}) do |resolved, (name, value_generator)|
+          resolved_value = resolve_value(value_generator, subject)
+          resolved[name.to_s.dasherize] = resolved_value unless resolved_value.nil?
           resolved
         end
       end
     end
-
+    
   end
 
 end

data/spec/representative/xml_spec.rb

@@ -200,6 +200,15 @@ describe Representative::Xml do
         end
       end
 
+      describe "with an argument that resolves to nil" do
+
+        it "omits the attribute" do
+          represent.list_of!(:flags)
+          resulting_xml.should == %(<flags/>)
+        end
+
+      end
+
       describe "with a block" do
 
         it "generates a nested element for each list element" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: representative
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Mike Williams
@@ -9,72 +14,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 +11:00
+date: 2010-06-24 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 2
         version: 2.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: mdub@dogbiscuit.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.markdown
-- Rakefile
-- examples/xml_demo.rb
-- init.rb
-- lib/representative.rb
 - lib/representative/empty.rb
+- lib/representative/object_inspector.rb
 - lib/representative/version.rb
 - lib/representative/xml.rb
-- representative.gemspec
-- spec/representative/xml_spec.rb
-- spec/spec_helper.rb
+- lib/representative.rb
+- examples/xml_demo.rb
+- README.markdown
+- LICENSE
 has_rdoc: true
 homepage: http://github.com/mdub/representative
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Builds XML representations of your Ruby objects
 test_files: 
 - spec/representative/xml_spec.rb
 - spec/spec_helper.rb
-- examples/xml_demo.rb
+- Rakefile

data/.document

@@ -1,3 +0,0 @@
-README.markdown
-LICENSE
-lib/**/*.rb

data/.gitignore

@@ -1,6 +0,0 @@
-*.sw?
-.DS_Store
-.yardoc
-coverage
-doc
-pkg

data/init.rb

@@ -1 +0,0 @@
-require "representative"

data/representative.gemspec

@@ -1,58 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{representative}
-  s.version = "0.1.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mike Williams"]
-  s.date = %q{2009-12-03}
-  s.email = %q{mdub@dogbiscuit.org}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "examples/xml_demo.rb",
-     "init.rb",
-     "lib/representative.rb",
-     "lib/representative/empty.rb",
-     "lib/representative/version.rb",
-     "lib/representative/xml.rb",
-     "representative.gemspec",
-     "spec/representative/xml_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/mdub/representative}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Builds XML representations of your Ruby objects}
-  s.test_files = [
-    "spec/representative/xml_spec.rb",
-     "spec/spec_helper.rb",
-     "examples/xml_demo.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-  end
-end
-