wikifari 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e576da6b575751378139da5e1445ddcad2791bd6
-  data.tar.gz: 5fcde8bad3ad2a1880a75e2bd3aba9a8dce4f56e
+  metadata.gz: 5eaf41bae5e5fb6453179ba9e6b2c8f1e9cd5ad8
+  data.tar.gz: 348d8cc42436b226f19fa68f9e67f6a6f96c2d84
 SHA512:
-  metadata.gz: e8b70e658e1461159ede5e6c2be419bdb5cd1d4ac30fac85971e71405956f89a4a115c5e64559198f02cf7307099b630ea1da3285b7520958d62a2cf9a55db44
-  data.tar.gz: 026dfdd0d9635bf583e3fcb5d1691c4f365ca2e75752294f9a36fa62adafb97d3fc206931ca2d50186e052ccde0c0b73683d1c7b1e24b16395b2c3b2c8eebaef
+  metadata.gz: a4729a858b002b30b600edd9b94d2ab864f192aea7e3bd8c4ff7eea565e7d77f09b27ef0a5085847f8fc8ded552d2c73a564f3f7b3c8b11713b52a9c8eeff9ef
+  data.tar.gz: 9c8db822004edbb796168a12fb5da448a68c70833abceb8ce7b75fd3f02d59f2463da5bfc1a0eccd2de73a5e1ba88582c0833c2a489cb4473667d90789e960b9

data/lib/wikifari.rb

@@ -1,25 +1,24 @@
-LIB = File.expand_path(File.dirname(__FILE__))
-$:.unshift(LIB) unless $:.include?(LIB)
+WF_LIB = File.expand_path(File.dirname(__FILE__))
+$:.unshift(WF_LIB) unless $:.include?(WF_LIB)
 
 require "json"
 require "open-uri"
 
-require "wikifari/custom"
 require "wikifari/helper"
 require "wikifari/page"
 require "wikifari/request"
 require "wikifari/search"
 
 module WikiFari
-  Options = {
+  OPTIONS = {
     :site => "http://en.wikipedia.org/w/api.php"
   }
 
-  Version = "0.2.2"
+  VERSION = "0.3.0"
 
   class Config < Request
     def initialize(site = nil)
-      Options[:site] = site if site
+      OPTIONS[:site] = site if site
     end
   end
 end

data/lib/wikifari/helper.rb

@@ -1,18 +1,4 @@
 module WikiFari
   class Helper
-    # Thanks, CGI!
-    def encode(string)
-      string.gsub(/([^\sa-zA-Z0-9\_\.\-\+]+)/) do
-        "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
-      end.tr(" ", "+").gsub(/\%25/, "%")
-    end
-
-    def query(hash)
-      string = ""
-
-      hash.each { |key, val| string << "#{key.to_s}=#{val}&" }
-
-      string.sub /\&$/, ""
-    end
   end
 end

data/lib/wikifari/page.rb

@@ -22,11 +22,11 @@ module WikiFari
     end
 
     def redirect?
-      self.content && self.content.match(/\#REDIRECT\s*\[\[(.*?)\]\]/i)
+      self.content && self.content.match(/\#redirect\s*\[\[(.*?)\]\]/i)
     end
 
     def redirect
-      self.content.match(/\#REDIRECT\s*\[\[(.*?)\]\]/i)[1]
+      self.content.match(/\#redirect\s*\[\[(.*?)\]\]/i)[1]
     end
 
     def title

data/lib/wikifari/request.rb

@@ -1,35 +1,25 @@
 module WikiFari
   class Request < Helper
-    def api_request(options = {})
-      site  = Options[:site]
-      query = self.query options
+    READ_QUERY   = "action=query&prop=revisions&rvlimit=1&rvprop=content&titles"
+    SEARCH_QUERY = "action=opensearch&limit=25&search"
 
-      URI.parse("#{site}?format=json&#{query}").read
-    end
-
-    def custom(options = {})
-      data = self.api_request options
+    def api_request(query, title)
+      site  = OPTIONS[:site]
+      title = URI.escape title
 
-      Custom.new data
+      URI.parse("#{site}?format=json&#{query}=#{title}").read
     end
 
-    def read(title, redirect = false)
-      data = self.api_request :action => "query",
-                              :prop   => "revisions",
-                              :rvprop => "content",
-                              :titles => self.encode(title)
+    def read(title, redirect = true)
+      data = self.api_request READ_QUERY, title
 
       page = Page.new data
 
-      return self.read(page.redirect) if page.redirect? and redirect
-
-      page
+      page.redirect? && redirect ? self.read(page.redirect) : page
     end
 
     def search(title)
-      data = self.api_request :action => "opensearch",
-                              :limit  => "10",
-                              :search => self.encode(title)
+      data = self.api_request SEARCH_QUERY, title
 
       Search.new data
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikifari
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Oscar Palmér
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies: []
 description: Read and search for content on MediaWiki-powered sites.
 email: opalmer@me.com
@@ -16,12 +16,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/wikifari/custom.rb
+- lib/wikifari.rb
 - lib/wikifari/helper.rb
 - lib/wikifari/page.rb
 - lib/wikifari/request.rb
 - lib/wikifari/search.rb
-- lib/wikifari.rb
 homepage: http://git.io/wf
 licenses:
 - MIT
@@ -32,17 +31,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: WikiFari!

data/lib/wikifari/custom.rb

@@ -1,16 +0,0 @@
-module WikiFari
-  class Custom
-    def initialize(data)
-      @data = JSON.parse data
-      @raw  = data
-    end
-
-    def json
-      @data
-    end
-
-    def raw
-      @raw
-    end
-  end
-end