lib/wombat/crawler.rb in wombat-1.0.0 vs lib/wombat/crawler.rb in wombat-2.0.0

@@ -1,15 +1,15 @@
 #coding: utf-8
-require 'wombat/metadata'
-require 'wombat/property'
-require 'wombat/parser'
+require 'wombat/dsl/metadata'
+require 'wombat/dsl/property'
+require 'wombat/processing/parser'
 require 'active_support'
 require 'date'
 
 module Wombat
   module Crawler
-    include Parser
+    include Processing::Parser
     extend ActiveSupport::Concern
 
     def crawl(&block)
       if block
         @metadata_dup = self.class.send(:metadata).clone
@@ -29,36 +29,26 @@
       else
         parse self.class.send(:metadata)
       end
     end
 
+    alias_method :scrape, :crawl
+
     def method_missing(method, *args, &block)
       self.class.send method, *args, &block
     end
 
-    def for_each(selector, &block)
-      self.class.for_each selector, &block
-    end
-
     module ClassMethods
       def method_missing(method, *args, &block)
         metadata.send method, *args, &block
       end
 
-      def for_each(selector, &block)
-        metadata.for_each(selector).instance_eval(&block) if block
-      end
-
-      def follow_links(selector)
-
-      end
-
       def to_ary
       end
 
       private
       def metadata
-        @metadata ||= Metadata.new
+        @metadata ||= DSL::Metadata.new
       end
     end
   end
 end
\ No newline at end of file