angular-rails-templates 0.3.0 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44d240dc6f8c691a6243c5595d3a460781ae0606
-  data.tar.gz: 369f4eef0998ac3d46e466331132c31acc16767e
+  metadata.gz: 9fb45cac6296e091c98d1a3d48afb136d320f074
+  data.tar.gz: 4df7de01e2ff66162c323393b968e291d5e281ff
 SHA512:
-  metadata.gz: b471e6cc6362f41b3b1811287d4856dc177a36e24dcf0a564fcf1affd8e43388a9ff041d9f57760e9994aacfb3fd642b0c1437466b66dfd512f9e03c2fa25e74
-  data.tar.gz: bd8f42bce871649cb42def0fa3aa64342a675adac268f7f34e078e4122c47f30791551d5ce3deec0d9833e0939b0b74c57c7b853346745a13d0c12e6893f15fb
+  metadata.gz: 76656192c87de937514ae8708ac1a2b45ec4062b4cf8c21dd04823e6f6b38e5552ca994151b71ccb89f408ce0e42cb09306d93634742619c9e177e8ec5cb5d66
+  data.tar.gz: b8c956f2e4dd71889e1fa6f4b93b64446386a553d61dfbe95d127385254fe6fb435b261781e41e2712b48b499b18753c18ccf78a40096dab0db0de1228f9d76e

data/README.md

@@ -43,7 +43,7 @@ foo.html.haml
 foo.html.slim
 ```
 
-Caution: *`.ngslim` and `.nghaml` are no longer supported!*
+Caution: *`.ngslim` is no longer supported!*
 
 Angular Rails Templates will try to load support for the following markups if their gems are present:
 
@@ -80,7 +80,7 @@ modals/dialog.html.slim.erb.str => modals/dialog.html # don't do this
 The templates can then be accessed via `templateUrl` as expected:
 
 ```javascript
-// Template: app/assets/templates/yourTemplate.html.haml
+// Template: app/assets/templates/yourTemplate.html.nghaml
 {
   templateUrl: 'yourTemplate.html'
 }
@@ -107,7 +107,6 @@ config.angular_templates.module_name    = 'templates'
 config.angular_templates.ignore_prefix  = %w(templates/)
 config.angular_templates.inside_paths   = [Rails.root.join('app', 'assets')]
 config.angular_templates.markups        = %w(erb str haml slim md)
-config.angular_templates.htmlcompressor = false
 ```
 
 ### Configuration Option: `module_name`
@@ -188,39 +187,13 @@ config.angular_templates.markups.push 'nghaml'
 ```
 Note: You would still need to use `foo`**`.html`**`.nghaml`
 
