Skip to content

Commit

Permalink
Merge pull request #23 from kikonen/ngannotate_1.0.0
Browse files Browse the repository at this point in the history
ngannotate 1.0.0
  • Loading branch information
kikonen committed Jun 3, 2015
2 parents c0cfaf4 + 6f8c9d9 commit 148ec57
Show file tree
Hide file tree
Showing 6 changed files with 5,855 additions and 4,514 deletions.
27 changes: 26 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,32 @@ Usage

By default ng-annotate processing is disabled in development and test environments. Processing, however, can be enforced by specifying NG_FORCE=true option.


### NOTES

#### Javascript runtime

[Issue with OSX javascript runtime](https://github.com/kikonen/ngannotate-rails/issues/20)

Use "therubyracer" as javascript runtime

Gemfile
```ruby
gem 'therubyracer', platforms: :ruby
```


#### Heroku
[Issue with Heroku](https://github.com/kikonen/ngannotate-rails/issues/10)

When pushing to heroku its important to invalidate all of your assets.


```ruby
Rails.application.config.assets.version = '1.0'
Rails.application.config.assets.version = '1.1
```
### Environment options
- NG_REGEXP
Expand All @@ -43,7 +69,6 @@ For example,
# with rails 4.1
NG_FORCE=true RAILS_ENV=development bundle exec rake assets:clobber assets:precompile

### Rails configuration options
Defined in "config.ng_annotate"
Expand Down
2 changes: 1 addition & 1 deletion lib/ngannotate/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Ngannotate
module Rails
VERSION = "1.0.0"
VERSION = "1.0.1"
end
end
2 changes: 2 additions & 0 deletions test/rails_4.2.x/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
log/*
public/assets
2 changes: 1 addition & 1 deletion test/rails_4.2.x/config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# config.action_dispatch.rack_cache = true

# Disable Rails's static asset server (Apache or nginx will already do this).
config.serve_static_assets = false
config.serve_static_files = false

# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
Expand Down
2 changes: 1 addition & 1 deletion test/rails_4.2.x/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
config.eager_load = false

# Configure static asset server for tests with Cache-Control for performance.
config.serve_static_assets = true
config.serve_static_files = true
config.static_cache_control = 'public, max-age=3600'

# Show full error reports and disable caching.
Expand Down
Loading

0 comments on commit 148ec57

Please sign in to comment.