angular-rails-templates 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ece303d7645e28620e1d23962f25cc83b8bbd6
-  data.tar.gz: 027e3a27b77c858645ca73cddf819358bd625fb2
+  metadata.gz: 80d31599aa89eaff14f2cdd3d038af6ce98a8d0e
+  data.tar.gz: c6dbc186816c5cf864ab9d49434d21a684e88963
 SHA512:
-  metadata.gz: 70acb2c79fa6ff46f32ddab5262c2213fd5890015405b983b63627c3dfb2f6c86984c15d85fb8e1f6da62b3d0434752395ddc8e919f0f4519bb455ce63f92163
-  data.tar.gz: bf103ce7edd782659b62ae11d4c4cc09ae550140d4b5d51d2e47355c9ad22cecc5de074ada646e2c3f791cda875d9dc015ba8e8ff02a242475fbdc7cb7bc88f9
+  metadata.gz: 1bc1093fa5a7b526d1fbbbadad85e21f593070ce30cca92ce25d41e157513218105b5b922ea955b142c572b06c0824080b24b46b0e210d2e821c5d1a33bea60b
+  data.tar.gz: 804162cf26a4d48e3044c8a1418a627d485b9fad6b54a6f229e208d8bc1314ee2bfc41f7efff0fd40d69ecc2eb8e54dfcfb591e0c2e08399f98cb619f3353e27

data/README.md

@@ -26,7 +26,7 @@ Then, in your `application.js` file, require `angular-rails-templates` and your
 // Templates in app/assets/javascript/templates
 //= require_tree ./templates
 // OR
-// Templates in app/assets/templates
+// Templates in app/assets/templates (but see step 5)
 //= require_tree ../templates
 ```
 
@@ -51,7 +51,7 @@ Angular Rails Templates will try to load support for the following markups if th
 | .str      | -                                                        |
 | .haml     | haml                                                     |
 | .slim     | slim                                                     |
-| .md       | liquid, rdiscount, redcrpet, bluecloth, kramdown, maruku |
+| .md       | liquid, rdiscount, redcarpet, bluecloth, kramdown, maruku |
 
 See [Advanced](#advanced-configuration) if you would like to use other markup languages.
 
@@ -77,13 +77,23 @@ modals/dialog.html.slim.erb.str => modals/dialog.html # don't do this
 
 The templates can then be accessed via `templateUrl` as expected:
 
-``` javascript
+```javascript
 // Template: app/assets/templates/yourTemplate.html.haml
 {
   templateUrl: 'yourTemplate.html'
 }
 ```
 
+Or anything else that uses `$templateCache` or `$templateRequest`
+
+```html
+<div ng-include='"yourTemplate.html"'></div>
+```
+
+### 5. Avoid name collisions
+
+If you have `app/assets/javascript/user.js` and `app/assets/templates/user.html`, the former one will actually hide the latter. This is due to how Rails asset pipeline sees asset files, both are served under `/assets/user.js`. Please use namespacing to combat this issue.
+
 ## Advanced Configuration
 
 Angular Rails Templates has some configuration options that can be set inside `config/application.rb`

data/lib/angular-rails-templates/engine.rb

@@ -23,7 +23,7 @@ module AngularRailsTemplates
     end
 
 
-    initializer 'angular-rails-templates' do |app|
+    initializer 'angular-rails-templates', group: :all  do |app|
       if app.config.assets
         require 'sprockets'
         require 'sprockets/engines' # load sprockets for Rails 3

data/lib/angular-rails-templates/template.rb

@@ -10,9 +10,11 @@ module AngularRailsTemplates
       'application/javascript'
     end
 
-    # this method is mandatory on Tilt::Template subclasses
     def prepare
-      if configuration.htmlcompressor
+      # we only want to process html assets inside Rails.root/app/assets
+      @asset_inside_rails_root = file.match "#{Rails.root.join 'app', 'assets'}"
+
+      if configuration.htmlcompressor and @asset_inside_rails_root
         @data = compress data
       end
     end
@@ -23,7 +25,11 @@ module AngularRailsTemplates
       locals[:source_file] = "#{scope.pathname}".sub(/^#{Rails.root}\//,'')
       locals[:angular_module] = configuration.module_name
 
-      AngularJsTemplateWrapper.render(scope, locals)
+      if @asset_inside_rails_root
+        AngularJsTemplateWrapper.render(scope, locals)
+      else
+        data
+      end
     end
 
     private

data/lib/angular-rails-templates/version.rb

@@ -1,3 +1,3 @@
 module AngularRailsTemplates
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular-rails-templates
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Damien Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Use your angular templates with rails' asset pipeline