representative 0.3.3 → 0.3.4

data/Rakefile

@@ -4,20 +4,11 @@ require 'bundler'
 
 Bundler::GemHelper.install_tasks
 
-require "spec/rake/spectask"
+require "rspec/core/rake_task"
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts << "-Du"
-  spec.spec_opts << "--color"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = ["--colour", "--format", "nested"]
 end
 
 task :default => :spec
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.rcov = true
-end
-

data/lib/representative/abstract_xml.rb

@@ -4,6 +4,11 @@ module Representative
   
   class AbstractXml < Base
 
+    def initialize(subject = nil, options = {})
+      super(subject, options)
+      @naming_strategy = options[:naming_strategy] || :dasherize
+    end
+
     # Generate an element.
     #
     # With two arguments, it generates an element with the specified text content.
@@ -64,7 +69,7 @@ module Representative
           end
         end
       
-        generate_element(name.to_s.dasherize, resolved_attributes, content_string, &content_block)
+        generate_element(format_name(name), resolved_attributes, content_string, &content_block)
 
       end
 
@@ -112,6 +117,34 @@ module Representative
     def empty
       Representative::EMPTY
     end
+
+    private
+
+    attr_reader :naming_strategy
+    
+    def format_name(name)
+      name = name.to_s
+      case naming_strategy
+      when :camelcase
+        name.camelcase(:lower)
+      when :dasherize
+        name.dasherize
+      when Symbol
+        name.send(naming_strategy)
+      else
+        naming_strategy.to_proc.call(name)
+      end
+    end
+    
+    def resolve_attributes(attributes)
+      if attributes
+        attributes.inject({}) do |resolved, (name, value_generator)|
+          resolved_value = resolve_value(value_generator)
+          resolved[format_name(name)] = resolved_value unless resolved_value.nil?
+          resolved
+        end
+      end
+    end
         
   end
   

data/lib/representative/base.rb

@@ -7,6 +7,7 @@ module Representative
     def initialize(subject = nil, options = {})
       @subjects = [subject]
       @inspector = options[:inspector] || ObjectInspector.new
+      @naming_strategy = options[:naming_strategy]
     end
 
     # Return the current "subject" of representation.  
@@ -48,16 +49,6 @@ module Representative
         value_generator
       end
     end
-
-    def resolve_attributes(attributes)
-      if attributes
-        attributes.inject({}) do |resolved, (name, value_generator)|
-          resolved_value = resolve_value(value_generator)
-          resolved[name.to_s.dasherize] = resolved_value unless resolved_value.nil?
-          resolved
-        end
-      end
-    end
     
   end
   

data/lib/representative/version.rb

@@ -1,3 +1,3 @@
 module Representative
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.4".freeze
 end

data/spec/representative/nokogiri_spec.rb

@@ -6,8 +6,8 @@ require "representative/xml_behaviour"
 
 describe Representative::Nokogiri do
 
-  def r
-    @representative ||= Representative::Nokogiri.new(@subject)
+  def r(options = {})
+    @representative ||= Representative::Nokogiri.new(@subject, options)
   end
 
   def resulting_xml

data/spec/representative/xml_behaviour.rb

@@ -12,17 +12,39 @@ shared_examples_for "an XML Representative" do
 
     describe "#element" do
 
+      before do
+        @subject.full_name = "Fredrick"
+      end
+      
       it "generates an element with content extracted from the subject" do
         r.element :name
         resulting_xml.should == %(<name>Fred</name>)
       end
 
       it "dasherizes the property name" do
-        @subject.full_name = "Fredrick"
         r.element :full_name
         resulting_xml.should == %(<full-name>Fredrick</full-name>)
       end
 
+      context "with naming_strategy :camelcase" do
+
+        it "applies the naming strategy to produce element names" do
+          r(:naming_strategy => :camelcase).element :full_name
+          resulting_xml.should == %(<fullName>Fredrick</fullName>)
+        end
+
+      end
+
+      context "with a custom naming_strategy" do
+
+        it "applies the naming strategy to produce element names" do
+          biff = lambda { |name| name.upcase }
+          r(:naming_strategy => biff).element :full_name
+          resulting_xml.should == %(<FULL_NAME>Fredrick</FULL_NAME>)
+        end
+
+      end
+
       describe "with attributes" do
 
         it "generates attributes on the element" do
@@ -73,15 +95,24 @@ shared_examples_for "an XML Representative" do
 
       end
 
-      describe "with a value argument that supports #to_proc" do
+      describe "with a Symbol argument" do
 
-        it "calls the Proc on the subject to generate a value" do
+        it "calls the named method to generate a value" do
           r.element :name, :width
           resulting_xml.should == %(<name>200</name>)
         end
 
       end
 
+      describe "with a value argument that supports #to_proc" do
+
+        it "calls the Proc on the subject to generate a value" do
+          r.element :name, (lambda { |x| x.width * 3 })
+          resulting_xml.should == %(<name>600</name>)
+        end
+
+      end
+
       describe "with value argument :self" do
 
         it "doesn't alter the subject" do

data/spec/representative/xml_spec.rb

@@ -10,8 +10,8 @@ describe Representative::Xml do
     @xml = Builder::XmlMarkup.new
   end
 
-  def r
-    @representative ||= Representative::Xml.new(@xml, @subject)
+  def r(options = {})
+    @representative ||= Representative::Xml.new(@xml, @subject, options)
   end
 
   def resulting_xml

data/spec/spec_helper.rb

@@ -1,10 +1,4 @@
-require 'spec'
-
-require "rubygems"
-
-Spec::Runner.configure do |config|
-  
-end
+require 'rspec'
 
 def undent(raw)
   if raw =~ /\A( +)/

metadata

@@ -2,7 +2,7 @@
 name: representative
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Mike Williams
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +11:00
-default_executable: 
+date: 2011-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -76,7 +75,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 2.5.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -142,7 +141,6 @@ files:
 - spec/representative/xml_spec.rb
 - spec/spec_helper.rb
 - Rakefile
-has_rdoc: true
 homepage: http://github.com/mdub/representative
 licenses: []
 
@@ -166,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Builds XML and JSON representations of your Ruby objects
@@ -178,3 +176,4 @@ test_files:
 - spec/representative/xml_spec.rb
 - spec/spec_helper.rb
 - Rakefile
+has_rdoc: