rspec-rails 2.0.0.a9 → 2.0.0.a10

data/.gitignore

@@ -1,2 +1,3 @@
 tmp
 pkg
+*.gemspec

data/README.markdown

@@ -69,3 +69,16 @@ Currently supported:
 * no routing specs
 * only works with ActiveRecord
 
+## Controller Specs
+
+Controller specs live in spec/controllers, and include
+behavior from ActionDispatch::Integration::Runner. The
+format for a request is:
+
+    # get action, params, headers
+    get :show, {:id => '37'}, {'HTTP_ACCEPT' => Mime::JS}
+
+This works for `get`, `post`, `put`, `delete`, `head`.
+
+After a request is made, you set expectations on the `request` and `response`
+objects.

data/Rakefile

@@ -13,37 +13,64 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-rails"
     gem.version = Rspec::Rails::Version::STRING
-    gem.summary = "Rspec-2 for Rails-3"
+    gem.summary = "rspec-rails-#{Rspec::Rails::Version::STRING}"
+    gem.description = "Rspec-2 for Rails-3"
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/rspec-rails"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
-    gem.add_dependency "rspec", ">= 2.0.0.a7"
+    gem.rubyforge_project = "rspec"
+    gem.add_dependency "rspec", "2.0.0.a10"
     gem.add_dependency "webrat", ">= 0.7.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.post_install_message = <<-EOM
+#{"*"*50}
+
+  Thank you for installing #{gem.summary}!
+
+  This version of rspec-rails only works with versions of rails >= 3.0.0.pre.
+
+  The 'a' in #{gem.version} means this is alpha software.  If you are looking
+  for a supported production release, please "gem install rspec-rails" (without
+  --pre).
+
+#{"*"*50}
+EOM
   end
-  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+namespace :generate do
+  desc "generate a fresh app with rspec installed"
+  task :app => :clobber_app do |t|
+    if File.directory?('./tmp/rails')
+      ruby "./tmp/rails/railties/bin/rails tmp/example_app --dev -m example_app_template.rb"
+    else
+      puts <<-MESSAGE
+
+  You need to install rails in ./tmp/rails before you can run the 
+  #{t.name} task:
+    
+    git clone git://github.com/rails/rails tmp/rails
 
-desc 'create app, generate a bunch of stuff, and run rake spec'
-task :create_app do |t|
-  if File.directory?('./tmp/rails')
-    rm_rf "tmp/example_app"
-    ruby "./tmp/rails/railties/bin/rails tmp/example_app --dev -m example_app_template.rb"
-  else
-    puts <<-MESSAGE
+  (We'll automate this eventually, but running 'git clone' from rake in this
+  project is mysteriously full of fail)
 
-You need to install rails in ./tmp/rails before you can run the 
-#{t.name} task:
-  
-  git clone git://github.com/rails/rails tmp/rails
+  MESSAGE
+    end
+  end
 
-(We'll automate this eventually, but running 'git clone' from rake in this
-project is mysteriously full of fail)
+  desc "generate a bunch of stuff with generators"
+  task :stuff do
+    Dir.chdir("./tmp/example_app/") do
+      sh "rake rails:template LOCATION='../../templates/generate_stuff.rb'"
+    end
+  end
+end
 
-MESSAGE
+desc "run a variety of specs against the generated app"
+task :run_specs do
+  Dir.chdir("./tmp/example_app/") do
+    sh "rake rails:template LOCATION='../../templates/run_specs.rb'"
   end
 end
 
@@ -52,5 +79,9 @@ task :clobber do
   rm_rf "pkg"
 end
 
-task :default => :create_app
+task :clobber_app do
+  rm_rf "tmp/example_app"
+end
+
+task :default => ["generate:app", "generate:stuff", :run_specs]
 

data/VERSION

@@ -1 +1 @@
-2.0.0.a9
+2.0.0.a10

data/example_app_template.rb

@@ -4,24 +4,5 @@ require 'rspec/rails/version'
 # - would be nicer if we could source them from the <repo>/pkg dirs
 gem 'rspec-rails', :path => File.expand_path('../../../', __FILE__)
 
-run('bundle install')
+generate('rspec:install')
 
