emacs_org_protocol_server 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27199ab432e45252ccda65a1bc2cab65addf2beb
-  data.tar.gz: 19d6821d5c598a3981e65b264095547befa9f611
+  metadata.gz: 49263eedd17719084314811be758b56d4fe037f2
+  data.tar.gz: 0cd5d52d2ce5268cc14d73772344ae69b7264150
 SHA512:
-  metadata.gz: caf32c60135eb76c61cd2768d52b490931d907cabc8891c2f4215dd76bacc772d77e5843b48cdfc31e8a80b17dc682e2774e4b234776b26c169cbad00234b78f
-  data.tar.gz: d21f8afb8f2cf4700b94f34be8e213114a342ad8398f7a61df8dcbc8ba1badc90d5e0c6ecb59705a06ec7c7e0b7f1eaafbe7fbda2365b20249790887e17ccfee
+  metadata.gz: 1b1982bd451a5d4140cf61f1147c94f942f63080199d0276f6f66d90738f2f11b79f358515bd1b5698531aa9d91c3fbfa1cec781516f49226fa8ff873bc72fa7
+  data.tar.gz: fd276e6a4f934a457db264599f0825f9ebd7dd2d2b4956f1d5df326084b7964b61c81dfdeae6cb263cae74d9d740a8471cb0508536e27d933209419214dc91e0

data/javascripts/bookmarklet.js

@@ -1,38 +1,59 @@
-function fixEncoding(str) {
-  return encodeURIComponent(str)
-    .replace(/[!'()*]/g,
-      function(c) {
-        return '%' +
-          c.charCodeAt(0)
-            .toString(16);
-      }
-    );
-}
-
-var captureLink = function() {
-  var selection = window.getSelection().toString();
-  var location = window.location.href;
-  var title = document.title;
-  var description = document.querySelector('meta[name=description]');
-  var keywords = document.querySelector('meta[name=keywords]');
-  var protocol = 'capture';
-
-  if (description) {
-    description = description.attributes.content.value.toString()
-  }
-
-  if (keywords) {
-    keywords.attributes.content.value.toString()
-  }
-
-  var uri = 'http://localhost:9998/?' +
-    'p=' + protocol +
-    '&l=' + fixEncoding(location) +
-    '&t=' + fixEncoding(title) +
-    '&s=' + fixEncoding("description: " + description + "\n\n" + "selection: " + selection + "\n\n")
-
-  window.location = uri;
-  return uri;
-};
-
-captureLink();
+(function() {
+    var fixEncoding = function(str) {
+	return encodeURIComponent(str)
+	    .replace(/[!'()*]/g, function(c) {
+		return '%' +
+		    c.charCodeAt(0)
+		    .toString(16);
+	    });
+    };
+
+    var location = window.location.href;
+    if (location) {
+	location = location.toString();
+    } else {
+	location = '';
+    }
+
+    var title = document.title;
+    if (title) {
+	title = title.toString();
+    } else {
+	title = '';
+    }
+
+    var selection = window.getSelection();
+    if (selection) {
+	selection = selection.toString();
+    } else {
+	selection = '';
+    }
+
+    var description = document.querySelector('meta[name=description]');
+    if (description) {
+	description = description.attributes.content.value.toString();
+    } else {
+	description = '';
+    }
+
+    var keywords = document.querySelector('meta[name=keywords]');
+    if (keywords) {
+	keywords.attributes.content.value.toString();
+    } else {
+	keywords = '';
+    }
+
+    var body = JSON.stringify({
+	'selection': selection,
+	'description': description,
+	'keywords': keywords
+    });
+
+    var uri = 'http://localhost:9998/?' +
+	'&l=' + fixEncoding(location) +
+	'&t=' + fixEncoding(title) +
+	'&b=' + fixEncoding(body);
+
+    window.location = uri;
+    return uri;
+})();

data/lib/emacs_org_protocol_server.rb

@@ -1,9 +1,11 @@
 require "emacs_org_protocol_server/version"
 require 'emacs_org_protocol_server/uglify'
+require 'emacs_org_protocol_server/emacs_client_runner'
 require 'sinatra/base'
 require 'uri'
 require 'yaml'
 require 'erb'
+require 'logger'
 
 module EmacsOrgProtocolServer
 
@@ -27,10 +29,11 @@ module EmacsOrgProtocolServer
     end
   end
 
-
-
   class OPServ < Sinatra::Application
 
+    set :logger , Logger.new(STDOUT)
+    logger.level = Logger::DEBUG
+
     settings = Settings.new
     set :server , settings.server
     set :port   , settings.port
@@ -43,24 +46,15 @@ module EmacsOrgProtocolServer
     end
 
     get '/' do
-      if params.empty?
-        return [422, 'no params passed']
+      begin
+        if EmacsOrgProtocolServer::EmacsClientRunner.new(params, settings.emacsclient, logger).run!
+          redirect params['l']
+        else
+          [400, 'bad request']
+        end
+      rescue EmacsOrgProtocolServer::EmacsClientRunner::NoParameters => e
+        return [400, 'bad request']
       end
-
-      p=params['p'].to_s.downcase
-      if p.match(%r{capture})
-        template='//w'
-      else
-        template=''
-      end
-      l=params['l'].to_s
-      t=params['t'].to_s
-      s=params['s'].to_s
-
-      emacsclient_target = "org-protocol://#{p}:#{template}//#{esc(l)}/#{esc(t)}/#{esc(s)}"
-      cmd = "#{settings.emacsclient} -n '#{emacsclient_target}'"
-      system(cmd)
-      redirect to(params['l'])
     end
 
     get '/bookmarklet' do

data/lib/emacs_org_protocol_server/emacs_client_runner.rb

@@ -0,0 +1,39 @@
+require "logger"
+require "uri"
+
+module EmacsOrgProtocolServer
+
+  class EmacsClientRunner
+
+    class NoParameters < RuntimeError; end
+
+    attr_accessor :client, :logger, :location, :title, :body
+
+    def initialize(params={}, client=nil, logger=Logger.new(STDERR))
+      raise NoParameters if params.empty?
+      self.logger      = logger
+      self.client      = client
+      self.location    = params['l'].to_s
+      self.title       = params['t'].to_s
+      self.body        = params['b'].to_s
+    end
+
+    def run!
+      emacs_target = URI('org-protocol://capture')
+      query_data = {
+        template: 'w',
+        url: location,
+        title: title,
+        body: body
+      }
+      query_string = URI.encode_www_form(query_data).gsub('+','%20')
+      emacs_target.query = query_string
+
+      cmd = "#{client} -n '#{emacs_target}'"
+      logger.info "emacsclient command: #{cmd}"
+      system(cmd)
+      return ($? == 0)
+    end
+  end
+
+end

data/lib/emacs_org_protocol_server/version.rb

@@ -1,3 +1,3 @@
 module EmacsOrgProtocolServer
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emacs_org_protocol_server
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tamara Temple
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ files:
 - javascripts/bookmarklet.js
 - javascripts/shortkey.js
 - lib/emacs_org_protocol_server.rb
+- lib/emacs_org_protocol_server/emacs_client_runner.rb
 - lib/emacs_org_protocol_server/uglify.rb
 - lib/emacs_org_protocol_server/version.rb
 homepage: https://github.com/tamouse/emacs_org_protocol_server
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple Sinatra server to call org-protocol with emacsclient