smg 0.2.0 → 0.2.1

data/README.rdoc

@@ -19,7 +19,8 @@ http://github.com/SSDany/smg/tree/master/examples
 
 == REQUIREMENTS:
 
-nokogiri (>=1.3)
+* nokogiri (>=1.3)
+* addressable (>=2.1.1)
 
 == LICENSE:
 

data/examples/crazy.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class A
+  include SMG::Resource
+  extract "a"   , :as => :href    , :at => :href
+  extract "a"   , :as => :content
+end
+
+class P
+  include SMG::Resource
+  extract "p"   , :as => :raw
+  collect "p/a" , :as => :links   , :class => A
+end
+
+class Requirements
+  include SMG::Resource
+  root "div"
+  extract "p"   , :as => :raw
+  extract "p"   , :as => :p       , :class => P
+  collect "p/a" , :as => :links   , :class => A
+end
+
+data = <<-HTML
+<div><p>Requirements: <a href="http://github.com/tenderlove/nokogiri">nokogiri</a> and <a href="http://github.com/sporkmonger/addressable">addressable</a>.</p></div>
+HTML
+
+parsed = Requirements.parse(data)
+
+puts parsed.raw                           #=> "Requirements: nokogiri and addressable."
+puts parsed.links.map { |a| a.href }      #=> ["http://github.com/tenderlove/nokogiri", "http://github.com/sporkmonger/addressable"]
+puts parsed.links.map { |a| a.content }   #=> ["nokogiri", "addressable"]
+
+puts parsed.p.raw                         #=> "Requirements: nokogiri and addressable."
+puts parsed.p.links.map { |a| a.href }    #=> ["http://github.com/tenderlove/nokogiri", "http://github.com/sporkmonger/addressable"]
+puts parsed.p.links.map { |a| a.content } #=> ["nokogiri", "addressable"]
+
+# EOF

data/examples/weather.rb

@@ -132,9 +132,10 @@ class YWeather
 
   root 'rss/channel/item'
 
+  extract "title"
+  extract "description"
   extract "geo:lat"               , :as => :latitude
   extract "geo:long"              , :as => :longitude
-  extract "title"                 , :as => :title
   extract "yweather:condition"    , :as => :current     , :class => Condition
   collect "yweather:forecast"     , :as => :forecasts   , :class => Forecast
 

data/lib/smg/document.rb

@@ -8,11 +8,10 @@ module SMG #:nodoc:
       @mapping  = object.class.mapping
       @stack    = []
       @docs     = []
+      @elements = []
       @thing    = thing
       @context  = context
-      @chars    = ""
-
-      @mapping.refresh!
+      @parsed   = []
     end
 
     def start_element(name, attrs)
@@ -20,55 +19,49 @@ module SMG #:nodoc:
       @stack << name
       ahash = nil
 
-      if doc = @docs.last
-        doc.start_element(name, attrs)
-      elsif (thing = @mapping.nested[@stack]) &&
-          !@mapping.parsed.include?(thing.object_id) &&
-          thing.in_context_of?(@context) &&
-          thing.with?(ahash ||= Hash[*attrs])
-
-        @docs << doc = Document.new(thing.data_class.new,@context,thing)
-        doc.start_element(name, attrs)
+      if thing = @mapping.nested[@stack] and
+         !@parsed.include?(thing.object_id) &&
+         thing.in_context_of?(@context) &&
+         thing.with?(ahash ||= Hash[*attrs])
+        @docs << Document.new(thing.data_class.new,@context,thing)
       end
 
+      @docs.each { |doc| doc.start_element(name,attrs) }
+
       if !attrs.empty? && maps = @mapping.attributes[@stack]
         maps.values_at(*(ahash ||= Hash[*attrs]).keys).compact.each do |m|
-          if !@mapping.parsed.include?(m.object_id) &&
-            m.in_context_of?(@context) &&
-            m.with?(ahash)
-
+          if !@parsed.include?(m.object_id) &&
+             m.in_context_of?(@context) &&
+             m.with?(ahash)
             @object.__send__(m.accessor, m.cast(ahash[m.at]))
-            @mapping.parsed << m.object_id unless m.collection?
+            @parsed << m.object_id unless m.collection?
           end
         end
       end
 
-      if (e = @mapping.elements[@stack]) &&
-          !@mapping.parsed.include?(e.object_id) &&
-          e.in_context_of?(@context) &&
-          e.with?(ahash ||= Hash[*attrs])
-        @element = e
-        @chars = ""
+      if e = @mapping.elements[@stack] and
+         !@parsed.include?(e.object_id) &&
+         e.in_context_of?(@context) &&
+         e.with?(ahash ||= Hash[*attrs])
+        @elements << [e,""]
       end
 
     end
 
     def end_element(name)
 
-      if @element
-        @object.__send__(@element.accessor, @element.cast(@chars))
-        @mapping.parsed << @element.object_id unless @element.collection?
-        @chars = ""
-        @element = nil
+      if e = @elements.last and e.first.path == @stack
+        e,chars = *@elements.pop
+        @object.__send__(e.accessor, e.cast(chars))
+        @parsed << e.object_id unless e.collection?
       end
 
-      if doc = @docs.last
-        doc.end_element(name)
-        if (t = doc.thing).path == @stack
-          @object.__send__(t.accessor, doc.object)
-          @docs.pop
-          @mapping.parsed << t.object_id unless t.collection?
-        end
+      @docs.each { |doc| doc.end_element(name) }
+
+      if doc = @docs.last and doc.thing.path == @stack
+        @object.__send__(doc.thing.accessor, doc.object)
+        @parsed << doc.thing.object_id unless doc.thing.collection?
+        @docs.pop
       end
 
       @stack.pop
@@ -76,12 +69,12 @@ module SMG #:nodoc:
     end
 
     def characters(string)
-      if doc = @docs.last
-        doc.characters(string)
-        @chars << string
-      elsif @element
-        @chars << string
-      end
+      @docs.each { |doc| doc.characters(string) }
+      @elements.each { |e| e.last << string }
+    end
+
+    def cdata_block(string)
+      characters(string)
     end
 
   end

data/lib/smg/mapping.rb

@@ -34,12 +34,6 @@ module SMG #:nodoc:
       @root = normalize_path(path)
     end
 
-    def refresh!
-      @parsed ||= []
-      @parsed.clear
-      nil
-    end
-
     private
 
     def normalize_path(path)

data/lib/smg/version.rb

@@ -1,5 +1,5 @@
 module SMG
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end
 
 # EOF

data/spec/collect_spec.rb

@@ -116,7 +116,7 @@ describe SMG::Model, ".collect", "when :class option represents SMG::Resource" d
     @data = data = File.read(FIXTURES_DIR + 'discogs/Genosha+Recordings.xml')
   end
 
-  before :all do
+  before :each do
     @release_class = Class.new { include SMG::Resource }
     @release_class.extract 'release'       , :at => :id      , :as => :discogs_id
     @release_class.extract 'release'       , :at => :status
@@ -206,7 +206,7 @@ describe SMG::Model, ".collect", "with nested collections" do
     @data = data = File.read(FIXTURES_DIR + 'discogs/948224.xml')
   end
 
-  before :all do
+  before :each do
     @artist_class = Class.new { include SMG::Resource }
     @artist_class.root 'artist'
     @artist_class.extract :name
@@ -217,38 +217,56 @@ describe SMG::Model, ".collect", "with nested collections" do
     @track_class.extract :position
     @track_class.extract :title
     @track_class.extract :duration
-    @track_class.collect 'extraartists/artist/name', :as => :extra_artist_names
     @track_class.collect 'extraartists/artist', :as => :extra_artists, :class => @artist_class
   end
 
