rory 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c207c6ca9b666cfe7491b6e74a8031286dff0f9f
-  data.tar.gz: 89c7cfd6f0c04dc0a813911d0e31935aeee12aee
+  metadata.gz: 3c2614566864c6eb2c8647067a7565c2afdcfa0e
+  data.tar.gz: af297aa8a0b21ea82ce229fe8d1128576d932038
 SHA512:
-  metadata.gz: 1a1a283981ba88f3495d08b90070a84dd8c91bc3c52bcdd7830738eddc7819efda4e3f68e6ac4a049510434c92f6f17c41cd7b0379dcdec3d01788f38c36f281
-  data.tar.gz: 0807c432dbfc12a8436602309ed7b249d28b467e37a6f30a27e353d75fcc59c284667a9f97955fd5be8242581e1d8e0c7415cb792d4a75cb0787066dda40fe9f
+  metadata.gz: 8d78888aaa95dea67ceed90adbeee129fc72dc81cf75b444b3cd4e0badc102c73e8b804ba5c2b544ec578b3aabdf67041024aee3834211081b42e92acea61c0c
+  data.tar.gz: a1c9f7af6cc2cde9b8a940ffd9086479df1d59dc49d88d26e309bfc54701e2efec766d74b3aa92a89b1e678c0cc1513ccf4770075cfdb27c4f3a77d8adc597b4

data/lib/rory/cli/generators/templates/app/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/rory.gemspec

@@ -23,7 +23,7 @@ EOF
   s.required_rubygems_version = ">= 1.3.6"
 
   s.extra_rdoc_files = ["LICENSE.txt", "README.md"]
-  s.files = Dir['{lib/**/*,spec/**/*}'] +
+  s.files = Dir["lib/**/{*,.[a-z]*}"] +
                   %w(LICENSE.txt Rakefile README.md rory.gemspec)
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ravi Gadad
@@ -247,12 +247,15 @@ files:
 - lib/rory/cli.rb
 - lib/rory/cli/generate.rb
 - lib/rory/cli/generators/application.rb
+- lib/rory/cli/generators/templates/app/.rspec
 - lib/rory/cli/generators/templates/app/Gemfile.tt
 - lib/rory/cli/generators/templates/app/Rakefile.tt
 - lib/rory/cli/generators/templates/app/config.ru.tt
 - lib/rory/cli/generators/templates/app/config/application.rb.tt
+- lib/rory/cli/generators/templates/app/config/initializers/.empty_directory
 - lib/rory/cli/generators/templates/app/config/routes.rb.tt
 - lib/rory/cli/generators/templates/app/controllers/application_controller.rb
+- lib/rory/cli/generators/templates/app/models/.empty_directory
 - lib/rory/cli/generators/templates/app/spec/spec_helper.rb
 - lib/rory/cli/root.rb
 - lib/rory/controller.rb
@@ -275,49 +278,6 @@ files:
 - lib/tasks/db.rake
 - lib/tasks/rory.rake
 - rory.gemspec
