angular-rails4-templates 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a13f3844657fe44fd18eb117dec2521b80d0c6d0
-  data.tar.gz: 6e34a70494b8499ef5bdd483954edbcfc7018874
+  metadata.gz: 7030f28e3d73640f9b2c8e192d5bd0cc4bb82f44
+  data.tar.gz: 6b172e47e0de5f36fc941c1a982c64915530e4e3
 SHA512:
-  metadata.gz: 2f1030c253b297758e529908c3b2deb19bb7766bc2950cea6e69d24f9d448dfa11e9ebf7987f562f11fd5cde913035cfe036c782a4597e6c63db65209620fa52
-  data.tar.gz: 40822030d06c66796e5e45f69dd9a85932cac9d704c77ca98e020a1e217231fc083ffc6519784ce65f09fcd9b0214d488d831b9f19190c4fa6daaebdf279df18
+  metadata.gz: 28d2c9112ce23c385f019fea283a9364c834f82aec9ebff7a2aa6a1550cb4c19c76fde4fa681de44524124f391da98e9d9e7386162c447e2ab86f7f0964302eb
+  data.tar.gz: b37e21fb5cde280dc3e36f11b123757e5aee18a69b2d188dbeb04eb07b11ff0c47eebcf01f971ec807b4da230292447fcb42072767ab8d0579b175cec3ea7917

data/README.md

@@ -17,12 +17,12 @@ gem 'angular-rails4-templates'
 
 ### 2. Include Templates in Rails Asset Pipeline
 
-Then, in your `application.js` file, require `angular-rails-templates` and your templates:
+Then, in your `application.js` file, require `angular-rails4-templates` and your templates:
 
 ```javascript
 //= require angularjs
 // ...
-//= require angular-rails-templates
+//= require angular-rails4-templates
 //
 // Templates in app/assets/javascript/templates
 //= require_tree ./templates
@@ -31,7 +31,7 @@ Then, in your `application.js` file, require `angular-rails-templates` and your
 //= require_tree ../templates
 ```
 
-Make sure to `require angular-rails-templates` **before** you require your templates.
+Make sure to `require angular-rails4-templates` **before** you require your templates.
 
 You'll need to use specific extensions to run the right preprocessor and load the resulting
 compiled template into the angular template cache.
@@ -112,7 +112,7 @@ It is used to generate javascript like:
 angular.module("<%= module_name %>")...
 ```
 
-Although it is not recommended, you can set `module_name` to the name of your main application module and remove `require angular-rails-templates` from your javascript manifest to have your templates directly injected into your app.
+Although it is not recommended, you can set `module_name` to the name of your main application module and remove `require angular-rails4-templates` from your javascript manifest to have your templates directly injected into your app.
 
 ### Configuration Option: `ignore_prefix`
 
@@ -217,3 +217,4 @@ MIT License. Copyright 2014 Pitr
 * Damien Mathieu <42@dmathieu.com>
 * pitr <pitr.vern@gmail.com>
 * Jeremy Ebler <jebler@gmail.com>
+* Chris Nelson <chris@teamgaslight.com>

data/lib/angular-rails4-templates.rb

@@ -2,6 +2,7 @@ require 'angular-rails4-templates/engine'
 
 module AngularRails4Templates
   autoload :HamlProcessor, 'angular-rails4-templates/haml_processor'
+  autoload :SlimProcessor, 'angular-rails4-templates/slim_processor'
   autoload :Processor, 'angular-rails4-templates/processor'
   autoload :VERSION,  'angular-rails4-templates/version'
 end

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

@@ -27,35 +27,16 @@ module AngularRails4Templates
 
 
     initializer 'angular-rails-templates', group: :all  do |app|
-      if app.config.assets
+      app.config.assets.configure do |env|
         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
-        #
-        # # 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
-        #   end
-        #
-        #   app.assets.register_engine ".#{ext}", mimeless_engine
-        # end
-
-        app.assets.register_mime_type 'text/ng-html', extensions: ['.nghtml']
-        app.assets.register_mime_type 'text/ng-haml', extensions: ['.nghaml']
-        app.assets.register_transformer 'text/ng-haml', 'application/javascript', AngularRails4Templates::HamlProcessor
-        app.assets.register_transformer 'text/ng-html', 'application/javascript', AngularRails4Templates::Processor
+        env.register_mime_type 'text/ng-html', extensions: ['.nghtml']
+        env.register_mime_type 'text/ng-haml', extensions: ['.nghaml']
+        env.register_mime_type 'text/ng-slim', extensions: ['.ngslim']
+        env.register_transformer 'text/ng-slim', 'application/javascript', AngularRails4Templates::SlimProcessor
+        env.register_transformer 'text/ng-haml', 'application/javascript', AngularRails4Templates::HamlProcessor
+        env.register_transformer 'text/ng-html', 'application/javascript', AngularRails4Templates::Processor
       end
 
       # Sprockets Cache Busting

data/lib/angular-rails4-templates/haml_processor.rb

@@ -1,4 +1,4 @@
-require 'angular-rails-templates/compact_javascript_escape'
+require 'angular-rails4-templates/compact_javascript_escape'
 require 'haml'
 
 module AngularRails4Templates

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

@@ -1,4 +1,4 @@
-require 'angular-rails-templates/compact_javascript_escape'
+require 'angular-rails4-templates/compact_javascript_escape'
 
 module AngularRails4Templates
   class Processor

data/lib/angular-rails4-templates/slim_processor.rb

@@ -0,0 +1,15 @@
+require 'angular-rails4-templates/compact_javascript_escape'
+require 'slim'
+
+module AngularRails4Templates
+  class SlimProcessor < Processor
+
+    include CompactJavaScriptEscape
+
+    def render_html(input)
+      template = input[:data]
+      output = Slim::Template.new { template }.render
+      escape_javascript output
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'angular-rails-templates/compact_javascript_escape'
+require 'angular-rails4-templates/compact_javascript_escape'
 
 module AngularRails4Templates
   class Template < ::Tilt::Template
@@ -51,4 +51,3 @@ module AngularRails4Templates
     end
   end
 end
-

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

@@ -1,3 +1,3 @@
 module AngularRails4Templates
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular-rails4-templates
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Damien Mathieu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -106,19 +106,13 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/angular-rails-templates/compact_javascript_escape.rb
-- lib/angular-rails-templates/engine.rb
-- lib/angular-rails-templates/haml_processor.rb
-- lib/angular-rails-templates/javascript_template.js.erb
-- lib/angular-rails-templates/processor.rb
-- lib/angular-rails-templates/template.rb
-- lib/angular-rails-templates/version.rb
 - lib/angular-rails4-templates.rb
 - lib/angular-rails4-templates/compact_javascript_escape.rb
 - lib/angular-rails4-templates/engine.rb
 - lib/angular-rails4-templates/haml_processor.rb
 - lib/angular-rails4-templates/javascript_template.js.erb
 - lib/angular-rails4-templates/processor.rb
+- lib/angular-rails4-templates/slim_processor.rb
 - lib/angular-rails4-templates/template.rb
 - lib/angular-rails4-templates/version.rb
 - vendor/assets/javascripts/angular-rails4-templates.js.erb

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

@@ -1,29 +0,0 @@
-module AngularRails4Templates
-  module CompactJavaScriptEscape
-    # inspired by Rails' action_view/helpers/javascript_helper.rb
-    JS_ESCAPE_MAP = {
-      '\\'    => '\\\\',
-      "\r\n"  => '\n',
-      "\n"    => '\n',
-      "\r"    => '\n',
-      '"'     => '\\"',
-      "'"     => "\\'"
-    }
-
-    # We want to deliver the shortist valid javascript escaped string
-    # Count the number of " vs '
-    # If more ', escape "
-    # If more ", escape '
-    # If equal, prefer to escape "
-
-    def escape_javascript(raw)
-      if raw
-        quote = raw.count(%{'}) >= raw.count(%{"}) ? %{"} : %{'}
-        escaped = raw.gsub(/(\\|\r\n|[\n\r#{quote}])/u) {|match| JS_ESCAPE_MAP[match] }
-        "#{quote}#{escaped}#{quote}"
-      else
-        '""'
-      end
-    end
-  end
-end

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

@@ -1,78 +0,0 @@
-require 'tilt'
-
-module AngularRails4Templates
-  class Engine < ::Rails::Engine
-    config.angular_templates = ActiveSupport::OrderedOptions.new
-    config.angular_templates.module_name    = 'templates'
-    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')]
-
-      # try loading common markups
-      %w(erb haml liquid md radius slim str textile wiki).
-      each do |ext|
-        begin
-          silence_warnings do
-            config.angular_templates.markups << ext if Tilt[ext]
-          end
-        rescue LoadError
-          # They don't have the required library required. Oh well.
-        end
-      end
-    end
-
-
-    initializer 'angular-rails-templates', group: :all  do |app|
-      if app.config.assets
-        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
-        #
-        # # 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
-        #   end
-        #
-        #   app.assets.register_engine ".#{ext}", mimeless_engine
-        # end
-
-        app.assets.register_mime_type 'text/ng-html', extensions: ['.nghtml']
-        app.assets.register_mime_type 'text/ng-haml', extensions: ['.nghaml']
-        app.assets.register_transformer 'text/ng-haml', 'application/javascript', AngularRails4Templates::HamlProcessor
-        app.assets.register_transformer 'text/ng-html', 'application/javascript', AngularRails4Templates::Processor
-      end
-
-      # Sprockets Cache Busting
-      # If ART's version or settings change, expire and recompile all assets
-      app.config.assets.version = [
-        app.config.assets.version,
-        'ART',
-        Digest::MD5.hexdigest("#{VERSION}-#{app.config.angular_templates}")
-      ].join '-'
-    end
-
-
-    config.after_initialize do |app|
-      # Ensure ignore_prefix can be passed as a String or Array
-      if app.config.angular_templates.ignore_prefix.is_a? String
-        app.config.angular_templates.ignore_prefix = Array(app.config.angular_templates.ignore_prefix)
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-require 'angular-rails-templates/compact_javascript_escape'
-require 'haml'
-
-module AngularRails4Templates
-  class HamlProcessor < Processor
-
-    include CompactJavaScriptEscape
-
-    def render_html(input)
-      template = input[:data]
-      haml_engine = Haml::Engine.new(template)
-      output = haml_engine.render
-      escape_javascript output
-    rescue Haml::SyntaxError => ex
-      raise Haml::SyntaxError.new("#{input[:filename]} #{ex.message}", ex.line)
-    end
-
-  end
-end

data/lib/angular-rails-templates/javascript_template.js.erb

@@ -1,6 +0,0 @@
-// Angular Rails Template
-// source: <%= source_file %>
-
-angular.module("<%= angular_module %>").run(["$templateCache", function($templateCache) {
-  $templateCache.put("<%= angular_template_name %>", <%= html %>)
-}]);

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

@@ -1,51 +0,0 @@
-require 'angular-rails-templates/compact_javascript_escape'
-
-module AngularRails4Templates
-  class Processor
-
-    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 render_html(input)
-      escape_javascript input[:data].chomp
-    end
-
-    def template_name(name)
-      path = name.sub /^(#{config.ignore_prefix.join('|')})/, ''
-      "#{path}.html"
-    end
-
-    def call(input)
-      angular_template_name = template_name(input[:name])
-      angular_module = config.module_name
-      html = render_html(input)
-      source_file = "#{input[:filename]}".sub(/^#{Rails.root}\//,'')
-      erb = ERB.new(File.read("#{File.dirname __FILE__}/javascript_template.js.erb"))
-
-      result = erb.result binding
-
-      result
-    end
-  end
-end

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

@@ -1,53 +0,0 @@
-require 'angular-rails-templates/compact_javascript_escape'
-
-module AngularRails4Templates
-  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) }
-
-      if configuration.htmlcompressor and @asset_should_be_processed
-        @data = compress data
-      end
-    end
-
-    def evaluate(scope, locals, &block)
-      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
-
-      if @asset_should_be_processed
-        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

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

@@ -1,3 +0,0 @@
-module AngularRails4Templates
-  VERSION = '1.0.0'
-end