-run('script/rails g rspec:install')
-run('script/rails g controller wombats index')
-run('script/rails g integration_test widgets')
-run('script/rails g mailer Notifications signup')
-run('script/rails g model thing name:string')
-run('script/rails g observer widget')
-run('script/rails g scaffold widgets name:string')
-
-run('rake db:migrate')
-run('rake db:test:prepare')
-run('rspec spec -cfdoc')
-run('rake spec')
-run('rake spec:requests')
-run('rake spec:models')
-run('rake spec:views')
-run('rake spec:controllers')
-run('rake spec:helpers')
-run('rake spec:mailers')
-run('rake stats')

data/lib/generators/rspec/controller/templates/controller_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe <%= class_name %>Controller do
 
 <% for action in actions -%>
-
   describe "GET '<%= action %>'" do
     it "should be successful" do
       get '<%= action %>'

data/lib/generators/rspec/integration/templates/request_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe <%= class_name.pluralize %> do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
-      get "/<%= table_name %>"
+      get <%= table_name %>_path
     end
   end
 end

data/lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -6,37 +6,37 @@ describe <%= controller_class_name %>Controller do
     @<%= mock_file_name %> ||= mock_model(<%= class_name %>, stubs).as_null_object
   end
 
-  <% unless options[:singleton] -%>
+<% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      <%= stub! orm_class.all(class_name) %>.and_return([<%= mock_file_name %>])
+      <%= stub! orm_class.all(class_name) %> { [<%= mock_file_name %>] }
       get :index
-      assigns(:<%= table_name %>).should == [<%= mock_file_name %>]
+      assigns(:<%= table_name %>).should eq([<%= mock_file_name %>])
     end
   end
-  <% end -%>
 
+<% end -%>
   describe "GET show" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      <%= stub! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
       get :show, :id => "37"
-      assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
+      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
     end
   end
 
   describe "GET new" do
     it "assigns a new <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name %>)
+      <%= stub! orm_class.build(class_name) %> { <%= mock_file_name %> }
       get :new
-      assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
+      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
     end
   end
 
   describe "GET edit" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      <%= stub! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
       get :edit, :id => "37"
-      assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
+      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
     end
   end
 
@@ -44,13 +44,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => true) %>)
+        <%= stub! orm_class.build(class_name, params) %> { <%= mock_file_name(:save => true) %> }
         post :create, :<%= file_name %> => <%= params %>
-        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
       end
 
       it "redirects to the created <%= file_name %>" do
-        <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => true) %>)
+        <%= stub! orm_class.build(class_name) %> { <%= mock_file_name(:save => true) %> }
         post :create, :<%= file_name %> => {}
         response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
       end
@@ -58,13 +58,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => false) %>)
+        <%= stub! orm_class.build(class_name, params) %> { <%= mock_file_name(:save => false) %> }
         post :create, :<%= file_name %> => <%= params %>
-        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => false) %>)
+        <%= stub! orm_class.build(class_name) %> { <%= mock_file_name(:save => false) %> }
         post :create, :<%= file_name %> => {}
         response.should render_template('new')
       end
@@ -76,19 +76,19 @@ describe <%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "updates the requested <%= file_name %>" do
-        <%= should_receive! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+        <%= should_receive! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
         mock_<%= should_receive! orm_instance.update_attributes(params) %>
         put :update, :id => "37", :<%= file_name %> => <%= params %>
       end
 
       it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
+        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
         put :update, :id => "1"
-        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
       end
 
       it "redirects to the <%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
+        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
         put :update, :id => "1"
         response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
       end
@@ -96,13 +96,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with invalid params" do
       it "assigns the <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
+        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
         put :update, :id => "1"
-        assigns(:<%= file_name %>).should equal(<%= mock_file_name %>)
+        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
+        <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
         put :update, :id => "1"
         response.should render_template('edit')
       end
@@ -112,13 +112,13 @@ describe <%= controller_class_name %>Controller do
 
   describe "DELETE destroy" do
     it "destroys the requested <%= file_name %>" do
-      <%= should_receive! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      <%= should_receive! orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
       mock_<%= should_receive! orm_instance.destroy %>
       delete :destroy, :id => "37"
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:destroy => true) %>)
+      <%= stub! orm_class.find(class_name) %> { <%= mock_file_name(:destroy => true) %> }
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)
     end

data/lib/rspec/rails/example/controller_example_group.rb

