mapricot 0.0.4 → 0.0.5

data/lib/mapricot/abstract_doc.rb

@@ -1,4 +1,3 @@
-require 'open-uri'
 require 'hpricot'
 require 'libxml'
 require 'nokogiri'
@@ -13,30 +12,9 @@ module Mapricot
 
   class AbstractDoc
 
-    def self.from_url(url)
-      adoc = new
-      adoc.url = url
-      adoc
-    end
-
-    def self.from_string(string)
-      adoc = new
-      adoc.string = string
-      adoc
-    end
-
-    def url=(url)
-      if Mapricot.parser == :libxml
-        @udoc = LibXML::XML::Parser.file(url).parse
-      elsif Mapricot.parser == :hpricot
-        @udoc = Hpricot::XML(open(url))
-      elsif Mapricot.parser == :nokogiri
-        @udoc = Nokogiri::HTML(open(url))
-      end
-    end
-
-    def string=(string)
+    def initialize(string)
       if Mapricot.parser == :libxml
+        string = string.read if string.is_a?(StringIO)
         @udoc = LibXML::XML::Parser.string(string).parse
       elsif Mapricot.parser == :hpricot
         @udoc = Hpricot::XML(string)

data/lib/mapricot/associations.rb

@@ -68,7 +68,7 @@ module Mapricot
         @value = nil
       else
         if @type == :xml
-         @value = class_from_name.new(:xml => node_list.first.to_s)
+         @value = class_from_name.new(node_list.first.to_s)
         else
           @value = node_list.first.contents
           typecast
@@ -88,7 +88,7 @@ module Mapricot
       @value = []
       node_list.each do |node|
         if @type == :xml
-          @value << class_from_name.new(:xml => node.to_s)
+          @value << class_from_name.new(node.to_s)
         else
           @value << node.contents
         end
@@ -97,4 +97,4 @@ module Mapricot
     end
   end
   
-end
+end

data/lib/mapricot/base.rb

@@ -39,18 +39,31 @@ module Mapricot
       end
     end
 
-    # class SomeClass < Mapricot::Base; end;
-    # SomeClass.new :url => "http://some_url"
-    # SomeClass.new :xml => %(<hi></hi>)
+    # class Foo < Mapricot::Base; end;
+    # Foo.new :url => "http://www.example.com"
+    # Foo.new :xml => %(<hi></hi>)
     # the class instance variable @association_list is duplicated in every instance of Feed, as the instance variable @associations.
     # i.e. Feed.association_list is the template for feed.associations
-    def initialize(opts)
-      @doc = AbstractDoc.from_url(opts[:url])     if opts[:url]
-      @doc = AbstractDoc.from_string(opts[:xml])  if opts[:xml]
+    def initialize(str)
+      @doc = AbstractDoc.new(correct_input_for_legacy_interface(str))
       dup_associations_and_attributes
       map_associations
       map_attributes
     end
+
+    private
+
+    def correct_input_for_legacy_interface(opts)
+      return opts if !opts.is_a?(Hash)
+
+      $stderr.puts "Initializing with a hash is deprecated, please pass a String or StringIO, see http://github.com/lzell/mapricot for examples."
+      if opts[:url]
+        require 'open-uri'
+        open(opts[:url])
+      else
+        opts[:xml]
+      end
+    end
     
     def dup_associations_and_attributes
       @associations = self.class.association_list.collect {|x| x.dup}   # do not do this: self.class.association_list.dup 
@@ -78,4 +91,4 @@ module Mapricot
       self.class.name.downcase.match(/[^:]+$/)[0]
     end
   end
-end
+end

data/mapricot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "mapricot"
-  s.version  = "0.0.4"
+  s.version  = "0.0.5"
   s.summary  = "XML to object mapper"
   s.email    = "lzell11@gmail.com"
   s.homepage = "http://github.com/lzell/mapricot"
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rdoc_options = ["--main", "README.rdoc", "--title", "Mapricot"]
   s.extra_rdoc_files = ["README.rdoc"]
-  s.add_dependency("hpricot")
-  s.add_dependency("nokogiri")
-  s.add_dependency("libxml-ruby")
+  s.add_dependency("hpricot", ">= 0.7")
+  s.add_dependency("nokogiri", ">= 1.4.1")
+  s.add_dependency("libxml-ruby", ">= 1.1.3")
 end

data/test/has_attribute/test_has_attribute.rb

@@ -30,7 +30,7 @@ class TestResponse < Test::Unit::TestCase
   def test_response
     @parsers.each do |parser|
       Mapricot.parser = parser
-      response = Response.new(:xml => @xml)
+      response = Response.new(@xml)
       assert_equal  "New York",     response.location.city
       assert_equal  "NY",           response.location.state
       assert_equal  "nyc",          response.location.code

data/test/has_many/test_has_many_ids.rb

@@ -23,7 +23,7 @@ class TestResponseWithManyIds < Test::Unit::TestCase
   def test_response
     @parsers.each do |parser|
       Mapricot.parser = parser
-      response = ResponseWithManyIds.new(:xml => @xml)
+      response = ResponseWithManyIds.new(@xml)
       assert_equal  10,     response.ids[0]
       assert_equal  20,     response.ids[1]
       assert_equal  30,     response.ids[2]
@@ -39,7 +39,7 @@ class TestResponseWithManyIds < Test::Unit::TestCase
   
   
   def test_internals
-    response = ResponseWithManyIds.new(:xml => @xml)
+    response = ResponseWithManyIds.new(@xml)
     template = response.class.association_list.first
     assert_equal  :ids,       template.name
     assert_equal  :integer,   template.type
@@ -52,4 +52,4 @@ class TestResponseWithManyIds < Test::Unit::TestCase
     assert_nil                  ass.namespace
     assert_equal  [10,20,30],   ass.value
   end
-end
+end

data/test/has_many/test_has_many_nested.rb

@@ -32,7 +32,7 @@ class TestResponseWithNesting < Test::Unit::TestCase
   def test_response
     @parsers.each do |parser|
       Mapricot.parser = parser
-      response = ResponseWithNesting.new(:xml => @xml)
+      response = ResponseWithNesting.new(@xml)
       assert_equal  10,       response.users[0].id
       assert_equal  "bob",    response.users[0].name
       assert_equal  20,       response.users[1].id
@@ -48,7 +48,7 @@ class TestResponseWithNesting < Test::Unit::TestCase
 
   
   def test_response_internals
-    response = ResponseWithNesting.new(:xml => @xml)
+    response = ResponseWithNesting.new(@xml)
     template = response.class.association_list.first
 
     assert_equal  :users,     template.name
@@ -64,7 +64,7 @@ class TestResponseWithNesting < Test::Unit::TestCase
   end
   
   def test_response_users_internals
-    response = ResponseWithNesting.new(:xml => @xml)
+    response = ResponseWithNesting.new(@xml)
     template = response.users.first.class.association_list.first
     assert_equal  :id,        template.name
     assert_equal  :integer,   template.type
@@ -78,4 +78,4 @@ class TestResponseWithNesting < Test::Unit::TestCase
     assert_equal  10,         ass.value
   end
 
-end
+end

data/test/has_one/test_has_one_id.rb

@@ -18,7 +18,7 @@ class TestReponseWithOneId < Test::Unit::TestCase
   def test_response
     @parsers.each do |parser|
       Mapricot.parser = parser
-      response = ResponseWithOneId.new(:xml => @xml)
+      response = ResponseWithOneId.new(@xml)
       assert_equal  10,     response.id
     end
   end

data/test/has_one/test_has_one_nested.rb

@@ -24,7 +24,7 @@ class TestReponseWithNesting < Test::Unit::TestCase
   def test_response
     @parsers.each do |parser|
       Mapricot.parser = parser
-      response = ResponseWithNesting.new(:xml => @xml)
+      response = ResponseWithNesting.new(@xml)
       assert_equal  "bob",     response.user.name
     end
   end

data/test/suite.rb

@@ -10,7 +10,7 @@ test_glob = File.join(path, "**", "test_*.rb")
 tests = Dir.glob(test_glob)
 
 if ARGV[0] != 'rg'
-  tests.each {|test| system("ruby #{test}")}
+  tests.each {|test| system("ruby -rubygems #{test}")}
 else
   tests.each {|test| system("rg #{test}")}
 end

data/test/test_abstract_doc.rb

@@ -4,15 +4,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'maprico
 
 class TestAbstractDoc < Test::Unit::TestCase
   
-  def test_initialize_from_string_or_url
-    assert_respond_to Mapricot::AbstractDoc,   :from_string
-    assert_respond_to Mapricot::AbstractDoc,   :from_url
-  end
-  
   def test_getting_node_contents
     [:libxml, :nokogiri, :hpricot].each do |parser|
       Mapricot.parser = parser
-      @doc = Mapricot::AbstractDoc.from_string('<user>bob</user>')
+      @doc = Mapricot::AbstractDoc.new('<user>bob</user>')
       @node = @doc.find(:user).first
       assert_equal "bob",                   @node.contents
       assert_equal "<user>bob</user>",      @node.to_s
@@ -22,7 +17,7 @@ class TestAbstractDoc < Test::Unit::TestCase
   def test_node_list
     [:libxml, :nokogiri, :hpricot].each do |parser|
       Mapricot.parser = parser
-      @doc = Mapricot::AbstractDoc.from_string('<response><user>sally</user><user>bob</user></response>')
+      @doc = Mapricot::AbstractDoc.new('<response><user>sally</user><user>bob</user></response>')
       @node_list = @doc.find(:user)
       assert_instance_of Mapricot::AbstractNodeList, @node_list
       assert_respond_to @node_list,   :each

data/test/test_mapricot.rb

@@ -5,52 +5,94 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'maprico
 # Please look at test_mapricot_readme.rb first!!
 # !!!!!!!!!!!!!!!!!!
 
+# Add test to parse uri, I'll use Natural Inputs as the example: 
+module NI
+  class NaturalInputsResponse < Mapricot::Base
+    has_one   :message
+    has_many  :occurrences, :xml
+  end
+
+  class Occurrence < Mapricot::Base
+    has_one   :type
+    has_one   :start_date
+    has_one   :end_date
+    has_one   :start_time
+    has_one   :end_time
+    has_one   :day_of_week
+    has_one   :week_of_month,   :integer
+    has_one   :date_of_month,   :integer
+    has_one   :interval,        :integer
+  end
+end
+
+class TestNI < Test::Unit::TestCase
+
+  def setup
+    query = "go to the park tomorrow at 10am"
+    now = Time.local(2010, 'Apr', 6)
+    @url = "http://naturalinputs.com/query?q=#{URI.escape(query)}&t=#{now.strftime("%Y%m%dT%H%M%S")}"
+  end
+
+  def test_url_parsing
+    require 'open-uri'
+
+    [:hpricot, :nokogiri, :libxml].each do |parser|
+      Mapricot.parser = parser
+      response = NI::NaturalInputsResponse.new(open(@url))
+      assert_equal "go to the park", response.message
+      assert_equal "20100407",  response.occurrences.first.start_date
+      assert_equal "10:00:00",  response.occurrences.first.start_time
+    end
+  end
+end
+
+
+
 class FeedA < Mapricot::Base
-  has_one :bar
+  has_one :name
 end
 
 class TestFeedA < Test::Unit::TestCase
   
-  def test_no_bar
-    feeda = FeedA.new(:xml => "<no></no>")
-    assert feeda.bar.nil?
+  def test_no_name
+    feeda = FeedA.new("<notag></notag>")
+    assert feeda.name.nil?
   end
   
-  def test_empty_bar
-    feeda = FeedA.new(:xml => "<bar></bar>")
-    assert feeda.bar.empty?
+  def test_empty_name
+    feeda = FeedA.new("<name></name>")
+    assert feeda.name.empty?
   end
   
-  def test_full_bar
-    @feed = FeedA.new(:xml => "<bar>is full</bar>")
-    assert_equal "is full", @feed.bar
+  def test_full_name
+    @feed = FeedA.new("<name>Lou</name>")
+    assert_equal "Lou", @feed.name
   end
 end
 
 
-
-
 class FeedB < Mapricot::Base
-  has_many :bars
+  has_many :names
 end
 
 class TestFeedB < Test::Unit::TestCase
-  def test_many_empty_bars
-    feedb = FeedB.new(:xml => "<notag></notag>")
-    assert feedb.bars.is_a?(Array)
-    assert feedb.bars.empty?
+  def test_many_empty_names
+    feedb = FeedB.new("<notag></notag>")
+    assert feedb.names.is_a?(Array)
+    assert feedb.names.empty?
   end
   
-  def test_full_bars
-    feedb = FeedB.new(:xml => %(
+  def test_full_names
+    xml = %(
       <response>
-        <bar>wet</bar>
-        <bar>full</bar>
+        <name>Lou</name>
+        <name>Pizza the Hut</name>
       </response>
-    ))
+    )
+    feedb = FeedB.new(xml)
     
-    assert_equal "wet", feedb.bars.first
-    assert_equal "full", feedb.bars.last
+    assert_equal "Lou", feedb.names.first
+    assert_equal "Pizza the Hut", feedb.names.last
   end
 end
 
@@ -67,12 +109,12 @@ end
 
 class TestFeedC < Test::Unit::TestCase
   def test_many_empty_bars
-    feedc = FeedC.new(:xml => "<no></no>")
+    feedc = FeedC.new("<no></no>")
     assert feedc.bars.empty?
   end
   
   def test_many_bars
-    feedc = FeedC.new(:xml => %(
+    feedc = FeedC.new(%(
       <response>
         <bar>
           <name>maroon saloon</name>
@@ -87,3 +129,7 @@ class TestFeedC < Test::Unit::TestCase
     assert_equal ['brett', 'chris', 'garon', 'mitch'], feedc.bars.first.patrons
   end
 end
+
+
+
+

data/test/test_mapricot_readme.rb

@@ -21,7 +21,7 @@ class TestSimpleUser < Test::Unit::TestCase
       </user>
     )
     
-    @user = SimpleUser.new(:xml => xml)
+    @user = SimpleUser.new(xml)
   end
   
   def test_mapping
@@ -77,7 +77,7 @@ class TestUser < Test::Unit::TestCase
       </user>
     )
     
-    @user = User.new(:xml => xml)
+    @user = User.new(xml)
   end
   
   def test_id_and_name

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Lou Zell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 7
+        version: "0.7"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -37,8 +38,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -49,8 +52,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id003
 description: XML to object mapper with an interface similar to ActiveRecord associations.