roxml 3.2.0 → 3.2.1

data/Gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+gem 'activesupport', '>= 2.3.0'
+gem 'nokogiri', '>= 1.3.3'
+
+group :development, :test do
+  gem 'rake'
+  gem 'jeweler'
+  gem "rspec", '>= 2.0.0'
+  gem "sqlite3-ruby", '>= 1.2.4'
+  gem "activerecord", '>= 2.2.2'
+end

data/Gemfile.lock

@@ -0,0 +1,50 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    multi_json (1.0.4)
+    nokogiri (1.5.0)
+    rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sqlite3 (1.3.5)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 2.2.2)
+  activesupport (>= 2.3.0)
+  jeweler
+  nokogiri (>= 1.3.3)
+  rake
+  rspec (>= 2.0.0)
+  sqlite3-ruby (>= 1.2.4)

data/Rakefile

@@ -21,18 +21,8 @@ EOF
   gem.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
 
   gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-
-  gem.add_dependency 'activesupport', '>= 2.3.0'
-  gem.add_dependency 'nokogiri', '>= 1.3.3'
-
-  gem.add_development_dependency "rspec", '>= 2.0.0'
-  gem.add_development_dependency "sqlite3-ruby", '>= 1.2.4'
-  gem.add_development_dependency "activerecord", '>= 2.2.2'
 end
 Jeweler::GemcutterTasks.new
-Jeweler::RubyforgeTasks.new do |rubyforge|
-  rubyforge.doc_task = "rdoc"
-end
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

data/lib/roxml.rb

@@ -171,9 +171,9 @@ module ROXML # :nodoc:
       end
 
       def roxml_naming_convention # :nodoc:
-        (@roxml_naming_convention || begin
+        @roxml_naming_convention || begin
           superclass.roxml_naming_convention if superclass.respond_to?(:roxml_naming_convention)
-        end).freeze
+        end
       end
 
       # Declares a reference to a certain xml element, whether an attribute, a node,

data/lib/roxml/xml/references.rb

@@ -32,11 +32,12 @@ module ROXML
     end
 
     def value_in(xml)
-      xml = XML::Node.from(xml)
-      value = fetch_value(xml)
+      value = fetch_value(XML::Node.from(xml))
       value = default if value.nil?
 
-      freeze(apply_blocks(value))
+      value = apply_blocks(value)
+      value = freeze(value) if value && opts.frozen?
+      value
     end
 
   private
@@ -67,12 +68,8 @@ module ROXML
     end
 
     def freeze(val)
-      if opts.frozen?
-        val.each(&:freeze) if val.is_a?(Enumerable)
-        val.freeze
-      else
-        val
-      end
+      val.each(&:freeze) if val.is_a?(Enumerable)
+      val.freeze
     end
 
     def xpath
@@ -269,12 +266,8 @@ module ROXML
     end
 
     def freeze(vals)
-      if opts.frozen?
-        vals.each_pair{|k, v| k.freeze; v.freeze }
-        vals.freeze
-      else
-        vals
-      end
+      vals.each_pair{|k, v| k.freeze; v.freeze }
+      vals.freeze
     end
 
     def to_hash(array)

data/roxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roxml}
-  s.version = "3.2.0"
+  s.version = "3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ben Woosley}, %q{Zak Mandhro}, %q{Anders Engstrom}, %q{Russ Olsen}]
-  s.date = %q{2011-11-25}
+  s.date = %q{2012-01-05}
   s.description = %q{ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.
 Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care
 of the marshalling and unmarshalling of mapped attributes so that developers can focus on
@@ -24,6 +24,8 @@ RESTful applications, Web Services, and XML-RPC.
   s.files = [
     ".gitmodules",
     ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
     "History.txt",
     "LICENSE",
     "README.rdoc",
@@ -63,6 +65,7 @@ RESTful applications, Web Services, and XML-RPC.
     "spec/examples/post_spec.rb",
     "spec/examples/twitter_spec.rb",
     "spec/reference_spec.rb",
+    "spec/regression_spec.rb",
     "spec/roxml_spec.rb",
     "spec/shared_specs.rb",
     "spec/spec_helper.rb",
@@ -139,12 +142,16 @@ RESTful applications, Web Services, and XML-RPC.
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_development_dependency(%q<activerecord>, [">= 2.2.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_dependency(%q<activerecord>, [">= 2.2.2"])
@@ -152,6 +159,8 @@ RESTful applications, Web Services, and XML-RPC.
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
     s.add_dependency(%q<activerecord>, [">= 2.2.2"])

data/spec/regression_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe ROXML do
+  describe 'frozen nils' do
+    subject { nil }
+
+    context 'before unmarshalling an XML document' do
+      it { should_not be_frozen }
+    end
+
+    context 'after unmarshalling an XML document' do
+      before do
+        lib = Library.from_xml(fixture(:library))
+      end
+
+      it { should_not be_frozen }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roxml
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153023980 !ruby/object:Gem::Requirement
+  requirement: &2165456080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153023980
+  version_requirements: *2165456080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153023460 !ruby/object:Gem::Requirement
+  requirement: &2165455600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,32 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153023460
+  version_requirements: *2165455600
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2165455120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165455120
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2165454640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165454640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153022940 !ruby/object:Gem::Requirement
+  requirement: &2165454160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +68,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153022940
+  version_requirements: *2165454160
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2153022340 !ruby/object:Gem::Requirement
+  requirement: &2165453680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +79,10 @@ dependencies:
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *2153022340
+  version_requirements: *2165453680
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153013780 !ruby/object:Gem::Requirement
+  requirement: &2165453200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +90,7 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *2153013780
+  version_requirements: *2165453200
 description: ! 'ROXML is a Ruby library designed to make it easier for Ruby developers
   to work with XML.
 
@@ -93,6 +115,8 @@ extra_rdoc_files:
 files:
 - .gitmodules
 - .rspec
+- Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - README.rdoc
@@ -132,6 +156,7 @@ files:
 - spec/examples/post_spec.rb
 - spec/examples/twitter_spec.rb
 - spec/reference_spec.rb
+- spec/regression_spec.rb
 - spec/roxml_spec.rb
 - spec/shared_specs.rb
 - spec/spec_helper.rb