memo_rage 0.0.7 → 0.0.8

data/lib/memo_rage/parser/base.rb

@@ -6,7 +6,7 @@ module MemoRage
       end
       
       def parse
-        parse_content @content
+        parse_content
       end
 
       def form_array(entry)

data/lib/memo_rage/parser/entry.rb

@@ -6,14 +6,12 @@ module MemoRage
       end
       
       def method_missing(sym, *args)
-        @entry.elements.map { |e| e.has_name?(sym.to_s) }.include?(true) ? @entry.elements[sym.to_s].text : ""
+        @entry.at(sym.to_s).try(:text)
       end
       
       def to_array(name)
-        return [] unless @entry.elements[name.to_s] 
-        @entry.elements[name.to_s].elements.collect do |text|
-          text.text
-        end
+        return [] unless record = @entry.at(name.to_s)
+        record.elements.map(&:text)
       end
     end
   end

data/lib/memo_rage/parser/episode_list.rb

@@ -1,43 +1,30 @@
 module MemoRage
   module Parser
     class EpisodeList < Base
-      def parse_content(content)
-        doc = REXML::Document.new(content.body)
-        list = doc.elements["Show"]
-
-        unless list == "0"
-          parse_entry(list)
-        end
-      end
-      
-      def parse_entry(entry)
-        episodes = []
-
-        if entry.elements["Episodelist"]
-          entry.elements["Episodelist"].elements.each("Season") do |season|
-            season.elements.each("episode") do |episode|
-              episode = MemoRage::Parser::Entry.new(episode)
-              episodes << MemoRage::Episode.new(
-                :id => episode.link.match(/[0-9]+$/).to_a.first.to_i,
-                :num => episode.epnum,
-                :season => season.attributes["no"].to_i,
-                :season_num => episode.seasonnum,
-                :prod_num => episode.prodnum,
-                :airdate => episode.airdate,
-                :link => episode.link,
-                :title => episode.title,
-                :rating => episode.rating,
-                :image => episode.screencap
-              )
-            end
-          end
+      def parse_content
+        @episodes = []
+        doc = Nokogiri::XML(@content.body)
+        doc.xpath('//Show//Episodelist//Season//episode').each do |record|
+          season = record.parent.at("@no").text.to_i
+          episode = Entry.new(record)
+          @episodes << MemoRage::Episode.new(
+            :id => episode.link.match(/[0-9]+$/).to_a.first.to_i,
+            :num => episode.epnum,
+            :season => season,
+            :season_num => episode.seasonnum.try(:to_i),
+            :prod_num => episode.prodnum,
+            :airdate => episode.airdate,
+            :link => episode.link,
+            :title => episode.title,
+            :rating => episode.rating,
+            :image => episode.screencap
+          )
         end
         
-        entry = MemoRage::Parser::Entry.new(entry)
         MemoRage::Show.new(
-          :name => entry.name,
-          :seasons => entry.totalseasons.to_i,
-          :episodes => episodes
+          :name => doc.at('//Show//name').text,
+          :seasons => doc.at('//Show//totalseasons').text.to_i,
+          :episodes => @episodes
         )
       end
     end

data/lib/memo_rage/parser/show_info.rb

@@ -1,18 +1,13 @@
 module MemoRage
   module Parser
     class ShowInfo < Base
-      def parse_content(content)
-        doc = REXML::Document.new(content.body)
-        showinfo = doc.elements["Showinfo"]
-
-        unless showinfo == "0"
-          parse_entry(showinfo)
-        end
-      end
-
-      def parse_entry(entry)
-        entry = MemoRage::Parser::Entry.new(entry)
-        MemoRage::Show.new(
+      def parse_content
+        doc = Nokogiri::XML(@content.body)
+        result = doc.at("Showinfo")
+        return nil if result.blank? || result.text.blank?
+        
+        entry = MemoRage::Parser::Entry.new(result)
+        show = MemoRage::Show.new(
           :id =>                entry.showid.to_i,
           :name =>              entry.showname,
           :link =>              entry.showlink,
@@ -30,7 +25,6 @@ module MemoRage
           :timezone =>          entry.timezone
         )
       end
-
     end
   end
 end

data/lib/memo_rage/parser/show_search.rb

@@ -1,26 +1,15 @@
 module MemoRage
   module Parser
     class ShowSearch < Base
-      def parse_content(content)
-        doc = REXML::Document.new(content.body)
-        results = doc.elements["Results"]
-
-        shows = []
-        unless results == "0"
-          results.elements.each("show") do |show|
-            shows << parse_entry(show)
-          end
+      def parse_content
+        doc = Nokogiri::XML(@content.body)
+        doc.xpath("//Results//show").collect do |entry|
+          entry = MemoRage::Parser::Entry.new(entry)
+          MemoRage::Show.new(
+            :id => entry.showid.to_i,
+            :name => entry.name
+          )
         end
-        
-        shows
-      end
-      
-      def parse_entry(entry)
-        entry = MemoRage::Parser::Entry.new(entry)
-        MemoRage::Show.new(
-          :id => entry.showid.to_i,
-          :name => entry.name
-        )
       end
     end
   end

data/lib/memo_rage/version.rb

@@ -1,3 +1,3 @@
 module MemoRage
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/memo_rage.rb

@@ -1,5 +1,8 @@
+require "nokogiri"
 require "httpclient"
-require "rexml/document"
+require "active_support/core_ext/object/try"
+require "active_support/core_ext/object/blank"
+
 require "memo_rage/version"
 
 module MemoRage

data/memo_rage.gemspec

@@ -17,10 +17,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency "httpclient", ">= 2.2.0.2"
-  s.add_runtime_dependency "hashie", ">= 1.1.0"
-  s.add_development_dependency "rake", ">= 0.8.7"
-  s.add_development_dependency "rspec", ">= 2"
-  s.add_development_dependency "webmock", ">= 1.6.2"
-  s.add_development_dependency "timecop", ">= 0.3.5"
+  
+  s.add_runtime_dependency "nokogiri", "~> 1.5"
+  s.add_runtime_dependency "httpclient", "~> 2.0"
+  s.add_runtime_dependency "activesupport", "~> 3.0"
+
+  s.add_development_dependency "pry"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "webmock", "~> 1.6"
 end

data/spec/memo_rage/parser/episode_list_spec.rb

@@ -11,6 +11,7 @@ describe MemoRage::Parser::EpisodeList do
       list.episodes.last.tap do |episode|
         episode.id.should == 28220
         episode.season.should == 7
+        episode.season_num.should == 22
       end
     end
   end

data/spec/memo_rage/parser/show_info_spec.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe MemoRage::Parser::ShowInfo do
@@ -26,11 +25,18 @@ describe MemoRage::Parser::ShowInfo do
     end
   end
 
-  it 'should handle empty/missing show info' do
-    mock_api :get, 'showinfo', 'show_info_empty', :params => client.params.merge(:sid => "22303") do
+  it 'should handle incomplete show info' do
+    mock_api :get, 'showinfo', 'show_info_incomplete', :params => client.params.merge(:sid => "22303") do
       show = client.show_info("22303")
       show.genres.should == []
     end 
   end
+  
+  it 'should handle empty show info' do
+    mock_api :get, 'showinfo', 'show_info_empty', :params => client.params.merge(:sid => "9999999") do
+      show = client.show_info("9999999")
+      show.should be_nil
+    end
+  end
 end
 

data/spec/memo_rage/parser/show_search_spec.rb

@@ -10,4 +10,10 @@ describe MemoRage::Parser::ShowSearch do
       show.name.should == "Buffy the Vampire Slayer"
     end
   end
+  
+  it 'should handle empty result set' do
+    mock_api :get, 'search', 'show_search_empty', :params => client.params.merge(:show => "yolo") do
+      client.search("yolo").should be_empty
+    end
+  end
 end

data/spec/mock_xml/show_info_empty.xml

@@ -1,20 +1,5 @@
+
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Showinfo>
-    <showid>22303</showid>
-    <showname>Alcatraz: The Whole Shocking Story</showname>
-    <showlink>http://www.tvrage.com/shows/id-22303</showlink>
-    <seasons>1</seasons>
-    <image>http://images.tvrage.com/shows/23/22303.jpg</image>
-    <started>1980</started>
-    <startdate>Nov/05/1980</startdate>
-    
-    <ended>Nov/06/1980</ended>
-    <origin_country>US</origin_country>
-    <status>Canceled/Ended</status>
-    <classification>Mini-Series</classification>
-    <runtime>240</runtime>
-    <network  country="US">NBC</network>
-    <airtime>12:00</airtime>
-    <timezone>GMT-5 +DST</timezone>
-</Showinfo>
+</Showinfo>

data/spec/mock_xml/show_info_incomplete.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Showinfo>
+    <showid>22303</showid>
+    <showname>Alcatraz: The Whole Shocking Story</showname>
+    <showlink>http://www.tvrage.com/shows/id-22303</showlink>
+    <seasons>1</seasons>
+    <image>http://images.tvrage.com/shows/23/22303.jpg</image>
+    <started>1980</started>
+    <startdate>Nov/05/1980</startdate>
+    
+    <ended>Nov/06/1980</ended>
+    <origin_country>US</origin_country>
+    <status>Canceled/Ended</status>
+    <classification>Mini-Series</classification>
+    <runtime>240</runtime>
+    <network  country="US">NBC</network>
+    <airtime>12:00</airtime>
+    <timezone>GMT-5 +DST</timezone>
+</Showinfo>

data/spec/mock_xml/show_search_empty.xml

@@ -0,0 +1,4 @@
+
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Results>0</Results>

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'pry'
 require 'rspec'
-require 'timecop'
 require 'memo_rage'
 require 'helpers/webmock_helper'
 
 RSpec.configure do |config|
   config.before(:each) do
-    Timecop.return
+    # Do nothing
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memo_rage
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,48 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +75,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,39 +91,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '1.6'
 description: An object-oriented Ruby wrapper for the TVRage API http://services.tvrage.com/
 email:
 - aganov@gmail.com
@@ -144,7 +160,9 @@ files:
 - spec/mock_xml/episode_list_empty.xml
 - spec/mock_xml/show_info.xml
 - spec/mock_xml/show_info_empty.xml
+- spec/mock_xml/show_info_incomplete.xml
 - spec/mock_xml/show_search.xml
+- spec/mock_xml/show_search_empty.xml
 - spec/spec_helper.rb
 homepage: http://github.com/appsbakery/memo_rage
 licenses: []
@@ -158,15 +176,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -67969453
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -67969453
 requirements: []
 rubyforge_project: memo_rage
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the TVRage API