-- spec/fixture_app/config/application.rb
-- spec/fixture_app/config/routes.rb
-- spec/fixture_app/controllers/base_filtered_controller.rb
-- spec/fixture_app/controllers/filtered_controller.rb
-- spec/fixture_app/controllers/for_reals_controller.rb
-- spec/fixture_app/controllers/goose/lumpies_controller.rb
-- spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb
-- spec/fixture_app/controllers/stub_controller.rb
-- spec/fixture_app/lib/dummy_middleware.rb
-- spec/fixture_app/log/test.log
-- spec/fixture_app/views/for_reals/but_wait.html.erb
-- spec/fixture_app/views/for_reals/custom.html.erb
-- spec/fixture_app/views/for_reals/srsly.html.erb
-- spec/fixture_app/views/layouts/surround.html.erb
-- spec/fixture_app/views/test/a_link.html.erb
-- spec/fixture_app/views/test/double_nested.html.erb
-- spec/fixture_app/views/test/dynamic.html.erb
-- spec/fixture_app/views/test/letsgo.html.erb
-- spec/fixture_app/views/test/nested.html.erb
-- spec/fixture_app/views/test/static.html.erb
-- spec/lib/rory/application_spec.rb
-- spec/lib/rory/cli/generate_spec.rb
-- spec/lib/rory/cli/generators/application_spec.rb
-- spec/lib/rory/cli/root_spec.rb
-- spec/lib/rory/cli_spec.rb
-- spec/lib/rory/controller_spec.rb
-- spec/lib/rory/dispatcher_spec.rb
-- spec/lib/rory/initializers_spec.rb
-- spec/lib/rory/logger_spec.rb
-- spec/lib/rory/middleware_stack_spec.rb
-- spec/lib/rory/parameter_filter_spec.rb
-- spec/lib/rory/renderer/context_spec.rb
-- spec/lib/rory/renderer_spec.rb
-- spec/lib/rory/request_id_spec.rb
-- spec/lib/rory/request_parameter_logger_spec.rb
-- spec/lib/rory/request_spec.rb
-- spec/lib/rory/route_spec.rb
-- spec/lib/rory/support_spec.rb
-- spec/lib/rory_spec.rb
-- spec/requests/controller_spec.rb
-- spec/spec_helper.rb
-- spec/support/generation_helpers.rb
-- spec/support/shared_examples/path_generation.rb
 homepage: http://github.com/screamingmuse/rory
 licenses:
 - MIT

data/spec/fixture_app/config/application.rb

@@ -1,6 +0,0 @@
-module Fixture
-  class Application < Rory::Application
-    turn_off_request_logging!
-    filter_parameters :orcas, :noodles
-  end
-end

data/spec/fixture_app/config/routes.rb

@@ -1,16 +0,0 @@
-Fixture::Application.set_routes do
-  match 'foo/:id/bar', :to => 'foo#bar', :methods => [:get, :post]
-  match 'this/:path/is/:very_awesome', :to => 'awesome#rad'
-  scope :method => [:get] do
-    scope :module => 'goose' do
-      match 'lumpies/:lump', :to => 'lumpies#show'
-    end
-    scope :module => 'goose/wombat' do
-      match 'rabbits/:chew', :to => 'rabbits#chew'
-    end
-  end
-  match '/', :to => 'root#vegetable', :methods => [:get]
-  match '/', :to => 'root#no_vegetable', :methods => [:delete]
-  match 'for_reals/switching', :to => 'for_reals#switching', :methods => [:get]
-  match 'for_reals/:parbles', :to => 'for_reals#srsly', :methods => [:get]
-end

data/spec/fixture_app/controllers/base_filtered_controller.rb

@@ -1,9 +0,0 @@
-class BaseFilteredController < Rory::Controller
-  before_action :pickle_something, :except => [:eat]
-  after_action :rub_tummy, :if => :horses_exist?
-  after_action :smile, :only => [:eat]
-
-  def horses_exist?
-    params[:horses] != 'missing'
-  end
-end

data/spec/fixture_app/controllers/filtered_controller.rb

@@ -1,10 +0,0 @@
-require_relative 'base_filtered_controller'
-
-class FilteredController < BaseFilteredController
-  before_action :make_it_tasty, :unless => proc { !horses_exist? }
-  before_action :make_it_nutritious, :only => [:eat]
-  after_action :sleep, :except => [:eat]
-
-  def eat
-  end
-end

data/spec/fixture_app/controllers/for_reals_controller.rb

@@ -1,14 +0,0 @@
-class ForRealsController < Rory::Controller
-  def srsly
-    expose :gibbit => @params[:parbles]
-    expose :but_when => 'again'
-  end
-
-  def switching
-    if json_requested?
-      render :json => { :a => 1 }
-    else
-      render 'for_reals/custom', :status => 404
-    end
-  end
-end

data/spec/fixture_app/controllers/goose/lumpies_controller.rb

@@ -1,12 +0,0 @@
-module Goose
-  class LumpiesController
-    def initialize(args, routing, context)
-      @args = args
-    end
-
-    def present
-      @args[:in_scoped_controller] = true
-      @args
-    end
-  end
-end

data/spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb

@@ -1,14 +0,0 @@
-module Goose
-  module Wombat
-    class RabbitsController
-      def initialize(args, routing, context)
-        @args = args
-      end
-
-      def present
-        @args[:in_scoped_controller] = true
-        @args
-      end
-    end
-  end
-end

data/spec/fixture_app/controllers/stub_controller.rb

@@ -1,10 +0,0 @@
-class StubController
-  def initialize(args, routing, context)
-    @args = args
-  end
-
-  def present
-    @args[:present_called] = true
-    @args
-  end
-end

data/spec/fixture_app/lib/dummy_middleware.rb

@@ -1,13 +0,0 @@
-class DummyMiddleware
-  attr_accessor :prefix
-
-  def initialize(app, *args, &block)
-    @app = app
-    @args = args
-    block.call(self)
-  end
-
-  def call(env)
-    @app.call("#{prefix} #{@args.first}")
-  end
-end

data/spec/fixture_app/views/for_reals/but_wait.html.erb

@@ -1 +0,0 @@
-But it's <%= when_is_it %> enough!

data/spec/fixture_app/views/for_reals/custom.html.erb

@@ -1 +0,0 @@
-Oh, a secret!

data/spec/fixture_app/views/for_reals/srsly.html.erb

@@ -1 +0,0 @@
-You've done it <%= but_when %>, <%= gibbit %>!

data/spec/fixture_app/views/layouts/surround.html.erb

@@ -1 +0,0 @@
-Surrounding <%= yield %> is fun

data/spec/fixture_app/views/test/a_link.html.erb

@@ -1 +0,0 @@
-You came from <%= base_path %>.

data/spec/fixture_app/views/test/double_nested.html.erb

@@ -1 +0,0 @@
-Don't Say <%= render 'test/nested' %>

data/spec/fixture_app/views/test/dynamic.html.erb

@@ -1 +0,0 @@
-Word: <%= word %>

data/spec/fixture_app/views/test/letsgo.html.erb

@@ -1 +0,0 @@
-Let's go content

data/spec/fixture_app/views/test/nested.html.erb

@@ -1 +0,0 @@
-A Bad <%= render 'test/dynamic', :locals => { :word => 'Poop' } %>!

data/spec/fixture_app/views/test/static.html.erb

@@ -1 +0,0 @@
-Static content

data/spec/lib/rory/application_spec.rb

@@ -1,353 +0,0 @@
-require_relative '../../fixture_app/lib/dummy_middleware'
-
-RSpec.describe Rory::Application do
-  let(:subject) {
-    Object.const_set(test_rory_app_name, Class.new(Rory::Application).tap { |app|
-      app.root = root
-      app.turn_off_request_logging!
-    })
-    Object.const_get(test_rory_app_name)
-  }
-
-  let(:test_rory_app_name){
-    "TestRory#{('a'..'z').to_a.sample(5).join}"
-  }
-  let(:root){"spec/fixture_app"}
-
-  before do
-    Rory::Application.initializers.clear
-    Rory::Application.initializer_default_middleware
-  end
-
-  describe ".root=" do
-    let(:root) { "current_app" }
-    before { `ln -s spec/fixture_app current_app` }
-    after { `rm current_app` }
-
-    it 'appends to the load path' do
-      expect($:).to receive(:unshift).with(Pathname("current_app").realpath)
-      subject
-    end
-  end
-
-  describe ".root" do
-    let(:root) { "current_app" }
-    before { `ln -s spec/fixture_app current_app` }
-    after { `rm current_app` }
-
-    it "returns the realpath" do
-      expect(subject.root.to_s).to match(/spec\/fixture_app/)
-    end
-  end
-
-  describe ".configure" do
-    it 'yields the given block to self' do
-      subject.configure do |c|
-        expect(c).to eq(subject.instance)
-      end
-    end
-  end
-
-  describe '.config_path' do
-    it 'is set to {root}/config by default' do
-      expect(subject.config_path).to eq(
-        Pathname.new(subject.root).join('config')
-      )
-    end
-
-    it 'raises exception if root not set' do
-      Rory.application = nil
-      class RootlessApp < Rory::Application; end
-      expect {
-        RootlessApp.config_path
-      }.to raise_error(RootlessApp::RootNotConfigured)
-      Rory.application = subject.instance
-    end
-  end
-
-  describe '.log_path' do
-    it 'is set to {root}/config by default' do
-      expect(subject.log_path).to eq(
-        Pathname.new(subject.root).join('log')
-      )
-    end
-
-    it 'raises exception if root not set' do
-      Rory.application = nil
-      class RootlessApp < Rory::Application; end
-      expect {
-        RootlessApp.config_path
-      }.to raise_error(RootlessApp::RootNotConfigured)
-      Rory.application = subject.instance
-    end
-  end
-
-  describe ".respond_to?" do
-    it 'returns true if the instance said so' do
-      expect(subject.instance).to receive(:respond_to?).with(:goat).and_return(true)
-      expect(subject.respond_to?(:goat)).to be_truthy
-    end
-
-    it 'does the usual thing if instance says no' do
-      expect(subject.instance).to receive(:respond_to?).twice.and_return(false)
-      expect(subject.respond_to?(:to_s)).to be_truthy
-      expect(subject.respond_to?(:obviously_not_a_real_method)).to be_falsey
-    end
-  end
-
-  describe ".dispatcher" do
-    it "returns new dispatcher rack app" do
-      allow(Rory::Dispatcher).to receive(:rack_app).
-        with(subject).and_return(:dispatcher_app)
-      expect(subject.dispatcher).to eq(:dispatcher_app)
-    end
-  end
-
-  describe ".call" do
-    it "calls the stack with the given environment" do
-      stack = double
-      allow(stack).to receive(:call).with(:the_env).and_return(:expected)
-      expect(subject.instance).to receive(:stack).and_return(stack)
-      expect(subject.call(:the_env)).to eq(:expected)
-    end
-  end
-
-  describe ".log_file" do
-    it "creates the log file directory if it does not exist" do
-      file = double(:sync= => true)
-      allow(File).to receive(:exists?).and_return(false)
-      allow(Dir).to receive(:mkdir).and_return(true)
-      allow(File).to receive(:open).and_return(file)
-      expect(subject.log_file).to eq(file)
-    end
-
-    it "returns the file and does not create the log file directory if it does not exist" do
-      file = double(:sync= => true)
-      allow(File).to receive(:exists?).and_return(true)
-      allow(File).to receive(:open).and_return(file)
-      expect(subject.log_file).to eq(file)
-    end
-  end
-
-  describe ".logger" do
-    it "returns a logger" do
-      logger = double
-      allow_any_instance_of(subject).to receive(:log_file)
-      allow(Logger).to receive(:new).and_return(logger)
-      expect(subject.logger).to eq(logger)
-    end
-  end
-
-  describe ".turn_off_request_logging!" do
-    it "resets stack and turns off request logging" do
-      subject.instance.instance_variable_set(:@request_logging, :true)
-      expect(subject.request_logging_on?).to eq(true)
-      expect(subject.instance).to receive(:reset_stack)
-      subject.turn_off_request_logging!
-      expect(subject.request_logging_on?).to eq(false)
-    end
-  end
-
-  describe ".filter_parameters" do
-    it "resets stack and sets parameters to filter" do
-      expect(subject.instance).to receive(:reset_stack)
-      subject.filter_parameters :dog, :kitty
-      expect(subject.parameters_to_filter).to eq([:dog, :kitty])
-    end
-  end
-
-  describe ".reset_stack" do
-    it "clears memoization of stack" do
-      stack = subject.stack
-      expect(subject.stack).to eq(stack)
-      subject.reset_stack
-      expect(subject.stack).not_to eq(stack)
-    end
-  end
-
-  describe ".stack" do
-    it "returns a rack builder instance with configured middleware" do
-      builder = double
-      allow(subject.instance).to receive(:dispatcher).
-        and_return(:the_dispatcher)
-      allow(Rack::Builder).to receive(:new).and_return(builder)
-      subject.use_middleware :horse
-      expect(subject.instance).to receive(:request_middleware).with(no_args)
-      expect(builder).to receive(:use).with(:horse)
-      expect(builder).to receive(:run).with(:the_dispatcher)
-      expect(subject.stack).to eq(builder)
-    end
-  end
-
-  describe ".parameters_to_filter" do
-    it "returns [:password] by default" do
-      expect(subject.parameters_to_filter).to eq([:password])
-    end
-  end
-
-  describe ".use_default_middleware" do
-    it "adds middleware when request logging is on" do
-      allow(subject.instance).to receive(:request_logging_on?).and_return(true)
-      allow(subject.instance).to receive(:parameters_to_filter).and_return([:horses])
-      allow(subject.instance).to receive(:logger).and_return(:the_logger)
-      expect(subject.instance).to receive(:use_middleware).with(Rory::RequestId, :uuid_prefix => Rory::Support.tokenize(test_rory_app_name))
-      expect(subject.instance).to receive(:use_middleware).with(Rack::PostBodyContentTypeParser)
-      expect(subject.instance).to receive(:use_middleware).with(Rack::CommonLogger, :the_logger)
-      expect(subject.instance).to receive(:use_middleware).with(Rory::RequestParameterLogger, :the_logger, :filters => [:horses])
-      subject.request_middleware
-    end
-
-    it "does not add middleware when request logging is off" do
-      allow(subject.instance).to receive(:request_logging_on?).and_return(false)
-      expect(subject.instance).to receive(:use_middleware).never
-      subject.request_middleware
-    end
-  end
-
-  describe ".load_config_data" do
-    it "returns parsed yaml file with given name from directory at config_path" do
-      allow_any_instance_of(subject).to receive(:config_path).and_return('Africa the Great')
-      allow(YAML).to receive(:load_file).with(
-        File.expand_path(File.join('Africa the Great', 'foo_type.yml'))).
-        and_return(:oscar_the_grouch_takes_a_nap)
-      expect(subject.load_config_data(:foo_type)).to eq(:oscar_the_grouch_takes_a_nap)
-    end
-  end
-
-  describe ".connect_db" do
-    it "sets up sequel connection to DB from YAML file" do
-      config = { 'development' => :expected }
-      logger_array = []
-      allow(subject.instance).to receive(:logger).and_return(:the_logger)
-      allow(subject.instance).to receive(:load_config_data).with(:database).and_return(config)
-      expect(Sequel).to receive(:connect).with(:expected).and_return(double(:loggers => logger_array))
-      subject.connect_db('development')
-      expect(logger_array).to match_array([:the_logger])
-    end
-  end
-
-  describe ".spin_up" do
-    it "connects the database" do
-      expect_any_instance_of(Rory::Application).to receive(:connect_db)
-      Rory::Application.spin_up
-    end
-  end
-
-  describe '.auto_require_paths' do
-    after(:each) do
-      subject.instance.instance_variable_set(:@auto_require_paths, nil)
-    end
-
-    it 'includes initializers, models, controllers, and helpers by default' do
-      expect(subject.auto_require_paths).to eq(['config/initializers', 'models', 'controllers', 'helpers'])
-    end
-
-    it 'accepts new paths' do
-      subject.auto_require_paths << 'chocolates'
-      expect(subject.auto_require_paths).to eq(['config/initializers', 'models', 'controllers', 'helpers', 'chocolates'])
-    end
-  end
-
-  describe '.require_all_files' do
-    it 'requires all files in auto_require_paths' do
-      allow_any_instance_of(subject).to receive(:auto_require_paths).and_return(['goats', 'rhubarbs'])
-      [:goats, :rhubarbs].each do |folder|
-        expect(Rory::Support).to receive(:require_all_files_in_directory).
-          with(Pathname.new(subject.root).join("#{folder}"))
-      end
-      subject.require_all_files
-    end
-  end
-
-  describe '.use_middleware' do
-    it 'adds the given middleware to the stack, retaining args and block' do
-
-      subject.use_middleware DummyMiddleware, :puppy do |dm|
-        dm.prefix = 'a salubrious'
-      end
-
-      expect(subject.instance).to receive(:dispatcher).
-        and_return(dispatch_stack_mock = double)
-      expect(dispatch_stack_mock).to receive(:call).
-        with('a salubrious puppy')
-      subject.call({})
-      subject.middleware.clear
-    end
-  end
-
-  context "with fixture application" do
-    subject { Fixture::Application }
-    describe ".routes" do
-      it "generates a collection of routing objects from route configuration" do
-        expect(subject.routes).to eq [
-          Rory::Route.new('foo/:id/bar', :to => 'foo#bar', :methods => [:get, :post]),
-          Rory::Route.new('this/:path/is/:very_awesome', :to => 'awesome#rad'),
-          Rory::Route.new('lumpies/:lump', :to => 'lumpies#show', :methods => [:get], :module => 'goose'),
-          Rory::Route.new('rabbits/:chew', :to => 'rabbits#chew', :methods => [:get], :module => 'goose/wombat'),
-          Rory::Route.new('', :to => 'root#vegetable', :methods => [:get]),
-          Rory::Route.new('', :to => 'root#no_vegetable', :methods => [:delete]),
-          Rory::Route.new('for_reals/switching', :to => 'for_reals#switching', :methods => [:get]),
-          Rory::Route.new('for_reals/:parbles', :to => 'for_reals#srsly', :methods => [:get])
-        ]
-      end
-    end
-
-    describe ".parameters_to_filter" do
-      it "returns overridden parameters" do
-        expect(subject.parameters_to_filter).to eq([:orcas, :noodles])
-      end
-    end
-  end
-
-  describe ".initializers" do
-    describe ".insert_after" do
-      it "inserts initializer before another" do
-        probe = []
-        Rory::Application.initializers.add("insert_after.A") { probe << "insert_after.A" }
-        Rory::Application.initializers.add("insert_after.B") { probe << "insert_after.B" }
-        Rory::Application.initializers.insert_after("insert_after.A", "insert_after.C") { probe << "insert_after.C" }
-
-        expect { subject.run_initializers }.to change { probe }.from([]).
-          to(%w(insert_after.A insert_after.C insert_after.B))
-      end
-    end
-
-    describe ".add" do
-      it "runs the code inside any initializer block" do
-        probe = :initializers_not_run
-        Rory::Application.initializers.add "add.test" do
-          probe = :was_run
-        end
-        expect { subject.run_initializers }.to change { probe }.from(:initializers_not_run).to(:was_run)
-      end
-
-      it "passes the app instance to the block" do
-        probe = :block_not_called
-        Rory::Application.initializers.add "add.test_passes_app" do |app|
-          probe = :block_called
-          expect(app.class.superclass).to eq Rory::Application
-        end
-        expect { subject.run_initializers }.to change { probe }.from(:block_not_called).to(:block_called)
-      end
-    end
-  end
-
-  describe "#middleware" do
-    before { subject.middleware.clear }
-
-    describe "#insert_before" do
-      it "places the middleware order right after the given class" do
-        subject.instance.instance_variable_set(:@request_logging, :true)
-        Rory::Application.initializers.add "insert_before.dummy_middleware" do |app|
-          app.middleware.insert_before Rory::RequestId, DummyMiddleware, :puppy
-        end
-        subject.run_initializers
-        expect(subject.middleware.map(&:klass)).to eq [DummyMiddleware,
-                                                       Rory::RequestId,
-                                                       Rack::PostBodyContentTypeParser,
-                                                       Rack::CommonLogger,
-                                                       Rory::RequestParameterLogger]
-      end
-    end
-  end
-end