@@ -9,11 +9,17 @@ module ControllerExampleGroupBehaviour
   include Rspec::Rails::Matchers
 
   def self.included(mod)
-    mod.before { @_result = Struct.new(:add_assertion).new }
+    mod.before do
+      @_result = Struct.new(:add_assertion).new
+    end
   end
 
   def app 
-    self.class.described_class.action(@_action)
+    self.class.described_class.action(@_action).tap do |endpoint|
+      def endpoint.routes
+        Rails.application.routes
+      end
+    end
   end
 
   %w[get post put delete head].map do |method|

data/lib/rspec/rails/example/mailer_example_group.rb

@@ -1,4 +1,8 @@
+require 'webrat'
+
 module MailerExampleGroupBehavior
+  include Webrat::Matchers
+  include Rspec::Matchers
 
   def read_fixture(action)
     IO.readlines(File.join(Rails.root, 'spec', 'fixtures', self.described_class.name.underscore, action))

data/lib/rspec/rails/example/request_example_group.rb

@@ -6,8 +6,15 @@ module RequestExampleGroupBehaviour
   include ActionDispatch::Integration::Runner
   include Webrat::Matchers
   include Webrat::Methods
-  Rails.application.routes.install_helpers(self)
+  include Rspec::Rails::Matchers
 
+  def self.included(mod)
+    mod.before do
+      @_result = Struct.new(:add_assertion).new
+      @router = Rails.application.routes
+    end
+  end
+  
   def app
     Rails.application
   end
@@ -19,7 +26,7 @@ module RequestExampleGroupBehaviour
   def last_response
     response
   end
-  
+
   Rspec.configure do |c|
     c.include self, :example_group => { :file_path => /\bspec\/requests\// }
   end

data/lib/rspec/rails/example/view_example_group.rb

@@ -2,6 +2,7 @@ require 'webrat'
 
 module ViewExampleGroupBehaviour
   include Webrat::Matchers
+  include Rspec::Matchers
 
   class ViewExampleController < ActionController::Base
     attr_accessor :controller_path
@@ -46,7 +47,7 @@ module ViewExampleGroupBehaviour
   end
 
   def method_missing(selector, *args)
-    if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+    if Rails.application.routes.named_routes.helpers.include?(selector)
       controller.__send__(selector, *args)
     else
       super
@@ -63,6 +64,7 @@ private
     @controller ||= begin
                       controller = ViewExampleController.new
                       controller.controller_path = controller_path
+                      controller.request = ActionDispatch::Request.new(Rack::MockRequest.env_for("/url"))
                       controller
                     end
   end

data/lib/rspec/rails/matchers.rb

@@ -4,9 +4,11 @@ require 'test/unit/assertionfailederror'
 module Rspec
   module Rails
     module Matchers
+      include Rspec::Matchers
+
       def redirect_to(destination)
         example = self
-        Rspec::Matchers::Matcher.new :redirect_to, destination do |destination_|
+        Matcher.new :redirect_to, destination do |destination_|
           match_unless_raises Test::Unit::AssertionFailedError do |_|
             example.assert_redirected_to destination_
           end
@@ -15,7 +17,7 @@ module Rspec
 
       def render_template(options={}, message=nil)
         example = self
-        Rspec::Matchers::Matcher.new :render_template, options, message do |options_, message_|
+        Matcher.new :render_template, options, message do |options_, message_|
           match_unless_raises Test::Unit::AssertionFailedError do |_|
             example.assert_template options_, message_
           end

data/templates/generate_stuff.rb

@@ -0,0 +1,7 @@
+generate('controller wombats index')
+generate('integration_test widgets')
+generate('mailer Notifications signup')
+generate('model thing name:string')
+generate('observer widget')
+generate('scaffold widgets name:string')
+

data/templates/run_specs.rb

@@ -0,0 +1,11 @@
+run('rake db:migrate')
+run('rake db:test:prepare')
+run('rspec spec -cfdoc')
+run('rake spec')
+run('rake spec:requests')
+run('rake spec:models')
+run('rake spec:views')
+run('rake spec:controllers')
+run('rake spec:helpers')
+run('rake spec:mailers')
+run('rake stats')

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - a9
-  version: 2.0.0.a9
+  - a10
+  version: 2.0.0.a10
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 -06:00
+date: 2010-02-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
-        - a7
-        version: 2.0.0.a7
+        - a10
+        version: 2.0.0.a10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   version_requirements: *id002
-description: 
+description: Rspec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
 
@@ -103,12 +103,25 @@ files:
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/transactional_database_support.rb
 - lib/rspec/rails/version.rb
-- rspec-rails.gemspec
+- templates/generate_stuff.rb
+- templates/run_specs.rb
 has_rdoc: true
 homepage: http://github.com/rspec/rspec-rails
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  **************************************************
+  
+    Thank you for installing rspec-rails-2.0.0.a10!
+  
+    This version of rspec-rails only works with versions of rails >= 3.0.0.pre.
+  
+    The 'a' in 2.0.0.a10 means this is alpha software.  If you are looking
+    for a supported production release, please "gem install rspec-rails" (without
+    --pre).
+  
+  **************************************************
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -131,10 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Rspec-2 for Rails-3
+summary: rspec-rails-2.0.0.a10
 test_files: []
 

data/rspec-rails.gemspec

@@ -1,88 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rspec-rails}
-  s.version = "2.0.0.a9"
-
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-02-21}
-  s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "example_app_template.rb",
-     "lib/generators/rspec.rb",
-     "lib/generators/rspec/controller/controller_generator.rb",
-     "lib/generators/rspec/controller/templates/controller_spec.rb",
-     "lib/generators/rspec/controller/templates/view_spec.rb",
-     "lib/generators/rspec/helper/helper_generator.rb",
-     "lib/generators/rspec/helper/templates/helper_spec.rb",
-     "lib/generators/rspec/install/install_generator.rb",
-     "lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt",
-     "lib/generators/rspec/install/templates/lib/tasks/rspec.rake",
-     "lib/generators/rspec/install/templates/spec/spec.opts",
-     "lib/generators/rspec/install/templates/spec/spec_helper.rb",
-     "lib/generators/rspec/integration/integration_generator.rb",
-     "lib/generators/rspec/integration/templates/request_spec.rb",
-     "lib/generators/rspec/mailer/mailer_generator.rb",
-     "lib/generators/rspec/mailer/templates/fixture",
-     "lib/generators/rspec/mailer/templates/mailer_spec.rb",
-     "lib/generators/rspec/model/model_generator.rb",
-     "lib/generators/rspec/model/templates/fixtures.yml",
-     "lib/generators/rspec/model/templates/model_spec.rb",
-     "lib/generators/rspec/observer/observer_generator.rb",
-     "lib/generators/rspec/observer/templates/observer_spec.rb",
-     "lib/generators/rspec/scaffold/scaffold_generator.rb",
-     "lib/generators/rspec/scaffold/templates/controller_spec.rb",
-     "lib/generators/rspec/scaffold/templates/edit_spec.rb",
-     "lib/generators/rspec/scaffold/templates/index_spec.rb",
-     "lib/generators/rspec/scaffold/templates/new_spec.rb",
-     "lib/generators/rspec/scaffold/templates/routing_spec.rb",
-     "lib/generators/rspec/scaffold/templates/show_spec.rb",
-     "lib/generators/rspec/view/templates/view_spec.rb",
-     "lib/generators/rspec/view/view_generator.rb",
-     "lib/rspec-rails.rb",
-     "lib/rspec/rails.rb",
-     "lib/rspec/rails/example.rb",
-     "lib/rspec/rails/example/controller_example_group.rb",
-     "lib/rspec/rails/example/mailer_example_group.rb",
-     "lib/rspec/rails/example/request_example_group.rb",
-     "lib/rspec/rails/example/view_example_group.rb",
-     "lib/rspec/rails/matchers.rb",
-     "lib/rspec/rails/mocks.rb",
-     "lib/rspec/rails/transactional_database_support.rb",
-     "lib/rspec/rails/version.rb",
-     "rspec-rails.gemspec"
-  ]
-  s.homepage = %q{http://github.com/rspec/rspec-rails}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Rspec-2 for Rails-3}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.a7"])
-      s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.a7"])
-      s.add_dependency(%q<webrat>, [">= 0.7.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.a7"])
-    s.add_dependency(%q<webrat>, [">= 0.7.0"])
-  end
-end
-