Api v4

Gemfile

@@ -4,3 +4,4 @@ gem "exifr", ">=1.1.3"
 gem "mail", ">=2.4.4"
 gem "rest-client", ">=1.6.7"
 gem "rmagick", ">=2.13.1"
+gem "unicode_utils"

README.md

@@ -1,22 +1,12 @@
-Localwiki Email Uploader
+LocalWiki Email Uploader
 ========================
 
-Localwiki content uploader from email using [Localwiki API] and custom API(see About Custom API).
-Email sender's address required in relation to User and API Key.
-Email subject is used Localwiki's page name.
-If Localwiki's page doesn't exist, create page and map, and upload jpeg file.
-If Localwiki's page exist, upload jpeg file, and modify page(don't modify map).
+LocalWiki content uploader from email using [LocalWiki API].
+Email subject is used LocalWiki's page name.
+If LocalWiki's page doesn't exist, create page and map, and upload jpeg file.
+If LocalWiki's page exist, upload jpeg file, and modify page(don't modify map).
 
-[Localwiki API]: http://localwiki.readthedocs.org/en/latest/api.html "API Documentation"
-
-## About Custom API
-
-Custom API is available at [Our branch].
-This API allow access to get API key.
-Please check [commit for api].
-
-[Our branch]: https://github.com/Georepublic/localwiki "Georepublic's master_ja branch"
-[commit for api]: https://github.com/Georepublic/localwiki/commit/29cf7ad5e0d846f617e12c46a0ac5fe35652b459 "add custom API for customer"
+[LocalWiki API]: http://localwiki.readthedocs.org/en/latest/api.html "API Documentation"
 
 ## Setup
 
@@ -43,13 +33,15 @@ If you setup in Ubuntu, see also: [Setup Email Uploader in Ubuntu]
 
 ## app_settings.rb
 
-ex: Localwiki's instance run "http://example.com" and create user "mail" and generate api_key "xxx" and add tag "frommail".
+ex: LocalWiki's instance run "http://example.com" and create user "mail" and generate api_key "xxx" and add tag "frommail".
 
     def get_setting
       return {
-        :base_url => 'http://example.com',
+        :base_url => 'http://localwiki.net/api/v4',
         :user_name => 'mailuser',
         :api_key => 'xxx',
+        # Pick a region URL here -
+        :region => 'http://localwiki.net/api/v4/regions/2/',
         :tag_slug => 'frommail'
       }
     end

api_settings.rb.example

@@ -2,8 +2,10 @@
 
 def get_setting
   return {
-    :base_url => '<server url>',
+    :base_url => 'http://localwiki.net/api/v4',
     :user_name => '<user name>',
+    # Pick a region URL here
+    :region => 'http://localwiki.net/api/v4/regions/2/',
     :api_key => '<api key>',
     :tag_slug => '<tag name>'
   }

localwiki_client.rb

@@ -2,12 +2,12 @@
 require 'rest_client'
 require 'json'
 require 'cgi'
+require 'uri'
 
 class LocalWikiClientBase
 
   def initialize args
     @base_url = args[:base_url] or raise ArgumentError, "must need :base_url"
-    @user_name = args[:user_name]
     @api_key = args[:api_key]
   end
 
@@ -28,9 +28,13 @@ def headers
 
   def exist?(page_or_id)
     begin
-      response = RestClient.get @base_url + api_path + CGI.escape(page_or_id), headers
+      response = RestClient.get @base_url + api_path + '?slug__icontains=' + URI.escape(page_or_id), headers
       if response.code == 200
-        return JSON.parse(response.to_str)
+        data = JSON.parse(response.to_str)
+        if data["count"] == 0
+            return nil
+        end
+        return data["results"][0]
       end
     rescue => e
       puts e
@@ -39,7 +43,7 @@ def exist?(page_or_id)
   end
 
   def create(obj)
-    raise RuntimeError, "must set user_name and api_key" unless can_post?
+    raise RuntimeError, "must set api_key" unless can_post?
     puts JSON.dump(obj)
     begin
       response = RestClient.post @base_url + api_path, JSON.dump(obj), headers
@@ -52,11 +56,25 @@ def create(obj)
     return false
   end
 
-  def update(page_or_id, obj)
-    raise RuntimeError, "must set user_name and api_key" unless can_post?
+  def update(page_url, obj)
+    raise RuntimeError, "must set api_key" unless can_post?
     puts JSON.dump(obj)
     begin
-      response = RestClient.put @base_url + api_path + CGI.escape(page_or_id), JSON.dump(obj), headers
+      response = RestClient.put page_url, JSON.dump(obj), headers
+      if response.code == 204
+        return true
+      end
+    rescue => e
+      puts "Unable update because #{e.message}"
+    end
+    return false
+  end
+
+  def patch(page_url, obj)
+    raise RuntimeError, "must set api_key" unless can_post?
+    puts JSON.dump(obj)
+    begin
+      response = RestClient.patch page_url, JSON.dump(obj), headers
       if response.code == 204
         return true
       end
@@ -119,35 +137,35 @@ def make_query(objs)
   end
 
   def can_post?
-    return false if @user_name.blank? or @api_key.blank?
+    return false if @api_key.blank?
     return true
   end
 
   def authorization_header
     return nil unless can_post?
-    return "ApiKey #{@user_name}:#{@api_key}"
+    return "Token #{@api_key}"
   end
 
 end
 
 class LocalWikiPage < LocalWikiClientBase
 
   def api_path
-    "/api/page/"
+    "/pages/"
   end
 
 end
 
 class LocalWikiFile < LocalWikiClientBase
 
   def api_path
-    "/api/file/"
+    "/files/"
   end
 
-  def upload(file_path, file_name, slug)
+  def upload(file_path, file_name, slug, region)
 
     begin
-      response = RestClient.post @base_url + api_path, {:file => File.new(file_path, 'rb'), :name => file_name, :slug => slug}, headers
+      response = RestClient.post @base_url + api_path, {:file => File.new(file_path, 'rb'), :name => file_name, :slug => slug, :region => region}, headers
     rescue => e
       puts e
     end
@@ -157,41 +175,7 @@ def upload(file_path, file_name, slug)
 class LocalWikiMap < LocalWikiClientBase
 
   def api_path
-    "/api/map/"
-  end
-
-end
-
-# for custom api
-class LocalWikiUsersWithKey < LocalWikiClientBase
-
-  def api_path
-    "/api/users_with_apikey/"
-  end
-
-end
-
-# for custom api
-class LocalWikiApiKey < LocalWikiClientBase
-
-  def api_path
-    "/api/api_key/"
-  end
-
-end
-
-class LocalWikiTag < LocalWikiClientBase
-
-  def api_path
-    "/api/tag/"
-  end
-
-end
-
-class LocalWikiPageTags < LocalWikiClientBase
-
-  def api_path
-    "/api/page_tags/"
+    "/maps/"
   end
 
 end