yasuri 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f70e0281f160fbabc3bff893ce607fb400d4b352
-  data.tar.gz: 768589a35a856f392eadf6d3eaa1410cf8d97fb0
+  metadata.gz: 2d97799a28c2b4d1991ce32abf50b81bce1cae5f
+  data.tar.gz: d94f15f6056e52f87feb1538964e8a049afb7fcb
 SHA512:
-  metadata.gz: 795dec45d612eb40f55aee0fce492979cade151d7f553e0f8e9a77e7ab39f55f3db015c20b6f13f447d991861c8b9c3bf9f25111a1af918ca055002f67491a76
-  data.tar.gz: 74452e32d9c91ceac9cc4d43963d3f0b68692474239770a55c14c52e6d9f266e28d768c1368211140dc8925acc9e41ce97bf91790fb19cc56366505f1db74894
+  metadata.gz: 193bb19ac39e9ea1ca74b2c44dc8c66840f630dcdcd32797acf28a6add47b9a5d878a9ffe3a482a544eccc75dc0f34aa03a4d199dffd311b6dc134f6471b5d35
+  data.tar.gz: 3a360133ce54adb4bcc16637a53d78d1cbd5402d64c47b4afc8e852918f4ea613b4eea9ab20e8bf8c325cb67bf57c31577fa45ba9c04b98d186aa1a72b913f64

data/lib/yasuri/version.rb

@@ -1,3 +1,3 @@
 module Yasuri
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/yasuri/yasuri_node_generator.rb

@@ -28,16 +28,13 @@ module Yasuri
 
       case name
       when /^text_(.+)$/
-        truncate, dummy = *opt
-        Yasuri::TextNode.new(xpath,   $1, children || [], truncate: truncate)
+        Yasuri::TextNode.new(xpath,   $1, children || [], *opt)
       when /^struct_(.+)$/
-        Yasuri::StructNode.new(xpath, $1, children || [])
+        Yasuri::StructNode.new(xpath, $1, children || [], *opt)
       when /^links_(.+)$/
-        Yasuri::LinksNode.new(xpath,  $1, children || [])
+        Yasuri::LinksNode.new(xpath,  $1, children || [], *opt)
       when /^pages_(.+)$/
-        limit, dummy = *opt
-        limit = limit || Float::MAX
-        Yasuri::PaginateNode.new(xpath, $1, children || [], limit: limit)
+        Yasuri::PaginateNode.new(xpath, $1, children || [], *opt)
       else
         nil
       end

data/lib/yasuri/yasuri_text_node.rb

@@ -7,13 +7,15 @@ module Yasuri
   class TextNode
     include Node
 
-    def initialize(xpath, name, children = [], truncate: nil)
+    def initialize(xpath, name, children = [], truncate: nil, proc:nil)
       super(xpath, name, children)
 
       truncate = Regexp.new(truncate) if not truncate.nil? # regexp or nil
-
       @truncate = truncate
       @truncate = Regexp.new(@truncate.to_s) if not @truncate.nil?
+
+      @proc = proc.nil? ? nil : proc.to_sym
+
     end
 
     def inject(agent, page, opt = {})
@@ -25,10 +27,12 @@ module Yasuri
         text = matches ? matches[1] || matches[0] || text : ""
       end
 
-      text.to_s
+      text = text.__send__(@proc) if @proc && text.respond_to?(@proc)
+      text
     end
+
     def opts
-      {truncate:@truncate}
+      {truncate:@truncate, proc:@proc}
     end
   end
 end

data/spec/yasuri_paginate_node_spec.rb

@@ -73,7 +73,7 @@ describe 'Yasuri' do
     end
 
     it 'can be defined by DSL, return single PaginateNode content limited' do
-      generated = Yasuri.pages_next "/html/body/nav/span/a[@class='next']", 2 do
+      generated = Yasuri.pages_next "/html/body/nav/span/a[@class='next']", limit:2 do
         text_content '/html/body/p'
       end
       original = Yasuri::PaginateNode.new("/html/body/nav/span/a[@class='next']", "root", [

data/spec/yasuri_spec.rb

@@ -3,9 +3,6 @@
 # Author::    TAC (tac@tac42.net)
 
 require_relative 'spec_helper'
-require_relative 'yasuri_text_node_spec'
-
-#require_relative '../lib/yasuri/yasuri'
 
 describe 'Yasuri' do
   include_context 'httpserver'

data/spec/yasuri_text_node_spec.rb

@@ -41,27 +41,39 @@ describe 'Yasuri' do
     end
 
     it "can be truncated with regexp" do
-      node  = Yasuri.text_title '/html/body/p[1]', /^[^,]+/
+      node  = Yasuri.text_title '/html/body/p[1]', truncate:/^[^,]+/
       actual = node.inject(@agent, @index_page)
       expect(actual).to eq "Hello"
     end
 
     it "return first captured if matched given capture pattern" do
-      node  = Yasuri.text_title '/html/body/p[1]', /H(.+)i/
+      node  = Yasuri.text_title '/html/body/p[1]', truncate:/H(.+)i/
       actual = node.inject(@agent, @index_page)
       expect(actual).to eq "ello,Yasur"
     end
 
     it "can be truncated with regexp" do
-      node = Yasuri.text_title '/html/body/p[1]', /[^,]+$/
+      node = Yasuri.text_title '/html/body/p[1]', truncate:/[^,]+$/
       actual = node.inject(@agent, @index_page)
       expect(actual).to eq "Yasuri"
     end
 
     it "return empty string if truncated with no match to regexp" do
-      node = Yasuri.text_title '/html/body/p[1]', /^hoge/
+      node = Yasuri.text_title '/html/body/p[1]', truncate:/^hoge/
       actual = node.inject(@agent, @index_page)
       expect(actual).to be_empty
     end
+
+    it "return symbol method applied string" do
+      node = Yasuri.text_title '/html/body/p[1]', proc: :upcase
+      actual = node.inject(@agent, @index_page)
+      expect(actual).to eq "HELLO,YASURI"
+    end
+
+    it "return apply multi arguments" do
+      node = Yasuri.text_title '/html/body/p[1]', proc: :upcase, truncate:/H(.+)i/
+      actual = node.inject(@agent, @index_page)
+      expect(actual).to eq "ELLO,YASUR"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yasuri
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - TAC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler