Skip to content

Accept wrapper default params #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2015
Merged

Accept wrapper default params #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d535d4
Accept wrapper default parameters
kamilbielawski Oct 26, 2015
2c01787
Reset options before running each spec
kamilbielawski Oct 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/annotate.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module Annotate
:timestamp, :exclude_serializers, :classified_sort, :show_foreign_keys,
]
OTHER_OPTIONS=[
:ignore_columns, :skip_on_db_migrate
:ignore_columns, :skip_on_db_migrate, :wrapper_open, :wrapper_close
]
PATH_OPTIONS=[
:require, :model_dir
Expand Down Expand Up @@ -78,6 +78,12 @@ def self.setup_options(options = {})
return options
end

def self.reset_options
[POSITION_OPTIONS, FLAG_OPTIONS, PATH_OPTIONS, OTHER_OPTIONS].flatten.each do |key|
ENV[key.to_s] = nil
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the reason to set these to nil?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's needed for the tests - ENV wasn't cleared between tests, so after wrapper attributes were set in one of the tests, the others also had it set, which resulted in incorrect annotations being generated.

end
end

def self.skip_on_migration?
ENV['skip_on_db_migrate'] =~ TRUE_RE
end
Expand Down
2 changes: 2 additions & 0 deletions lib/generators/annotate/templates/auto_annotate_models.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ if Rails.env.development?
'sort' => "false",
'force' => "false",
'trace' => "false",
'wrapper_open' => nil,
'wrapper_close' => nil,
})
end

Expand Down
1 change: 1 addition & 0 deletions spec/annotate/annotate_models_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ class User < ActiveRecord::Base
mock_column(:name, :string, :limit => 50)
])
@schema_info = AnnotateModels.get_schema_info(@klass, "== Schema Info")
Annotate.reset_options
end

def write_model file_name, file_content
Expand Down