-  it "supports nested collections" do
-    @klass.root 'resp/release'
-    @klass.collect 'tracklist/track'        , :as => :tracks, :class => @track_class
-    @klass.collect 'tracklist/track/title'  , :as => :tracklist
-    release = @klass.parse(@data)
-
-    release.tracklist.should be_an_instance_of ::Array
-    release.tracklist.size.should == 6
-    release.tracklist.should == ["Butterfly V.I.P. (VIP Edit By Ophidian)", "Butterfly V.I.P. (Interlude By Cubist Boy & Tapage)", "Butterfly V.I.P. (Original Version)", "Hammerhead V.I.P. (VIP Edit By Ophidian)", "Hammerhead V.I.P. (Interlude By Cubist Boy & Tapage)", "Hammerhead V.I.P. (Original Version)"]
+  after :each do
+    @release.tracks.should be_an_instance_of ::Array
+    @release.tracks.size.should == 6
 
-    release.tracks.should be_an_instance_of ::Array
-    release.tracks.size.should == 6
-
-    track = release.tracks[1]
+    track = @release.tracks[1]
     track.position.should == 'A2'
     track.title.should == 'Butterfly V.I.P. (Interlude By Cubist Boy & Tapage)'
     track.duration.should == '1:24'
 
-    track.extra_artist_names.should be_an_instance_of ::Array
-    track.extra_artist_names.size.should == 2
-    track.extra_artist_names.should == ['Cubist Boy', 'Tapage']
-
     track.extra_artists.should be_an_instance_of ::Array
     track.extra_artists.size.should == 2
     track.extra_artists[1].name.should == 'Tapage'
     track.extra_artists[1].role.should == 'Co-producer'
   end
 
+  it "supports nested collections" do
+    @klass.root 'resp/release'
+    @klass.collect 'tracklist/track', :as => :tracks, :class => @track_class
+
+    @release = @klass.parse(@data)
+  end
+
+  it "handles each collection independently" do
+
+    @track_class.collect 'extraartists/artist/name', :as => :extra_artist_names
+
+    @klass.root 'resp/release/tracklist'
+    @klass.collect 'track'                      , :as => :tracks, :class => @track_class
+    @klass.collect 'track/title'                , :as => :tracklist
+    @klass.collect 'track/extraartists/artist'  , :as => :extra_artists, :class => @artist_class
+
+    @release = @klass.parse(@data)
+
+    @release.tracklist.should be_an_instance_of ::Array
+    @release.tracklist.size.should == 6
+    @release.tracklist.should == ["Butterfly V.I.P. (VIP Edit By Ophidian)", "Butterfly V.I.P. (Interlude By Cubist Boy & Tapage)", "Butterfly V.I.P. (Original Version)", "Hammerhead V.I.P. (VIP Edit By Ophidian)", "Hammerhead V.I.P. (Interlude By Cubist Boy & Tapage)", "Hammerhead V.I.P. (Original Version)"]
+
+    @release.tracks.should be_an_instance_of ::Array
+    @release.tracks.size.should == 6
+
+    @release.extra_artists.should be_an_instance_of ::Array
+    @release.extra_artists.size.should == 6
+    @release.extra_artists[2].name.should == 'Tapage'
+    @release.extra_artists[2].role.should == 'Co-producer'
+
+  end
+
 end
 
 # EOF

data/spec/extract_spec.rb

@@ -197,4 +197,23 @@ describe SMG::Model, ".extract" do
 
 end
 
+describe SMG::Model, ".extract" do
+
+  before :each do
+    @klass = Class.new { include SMG::Resource }
+    @data = "<thing>just<another>yetanother</another>spec</thing>"
+  end
+
+  it "handles each element independently" do
+    @klass.extract :thing
+    parsed = @klass.parse(@data)
+    parsed.thing.should == "justyetanotherspec"
+
+    @klass.extract "thing/another"
+    parsed = @klass.parse(@data)
+    parsed.thing.should == "justyetanotherspec" # NOT "justspec"
+    parsed.another.should == "yetanother"
+  end
+
+end
 # EOF

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - SSDany
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +04:00
+date: 2010-06-14 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - lib/smg/resource.rb
 - lib/smg/version.rb
 - lib/smg.rb
+- examples/crazy.rb
 - examples/discogs/label.rb
 - examples/discogs/search.rb
 - examples/helper.rb