wombat 2.1.0 → 2.1.1

data/Gemfile.lock

@@ -1,11 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
-    domain_name (0.5.6)
+    domain_name (0.5.7)
       unf (~> 0.0.3)
     fakeweb (1.3.0)
     git (1.2.5)
@@ -15,7 +15,7 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
+    json (1.7.6)
     mechanize (2.5.1)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)
@@ -28,7 +28,7 @@ GEM
     multi_json (1.5.0)
     net-http-digest_auth (1.2.1)
     net-http-persistent (2.8)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     ntlm-http (0.1.1)
     rake (10.0.3)
     rdoc (3.12)
@@ -40,13 +40,13 @@ GEM
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
     rspec-core (2.12.2)
-    rspec-expectations (2.12.0)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.2)
     unf (0.0.5)
       unf_ext
     unf_ext (0.0.5)
-    vcr (2.3.0)
+    vcr (2.4.0)
     webrobots (0.0.13)
     yard (0.8.3)
 

data/README.md

@@ -26,35 +26,38 @@ Wombat.crawl do
   path "/"
 
   headline "xpath=//h1"
-  what_is "css=.column.secondary p", :html
-  repositories "css=a.repo", :list
+  subheading "css=p.subheading"
 
-  explore "xpath=//ul/li[2]/a" do |e|
-    e.gsub(/Explore/, "LOVE")
-  end
+  what_is "css=.teaser h3", :list
+
+  links do
+    explore 'xpath=//*[@id="wrapper"]/div[1]/div/ul/li[1]/a' do |e|
+      e.gsub(/Explore/, "Love")
+    end
 
