representative 0.3.4 → 0.3.5

data/lib/representative/abstract_xml.rb

@@ -5,8 +5,10 @@ module Representative
   class AbstractXml < Base
 
     def initialize(subject = nil, options = {})
+      unless options.has_key?(:naming_strategy)
+        options = options.merge!(:naming_strategy => :dasherize)
+      end
       super(subject, options)
-      @naming_strategy = options[:naming_strategy] || :dasherize
     end
 
     # Generate an element.
@@ -120,22 +122,6 @@ module Representative
 
     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)|

data/lib/representative/base.rb

@@ -7,7 +7,7 @@ module Representative
     def initialize(subject = nil, options = {})
       @subjects = [subject]
       @inspector = options[:inspector] || ObjectInspector.new
-      @naming_strategy = options[:naming_strategy]
+      @naming_strategy = options[:naming_strategy] || :plain
     end
 
     # Return the current "subject" of representation.  
@@ -50,6 +50,20 @@ module Representative
       end
     end
     
+    def format_name(name)
+      name = name.to_s
+      case @naming_strategy
+      when :plain
+        name
+      when :camelcase, :camelCase
+        name.camelcase(:lower)
+      when Symbol
+        name.send(@naming_strategy)
+      else
+        @naming_strategy.to_proc.call(name)
+      end
+    end
+    
   end
   
-end
+end

data/lib/representative/json.rb

@@ -104,7 +104,7 @@ module Representative
     def label(name)
       return false if @indent_level == 0
       new_item
-      emit("#{name.to_s.to_json}: ")
+      emit("#{format_name(name).to_json}: ")
     end
 
     def new_item

data/lib/representative/version.rb

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

data/spec/representative/json_spec.rb

@@ -4,8 +4,8 @@ require "representative/json"
 
 describe Representative::Json do
 
-  def r
-    @representative ||= Representative::Json.new(@subject)
+  def r(options = {})
+    @representative ||= Representative::Json.new(@subject, options)
   end
 
   def resulting_json
@@ -319,4 +319,37 @@ describe Representative::Json do
     
   end
 
+  context "by default" do
+    
+    it "does not tranform element names" do
+      r.element :user, Object.new do
+        r.element :full_name, "Fred Bloggs"
+      end
+      resulting_json.should == undent(<<-JSON)
+      { 
+        "full_name": "Fred Bloggs"
+      }
+      JSON
+    end
+
+  end
+  
+  context "with naming_strategy :camelcase" do
+
+    it "generates camelCased element and attribute names" do
+      @user = OpenStruct.new(:full_name => "Fred Bloggs")
+      r(:naming_strategy => :camelcase).element :user, @user do
+        r.attribute :alt_url, "http://xyz.com"
+        r.element :full_name
+      end
+      resulting_json.should == undent(<<-JSON)
+      { 
+        "@altUrl": "http://xyz.com",
+        "fullName": "Fred Bloggs"
+      }
+      JSON
+    end
+
+  end
+
 end

data/spec/representative/xml_behaviour.rb

@@ -7,14 +7,15 @@ shared_examples_for "an XML Representative" do
   describe "for some 'subject'" do
 
     before do
-      @subject = OpenStruct.new(:name => "Fred", :width => 200, :vehicle => OpenStruct.new(:year => "1959", :make => "Chevrolet"))
+      @subject = OpenStruct.new(
+        :name => "Fred", 
+        :full_name => "Fredrick", 
+        :width => 200, 
+        :vehicle => OpenStruct.new(:year => "1959", :make => "Chevrolet")
+      )
     end
 
     describe "#element" do
-
-      before do
-        @subject.full_name = "Fredrick"
-      end
       
       it "generates an element with content extracted from the subject" do
         r.element :name
@@ -26,25 +27,6 @@ shared_examples_for "an XML Representative" do
         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
@@ -293,9 +275,37 @@ shared_examples_for "an XML Representative" do
         resulting_xml.should == 
         %(<vehicle><!-- Year of manufacture --><year>1959</year></vehicle>)
       end
-      
+
     end
-    
+
+    context "with naming_strategy :camelcase" do
+
+      it "generates camelCased element and attribute names" do
+        r(:naming_strategy => :camelcase).element :full_name, :foo_bar => 5
+        resulting_xml.should == %(<fullName fooBar="5">Fredrick</fullName>)
+      end
+
+    end
+
+    context "with a custom naming_strategy" do
+
+      it "generates suitably transformed names" do
+        biff = lambda { |name| name.upcase }
+        r(:naming_strategy => biff).element :full_name
+        resulting_xml.should == %(<FULL_NAME>Fredrick</FULL_NAME>)
+      end
+
+    end
+
+    context "with no naming_strategy" do
+
+      it "uses raw names" do
+        r(:naming_strategy => nil).element :full_name
+        resulting_xml.should == %(<full_name>Fredrick</full_name>)
+      end
+
+    end
+
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: representative
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Mike Williams
@@ -14,7 +14,6 @@ date: 2011-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +21,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.2
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: i18n
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +32,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.4.1
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +43,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.2
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +54,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.5
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +65,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +76,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: tilt
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +87,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.9"
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,10 +98,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.2
   type: :development
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,6 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id009
 description: 
 email: mdub@dogbiscuit.org
@@ -154,12 +154,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4481095583233401892
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4481095583233401892
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -176,4 +182,3 @@ test_files:
 - spec/representative/xml_spec.rb
 - spec/spec_helper.rb
 - Rakefile
-has_rdoc: