majestic_seo_api 1.2.2 → 1.2.3

data/lib/majestic_seo/api/data_table.rb

@@ -62,26 +62,40 @@ module MajesticSeo
 
       def parse_row(row)
         if (row && row.content)
-          row           =   row.content
-          row_hash      =   {}
-          splitted_row  =   split(row, true)
+          row             =   row.content
+          row_hash        =   {}
+          splitted_row    =   split(row, true)
+          splitted_row    =   adjust_for_invalid_title(splitted_row)
           
           @headers.each_with_index do |header, index|
             value               =   splitted_row[index].strip
             value               =   (value && value != "") ? value : nil
             
-            #If the title element contains a |-sign (the separator) the title will be splitted into two rows, thus breaking the parsing of the remaining rows
-            if (header.eql?("Title") && splitted_row.size > @headers.size)
-              remaining_title   =   splitted_row.delete_at(index+1).strip
-              value            +=   remaining_title if value
-            end
-            
             row_hash[header]    =   value
           end
 
           @rows << row_hash if (row_hash && !row_hash.empty?)
         end
       end
+      
+      def adjust_for_invalid_title(rows)
+        if (rows.size > @headers.size)
+          difference          =   rows.size - @headers.size
+          index               =   @headers.index("Title")
+          
+          title               =   rows[index]
+          remaining_title     =   ""
+          
+          1.upto(difference) do |diff_index|
+            remaining_title  +=   rows.delete_at(index+1)
+          end
+          
+          title              +=   remaining_title
+          rows[index]         =   title
+        end
+        
+        return rows
+      end
 
       def split(text, remove_excess_separators = false)
         text        =   text.gsub(/\|{2,}/i, "|") if remove_excess_separators

data/lib/majestic_seo_api.rb

@@ -1,5 +1,5 @@
 module MajesticSeoApi
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 
   require File.join(File.dirname(__FILE__), 'majestic_seo/railtie') if defined?(Rails)
 

data/majestic_seo_api.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
 
   s.name = 'majestic_seo_api'
-  s.version = '1.2.2'
+  s.version = '1.2.3'
 
   s.homepage      =   "http://developer-support.majesticseo.com/connectors/"
   s.email         =   "sebastian@agiley.se"

data/spec/majestic_seo/item_info_response_spec.rb

@@ -261,4 +261,61 @@ describe MajesticSeo::Api::ItemInfoResponse  do
     end
   end
   
+  #Example XML:
+  #<Result Code="OK" ErrorMessage="" FullError="">
+  #		<GlobalVars FirstBackLinkDate="2007-03-14" IndexBuildDate="2012-11-05 04:42:33" IndexType="0" MostRecentBackLinkDate="2012-10-14" ServerBuild="2012-11-07 12:42:57" ServerName="PWRGURU" ServerVersion="1.0.4694.22888" UniqueIndexID="20121105044233-HISTORICAL"/>
+  #	<DataTables Count="1">
+  #		<DataTable Name="Results" RowsCount="1" Headers="ItemNum|Item|ResultCode|Status|ExtBackLinks|RefDomains|AnalysisResUnitsCost|ACRank|ItemType|IndexedURLs|GetTopBackLinksAnalysisResUnitsCost|DownloadBacklinksAnalysisResUnitsCost|RefIPs|RefSubNets|RefDomainsEDU|ExtBackLinksEDU|RefDomainsGOV|ExtBackLinksGOV|RefDomainsEDU_Exact|ExtBackLinksEDU_Exact|RefDomainsGOV_Exact|ExtBackLinksGOV_Exact|CrawledFlag|LastCrawlDate|LastCrawlResult|RedirectFlag|FinalRedirectResult|OutDomainsExternal|OutLinksExternal|OutLinksInternal|LastSeen|Title|RedirectTo|CitationFlow|TrustFlow|TrustMetric">
+  #			<Row>0|simplygreat.se|OK|Found|1577|31|1577|-1|1|276|5000|25000|29|29|0|0|0|0|0|0|0|0|False| | |False| |0|0|0| |Henrik Nilsson || Designer, Strateg || henrik@simplygreat.se || 0730 - 248 757| |9|3|3</Row>
+  #		</DataTable>
+  #	</DataTables>
+  #</Result>
+  describe "response with the title column containing multiple separators (|) inside" do
+    before(:each) do
+      #We need to keep the XML on one line - JRuby goes bonanza otherwise
+      @xml        =   '<Result Code="OK" ErrorMessage="" FullError=""><GlobalVars FirstBackLinkDate="2007-03-14" IndexBuildDate="2012-11-05 04:42:33" IndexType="0" MostRecentBackLinkDate="2012-10-14" ServerBuild="2012-11-07 12:42:57" ServerName="PWRGURU" ServerVersion="1.0.4694.22888" UniqueIndexID="20121105044233-HISTORICAL"/><DataTables Count="1"><DataTable Name="Results" RowsCount="1" Headers="ItemNum|Item|ResultCode|Status|ExtBackLinks|RefDomains|AnalysisResUnitsCost|ACRank|ItemType|IndexedURLs|GetTopBackLinksAnalysisResUnitsCost|DownloadBacklinksAnalysisResUnitsCost|RefIPs|RefSubNets|RefDomainsEDU|ExtBackLinksEDU|RefDomainsGOV|ExtBackLinksGOV|RefDomainsEDU_Exact|ExtBackLinksEDU_Exact|RefDomainsGOV_Exact|ExtBackLinksGOV_Exact|CrawledFlag|LastCrawlDate|LastCrawlResult|RedirectFlag|FinalRedirectResult|OutDomainsExternal|OutLinksExternal|OutLinksInternal|LastSeen|Title|RedirectTo|CitationFlow|TrustFlow|TrustMetric"><Row>0|simplygreat.se|OK|Found|1577|31|1577|-1|1|276|5000|25000|29|29|0|0|0|0|0|0|0|0|False| | |False| |0|0|0| |Henrik Nilsson || Designer, Strateg || henrik@simplygreat.se || 0730 - 248 757| |9|3|3</Row></DataTable></DataTables></Result>'
+      @parsed     =   ::Nokogiri::XML(@xml, nil, "utf-8")
+      @response   =   MajesticSeo::Api::ItemInfoResponse.new(@parsed)
+      @table      =   @response.tables["Results"]
+    end
+
+    it "should be a valid response" do
+      @response.success.should == true
+    end
+
+    it "should not have an error message" do
+      @response.error_message.should == ""
+    end
+
+    it "should have global variables set" do
+      @response.global_variables["most_recent_back_link_date"].should == "2012-10-14"
+      @response.global_variables["index_type"].should == "0"
+    end
+
+    it "should have one returned data table" do
+      @response.tables.size.should == 1
+    end
+
+    it "should have a data table with the name 'Results'" do
+      @table.should_not be_nil
+    end
+
+    it "should have a data table with the name 'Results' containing 1 row" do
+      @table.row_count.should == 1
+    end
+
+    it "should have results for simplygreat.se" do
+      row                             =   @response.items[0]
+      
+      row.url.should                  ==  "simplygreat.se"
+      row.type.should                 ==  :root_domain
+      row.result_code.should          ==  "OK"
+      row.success.should              ==  true
+      row.status.should               ==  "Found"
+      row.citation_flow.should        ==  9
+      row.trust_flow.should           ==  3
+      row.trust_metric.should         ==  3
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: majestic_seo_api
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors: