datahen 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5802e9aa7b521b1229869cf01ebbe9a863b62ffd2f320e71816ee0c29e4b0f98
-  data.tar.gz: be96da67ce8fb5636f027b0ef739223658a2204c5b4082fc0a548a489c6adc76
+  metadata.gz: 915387ff86d8c0f0c92a1f103dc9d7d346df5d281aecec611e4ced0f37498253
+  data.tar.gz: 5565fa02cf9c234fc3ac4e5ccaafea64316981569d500e1cf13d2d3f5b80ffa8
 SHA512:
-  metadata.gz: 62401dd4bc3f76601a998cfb0543740236eedd17a58b6aa15c11d6036be6147f66365dec4a0f396f3864c66ed7d138c47dc782bab5eac1c9b4a69d5654abecfa
-  data.tar.gz: f42f8249f4fdb2213aadcb93b34ede5bc0817e7e8a3c928bd3bb7d14f5a0218a9d73df19fa6a966e219d6d2566be445b92595a664a3dacb6a978dba0a107c726
+  metadata.gz: bb66f09cfb02c96cc31f6659b00185bd407b40ba60457fd919f1efa5fee51c5f412fdac8febe897ecb370ce4bfe9881f76700b076802f4608c7d065eaff904d6
+  data.tar.gz: a5979d502604f16af80bd431782b4ba7275b470476733f0af6be5a0c1d0bfeb77f3a09ec3cec03791e47ddee1531f0135684214a1cd3c92ef521e09d61cbf71a

data/lib/datahen/cli/global_page.rb

@@ -12,28 +12,15 @@ module Datahen
       def content(gid)
         client = Client::GlobalPage.new(options)
         result = JSON.parse(client.find_content(gid).to_s)
-        
+
         if result['available'] == true
           puts "Preview content url: \"#{result['preview_url']}\""
           `open "#{result['preview_url']}"`
         else
           puts "Content does not exist"
-        end        
+        end
       end
 
-      desc "failedcontent <gid>", "Show failed content of a globalpage"
-      def failedcontent(gid)
-        client = Client::GlobalPage.new(options)
-        result = JSON.parse(client.find_failed_content(gid).to_s)
-        
-        if result['available'] == true
-          puts "Preview failed content url: \"#{result['preview_url']}\""
-          `open "#{result['preview_url']}"`
-        else
-          puts "Failed Content does not exist"
-        end        
-      end
-      
     end
   end
 end

data/lib/datahen/cli/scraper_page.rb

@@ -17,6 +17,7 @@ module Datahen
       option :per_page, :aliases => :P, type: :numeric, desc: 'Number of records per page. Max 500 per page.'
       option :fetch_fail, type: :boolean, desc: 'Returns only pages that fails fetching.'
       option :parse_fail, type: :boolean, desc: 'Returns only pages that fails parsing.'
+      option :status, type: :string, desc: 'Returns only pages with specific status.'
       def list(scraper_name)
         if options[:job]
           client = Client::JobPage.new(options)
@@ -197,6 +198,46 @@ module Datahen
         end
       end
 
+      desc "content <scraper_name> <gid>", "Show a page's content in scraper's current job"
+      option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
+      def content(scraper_name, gid)
+        result = nil
+        if options[:job]
+          client = Client::JobPage.new(options)
+          result = JSON.parse(client.find_content(options[:job], gid).to_s)
+        else
+          client = Client::ScraperJobPage.new(options)
+          result = JSON.parse(client.find_content(scraper_name, gid).to_s)
+        end
+
+        if result['available'] == true
+          puts "Preview content url: \"#{result['preview_url']}\""
+          `open "#{result['preview_url']}"`
+        else
+          puts "Content does not exist"
+        end
+      end
+
+      desc "failedcontent <gid>", "Show a page's failed content in scraper's current job"
+      option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
+      def failedcontent(scraper_name, gid)
+        result = nil
+        if options[:job]
+          client = Client::JobPage.new(options)
+          result = JSON.parse(client.find_failed_content(options[:job], gid).to_s)
+        else
+          client = Client::ScraperJobPage.new(options)
+          result = JSON.parse(client.find_failed_content(scraper_name, gid).to_s)
+        end
+
+        if result['available'] == true
+          puts "Preview failed content url: \"#{result['preview_url']}\""
+          `open "#{result['preview_url']}"`
+        else
+          puts "Failed Content does not exist"
+        end
+      end
+
     end
   end
 

data/lib/datahen/client/global_page.rb

@@ -8,11 +8,6 @@ module Datahen
       def find_content(gid)
         self.class.get("/global_pages/#{gid}/content", @options)
       end
-
-      def find_failed_content(gid)
-        self.class.get("/global_pages/#{gid}/failed_content", @options)
-      end
     end
   end
 end
-

data/lib/datahen/client/job_page.rb

@@ -53,6 +53,14 @@ module Datahen
 
         self.class.put("/jobs/#{job_id}/pages/#{gid}/parsing_update", params)
       end
+
+      def find_content(job_id, gid)
+        self.class.get("/jobs/#{job_id}/pages/#{gid}/content", @options)
+      end
+
+      def find_failed_content(job_id, gid)
+        self.class.get("/jobs/#{job_id}/pages/#{gid}/failed_content", @options)
+      end
     end
   end
 end

data/lib/datahen/client/scraper_job_page.rb

@@ -62,6 +62,14 @@ module Datahen
         self.class.post("/scrapers/#{scraper_name}/current_job/pages", params)
       end
 
+      def find_content(scraper_name, gid)
+        self.class.get("/scrapers/#{scraper_name}/current_job/pages/#{gid}/content", @options)
+      end
+
+      def find_failed_content(scraper_name, gid)
+        self.class.get("/scrapers/#{scraper_name}/current_job/pages/#{gid}/failed_content", @options)
+      end
+
     end
   end
 end

data/lib/datahen/version.rb

@@ -1,3 +1,3 @@
 module Datahen
-  VERSION = "0.11.2"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahen
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Parama Danoesubroto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor