cramp 0.15.2 → 0.15.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU3MzczMjYwZmVjOWNlODI4MDViMDkzODFkYmRlNTI2ZGFmY2E3Yw==
+    ZTExZGJiNmFkNjk5NmM0NDgwMzUwYTJkMjdlZDEwMGEzYjc3ODFiMg==
   data.tar.gz: !binary |-
-    ZmExZWQwMTJiMGRkMTNjZWVlNmJlY2FhZmNmNjNjYTMzMWFhZWI0ZA==
+    N2I5NDY5OTJiZjE1ZTkwZmUwZDU5YmY4MjU1Yzg3ZGYwMDdhNzExYQ==
 SHA512:
   metadata.gz: !binary |-
-    YjM0NjdiMDZjOWI0ZWZiMjBkMzg5ZDgwYWRhZWRiMjBjYjlhNTQwNGM2ODk3
-    ZmI4NzNhM2IyNmZjODBhMDIwNmZkODFjMTdhZmI0YWJjNTBmMzMyNzAwNzc2
-    NzJmOTMyMWEzZmI4OGNhOTEzZmM0MWQxODYyZWNmMjM1NmE4MjU=
+    YjQ1YjE4YzQ1MDkzM2Y1MmYyZmJmY2JmYjE3NTdhMTJhMDE3YmZjNDFiMzQw
+    NWRhYjI3MmYyZDdlYTc2N2RiY2Y2MzZmZDIzMGJjYWFkMTJlN2JiODc2ZDkz
+    MmYwN2ViNjQzNTVhNTE5YjU2YmZiZDE2NjQxMTIzNzRiZDg0NzA=
   data.tar.gz: !binary |-
-    MjA5NjZmN2I5NDAyNTNkYWM1YWU1NDliZTkwYzJlY2NlZTI5MzBhYmMzYzgz
-    ZmE4MzRlYTk0N2U5MThhNmFkZmY4YTlkYzlhMmUwZmE4YjVlOWQ1YmIyZGY0
-    MDM1ZDFjZTIyOTRmZGU1MmE5NzcwNDQwODQyYmFhZjQ2YTE5NTk=
+    OTgyYTE3OTgwZDc3MmYzZTY2NjI2NTY4M2RlZDg4ZDBmMzA5MDY2ODE0ZTk5
+    ZmM2MWM1OTllM2VhNGY0MTk4MjcyMDdiMzFlNTBhMTFhYmQwNzQ0YmI0NzYx
+    NzkzNWUzNTU1MmYyMDgxMjM4YjAyN2FjMDIwM2VjNjRjZjAzMTk=

data/lib/cramp/abstract.rb

@@ -26,7 +26,7 @@ module Cramp
       throw :async
     end
 
-    protected
+    private
 
     def continue
       init_async_body
@@ -75,7 +75,7 @@ module Cramp
     end
 
     def halt(status, headers = {}, halt_body = '')
-      send_response(status, headers, halt_body)
+      send_response(status, headers, [halt_body])
     end
 
     def send_response(response_status, response_headers, response_body)
@@ -94,8 +94,6 @@ module Cramp
       @env['router.params'] || {}
     end
 
-    private
-
     def is_finishable?
       !finished? && @body && !@body.closed?
     end

data/lib/cramp/action.rb

@@ -5,7 +5,7 @@ module Cramp
 
     def initialize(env)
       super
-      
+
       case
       when Faye::EventSource.eventsource?(env)
         # request has Accept: text/event-stream
@@ -24,7 +24,7 @@ module Cramp
       end
     end
 
-    protected
+    private
 
     def render(body, *args)
       send(:"render_#{transport}", body, *args)
@@ -119,8 +119,6 @@ module Cramp
       string.respond_to?(:force_encoding) ? string.force_encoding(encoding) : string
     end
 
-    protected
-
     def finish
       case transport
       when :chunked

data/lib/cramp/callbacks.rb

@@ -62,7 +62,21 @@ module Cramp
       end
     end
 
-    protected
+    private
+
+    def _receive_protocol10_data(data)
+      protocol10_parser.data << data
+
+      messages = @protocol10_parser.process_data
+      messages.each do |type, content|
+        _invoke_data_callbacks(content) if type == :text
+      end
+    end
+
+    def _receive_protocol76_data(data)
+      data = data.split(Regexp.new('\000([^\377]*)\377')).select{|d| !d.empty? }.collect{|d| d.gsub(Regexp.new('^\x00|\xff$'), '') }
+      data.each {|message| _invoke_data_callbacks(message) }
+    end
 
     def _invoke_data_callbacks(message)
       self.class.on_data_callbacks.each do |callback|
@@ -74,10 +88,8 @@ module Cramp
       handler = ExceptionHandler.new(@env, exception)
 
       # Log the exception
-      unless ENV['RACK_ENV'] == 'test'
-        exception_body = handler.dump_exception
-        Cramp.logger ? Cramp.logger.error(exception_body) : $stderr.puts(exception_body)
-      end
+      exception_body = handler.dump_exception
+      Cramp.logger ? Cramp.logger.error(exception_body) : $stderr.puts(exception_body)
 
       case @_state
       when :init

data/lib/cramp/generators/application.rb

@@ -66,7 +66,7 @@ module Cramp
         end
       end
 
-      protected
+      private
 
       def active_record?
         options[:with_active_record]
@@ -94,4 +94,4 @@ module Cramp
     end
 
   end
-end
+end

data/lib/cramp/generators/templates/application/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'cramp'
 

data/lib/cramp/generators/templates/application/application.rb

@@ -14,11 +14,11 @@ module <%= app_const_base %>
     end
 
     def self.routes
-      @_routes ||= eval(File.read('./config/routes.rb'))
+      @_routes ||= eval(File.read(File.expand_path('../config/routes.rb', __FILE__)))
     end
 
     <% if active_record? %>def self.database_config
-      @_database_config ||= YAML.load(File.read('./config/database.yml')).with_indifferent_access
+      @_database_config ||= YAML.load_file(File.expand_path('../config/database.yml', __FILE__)).with_indifferent_access
     end
 
     <% end %># Initialize the application
@@ -33,4 +33,4 @@ end
 Bundler.require(:default, <%= app_const %>.env)
 
 # Preload application classes
-Dir['./app/**/*.rb'].each {|f| require f}
+Dir[File.join(File.dirname(__FILE__), 'app/**/*.rb')].each {| f| require f }

data/lib/cramp/generators/templates/application/config.ru

@@ -1,4 +1,4 @@
-require './application'
+require File.expand_path('../application',  __FILE__)
 <%= app_const %>.initialize!
 
 # Development middlewares

data/lib/cramp/periodic_timer.rb

@@ -19,7 +19,7 @@ module Cramp
       @timers = []
     end
 
-    protected
+    private
 
     def continue
       super

data/lib/cramp/test_case.rb

@@ -10,33 +10,59 @@ module Cramp
       @request = Rack::MockRequest.new(app)
     end
 
-    def get(path, options = {}, headers = {}, &block)
+    def get(path, opts={}, headers={}, &block)     request(:get, path, opts, headers, &block)     end
+    def post(path, opts={}, headers={}, &block)    request(:post, path, opts, headers, &block)    end
+    def put(path, opts={}, headers={}, &block)     request(:put, path, opts, headers, &block)     end
+    def delete(path, opts={}, headers={}, &block)  request(:delete, path, opts, headers, &block)  end
+    def options(path, opts={}, headers={}, &block) request(:options, path, opts, headers, &block) end
+
+    def request(method, path, options = {}, headers = {}, &block)
       callback = options.delete(:callback) || block
       headers = headers.merge('async.callback' => callback)
 
       EM.run do
-        catch(:async) { @request.get(path, headers) }
+        catch(:async) { @request.request(method, path, headers) }
       end
     end
 
-    def get_body(path, options = {}, headers = {}, &block)
+    def get_body(path, opts={}, headers={}, &block)     request_body(:get, path, opts, headers, &block)     end
+    def post_body(path, opts={}, headers={}, &block)    request_body(:post, path, opts, headers, &block)    end
+    def put_body(path, opts={}, headers={}, &block)     request_body(:put, path, opts, headers, &block)     end
+    def delete_body(path, opts={}, headers={}, &block)  request_body(:delete, path, opts, headers, &block)  end
+    def options_body(path, opts={}, headers={}, &block) request_body(:options, path, opts, headers, &block) end
+
+    def request_body(method, path, options = {}, headers = {}, &block)
       callback = options.delete(:callback) || block
-      response_callback = proc {|response| response[-1].each {|chunk| callback.call(chunk) } }
+      response_callback = proc do |response|
+        # 'halt' returns a String, not an async Body object
+        if response.last.is_a? String
+          callback.call(response.last)
+        else
+          response.last.each {|chunk| callback.call(chunk) }
+        end
+      end
       headers = headers.merge('async.callback' => response_callback)
 
       EM.run do
-        catch(:async) { @request.get(path, headers) }
+        catch(:async) { @request.request(method, path, headers) }
       end
     end
 
-    def get_body_chunks(path, options = {}, headers = {}, &block)
+
+    def get_body_chunks(path, opts={}, headers={}, &block)     request_body_chunks(:get, path, opts, headers, &block)     end
+    def post_body_chunks(path, opts={}, headers={}, &block)    request_body_chunks(:post, path, opts, headers, &block)    end
+    def put_body_chunks(path, opts={}, headers={}, &block)     request_body_chunks(:put, path, opts, headers, &block)     end
+    def delete_body_chunks(path, opts={}, headers={}, &block)  request_body_chunks(:delete, path, opts, headers, &block)  end
+    def options_body_chunks(path, opts={}, headers={}, &block) request_body_chunks(:options, path, opts, headers, &block) end
+
+    def request_body_chunks(method, path, options = {}, headers = {}, &block)
       callback = options.delete(:callback) || block
       count = options.delete(:count) || 1
 
       stopping = false
       chunks = []
 
-      get_body(path, options, headers) do |body_chunk|
+      request_body(method, path, options, headers) do |body_chunk|
         chunks << body_chunk unless stopping
 
         if chunks.count >= count
@@ -55,4 +81,5 @@ module Cramp
       EM.stop
     end
   end
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cramp
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -115,7 +115,8 @@ files:
 - lib/vendor/fiber_pool.rb
 - bin/cramp
 homepage: http://cramp.in
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -133,8 +134,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Asynchronous web framework.
 test_files: []
+has_rdoc: false