Dynamised 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a50d089e06a0aed555c420f05550140421382c
-  data.tar.gz: 1e3230c210211f9a1e300d2adafffda0c03f2ee3
+  metadata.gz: 85306d1ca4783b76d31d8d80aa9191bab45c89cf
+  data.tar.gz: 379d655d95f1d7785c674b2cdbd06b55e3fdd6c5
 SHA512:
-  metadata.gz: 23a5a47d22dfc676790017a97bde656a842988115722a079788a41f53399cbb8114a9781024b4d60fc32e5b0653209785cb4cdcb00758a0076f5fec71bdbf7b4
-  data.tar.gz: b654c59470598500794eab450194ebf93e72ec5ba607b94dac910b7ea3dfd1afa5b784304214b03942aea968c9329c5dc6a8632586ad6784f667dd921310f953
+  metadata.gz: dfb74739fa85cfd033791dd8058173eff8bfbbe9e4b53ecf168104aa0dbf01f2dd21b88f43bb4d2774b6a72cd22b96dfb7e4b3b133ed867862814b40d90f6380
+  data.tar.gz: f0f0345648923fbb280a858e1fa6b386c549c918dcbdba0f2ee014d56c149761771778496efeef72bac6d4f13f1bb640ab41176f8edb9f519b0d8d1381d49bbe

data/bin/dynamised

@@ -21,7 +21,7 @@ module Dynamised
           class_name = get_class_name(args.first)
           create_temp_class(class_name,File.read(script_path))
           class_ref = Scraper.fetch(class_name)
-          spinner = TTY::Spinner.new("[:spinner] scraping with %s" % scraper_name)
+          spinner = TTY::Spinner.new("[:spinner] scraping with %s" % class_name)
           class_ref.new.pull_and_store do
             spinner.spin
           end

data/lib/dynamised/meta.rb

@@ -1,6 +1,6 @@
 module Dynamised
   module META
-    Version = "0.1.0"
+    Version = "0.1.1"
     Description = <<-DESC.gsub(/^\s*/, '')
       A tool that allows a user to build a web scraper that works by recursively crawling pages until
       it finds the requested infomation.

data/lib/dynamised/scraper.rb

@@ -40,7 +40,7 @@ module Dynamised
       @args = args
       @tree_pointer = []
       @use_store = false
-      @scraped_data = DBM_Wrapper.new("%s_scraped_data" % self.class.to_s)
+      @scraped_data = DBM_Wrapper.new("%s_scraped_data" % get_class_name(self.class.to_s))
       [:inc,:uri,:tree,:tree_pointer,:base_url,:writer].each do |attr|
         varb_name = "@%s" % attr
         self.instance_variable_set(varb_name,self.class.instance_variable_get(varb_name))
@@ -70,8 +70,12 @@ module Dynamised
 
     private
 
+    def get_class_name(string)
+      string.split('::').last.split('.').first.gsub(/ /,'_').capitalize
+    end
+
     def scrape_data(&spinner)
-      pull(pull_initial) do |hash|
+      pull(pull_initial,@tree) do |hash|
         spinner.call
       end
     end
@@ -88,6 +92,7 @@ module Dynamised
             raise '%s is a non supported writer type'
         end
       end
+      @scraped_data.stop
     end
 
 
@@ -128,7 +133,7 @@ module Dynamised
           res_hash[field] = value ? execute_method(data[:meta][:after],value,res_hash) : data[:meta].fetch(:default,nil)
         end
         @scraped_data[c_url] = fields.to_json if @use_store
-        block.call(res_hash)
+        block.call(fields)
       end
     end
 

data/lib/dynamised.rb

@@ -1,4 +1,4 @@
-%w{tty-spinner nokogiri awesome_print gdbm json}.each {|lib| require lib}
+%w{tty-spinner nokogiri awesome_print dbm json}.each {|lib| require lib}
 %w{meta after_scrape_methods before_scrape_methods curb_dsl helpers node scraper_dsl writers dbm_wrapper scraper}
   .each do |f|
   require_relative "dynamised/%s" % f

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dynamised
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Martin Becker