-
-### Configuration Option: `htmlcompressor`
-
-The [htmlcompressor gem](https://github.com/paolochiodi/htmlcompressor) is in alpha, not activly maintained, and has several known bugs. Beware if you are using windows. The `simple_boolean_attributes` option is known to mangle angular templates. It depends on a three-year-old version of yui-compressor. However, it does a good job of compressing html!
-
-If you would like to use htmlcompressor add it to your Gemfile and Enable the configuration option.
-
-```ruby
-# Gemfile
-gem 'htmlcompressor'
-```
-
-```ruby
-# config/application.rb
-config.angular_templates.htmlcompressor = true
-```
-
-You can also pass an options hash to `htmlcompressor` that will be directly passed to ```HtmlCompressor::Compressor.new```. See the [ruby project](https://github.com/paolochiodi/htmlcompressor#usage) or the [java project](https://code.google.com/p/htmlcompressor/#Compressing_HTML_and_XML_files_from_a_command_line) for descriptions of the options.
-
-```ruby
-# config/application.rb
-config.angular_templates.htmlcompressor = {
-  :remove_quotes => true
-}
-```
-
-
 ## License
 
-MIT License. Copyright 2017 pitr
+MIT License. Copyright 2015 pitr
 
 ## Authors & contributors
 
 * Damien Mathieu <42@dmathieu.com>
 * pitr <pitr.vern@gmail.com>
 * Jeremy Ebler <jebler@gmail.com>
+* Chris Nelson <chris@teamgaslight.com>

data/lib/angular-rails-templates.rb

@@ -1,6 +1,7 @@
+require 'angular-rails-templates/compact_javascript_escape'
+require 'angular-rails-templates/processor'
 require 'angular-rails-templates/engine'
 
 module AngularRailsTemplates
-  autoload :Template, 'angular-rails-templates/template'
   autoload :VERSION,  'angular-rails-templates/version'
 end

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

@@ -7,7 +7,6 @@ module AngularRailsTemplates
     config.angular_templates.ignore_prefix  = ['templates/']
     config.angular_templates.inside_paths   = [] # defined in before_configuration
     config.angular_templates.markups        = []
-    config.angular_templates.htmlcompressor = false
 
     config.before_configuration do |app|
       config.angular_templates.inside_paths = [Rails.root.join('app', 'assets')]
@@ -31,29 +30,16 @@ module AngularRailsTemplates
         require 'sprockets'
         require 'sprockets/engines' # load sprockets for Rails 3
 
-        if app.config.angular_templates.htmlcompressor
-          require 'htmlcompressor/compressor'
-          unless app.config.angular_templates.htmlcompressor.is_a? Hash
-            app.config.angular_templates.htmlcompressor = {remove_intertag_spaces: true}
-          end
-        end
+        config.assets.configure do |env|
+          # byebug
+          env.register_mime_type 'text/ng-html', extensions: ['.html']
+          env.register_transformer 'text/ng-html', 'application/javascript', AngularRailsTemplates::Processor
 
-        # These engines render markup as HTML
-        app.config.angular_templates.markups.each do |ext|
-          # Processed haml/slim templates have a mime-type of text/html.
-          # If sprockets sees a `foo.html.haml` it will process the haml
-          # and stop, because the haml output is html. Our html engine won't get run.
-          mimeless_engine = Class.new(Tilt[ext]) do
-            def self.default_mime_type
-              nil
-            end
+          # These engines render markup as HTML
+          app.config.angular_templates.markups.each do |ext|
+            env.register_engine ".#{ext}", Tilt[ext]
           end
-
-          app.assets.register_engine ".#{ext}", mimeless_engine
         end
-
-        # This engine wraps the HTML into JS
-        app.assets.register_engine '.html', AngularRailsTemplates::Template
       end
 
       # Sprockets Cache Busting

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

@@ -0,0 +1,52 @@
+require 'angular-rails-templates/compact_javascript_escape'
+
+module AngularRailsTemplates
+  class Processor
+
+    AngularJsTemplateWrapper = Tilt::ERBTemplate.new "#{File.dirname __FILE__}/javascript_template.js.erb"
+
+    include CompactJavaScriptEscape
+
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.call(input)
+      instance.call(input)
+    end
+
+    def self.cache_key
+      instance.cache_key
+    end
+
+    attr_reader :cache_key, :config
+
+    def config
+      Rails.configuration.angular_templates
+    end
+
+    def initialize(options = {})
+      @cache_key = [self.class.name, VERSION, options].freeze
+    end
+
+    def template_name(name)
+      path = name.sub /^(#{config.ignore_prefix.join('|')})/, ''
+      "#{path}.html"
+    end
+
+    def call(input)
+      locals = {}
+      locals[:angular_template_name] = template_name(input[:name])
+      locals[:angular_module] = config.module_name
+      locals[:source_file] = "#{input[:filename]}".sub(/^#{Rails.root}\//,'')
+
+      locals[:html] = escape_javascript(input[:data].chomp)
+
+      if config.inside_paths.any? { |folder| input[:filename].match(folder.to_s) }
+        AngularJsTemplateWrapper.render(nil, locals)
+      else
+        input[:data]
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module AngularRailsTemplates
-  VERSION = '0.3.0'
+  VERSION = '1.0.0.beta1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular-rails-templates
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Damien Mathieu
@@ -10,50 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -82,20 +68,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +95,7 @@ files:
 - lib/angular-rails-templates/compact_javascript_escape.rb
 - lib/angular-rails-templates/engine.rb
 - lib/angular-rails-templates/javascript_template.js.erb
-- lib/angular-rails-templates/template.rb
+- lib/angular-rails-templates/processor.rb
 - lib/angular-rails-templates/version.rb
 - vendor/assets/javascripts/angular-rails-templates.js.erb
 homepage: https://github.com/pitr/angular-rails-templates
@@ -141,12 +113,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Use your angular templates with rails' asset pipeline

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

@@ -1,58 +0,0 @@
-require 'angular-rails-templates/compact_javascript_escape'
-
-module AngularRailsTemplates
-  class Template < ::Tilt::Template
-    include CompactJavaScriptEscape
-    AngularJsTemplateWrapper = Tilt::ERBTemplate.new "#{File.dirname __FILE__}/javascript_template.js.erb"
-    @@compressor = nil
-
-    def self.default_mime_type
-      'application/javascript'
-    end
-
-    def prepare
-      # we only want to process html assets inside those specified in configuration.inside_paths
-      @asset_should_be_processed = configuration.inside_paths.any? { |folder| file.match(folder.to_s) }
-
-      unless @asset_should_be_processed
-        @data = nil
-        return
-      end
-      
-      if configuration.htmlcompressor and @asset_should_be_processed
-        @data = compress data
-      end
-    end
-
-    def evaluate(scope, locals, &block)
-      if @asset_should_be_processed
-        locals[:html] = escape_javascript data.chomp
-        locals[:angular_template_name] = logical_template_path(scope)
-        locals[:source_file] = "#{scope.pathname}".sub(/^#{Rails.root}\//,'')
-        locals[:angular_module] = configuration.module_name
-        AngularJsTemplateWrapper.render(scope, locals)
-      else
-        data
-      end
-    end
-
-    private
-
-    def logical_template_path(scope)
-      path = scope.logical_path.sub /^(#{configuration.ignore_prefix.join('|')})/, ''
-      "#{path}.html"
-    end
-
-    def configuration
-      ::Rails.configuration.angular_templates
-    end
-
-    def compress html
-      unless @@compressor
-        @@compressor = HtmlCompressor::Compressor.new configuration.htmlcompressor
-      end
-      @@compressor.compress(html)
-    end
-  end
-end
-