botch 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710ce37273136fc5bcf4a70c21c592d6784c472b
-  data.tar.gz: 1d789bc4642ab1b6f84c07c5b7fe9e2e1eeee0b9
+  metadata.gz: 0fe3e67b5d6e95407e12c4faf9f869c225b904ff
+  data.tar.gz: dccfb3b75e385bf8c1b1ac2e898bd719c60fe747
 SHA512:
-  metadata.gz: 2d784cdfb50915130712eb47b98621f7d980e29763c6b8e7e183690d408db1ce91deedbd723c4c9409dc554b6e35cb0c8779992a05ed8fbc6419cd2840867c80
-  data.tar.gz: ae68b1a304cb6a85287491b29aac14a087b8d9abd5f45130c861849fc786489bbd93241607439655246da53fb9fb7b560a400f7c1823e1551ba6ba6783688247
+  metadata.gz: c271d30d2d725f552cdb0f347959962557a7892de5525aeb2c53a30e7f35c5a0de6ad61d18f66792011f4d9a80a5346e1670dfa0111f2bf531af23deea4a96d5
+  data.tar.gz: e76498ef673c6a0bfd09fb9c7935512aabb2417589b4cd22ea22568bc335721e23d84fcc00112e863c11bb63d56f1ce7610e7db6e2b3b011ddc24d54575d97f7

data/.travis.yml

@@ -0,0 +1,16 @@
+lang: ruby
+before_install: gem install bundler --pre
+install:
+  - gem update --system
+  - bundle update
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+notifications:
+  recipients:
+    - namusyaka@gmail.com
+branches:
+  only:
+    - master

data/README.md

@@ -1,9 +1,13 @@
 # Botch
 
+[![Build Status](https://travis-ci.org/namusyaka/botch.png)](https://travis-ci.org/namusyaka/botch)
+
 Botch is a simple DSL for quickly creating web crawlers.
 
 Inspired by Sinatra.
 
+[Japanese](https://gist.github.com/namusyaka/6001467)
+
 ## Installation
 
 add this line to your Gemfile.
@@ -19,16 +23,23 @@ or
 ```ruby
 require 'lib/botch'
 require 'kconv'
+require 'rack'
 
 class SampleBotch < Botch::Base
   set :user_agent, "SampleBotch"
 
+  helpers do
+    def h(str)
+      Rack::Utils.escape_html(str)
+    end
+  end
+
   filter :example, :map => "example.com" do
     status == 200
   end
 
   rule :example, :map => /example\.com/ do
-    body.toutf8
+    h(body.toutf8)
   end
 end
 

data/botch.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path("../lib/botch", __FILE__)
+require File.expand_path("../lib/botch/version", __FILE__)
 
 Gem::Specification.new "botch", Botch::VERSION do |s|
   s.description      = "Botch is a DSL for quickly creating web crawlers. Inspired by Sinatra."

data/lib/botch.rb

@@ -1,5 +1 @@
 require File.expand_path('../botch/base', __FILE__)
-
-module Botch
-  VERSION = "0.1.2"
-end

data/lib/botch/base.rb

@@ -14,7 +14,6 @@ module Botch
 
     def initialize
       @routes = []
-      self
     end
 
     def add(label, options = {}, &block)
@@ -54,11 +53,11 @@ module Botch
     private
 
     def map_validation(url, map)
-      case map.class.to_s
-      when "Regexp"   then url =~ map
-      when "String"   then url.include?(map)
-      when "NilClass" then true
-      else                 nil
+      case map
+      when Regexp   then url =~ map
+      when String   then url.include?(map)
+      when NilClass then true
+      else               nil
       end
     end
   end
@@ -144,13 +143,18 @@ module Botch
         end
       end
 
+      def reset
+        @@routes = { :filter => Filter.new, :rule => Rule.new }
+      end
+
       def reset!
+        reset
         settings = {}
       end
 
       def request(method, *urls, &block)
 
-        set_default_options! unless self.client
+        set_default_options unless self.client
         raise ArgumentError  unless self.client.respond_to?(method)
 
         block = generate_main_block(&block) if block_given?
@@ -159,11 +163,12 @@ module Botch
           filters, rules = @@routes.map{ |k, v| v.inject(url) }
           response = self.client.send(method, url, options)
 
-          set_instance_variables(:header => response[:header],
+          set_instance_variables :header => response[:header],
                                  :body   => response[:body],
-                                 :status => response[:status])
+                                 :status => response[:status]
 
           response = response[:response]
+          valid    = true
 
           unless filters.empty?
             valid = filters.map{ |_filter| _filter[:block].call(response) }.all?
@@ -207,7 +212,7 @@ module Botch
           @_clients ||= [:faraday, :mechanize]
         end
 
-        def set_default_options!
+        def set_default_options
           self.client = :faraday
         end
     end

data/lib/botch/version.rb

@@ -0,0 +1,3 @@
+module Botch
+  VERSION = "0.1.3"
+end

data/spec/botch_spec.rb

@@ -2,12 +2,6 @@ $:.unshift(File.dirname(__FILE__))
 require 'spec_helper'
 
 module Botch
-  describe do
-    it "Should have a version." do
-      expect(Botch.const_defined?("VERSION")).to be_true
-    end
-  end
-
   describe Base do
     before(:all) do
       @fake = Fake.new
@@ -43,7 +37,7 @@ module Botch
         expect(@settings[:disabled_invalid]).to be_true
       end
 
-      it "Client setter should be valid." do
+      it "client should be a Client::Mechanize instance." do
         expect(SampleBotch.client).to be_an_instance_of(Botch::Client::MechanizeClient)
       end
     end

data/spec/filter_spec.rb

@@ -0,0 +1,29 @@
+$:.unshift(File.dirname(__FILE__))
+require 'spec_helper'
+
+module Botch
+  describe Filter do
+    before(:each) do
+      FakeWeb.clean_registry
+      @fakes = []
+      @fakes << Fake.new("/", :status => [200, "OK"], :content_type => "text/html")
+      @fakes << Fake.new("/test1", :status => [404, "Not Found"], :content_type => "text/html")
+      @fakes << Fake.new("/test2", :status => [500, "Internal Server Error"], :content_type => "text/html")
+
+      class SampleBotch < Botch::Base
+        reset!
+        set :client, :faraday
+        filter :test1, :map => /test1|test2/ do
+          status == 404
+        end
+      end
+    end
+
+    it "filter should decide a valid in reference to return value of filter's block." do
+      result = SampleBotch.run(*@fakes.map(&:url)) {|response, valid| valid }
+      expect(result[0]).to be_true
+      expect(result[1]).to be_true
+      expect(result[2]).to be_false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,6 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -81,8 +82,10 @@ files:
 - lib/botch/clients/abstract_client.rb
 - lib/botch/clients/faraday_client.rb
 - lib/botch/clients/mechanize_client.rb
+- lib/botch/version.rb
 - spec/botch_spec.rb
 - spec/faraday_spec.rb
+- spec/filter_spec.rb
 - spec/mechanize_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/namusyaka/botch
@@ -112,5 +115,6 @@ summary: A DSL for web clawler.
 test_files:
 - spec/botch_spec.rb
 - spec/faraday_spec.rb
+- spec/filter_spec.rb
 - spec/mechanize_spec.rb
 has_rdoc: