solr_like_rack_server 0.0.3-java → 0.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e538604d81eea31363c960b969f0020973ac85a9
-  data.tar.gz: 2f3080eb6e35b434ee622b9b327a26ce9403f25c
+  metadata.gz: 484ac9e8567a2496df63d728ea217396db87b18a
+  data.tar.gz: 235c9517f537e2203252bc4e140654a11b447469
 SHA512:
-  metadata.gz: f224920cb51cda1c1f53967e5b95408bfa2dd0c9a0ab20026d37bedb540d2db5ae8e6827c4533e2021df4f897bbcb586919da38fbacef42da55ad206a704c8e3
-  data.tar.gz: cbb3dd72cc658875443d31a05a6c0239d84792ecd9a3a33b4214edf441a76d74effe514056b1cf4555979a59dae161d6b2ace9cc9ddcea34e3ef487f2e56b2dd
+  metadata.gz: 8bbd405a488a358587c59d7e98998122614672970510b77978bcb826ad8edd20ee5d51851be6e3b32f9d248bb1036b9263e0dfa653c035ad348281ac5686d922
+  data.tar.gz: a2b4d309ddb526e78e1d399efe7290c22bef41d682e788c3c64d2dc0d333ff8552cddb24f4d5b76b438ea7531e79b4a6f21371be4be2de38dee95a53d3078dd5

data/lib/solr_like_rack_server.rb

@@ -6,15 +6,20 @@ require "solr_like_rack_server/version"
 require "solr_like_rack_server/response_writer_wrapper"
 
 module SolrLikeRackServer
+  PORT = ENV["SOLR_LIKE_RACK_SERVER_PORT"] || 12345
+
   class << self
-    def start mount_procs
-      wakeupProc = nil
+    def server
+      @server ||= create_server
+    end
+
+    def create_server
       opt = {
-        Port: 12345,
+        Port: SolrLikeRackServer::PORT,
         Logger: WEBrick::Log.new('/dev/null'),
         AccessLog: [],
         StartCallback: Proc.new {
-          wakeupProc.call unless wakeupProc.nil?
+          Thread.main.wakeup
         }
       }
       unless ENV["SOLR_LIKE_RACK_SERVER_VERBOSE"].nil?
@@ -22,8 +27,20 @@ module SolrLikeRackServer
         opt.delete :AccessLog
       end
       server = WEBrick::HTTPServer.new opt
-      mount_procs.each {|path, proc|
-        server.mount_proc(path) {|req, res|
+      Thread.new do
+        server.start
+      end
+      Thread.stop
+      at_exit {
+        server.shutdown
+      }
+      server
+    end
+
+    def start mount_procs
+      mounted = []
+      mount_procs.each {|dir, proc|
+        server.mount_proc(dir) {|req, res|
           res["Content-Type"] = "application/octet-stream"
           data = if Proc === proc
             if proc.arity == 0
@@ -43,24 +60,13 @@ module SolrLikeRackServer
           end
           res.body = SolrLikeRackServer::ResponseWriterWrapper.new.write data
         }
+        mounted << dir
       }
-      if block_given?
-        wakeupProc = Proc.new { Thread.main.wakeup }
-        server_thread = Thread.new do
-          Thread.current[:server] = server
-          server.start
-        end
-        Thread.stop
-        begin
-          yield
-        ensure
-          server_thread[:server].shutdown
-        end
-      else
-        server
+      begin
+        yield
+      ensure
+        mounted.each {|dir| server.unmount dir }
       end
     end
-
-    alias_method :server, :start
   end
 end

data/lib/solr_like_rack_server/version.rb

@@ -1,3 +1,3 @@
 module SolrLikeRackServer
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/test/run.rb

@@ -33,7 +33,7 @@ reco_city = YAML.load <<EOM
   poi_num: 100
 EOM
 
-SolrLikeRackServer.server(
+SolrLikeRackServer.start(
   "/search/map_mini/select"=>map_mini,
   "/search/reco_city/select"=>reco_city,
 ) {
@@ -51,3 +51,12 @@ SolrLikeRackServer.server(
   puts client.getBeans(Java::jp.co.mapion.solr.client.beans.Recommendation.java_class).get(0).pref_code
   puts client.getNumFound
 }
+
+SolrLikeRackServer.start(
+  "/search/map_mini2/select"=>map_mini,
+) {
+  client = LocalSearchClient.new "map_mini2"
+  client.executeQuery
+  puts client.getBeans(Java::jp.co.mapion.solr.client.beans.Phone.java_class).get(0).poi_code
+  puts client.getNumFound
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_like_rack_server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: java
 authors:
 - Koji NAKAMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler