vvlad-rack_ext_direct 0.0.3 → 0.0.4

data/example/config.ru

@@ -0,0 +1,12 @@
+$:<<File.expand_path(File.dirname( __FILE__) + "/../lib/")
+require 'rack'
+require 'rack/ext/direct'
+
+# use Rack::Ext::Direct::Remoting,
+#   :service_root => "app/services",
+#   :remoting_path => /^\/services$/,
+#   :report_errors => true
+
+use Rack::Ext::Direct::Dispatching ,"app/services", :report_errors => true  
+  
+run Rack::File.new "public"

data/lib/rack/ext/direct/client.rb

@@ -1,4 +1,4 @@
-require 'activesupport'
+require 'active_support'
 require 'open-uri'
 require 'net/http'
 require 'json'
@@ -8,9 +8,12 @@ module Rack
     module Direct
       class Client
         class_inheritable_accessor :service_url
+        class_inheritable_accessor :service_options
         class <<self
-          def end_point_url(url)
+          def end_point_url(url,options={})
+            options.assert_valid_keys :service_name
             self.service_url= url
+            self.service_options = options.to_options
           end
 
           def next_tid
@@ -20,7 +23,7 @@ module Rack
 
           def perform_request(id,*params,&block)
             request = {
-              :action => self.name.demodulize,
+              :action => service_options[:service_name]||name,
               :method => id,
               :data => [*params],
               :type => "rpc",
@@ -28,7 +31,7 @@ module Rack
             }
 
             
-            url = URI.parse(self.service_url)
+            url = URI.parse(service_url)
             req = Net::HTTP::Post.new(url.path.empty? ? "/" : url.path)
             req.body = request.to_json
             req.content_type= "application/json"

data/lib/rack/ext/direct/remoting.rb

@@ -1,16 +1,22 @@
 require 'json'
-require 'activesupport'
+require 'active_support'
+
 module Rack
   module Ext
     module Direct
-      class Remoting
-
+      class Remoting      
+        
+        include ActiveSupport::Dependencies
+        
         def initialize(app,options={})          
           @app = app
           @services_root = ::File.expand_path(options[:service_root])
           @services = {}
           @report_errors = options[:report_errors] || false
           @remoting_path = options[:remoting_path]
+          @reloading = ENV["RACK_ENV"] == "development"
+          load_paths << @services_root
+
           raise "Services Directory `#{@services_root}' missing." unless ::File.directory? @services_root
         end
 
@@ -29,11 +35,16 @@ module Rack
           return @app.call(env) if service_class.nil?
           
           response = begin
-            Response.new request,service_class.new.send(request.method.to_sym,request.data)
+            instance = service_class.new
+            response = Response.new request,instance.send(request.method.to_sym,request.data)
+            instance = nil
+            response
           rescue => e
             ResponseException.new request,e
           end
 
+          remove_unloadable_constants!
+          
           [ 200 , {"Content-Type" => "application/json"}, [response.to_json]]
 
         end
@@ -56,18 +67,27 @@ module Rack
         end
         
         def service_by_name(service_name)
-          @services[service_name] ||= try_load_service(service_name)
+          try_load_service(service_name)
         end
 
         def try_load_service(service_name)
-          service_name = service_name.underscore
-          service_file = "#{@services_root}/#{service_name}_service.rb"
-          return nil unless ::File.exists? service_file
-          require service_file
-          class_object = "#{service_name}_service".classify.constantize
+          begin
+            if @reloading
+              puts "Reloading #{service_name}"
+              ActiveSupport::Dependencies.load_file("#{@services_root}/#{service_name.underscore}.rb")
+            else
+              require "#{@services_root}/#{service_name.underscore}.rb"
+            end
+            return service_name.constantize
+          rescue => e
+            puts e
+            puts e.backtrace
+          end
+          nil
         end
         
       end
     end
   end
-end
+end
+

data/lib/rack/ext/direct/request.rb

@@ -14,6 +14,7 @@ module Rack::Ext::Direct
           instance_variable_set("@#{k}",v)
         end
       end
+      @action.gsub! /\./,'::'
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vvlad-rack_ext_direct
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Verestiuc Vlad Ovidiu
@@ -53,6 +53,7 @@ extra_rdoc_files:
 files: 
 - example/app/services/test_service.rb
 - example/client.rb
+- example/config.ru
 - lib/rack/ext/direct/client.rb
 - lib/rack/ext/direct/dispatching.rb
 - lib/rack/ext/direct/remote_error.rb