cut 0.0.3 → 0.0.4

data/README.md

@@ -30,6 +30,7 @@ class SearchResult
   selector "li.g"
 
   map :title, String, to: "h3.r"
+  map :url,   String, to: "div.s cite", operation: lambda {|str| str.upcase }
 
 end
 ```
@@ -38,7 +39,10 @@ Return Results:
 
 ```ruby
 SearchResult.all(keywords: "war and peace")
-#=> [#<SearchResult:0x007fd18be96588 @title="War and Peace - Wikipedia, the free encyclopedia">, #<SearchResult:0x007fd18b97c098 @title="War and Peace (1956) - IMDb">, #<SearchResult:0x007fd18b986188 @title="War and Peace (Vintage Classics): Leo Tolstoy, Richard Pevear ...">, #<SearchResult:0x007fd18b874038 @title="War and Peace by graf Leo Tolstoy - Free Ebook - Project Gutenberg">, #<SearchResult:0x007fd18b8b46b0 @title="SparkNotes: War and Peace">, #<SearchResult:0x007fd18bc070d8 @title="War and Peace by Leo Tolstoy - Reviews, Discussion, Bookclubs, Lists">, #<SearchResult:0x007fd18bf7c8d0 @title="War and Peace - The Literature Network">, #<SearchResult:0x007fd18bf7a0f8 @title="War and Peace - graf Leo Tolstoy - Google Books">, #<SearchResult:0x007fd18bfc2d58 @title="Images for war and peace">, #<SearchResult:0x007fd189397be8 @title="War and Peace - Planet PDF">, #<SearchResult:0x007fd1893c6268 @title="War and Peace - Shmoop">, #<SearchResult:0x007fd1895fe0f8 @title="News for war and peace">]
+#=> [#<SearchResult:0x007f94bbfaae90 @title="War and Peace - Wikipedia, the free encyclopedia", @url="HTTPS://EN.WIKIPEDIA.ORG/WIKI/WAR_AND_PEACE">, #<SearchResult:0x007f94beed97c0 @title="War and Peace (Vintage Classics): Leo Tolstoy, Richard Pevear ...", @url="WWW.AMAZON.COM/WAR-PEACE-VINTAGE-CLASSICS.../DP/1400079985">, #<SearchResult:0x007f94be95ee80 @title="War and Peace (1956) - IMDb", @url="WWW.IMDB.COM/TITLE/TT0049934/">, #<SearchResult:0x007f94be9cb198 @title="SparkNotes: War and Peace", @url="WWW.SPARKNOTES.COM/LIT/WARANDPEACE/">, #<SearchResult:0x007f94be9c7ea8 @title="War and Peace by graf Leo Tolstoy - Free Ebook - Project Gutenberg", @url="WWW.GUTENBERG.ORG/EBOOKS/2600">, #<SearchResult:0x007f94bc83f218 @title="War and Peace by Leo Tolstoy - Reviews, Discussion, Bookclubs, Lists", @url="WWW.GOODREADS.COM/BOOK/SHOW/656.WAR_AND_PEACE">, #<SearchResult:0x007f94bba7ee80 @title="War and Peace - The Literature Network", @url="WWW.ONLINE-LITERATURE.COM/TOLSTOY/WAR_AND_PEACE/">, #<SearchResult:0x007f94bba7b820 @title="War and Peace - graf Leo Tolstoy - Google Books", @url="BOOKS.GOOGLE.COM/BOOKS/ABOUT/WAR_AND_PEACE.HTML?ID=2GOK4HJO2VKC">, #<SearchResult:0x007f94bbed4ac0 @title="Images for war and peace", @url="">, #<SearchResult:0x007f94bdda0eb8 @title="War and Peace - Shmoop", @url="WWW.SHMOOP.COM/WAR-AND-PEACE/">, #<SearchResult:0x007f94bdd695d0 @title="War and Peace - Planet PDF", @url="WWW.PLANETPDF.COM/PLANETPDF/PDFS/FREE_EBOOKS/WAR_AND_PEACE_NT.PDF">, #<SearchResult:0x007f94bdde53d8 @title="News for war and peace", @url="">]
+
+SearchResult.first(keywords: "war and peace")
+#=> #<SearchResult:0x007f94bdfbeb78 @title="War and Peace - Wikipedia, the free encyclopedia", @url="HTTPS://EN.WIKIPEDIA.ORG/WIKI/WAR_AND_PEACE">
 ```
 
 

data/lib/cut/class_methods.rb

@@ -14,11 +14,11 @@ module Cut
     end
 
     def all(options = {})
-      endpoint = @url.dup
-      options.each {|key,value| endpoint.gsub!("{{#{key}}}", CGI.escape(value)) }
-      response = Client.get(endpoint)
+      Client.get(@url, options).css(@selector).map {|node| from_node(node) }
+    end
 
-      parse(response)
+    def first(options = {})
+      from_node(Client.get(@url, options).at_css(@selector))
     end
 
     private
@@ -32,12 +32,10 @@ module Cut
       send(:attribute, name, type)
     end
 
-    def parse(response)
-      response.css(@selector).map do |node|
-        new.tap do |instance|
-          mappings.each do |mapping|
-            instance.send("#{mapping.name}=", node.at_css(mapping.selector).value)
-          end
+    def from_node(node)
+      new.tap do |instance|
+        mappings.each do |mapping|
+          instance.send("#{mapping.name}=", mapping.value_from_node(node))
         end
       end
     end

data/lib/cut/client.rb

@@ -1,12 +1,14 @@
 module Cut
   class Client
 
-    def self.get(endpoint)
-      new(endpoint).get
+    def self.get(*args)
+      new(*args).get
     end
 
-    def initialize(endpoint)
-      @endpoint = endpoint
+    def initialize(endpoint, parameters = {})
+      @endpoint = parameters.inject(endpoint) do |str, param|
+        str.gsub("{{#{param.first}}}", CGI.escape(param.last))
+      end
     end
 
     def get

data/lib/cut/mapping.rb

@@ -4,13 +4,22 @@ module Cut
     attr_reader :name
 
     def initialize(name, options = {})
-      @name = name
-      @selector = options[:to]
+      @name      = name
+      @selector  = options[:to]
+      @operation = options[:operation]
     end
 
     def selector
       @selector ||= ".#{name}"
     end
 
+    def operation
+      @operation ||= Proc.new {|value| value }
+    end
+
+    def value_from_node(node)
+      operation.call( node.at_css(selector).value.to_s )
+    end
+
   end
 end

data/lib/cut/version.rb

@@ -1,3 +1,3 @@
 module Cut
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cut
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty