wowget 0.2.1 → 0.2.2

data/lib/wowget/spell.rb

@@ -30,6 +30,35 @@ module Wowget
         if spell_xml.css('table#spelldetails th#icontab-icon1 + td span a').length == 1
           self.item_id = spell_xml.css('table#spelldetails th#icontab-icon1 + td span a').attribute('href').content.match(/\/item=([0-9]+)/)[1].to_i
         end
+
+        # profession
+        unless self.item_id.nil?
+          prof_markup = spell_xml.xpath("//script[contains(., 'Markup')]")
+          
+          unless prof_markup.empty?
+            matches = prof_markup.inner_text.match(/\[ul\]\[li\](.+?)\[\/li\]/)[1].match(/Requires (.+?) \(([0-9]+?)\)/)
+            self.profession = matches[1]
+            self.profession_id = case self.profession
+              when "Alchemy" then 1
+              when "Blacksmithing" then 2
+              when "Cooking" then 3
+              when "Enchanting" then 4
+              when "Engineering" then 5
+              when "First Aid" then 6
+              when "Jewelcrafting" then 7
+              when "Leatherworking" then 8
+              when "Mining" then 9
+              when "Tailoring" then 10
+              when "Yes" then 11
+              when "No" then 12
+              when "Fishing" then 13
+              when "Herbalism" then 14
+              when "Inscription" then 15
+              when "Archaeology" then 16
+            end
+            self.skill = matches[2].to_i
+          end
+        end
         
         # reagents
         if spell_xml.css("h3:contains('Reagents')").length == 1
@@ -42,38 +71,12 @@ module Wowget
               quantity = 1
             else
               quantity = quantity_match[1].to_i
+              quantity += 1 if self.profession.nil? # see http://www.wowhead.com/spell=49244#comments:id=448843
             end
-
             self.reagents.push({:item => Wowget::Item.new(item_id), :quantity => quantity})
           end
         end
         
-        # profession
-        unless self.item_id.nil?
-          matches = spell_xml.xpath("//script[contains(., 'Markup')]").inner_text.match(/\[ul\]\[li\](.+?)\[\/li\]/)[1].match(/Requires (.+?) \(([0-9]+?)\)/)
-          self.profession = matches[1]
-          self.skill = matches[2].to_i
-          
-          self.profession_id = case self.profession
-            when "Alchemy" then 1
-            when "Blacksmithing" then 2
-            when "Cooking" then 3
-            when "Enchanting" then 4
-            when "Engineering" then 5
-            when "First Aid" then 6
-            when "Jewelcrafting" then 7
-            when "Leatherworking" then 8
-            when "Mining" then 9
-            when "Tailoring" then 10
-            when "Yes" then 11
-            when "No" then 12
-            when "Fishing" then 13
-            when "Herbalism" then 14
-            when "Inscription" then 15
-            when "Archaeology" then 16
-          end
-          
-        end
       end
     end
     

data/spec/spell_spec.rb

@@ -11,7 +11,24 @@ describe Wowget::Spell do
     end
   end
   
-
+  describe "With a non-profession spell" do
+    spell = Wowget::Spell.new(49244)
+    
+    it "should have a spell name" do
+      spell.name.should == "Create Eternal Fire"
+    end
+    
+    it "should have the correct quantity of reagents" do
+      spell.reagents[0][:quantity].should == 10
+    end
+    
+    it "shouldn't have any profession" do
+      spell.profession_id.should == nil and
+      spell.profession.should == nil and
+      spell.skill.should == nil
+    end
+  end
+  
   describe "With a recipe" do
     spell = Wowget::Spell.new(63188)
     

metadata

@@ -2,7 +2,7 @@
 name: wowget
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ben Darlow