majestic_seo_api 1.2.1 → 1.2.2

data/lib/majestic_seo/api/data_table.rb

@@ -34,9 +34,9 @@ module MajesticSeo
   module Api
     class DataTable
       attr_accessor :node, :name, :row_count, :headers, :rows
-
+      
       def initialize(node)
-        @node       =   node
+        @node         =   node
 
         if (@node)
           @name       =   @node["Name"]       ||  nil
@@ -64,11 +64,18 @@ module MajesticSeo
         if (row && row.content)
           row           =   row.content
           row_hash      =   {}
-          splitted_row  =   split(row)
-
+          splitted_row  =   split(row, true)
+          
           @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
 
@@ -76,8 +83,9 @@ module MajesticSeo
         end
       end
 
-      def split(text)
-        splitted = text.split(/\|(?!\|)/)
+      def split(text, remove_excess_separators = false)
+        text        =   text.gsub(/\|{2,}/i, "|") if remove_excess_separators
+        splitted    =   text.split(/\|(?!\|)/)
       end
 
       def row_count

data/lib/majestic_seo_api.rb

@@ -1,5 +1,5 @@
 module MajesticSeoApi
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 
   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.1'
+  s.version = '1.2.2'
 
   s.homepage      =   "http://developer-support.majesticseo.com/connectors/"
   s.email         =   "sebastian@agiley.se"

data/spec/majestic_seo/item_info_response_spec.rb

@@ -185,7 +185,7 @@ describe MajesticSeo::Api::ItemInfoResponse  do
       @table.should_not be_nil
     end
 
-    it "should have a data table with the name 'Results' containing 2 rows" do
+    it "should have a data table with the name 'Results' containing 1 row" do
       @table.row_count.should == 1
     end
 
@@ -203,4 +203,62 @@ 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|theconnection.se|OK|Found|117646|8599|117646|-1|1|8592|5000|126238|7119|4659|60|1072|6|38|3|57|0|0|False| | |False| |0|0|0| |&#13;
+  #		Nätverk och större möjligheter till frihet. || The Connection.													| |16|4|4</Row>
+  #		</DataTable>
+  #	</DataTables>
+  #</Result>
+  describe "response with the title column containing the separator (|) 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|theconnection.se|OK|Found|117646|8599|117646|-1|1|8592|5000|126238|7119|4659|60|1072|6|38|3|57|0|0|False| | |False| |0|0|0| |&#13;Nätverk och större möjligheter till frihet. || The Connection.													| |16|4|4</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 theconnection.se" do
+      row                             =   @response.items[0]
+      
+      row.url.should                  ==  "theconnection.se"
+      row.type.should                 ==  :root_domain
+      row.result_code.should          ==  "OK"
+      row.success.should              ==  true
+      row.status.should               ==  "Found"
+      row.citation_flow.should        ==  16
+      row.trust_flow.should           ==  4
+      row.trust_metric.should         ==  4
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: majestic_seo_api
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday