Merge pull request #9 from joneslee85/bump-everything-up-to-date

Bump everything up to date

Author: mdub

.rspec

@@ -1 +1,2 @@
 --colour
+--format progress

.travis.yml

@@ -1,5 +1,20 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - 2.1.2
+  - 2.1.3
+  - 2.1.4
+  - 2.1.5
+  - 2.1.6
+  - 2.1.7
+  - 2.1.8
+  - 2.2.0
+  - 2.2.1
+  - 2.2.2
+  - 2.2.3
+  - 2.2.4
+  - 2.3.0

Gemfile

@@ -2,8 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rake", ">= 10.0.4"
-gem "rspec", "~> 2.13.0"
+gem "rake"
 gem "tilt"
 gem "diff-lcs"
 gem "ruby-prof"

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Mike Williams
+Copyright (c) 2009-2016 Mike Williams
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.markdown

@@ -1,6 +1,8 @@
 Representative
 ==============
 
+[![Build Status](https://travis-ci.org/mdub/representative.svg?branch=master)](https://travis-ci.org/mdub/representative)
+
 "Representative" makes it easier to create XML or JSON representations of your Ruby objects.
 
 It works best when you want the output to roughly follow the object structure, but still want complete control of the result.
@@ -12,15 +14,15 @@ Given a Ruby data-structure:
 
     @books = [
       Book.new(
-        :title => "Sailing for old dogs", 
+        :title => "Sailing for old dogs",
         :authors => ["Jim Watson"],
         :published => Publication.new(
           :by => "Credulous Print",
           :year => 1994
         )
       ),
       Book.new(
-        :title => "On the horizon", 
+        :title => "On the horizon",
         :authors => ["Zoe Primpton", "Stan Ford"],
         :published => Publication.new(
           :by => "McGraw-Hill",
@@ -37,7 +39,7 @@ Given a Ruby data-structure:
 Representative::Nokogiri can be used to generate XML:
 
     xml = Representative::Nokogiri.new do |r|
-    
+
       r.list_of :books, @books do
         r.element :title
         r.list_of :authors
@@ -46,7 +48,7 @@ Representative::Nokogiri can be used to generate XML:
           r.element :year
         end
       end
-      
+
     end
 
     puts xml.to_s
@@ -98,7 +100,7 @@ Generating JSON
 Representative::Json can be used to generate JSON, using exactly the same DSL:
 
     json = Representative::Json.new do |r|
-    
+
       r.list_of :books, @books do
         r.element :title
         r.list_of :authors
@@ -169,7 +171,7 @@ This registers handlers for "`.xml.rep`" and "`.json.rep`" templates.
 Copyright
 ---------
 
-Copyright (c) 2009 Mike Williams. See LICENSE for details.
+Copyright (c) 2009-2016 Mike Williams. See LICENSE for details.
 
 Similar projects
 ----------------

Rakefile

@@ -8,7 +8,6 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = ["--colour", "--format", "nested"]
 end
 
 task :default => :spec

lib/representative/abstract_xml.rb

@@ -1,4 +1,5 @@
 require "representative/base"
+require "active_support/core_ext/array/extract_options"
 
 module Representative
 

lib/representative/json.rb

@@ -1,5 +1,5 @@
-require "active_support/core_ext/array"
-require "active_support/json"
+require "activesupport/json_encoder"
+require "active_support/core_ext/array/extract_options"
 require "representative/base"
 
 module Representative

lib/representative/nokogiri.rb

@@ -1,14 +1,13 @@
-require "active_support/core_ext"
 require "nokogiri"
 require "representative/abstract_xml"
 require "representative/empty"
 
 module Representative
-  
+
   # Easily generate XML while traversing an object-graph.
   #
   class Nokogiri < AbstractXml
-    
+
     def initialize(subject = nil, options = {})
       super(subject, options)
       @doc = ::Nokogiri::XML::Document.new
@@ -35,7 +34,7 @@ def comment(text)
       comment_node = ::Nokogiri::XML::Comment.new(doc, " #{text} ")
       current_element.add_child(comment_node)
     end
-    
+
     def attribute(name, value_generator = name)
       attribute_name = name.to_s.dasherize
       value = resolve_value(value_generator)
@@ -45,7 +44,7 @@ def attribute(name, value_generator = name)
     end
 
     private
-    
+
     def generate_element(name, resolved_attributes, content_string)
       tag_args = [content_string, resolved_attributes].compact
       new_element = doc.create_element(name, *tag_args)
@@ -54,13 +53,13 @@ def generate_element(name, resolved_attributes, content_string)
         old_element = @current_element
         begin
           @current_element = new_element
-          yield 
+          yield
         ensure
           @current_element = old_element
         end
       end
     end
-    
+
   end
-  
+
 end

lib/representative/version.rb

@@ -1,3 +1,3 @@
 module Representative
-  VERSION = "1.0.5".freeze
+  VERSION = "1.0.6".freeze
 end