botch 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae74c3065a7d5ed43b4449d9925b28878fbca7a8
-  data.tar.gz: b654385120dc79ea047deee77e4e168b3c19f9f1
+  metadata.gz: eff678a7305dfcfc0c931cce263e2b35448b8468
+  data.tar.gz: 2a6c7ac9038ec3eed13797de421741514b918ea0
 SHA512:
-  metadata.gz: 56e97284275e453754a81af2996f00c1e3789c2007bad2c4310c07cdcf00540aa3f02f5941f7c7e57755f0ee65b27539f1c3f50606701977491a7e9e2ebc773d
-  data.tar.gz: b6bd8dc7a7589c0aa654fad04a564fdbf107c2e1195efd4cf8fa3f3e171b6e79406a0129174d398b3f84270d376f22f25591d6878585f3192dfc730876a03c6c
+  metadata.gz: 6e4776acf3a3fe5023b784e2b4eaa902b469827e677c9c4aadd6752f374074d51fd115029c8bcbcd0b070681f591745e9d5b8ab690e1c7ca5505be1990b88c29
+  data.tar.gz: a0465a209cd8fb5199906871144d49ed593fc9de2849f9012737e0b2598ba56999988dba45beacbf270b84278c22c0a98810b74c8ce5c2028a26ab5b0a1e811e

data/README.md

@@ -54,7 +54,6 @@ end
 
 - RSpec
 - Documentation
-- Classic style
 
 ## Contributing to Botch
 

data/lib/botch/base.rb

@@ -18,8 +18,7 @@ module Botch
 
     def add(label, options = {}, &block)
       raise ArgumentError unless block_given?
-      if position = index(label)
-        route = @routes[position]
+      if route = exists?(label)
         route[:block] = block
         route[:label] = label
       else
@@ -34,14 +33,10 @@ module Botch
     end
 
     def exist?(label)
-      !!index(label)
+      @routes.find{ |route| route[:label] == label }
     end
 
-    alias :exists? :exist?
-
-    def index(label)
-      @routes.index{ |route| route[:label] === label }
-    end
+    alias exists? exist?
 
     def inject(url)
       @routes.inject([]) do |result, route|
@@ -122,9 +117,9 @@ module Botch
         route(:rule, label, options, &block)
       end
 
-      def generate_wrapper(&method)
-        method.arity != 0 ? proc {|args| method.call(*args) } :
-                            proc {|args| method.call }
+      def generate_wrapper(&block)
+        block.arity != 0 ? proc {|args| block.call(*args) } :
+                           proc {|args| block.call }
       end
 
       def generate_method(method_name, &block)
@@ -153,8 +148,7 @@ module Botch
       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?
@@ -189,7 +183,7 @@ module Botch
       def get(*urls, &block); request(:get, *urls, &block); end
       def post(*urls, &block); request(:post, *urls, &block); end
 
-      alias :run :get
+      alias run get
 
       def client=(name)
         @client = Client.const_get("#{name.to_s.capitalize}Client").new(settings) if clients.include?(name)

data/lib/botch/main.rb

@@ -0,0 +1,30 @@
+require 'botch'
+
+module Botch
+  module Delegator
+    class << self
+      def delegate(*methods)
+        methods.each do |method_name|
+          define_method(method_name) do |*args, &block|
+            Delegator.target.send(method_name, *args, &block)
+          end
+        end
+      end
+
+      def target
+        @target ||= Main
+      end
+
+      def target=(klass)
+        @target = klass
+      end
+    end
+
+    delegate :filter, :get, :helpers, :options, :post, :reset,
+             :request, :rule, :run, :set, :settings
+  end
+
+  class Main < Base; end
+end
+
+extend Botch::Delegator

data/lib/botch/version.rb

@@ -1,3 +1,3 @@
 module Botch
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/delegator_spec.rb

@@ -0,0 +1,50 @@
+$:.unshift(File.dirname(__FILE__))
+require 'spec_helper'
+require File.expand_path("../../lib/botch/main", __FILE__)
+
+
+class DelegatorTest
+  class Dummy
+    attr_reader :result
+
+    def method_missing(*args, &block)
+      @result = args
+      @result << block if block_given?
+    end
+  end
+
+  def self.delegate_test(*args)
+    args.each do |name|
+      describe "delegate #{name}" do
+        before(:all) { @fake = Botch::Fake.new }
+
+        it "#{name}" do
+          result = DelegatorTest.dummy { send(name) }.result
+          expect(result).to eq([name])
+        end
+
+        it "#{name} with arguments" do
+          fake = @fake
+          result = DelegatorTest.dummy { send(name, fake.url) }.result
+          expect(result).to eq([name, "http://example.com/"])
+        end
+
+        it "#{name} with block" do
+          fake, block = @fake, proc {}
+          result = DelegatorTest.dummy { send(name, fake.url, &block) }.result
+          expect(result).to eq([name, "http://example.com/", block])
+        end
+      end
+    end
+  end
+
+  def self.dummy(&block)
+    dummy = Dummy.new
+    Botch::Delegator.target = dummy
+    Object.new.extend(Botch::Delegator).instance_eval(&block)
+    Botch::Delegator.target
+  end
+
+  delegate_test :filter, :get, :helpers, :options, :post, :reset,
+                :request, :rule, :run, :set, :settings
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botch
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -96,8 +96,10 @@ files:
 - lib/botch/clients/abstract_client.rb
 - lib/botch/clients/faraday_client.rb
 - lib/botch/clients/mechanize_client.rb
+- lib/botch/main.rb
 - lib/botch/version.rb
 - spec/botch_spec.rb
+- spec/delegator_spec.rb
 - spec/faraday_spec.rb
 - spec/filter_spec.rb
 - spec/mechanize_spec.rb
@@ -128,6 +130,7 @@ specification_version: 4
 summary: A DSL for web clawler.
 test_files:
 - spec/botch_spec.rb
+- spec/delegator_spec.rb
 - spec/faraday_spec.rb
 - spec/filter_spec.rb
 - spec/mechanize_spec.rb