peanuts 2.1.1 → 2.1.4

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake'
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 Rake::GemPackageTask.new(Gem::Specification.load('peanuts.gemspec')) do |p|
   p.need_tar = true
@@ -24,6 +24,6 @@ end
 desc 'Run specs'
 task :test => :spec
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*.rb']
+Rspec::Core::RakeTask.new do |t|
+
 end

data/lib/peanuts.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'peanuts/mappable'
 
 module Peanuts #:nodoc:

data/lib/peanuts/converters.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Peanuts
   autoload :Time, 'time'
   autoload :BigDecimal, 'bigdecimal'

data/lib/peanuts/mappable.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'peanuts/xml'
 require 'peanuts/mappings'
 require 'peanuts/mapper'

data/lib/peanuts/mapper.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'enumerator'
 
 module Peanuts

data/lib/peanuts/mappings.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'forwardable'
 require 'peanuts/converters'
 require 'set'

data/lib/peanuts/xml.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'enumerator'
 
 class Hash

data/lib/peanuts/xml/libxml.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'libxml'
 require 'forwardable'
 require 'uri'
@@ -153,9 +155,9 @@ module Peanuts
         def value
           case @reader.node_type
           when RD::TYPE_ELEMENT
-            @reader.read_string
+            _string(@reader.read_string)
           else
-            @reader.has_value? ? @reader.value : nil
+            @reader.has_value? ? _string(@reader.value) : nil
           end
         end
 
@@ -177,6 +179,16 @@ module Peanuts
         end
 
         private
+        if ''.respond_to?(:force_encoding)
+          def _string(v)
+            v.force_encoding(Encoding::UTF_8)
+          end
+        else
+          def _string(v)
+            v
+          end
+        end
+
         def read
           case @reader.node_type
           when RD::TYPE_ATTRIBUTE

data/spec/cat_spec.rb

@@ -1,56 +1,59 @@
+# encoding: UTF-8
+
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'bigdecimal'
-require 'test/unit'
 require 'rubygems'
 require 'peanuts'
+require 'rspec'
 
+module Caturday
+  class Cheezburger
+    include Peanuts::MappableObject
 
-class Cheezburger
-  include Peanuts::MappableObject
+    attribute :weight, :float
+    attribute :price, :decimal
 
-  attribute :weight, :float
-  attribute :price, :decimal
+    def initialize(weight = nil, price = nil)
+      @weight, @price = weight, price
+    end
 
-  def initialize(weight = nil, price = nil)
-    @weight, @price = weight, price
-  end
+    def eql?(other)
+      other && weight == other.weight && price == other.price
+    end
 
-  def eql?(other)
-    other && weight == other.weight && price == other.price
+    alias == eql?
   end
 
-  alias == eql?
-end
-
-class Paws
-  include Peanuts::MappableObject
+  class Paws
+    include Peanuts::MappableObject
 
-  elements :paws, :name => :paw, :ns => 'urn:x-lol'
-end
+    elements :paws, :name => :paw, :ns => 'urn:x-lol'
+  end
 
-class Cat
-  include Peanuts::MappableObject
+  class Cat
+    include Peanuts::MappableObject
 
-  namespaces :lol => 'urn:x-lol', :kthnx => 'urn:x-lol:kthnx'
+    namespaces :lol => 'urn:x-lol', :kthnx => 'urn:x-lol:kthnx'
 
-  root 'kitteh', :ns => 'urn:x-lol'
+    root 'kitteh', :ns => 'urn:x-lol'
 
-  attribute :has_tail?, :boolean, :name => 'has-tail', :ns => :kthnx
-  attribute :ears, :integer
+    attribute :has_tail?, :boolean, :name => 'has-tail', :ns => :kthnx
+    attribute :ears, :integer
 
-  element :ration, [:string], :name => :eats, :ns => :kthnx
-  element :name, :ns => 'urn:x-lol:kthnx'
+    element :ration, [:string], :name => :eats, :ns => :kthnx
+    element :name, :ns => 'urn:x-lol:kthnx'
   
-  shallow :paws, Paws
+    shallow :paws, Paws
 
-  shallow :pals, :ns => :kthnx do
-    elements :friends, :name => :pal
-  end
+    shallow :pals, :ns => :kthnx do
+      elements :friends, :name => :pal
+    end
 
-  element :cheezburger, Cheezburger
-  element :moar_cheezburgers do
-    elements :cheezburger, Cheezburger
+    element :cheezburger, Caturday::Cheezburger
+    element :moar_cheezburgers do
+      elements :cheezburger, Caturday::Cheezburger
+    end
   end
 end
 
@@ -80,13 +83,13 @@ shared_examples_for 'my cat' do
   end
 
   it 'should has cheezburger' do
-    @cat.cheezburger.should be_kind_of Cheezburger
+    @cat.cheezburger.should be_kind_of Caturday::Cheezburger
   end
 
   it 'should has 2 moar good cheezburgerz' do
     @cat.moar_cheezburgers.cheezburger.should == [
-      Cheezburger.new(685.940, BigDecimal('19')),
-      Cheezburger.new(9356.7, BigDecimal('7.40'))]
+      Caturday::Cheezburger.new(685.940, BigDecimal('19')),
+      Caturday::Cheezburger.new(9356.7, BigDecimal('7.40'))]
   end
 end
 
@@ -103,6 +106,7 @@ end
 shared_examples_for 'sample kitteh' do
   before :all do
     @xml_fragment = <<-EOS
+<?xml version="1.0" encoding="utf-8" ?>
         <kitteh xmlns='urn:x-lol' xmlns:kthnx='urn:x-lol:kthnx' ears=' 2 ' kthnx:has-tail=' yes  '>
           <name xmlns='urn:x-lol:kthnx'>
               Silly
@@ -130,7 +134,7 @@ shared_examples_for 'sample kitteh' do
           </moar_cheezburgers>
         </kitteh>
     EOS
-    @cat = Cat.from_xml(@xml_fragment)
+    @cat = Caturday::Cat.from_xml(@xml_fragment)
     @cheezburger = @cat.cheezburger
   end
 
@@ -144,7 +148,7 @@ describe 'My cat' do
     it_should_behave_like 'sample kitteh'
 
     before :all do
-      @cat = Cat.from_xml(@cat.to_xml)
+      @cat = Caturday::Cat.from_xml(@cat.to_xml)
     end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: peanuts
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - Igor Gunko
@@ -9,29 +14,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 +02:00
+date: 2010-03-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.3"
-    version: 
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id002
 description: "    Peanuts is an XML to Ruby and back again mapping library.\n"
 email: tekmon@gmail.com
 executables: []
@@ -67,18 +79,20 @@ 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: 2
 summary: Making XML <-> Ruby binding easy