RubyGems - angelo - Versions diffs - 0.3.3 → 0.4.0 - Mend

angelo 0.3.3 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/.travis.yml +1 -4
data/CHANGELOG.md +22 -0
data/Gemfile +5 -4
data/README.md +101 -57
data/angelo.gemspec +13 -10
data/lib/angelo.rb +5 -2
data/lib/angelo/base.rb +136 -54
data/lib/angelo/main.rb +47 -0
data/lib/angelo/minitest/helpers.rb +51 -23
data/lib/angelo/params_parser.rb +33 -17
data/lib/angelo/responder.rb +10 -9
data/lib/angelo/responder/eventsource.rb +21 -20
data/lib/angelo/responder/websocket.rb +1 -2
data/lib/angelo/stash.rb +5 -3
data/lib/angelo/tilt/erb.rb +38 -11
data/lib/angelo/version.rb +1 -1
data/test/angelo/erb_spec.rb +65 -3
data/test/angelo/mustermann_spec.rb +1 -8
data/test/angelo/options_spec.rb +19 -0
data/test/angelo/params_spec.rb +27 -2
data/test/angelo_spec.rb +18 -0
data/test/main/app.rb +38 -0
data/test/main/main_spec.rb +101 -0
data/test/spec_helper.rb +7 -39
metadata +37 -6
data/lib/angelo/mustermann.rb +0 -98

data/test/angelo/erb_spec.rb CHANGED

@@ -1,5 +1,4 @@
 require_relative '../spec_helper'
-require 'angelo/tilt/erb'
 describe Angelo::Base do
   describe Angelo::Tilt::ERB do
@@ -54,8 +53,6 @@ JS
     define_app do
-      include Angelo::Tilt::ERB
       @root = TEST_APP_ROOT
       def set_vars
@@ -218,6 +215,71 @@ HTML
       last_response.body.must_equal expected_json
       last_response.headers['Content-Type'].must_equal 'application/json'
     end
+  end
+  describe 'reload_templates!' do
+    expected_html = <<HTML
+<!doctype html>
+<html>
+  <head>
+    <title>test</title>
+  </head>
+  <body>
+    foo - asdf
+locals :bar - bat
+  </body>
+</html>
+HTML
+    reloaded_expected_html = <<HTML
+<!doctype html>
+<html>
+  <head>
+    <title>test</title>
+  </head>
+  <body>
+    foo - asdf
+locals :bar - bat
+hi
+  </body>
+</html>
+HTML
+    define_app do
+      @root = TEST_APP_ROOT
+      def set_vars
+        @title = 'test'
+        @foo = params[:foo]
+      end
+      reload_templates!
+      get '/' do
+        set_vars
+        erb :index, locals: {bar: 'bat'}
+      end
+    end
+    it 'reloads templates' do
+      original_index = File.read TEST_APP_ROOT + '/views/index.html.erb'
+      begin
+        get '/', foo: 'asdf'
+        last_response_must_be_html expected_html
+        File.open TEST_APP_ROOT + '/views/index.html.erb', 'a' do |f|
+          f.puts 'hi'
+        end
+        get '/', foo: 'asdf'
+        last_response_must_be_html reloaded_expected_html
+      ensure
+        File.open TEST_APP_ROOT + '/views/index.html.erb', 'w' do |f|
+          f.write original_index
+        end
+      end
+    end
   end
 end

data/test/angelo/mustermann_spec.rb CHANGED

@@ -1,10 +1,8 @@
 if RUBY_VERSION =~ /^2\.(\d)/ and $1.to_i > 0 and RUBY_PLATFORM != 'java'
   require_relative '../spec_helper'
-  require 'angelo/mustermann'
-  require 'angelo/tilt/erb'
-  describe Angelo::Mustermann do
+  describe 'mustermann integration' do
     describe 'pattern matching' do
@@ -12,7 +10,6 @@ if RUBY_VERSION =~ /^2\.(\d)/ and $1.to_i > 0 and RUBY_PLATFORM != 'java'
       let(:mm_pattern){ ::Mustermann.new(pattern) }
       define_app do
-        include Angelo::Mustermann
         content_type :json
         get pattern do
@@ -59,8 +56,6 @@ if RUBY_VERSION =~ /^2\.(\d)/ and $1.to_i > 0 and RUBY_PLATFORM != 'java'
     describe 'tilt/erb integration' do
       define_app do
-        include Angelo::Tilt::ERB
-        include Angelo::Mustermann
         @root = TEST_APP_ROOT
@@ -99,7 +94,6 @@ HTML
     describe 'params in route blocks' do
       define_app do
