kabutops 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d989a93c5be7f56e4d98e2c35e4ecc46704ca14
-  data.tar.gz: 0c67351ca58b0a92e8dacd2724b17c8c3c3f98ee
+  metadata.gz: 30185d1be8fe797322576ca2ded85d792f26d6ce
+  data.tar.gz: fba6fe7cf866ad20f8c632f9fc5761c3e5920c6a
 SHA512:
-  metadata.gz: 8b8d434946b2cfd1841e248877412931d4d7ede4971290dece53cab4bc9264dbb5367116a4c1a2c48463a0444d1a5568d3e1c4e5f13b32bdcd53ea735d3e08df
-  data.tar.gz: e78be8207319e3a56970318aacd9f5e90c8b5c7a115b2777727e5728664351ae1c05f7b7520041d30b4230921e37d9d2bb76040a3a5d135be68a1cc782fa37cc
+  metadata.gz: ed6ab102fb990e4e83d6efb7eedbe3a84136979452395f448827b529b772dd410ec3eed39ba4f51cd844a2b780ac6e1a7e84d94479fa30993048b20ba6cc1c0f
+  data.tar.gz: 4ec9f7872df1e79a8f4780bf50233d1ce761ee2b8702efb22058bd52900c551147dae3fe174d05fc75b655e44a3e340c8f5cb369758dcfc11ba1f65e34db1a0b

data/README.md

@@ -13,7 +13,7 @@ gem install kabutops
 Or you can put it in your Gemfile
 
 ```ruby
-gem 'kabutops', '~> 0.0.4'
+gem 'kabutops', '~> 0.0.5'
 ```
 
 Basic example

data/lib/kabutops.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 require 'hashie'
 require 'sidekiq'
 require 'cachy'

data/lib/kabutops/adapters/base.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module Adapters
@@ -11,7 +13,7 @@ module Kabutops
         @debug == true
       end
     end
-    
+
   end
 
 end

data/lib/kabutops/adapters/database_adapter.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module Adapters
@@ -5,6 +7,8 @@ module Kabutops
     class DatabaseAdapter < Base
       include Extensions::CallbackSupport
 
+      callbacks :after_save
+
       def data &block
         @recipe = Recipe.new
         @recipe.instance_eval &block

data/lib/kabutops/adapters/elastic_search.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module Adapters
@@ -8,10 +10,9 @@ module Kabutops
       params :host, :port, :index, :type
 
       def store result
-        @@client ||= Elasticsearch::Client.new
-        @@client.index(
-          index: @params[:index] || 'default',
-          type: @params[:type] || 'default',
+        client.index(
+          index: params[:index] || 'default',
+          type: params[:type] || 'default',
           id: result[:id],
           body: result.to_hash,
         )
@@ -20,6 +21,19 @@ module Kabutops
       def nested?
         true
       end
+
+      protected
+
+      def client
+        @@client ||= Elasticsearch::Client.new(
+          hosts: [
+            {
+              host: params[:host] || 'localhost',
+              port: params[:port] || '9200',
+            },
+          ],
+        )
+      end
     end
 
   end

data/lib/kabutops/crawler.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   class Crawler
@@ -11,6 +13,7 @@ module Kabutops
       include Extensions::CallbackSupport
 
       params :collection, :proxy, :cache, :wait
+      callbacks :after_crawl
 
       def adapters
         @adapters || []

data/lib/kabutops/crawler_extensions/debugging.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module CrawlerExtensions

data/lib/kabutops/crawler_extensions/elastic_search.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module CrawlerExtensions

data/lib/kabutops/crawler_extensions/pstore_storage.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module CrawlerExtensions

data/lib/kabutops/extensions/callback_support.rb

@@ -1,13 +1,30 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module Extensions
 
     module CallbackSupport
 
+      def self.included base
+        base.extend(ClassMethods)
+        base.class_eval do
+          attr_reader :allowed_callbacks
+        end
+      end
+
       class Manager
+        def initialize allowed=nil
+          @allowed = allowed || []
+        end
+
         def method_missing name, *args, &block
           return unless block_given?
 
+          unless @allowed.include?(name)
+            raise "Invalid callback name: #{name}"
+          end
+
           @map ||= Hashie::Mash.new
           @map[name] ||= []
           @map[name] << block
@@ -23,14 +40,25 @@ module Kabutops
       end
 
       def callbacks &block
-        @manager ||= Manager.new
+        @manager ||= Manager.new(allowed_callbacks)
         @manager.instance_eval &block
       end
 
       def notify name, *args
-        @manager ||= Manager.new
+        @manager ||= Manager.new(allowed_callbacks)
         @manager.notify(name, *args)
       end
+
+      module ClassMethods
+
+        def callbacks *args
+          define_method :allowed_callbacks do
+            args
+          end
+        end
+
+      end
+
     end
 
   end

data/lib/kabutops/extensions/parameterable.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   module Extensions
@@ -14,8 +16,6 @@ module Kabutops
       module ClassMethods
 
         def params *list
-          return @params if list.empty?
-
           list.each do |name|
             define_method name do |*args|
               @params ||= Hashie::Mash.new

data/lib/kabutops/recipe.rb

@@ -1,6 +1,10 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   class Recipe
+    attr_reader :items
+
     def initialize
       @items = Hashie::Mash.new
       @nested = false
@@ -10,11 +14,11 @@ module Kabutops
       if block_given?
         recipe = Recipe.new
         recipe.instance_eval &block
-        @items[name] = RecipeItem.new(name, :recipe, recipe)
+        @items[name] = RecipeItem.new(:recipe, recipe)
         @nested = true
       else
         type, value = args[0..1]
-        @items[name] = RecipeItem.new(name, type, value)
+        @items[name] = RecipeItem.new(type, value)
       end
     end
 
@@ -22,22 +26,7 @@ module Kabutops
       result = Hashie::Mash.new
 
       @items.each do |name, item|
-        result[name] = case item.type
-        when :var
-          resource[item.value]
-        when :recipe
-          item.value.process(resource, page)
-        when :css
-          page.css(item.value).text
-        when :xpath
-          page.xpath(item.value).text
-        when :lambda
-          item.value.call(resource, page)
-        when :proc
-          page.instance_eval &item.value
-        else
-          raise "unknown recipe item type '#{item.type}'"
-        end
+        result[name] = item.process(resource, page)
       end
 
       result

data/lib/kabutops/recipe_item.rb

@@ -1,13 +1,31 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
 
   class RecipeItem
-    attr_reader :name, :type, :value
+    attr_reader :type, :value
 
-    def initialize name, type, value
-      @name = name
+    def initialize type, value
       @type = type
       @value = value
     end
+
+    def process resource, page
+      case @type
+      when :var
+        resource[@value]
+      when :recipe
+        @value.process(resource, page)
+      when :css
+        page.css(@value).text
+      when :xpath
+        page.xpath(@value).text
+      when :lambda, :proc
+        @value.call(resource, page)
+      else
+        raise "unknown recipe item type '#{item.type}'"
+      end
+    end
   end
 
 end

data/lib/kabutops/version.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Kabutops
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabutops
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rene Klacan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize