extractula 0.0.8 → 0.0.9

data/lib/extractula.rb

@@ -9,29 +9,44 @@ require 'extractula/extracted_content'
 require 'extractula/extractor'
 
 module Extractula
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 
   @extractors = []
 
-  def self.add_extractor(extractor_class)
-    @extractors << extractor_class
-  end
-
-  def self.remove_extractor(extractor_class)
-    @extractors.delete extractor_class
-  end
-
-  def self.extract(url, html)
-    parsed_url = Domainatrix.parse(url)
-    parsed_html = Nokogiri::HTML(html)
-    extractor = @extractors.detect {|e| e.can_extract? parsed_url, parsed_html} || Extractor
-    extractor.new(parsed_url, parsed_html).extract
-  end
-
-  def self.custom_extractor(config = {})
-    klass = Class.new(Extractula::Extractor)
-    klass.include(Extractula::OEmbed) if config.delete(:oembed)
-    config.each { |option, args| klass.__send__(option, *args) }
-    klass
+  class << self
+    
+    attr_reader :extractors, :last_extractor
+    
+    def add_extractor(extractor_class)
+      @extractors << extractor_class
+    end
+
+    def remove_extractor(extractor_class)
+      @extractors.delete extractor_class
+    end
+
+    def extract(url, html)
+      parsed_url, parsed_html = Domainatrix.parse(url), Nokogiri::HTML(html)
+      extractor = select_extractor parsed_url, parsed_html
+      extractor.new(parsed_url, parsed_html).extract
+    end
+
+    def select_extractor url, html
+      @last_extractor = @extractors.detect {|e| e.can_extract? url, html} || Extractor
+    end
+
+    def custom_extractor(*args, &block)
+      config      = args.last.is_a?(Hash) ? args.pop : {}
+      klass_name  = args[0]
+      if block_given?
+        klass = Class.new Extractula::Extractor, &block
+      else
+        klass = Class.new Extractula::Extractor
+        klass.__send__ :include, Extractula::OEmbed if config.delete(:oembed)
+        config.each { |option, args| klass.__send__(option, *args) }
+      end
+      const_set klass_name, klass if klass_name
+      klass
+    end
   end
 end

data/spec/extractula_spec.rb

@@ -12,7 +12,7 @@ describe "extractula" do
       end
     end
 
-    Extractula.add_extractor custom_extractor
+    # Extractula.add_extractor custom_extractor
     content = Extractula.extract("http://pauldix.net", "some html")
     content.url.should == "custom extractor url"
     content.summary.should == "my custom extractor"
@@ -30,7 +30,7 @@ describe "extractula" do
       end
     end
 
-    Extractula.add_extractor custom_extractor
+    # Extractula.add_extractor custom_extractor
     content = Extractula.extract("http://pauldix.net", "some html")
     content.url.should_not == "this url"
     content.summary.should_not == "this summary"
@@ -42,4 +42,47 @@ describe "extractula" do
     result.should be_a Extractula::ExtractedContent
     result.url.should == "http://pauldix.net"
   end
+  
+  it "saves a reference to the last extractor used" do
+    custom_extractor = Class.new(Extractula::Extractor) do
+      def self.can_extract? url, html
+        true
+      end
+    end
+    Extractula.extract "http://pauldix.net", "some html"
+    Extractula.last_extractor.should == custom_extractor
+    Extractula.remove_extractor custom_extractor
+  end
+  
+  describe "defining an inline custom extractor" do
+    it "takes a block form definition" do
+      klass = Extractula.custom_extractor do
+        domain        'pauldix'
+        content_path  '#content'
+      end
+      Extractula.extractors.should include(klass)
+      Extractula.remove_extractor klass
+    end
+    
+    it "takes a hash form definition" do
+      klass = Extractula.custom_extractor :domain => 'pauldix', :content_path => '#content'
+      Extractula.extractors.should include(klass)
+      Extractula.remove_extractor klass
+    end
+    
+    it "can be named" do
+      klass = Extractula.custom_extractor :PaulDix do
+        domain        'pauldix'
+        content_path  '#content'
+      end
+      Extractula.const_defined?(:PaulDix).should be_true
+      Extractula.remove_extractor klass
+    end
+    
+    it "can contain the OEmbed module" do
+      klass = Extractula.custom_extractor :oembed => true
+      klass.should include(Extractula::OEmbed)
+      Extractula.remove_extractor klass
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extractula
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Paul Dix