-        include Angelo::Mustermann
         before '/before/:foo' do
           @foo = params[:foo]
@@ -127,7 +121,6 @@ HTML
     describe 'wildcard' do
       define_app do
-        include Angelo::Mustermann
         before do
           @foo = params[:foo]

data/test/angelo/options_spec.rb ADDED

@@ -0,0 +1,19 @@
+require_relative '../spec_helper'
+describe "parse_options" do
+  describe "parses" do
+    it "-p port" do
+      Class.new(Angelo::Base) do
+        parse_options("-p 12345".split)
+        port.must_equal 12345
+      end
+    end
+    it "-o addr" do
+      Class.new(Angelo::Base) do
+        parse_options("-o 3.2.1.0".split)
+        addr.must_equal "3.2.1.0"
+      end
+    end
+  end
+end

data/test/angelo/params_spec.rb CHANGED

@@ -60,6 +60,13 @@ describe Angelo::ParamsParser do
     parser.parse_post_body.must_equal post_params
   end
+  it "doesn't choke on empty JSON POST bodies" do
+    parser.form_encoded = false
+    parser.json = true
+    parser.body = ""
+    parser.parse_post_body.must_equal({})
+  end
   it 'recursively symhashes JSON POST bodies params' do
     nested = {
       foo: {
@@ -84,7 +91,7 @@ describe Angelo::ParamsParser do
     parser.json = true
     parser.query_string = get_params
     parser.body = json_params
-    parser.parse_post_body.must_equal post_params
+    parser.parse_query_string_and_post_body.must_equal post_params
   end
   it 'does not parse POST bodies if no Content-Type' do
@@ -92,8 +99,26 @@ describe Angelo::ParamsParser do
     parser.json = false
     parser.query_string = get_params
     parser.body = nil
-    parser.parse_post_body.must_equal params_s
     parser.parse_query_string.must_equal params_s
+    parser.parse_post_body.must_equal({})
+    parser.parse_query_string_and_post_body.must_equal params_s
+  end
+end
+describe Angelo::SymHash do
+  describe ".new" do
+    it "returns a Hash" do
+      Angelo::SymHash.new.must_be_kind_of Hash
+    end
+  end
+  it "fetches values for Symbols that were inserted with Strings" do
+    symhash = Angelo::SymHash.new
+    symhash["x"] = "y"
+    symhash["x"].must_equal "y"
+    symhash[:x].must_equal "y"
   end
 end

data/test/angelo_spec.rb CHANGED

@@ -442,6 +442,24 @@ describe Angelo::Base do
   end
+  describe 'test Angelo::Base subclasses' do
+    class MyWebApp < Angelo::Base
+      get '/up_and_running' do
+        content_type :html
+        'ok'
+      end
+    end
+    define_app MyWebApp
+    it 'answers to up_and_running' do
+      get '/up_and_running'
+      assert_equal(last_response.body, 'ok')
+    end
+  end
   describe 'dsl configs' do
     describe 'addr' do

data/test/main/app.rb ADDED

@@ -0,0 +1,38 @@
+# This file is run by main_test.rb.  It starts a separate server
+# process that main_spec.rb queries to make sure things get set up and
+# work correctly with require "angelo/main" which we don't want to
+# require in the test process because it wants to take over: parse
+# args, add methods to main, and run a server.  So we isolate it in
+# its own process here.
+require "rubygems"
+require "bundler/setup"
+$:.unshift File.expand_path "../../../lib", __FILE__
+require "angelo/main"
+# Use top-level DSL to make sure it works.  And the server should
+# auto-run at exit.
+helpers do
+  def help_me
+    "help me!"
+  end
+end
+get "/app_file" do
+  self.class.app_file
+end
+get "/mainonly" do
+  begin
+    Object.new.send(:get, "/spud") {}
+    "false"
+  rescue NameError
+    "true"
+  end
+end
+get "/help" do
+  help_me
+end

data/test/main/main_spec.rb ADDED

@@ -0,0 +1,101 @@
+# These tests start a real server and talk to it over TCP so we can
+# isolate the effects of require "angelo/main" in a separate process
+# but still test them.
+#
+# See test/main/app.rb for the code of the app we test against.
+require_relative '../spec_helper'
+class MainSpec < Minitest::Spec
+  # Info for starting the server.
+  app_file = File.expand_path("../app.rb", __FILE__)
+  address = "127.0.0.1"
+  port = 14410
+  server_command = "#{RbConfig.ruby} #{app_file} -o #{address} -p #{port}"
+  # Start the server.
+  pid = spawn server_command, out: "/dev/null", err: "/dev/null"
+  # Prepare to shut it down.
+  MiniTest.after_run do
+    begin
+      Process.kill("KILL", pid)
+    rescue Errno::ESRCH
+    end
+  end
+  # Client for talking to the server.
+  client = HTTPClient.new
+  client.connect_timeout = 1
+  client.send_timeout = 1
+  client.receive_timeout = 1
+  # Use define method so client_get's body is a closure that captures
+  # the lovely variables we just set up.  Nevermind all the hoops we
+  # have to jump through to do that.  Define this on the class because
+  # we're going to need it in a bit to check that the server is alive.
+  self.singleton_class.class_eval do
+    define_method :client_get do |url|
+      client.get("http://#{address}:#{port}#{url}").body
+    end
+  end
+  def client_get(url)
+    self.class.client_get(url)
+  end
+  # Wait for the server to start up.  If it doesn't start, the
+  # cleanest thing to do seems ot be to let the tests run anyway and
+  # fail to connect.
+  def self.wait_for_server(timeout)
+    started = Time.now
+    while !(alive = alive?) && Time.now - started < timeout
+      sleep 0.1
+    end
+    alive
+  end
+  def self.alive?
+    # This will 404 but that's good enough.
+    3.times { client_get("/ping") }
+    true
+  rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, SystemCallError
+    # No doubt that's not an exhaustive list of exceptions we should
+    # rescue.
+    false
+  end
+  if !self.wait_for_server(2)
+    # Write this out after the tests finish, where it's likely to be seen.
+    MiniTest.after_run do
+      STDERR.puts
+      STDERR.puts "The server for main_spec.rb failed to start."
+      STDERR.puts "Try running it manually for debugging like this:"
+      STDERR.puts "  #{server_command}"
+      STDERR.puts
+    end
+  end
+  describe 'require "angelo/main"' do
+    it "sets app_file to the file being run" do
+      client_get("/app_file").must_equal app_file
+    end
+    it "only extends main" do
+      client_get("/mainonly").must_equal "true"
+    end
+    it "makes helpers accessible" do
+      client_get("/help").must_equal "help me!"
+    end
+  end
+end

data/test/spec_helper.rb CHANGED

@@ -1,5 +1,12 @@
 $:.unshift File.expand_path '../../lib', __FILE__
+if RUBY_ENGINE == "ruby" && ENV['TRAVIS'] != 'true'
+  require 'simplecov'
+  SimpleCov.coverage_dir File.join('test', 'coverage')
+  SimpleCov.start
+  SimpleCov.command_name 'minitest'
+end
 require 'bundler'
 Bundler.require :default, :development, :test
 require 'minitest/pride'
@@ -42,47 +49,8 @@ class CountDownLatch
 end
-module Cellper
-  @@stop = false
-  @@testers = {}
-  def define_action sym, &block
-    define_method sym, &block
-  end
-  def remove_action sym
-    remove_method sym
-  end
-  def unstop!
-    @@stop = false
-  end
-  def stop!
-    @@stop = true
-  end
-  def stop?
-    @@stop
-  end
-  def testers; @@testers; end
-end
-class Reactor
-  include Celluloid::IO
-  extend Cellper
-end
 $reactor = Reactor.new
-class ActorPool
-  include Celluloid
-  extend Cellper
-end
 $pool = ActorPool.pool size: CONCURRENCY
 def obj

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: mustermann
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-description: A Sinatra-esque DSL for Reel
+description: A Sinatra-like DSL for Reel
 email:
 - kenichi.nakamura@gmail.com
 executables: []
@@ -55,8 +83,8 @@ files:
 - angelo.gemspec
 - lib/angelo.rb
 - lib/angelo/base.rb
+- lib/angelo/main.rb
 - lib/angelo/minitest/helpers.rb
-- lib/angelo/mustermann.rb
 - lib/angelo/params_parser.rb
 - lib/angelo/responder.rb
 - lib/angelo/responder/eventsource.rb
@@ -70,11 +98,14 @@ files:
 - test/angelo/eventsource_spec.rb
 - test/angelo/filter_spec.rb
 - test/angelo/mustermann_spec.rb
+- test/angelo/options_spec.rb
 - test/angelo/params_spec.rb
 - test/angelo/stash_spec.rb
 - test/angelo/static_spec.rb
 - test/angelo/websocket_spec.rb
 - test/angelo_spec.rb
+- test/main/app.rb
+- test/main/main_spec.rb
 - test/spec_helper.rb
 - test/test_app_root/public/jquery-1.7.1.min.js
 - test/test_app_root/public/test.css
@@ -99,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -110,5 +141,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
-summary: A Sinatra-esque DSL for Reel
+summary: A Sinatra-like DSL for Reel
 test_files: []