-  benefits do
-    first_benefit "css=.column.leftmost h3"
-    second_benefit "css=.column.leftmid h3"
-    third_benefit "css=.column.rightmid h3"
-    fourth_benefit "css=.column.rightmost h3"
+    search 'css=.search'
+    features 'css=.features'
+    blog 'css=.blog'
   end
 end
 ```
 
-###### The code above is gonna return the following hash: 
+###### The code above is gonna return the following hash:
 
 ```ruby
 {
-  "headline" => "1,316,633 people hosting over 3,951,378 git repositories", 
-  "what_is" => "GitHub is the best way to collaborate with others.  Fork, send pull requests and manage all your <strong>public</strong> and <strong>private</strong> git repositories.",
-  "explore" => "LOVE GitHub",
-  "repositories" => ["jQuery", "reddit", "Sparkle", "curl", "Ruby on Rails", "node.js", "ClickToFlash", "Erlang/OTP", "CakePHP", "Redis"]
-  "benefits" => {
-    "first_benefit"  => "Team management", 
-    "second_benefit" => "Code review", 
-    "third_benefit"  => "Reliable code hosting", 
-    "fourth_benefit" => "Open source collaboration"
+  "headline"=>"Build software better, together.",
+  "subheading"=> "Powerful collaboration, review, and code management for open source and private development projects.",
+  "what_is"=> [
+    "Great collaboration starts with communication.",
+    "Manage and contribute from all your devices.",
+    "The world’s largest open source community."
+  ],
+  "links"=> {
+    "explore"=>"Love GitHub",
+    "search"=>"Search",
+    "features"=>"Features",
+    "blog"=>"Blog"
   }
 }
 ```
@@ -65,7 +68,7 @@ end
 
 
 ## Contributing to Wombat
- 
+
  * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
  * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
  * Fork the project

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/examples/no_class.rb

@@ -6,36 +6,36 @@ data = Wombat.crawl do
   path "/"
 
   headline "xpath=//h1"
-  what_is "css=.column.secondary p", :html
+  subheading "css=p.subheading"
 
-  explore "xpath=//ul/li[2]/a" do |e|
-    e.gsub(/Explore/, "LOVE")
-  end
-
-  benefits do
-    team_mgmt "css=.column.leftmost h3"
-    code_review "css=.column.leftmid h3"
-    hosting "css=.column.rightmid h3"
-    collaboration "css=.column.rightmost h3"
+  what_is "css=.teaser h3", :list
 
-    links do
-      team_mgmt "xpath=//div[@class='column leftmost']//a/@href"
+  links do
+    explore 'xpath=//*[@id="wrapper"]/div[1]/div/ul/li[1]/a' do |e|
+      e.gsub(/Explore/, "Love")
     end
+
+    search 'css=.search'
+    features 'css=.features'
+    blog 'css=.blog'
   end
 end
 
 =begin
 pp data
 {
-  "headline"=>"1,900,094\n        people hosting over\n        3,371,168\n        repositories",
-  "what_is"=>"GitHub is the best way to collaborate with others.  Fork, send pull requests and manage all your <strong>public</strong> and <strong>private</strong> git repositories.",
-  "explore"=>"LOVE GitHub",
-  "benefits"=> {
-    "team_mgmt"=>"Team management",
-    "code_review"=>"Code review",
-    "hosting"=>"Reliable code hosting",
-    "collaboration"=>"Open source collaboration",
-    "links"=>{"team_mgmt"=>"/features/projects/collaboration"}
+ "headline"=>"Build software better, together.",
+ "subheading"=>
+  "Powerful collaboration, review, and code management for open source and private development projects.",
+ "what_is"=>
+  ["Great collaboration starts with communication.",
+   "Manage and contribute from all your devices.",
+   "The world’s largest open source community."],
+ "links"=>
+  {"explore"=>"Love GitHub",
+   "search"=>"Search",
+   "features"=>"Features",
+   "blog"=>"Blog"
   }
 }
 =end

data/lib/wombat/dsl/property_group.rb

@@ -19,18 +19,10 @@ module Wombat
           self[property_name] = property_group
           property_group.instance_eval(&block)
         else
-          if args[1] == :iterator
-            it = Iterator.new(property_name, args.first)
-            self[property_name] = it
-            it.instance_eval(&block) if block
-          elsif args[1] == :follow
-            it = Follower.new(property_name, args.first)
-            self[property_name] = it
-            it.instance_eval(&block) if block
-          else
-            self[property_name] = Property.new(property_name, *args, &block)
-          end
-        end      
+          it = build_property(property_name, *args, &block)
+          self[property_name] = it
+          it.instance_eval(&block) if block_given? && !it.instance_of?(Property)
+        end
       end
 
       def to_ary
@@ -43,6 +35,18 @@ module Wombat
       def wombat_property_namespaces
         nil
       end
+
+      protected
+
+      def build_property(name, *args, &block)
+        if args[1] == :iterator
+          Iterator.new(name, args.first)
+        elsif args[1] == :follow
+          Follower.new(name, args.first)
+        else
+          Property.new(name, *args, &block)
+        end
+      end
     end
   end
 end

data/lib/wombat/property/locators/base.rb

@@ -7,16 +7,16 @@ module Wombat
       # Abstract base class
       class Base
         include Wombat::Processing::NodeSelector
-        
+
         def initialize(property)
           @property = property
         end
 
         def locate(context, page = nil)
           @context = context
-          
+
           raw_data = yield if block_given?
-          data = @property.respond_to?(:callback) && @property.callback ? @property.callback.call(raw_data) : raw_data 
+          data = @property.respond_to?(:callback) && @property.callback ? @property.callback.call(raw_data) : raw_data
 
           @property.wombat_property_name ? { @property.wombat_property_name => data } : data
         end
@@ -27,6 +27,15 @@ module Wombat
 
           select_nodes @property.wombat_property_selector, @property.wombat_property_namespaces
         end
+
+        def filter_properties(context, page)
+          Hash.new.tap do |h|
+            @property.values
+              .select { |v| v.is_a?(Wombat::DSL::Property) || v.is_a?(Wombat::DSL::PropertyGroup) }
+              .map { |p| Factory.locator_for(p).locate(context, page) }
+              .map { |p| h.merge! p }
+          end
+        end
       end
     end
   end

data/lib/wombat/property/locators/follow.rb

@@ -10,12 +10,7 @@ module Wombat
               target_page = page.click node
               context = target_page.parser
 
-              Hash.new.tap do |h|
-                @property.values
-                  .select { |v| v.is_a?(Wombat::DSL::Property) || v.is_a?(Wombat::DSL::PropertyGroup) }
-                  .map { |p| Factory.locator_for(p).locate(context, page) }
-                  .map { |p| h.merge! p }
-              end
+              filter_properties(context, page)
             end
           end
 	    	end

data/lib/wombat/property/locators/iterator.rb

@@ -5,15 +5,10 @@ module Wombat
   module Property
     module Locators
       class Iterator < Base
-      	def locate(contex, page = nil)
+      	def locate(context, page = nil)
           super do
-            locate_nodes(contex).flat_map do |node|
-              Hash.new.tap do |h|
-                @property.values
-                  .select { |v| v.is_a?(Wombat::DSL::Property) || v.is_a?(Wombat::DSL::PropertyGroup) }
-                  .map { |p| Factory.locator_for(p).locate(node, page) }
-                  .map { |p| h.merge! p }
-              end
+            locate_nodes(context).flat_map do |node|
+              filter_properties(node, page)
             end
           end
         end

data/lib/wombat/property/locators/property_group.rb

@@ -6,12 +6,7 @@ module Wombat
       class PropertyGroup < Base
         def locate(context, page = nil)
           super do
-            Hash.new.tap do |h|
-              @property.values
-                .select { |v| v.is_a?(Wombat::DSL::Property) || v.is_a?(Wombat::DSL::PropertyGroup) }
-                .map { |p| Factory.locator_for(p).locate(context, page) }
-                .map { |p| h.merge! p }
-            end
+            filter_properties(context, page)
           end
         end
       end

data/wombat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wombat"
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Lima"]
-  s.date = "2012-12-15"
+  s.date = "2013-02-03"
   s.description = "Generic Web crawler with a DSL that parses structured data from web pages"
   s.email = "felipe.lima@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wombat
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize