ngannotate-rails 0.9.6.2 → 0.9.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: fbf0f62be2ffca2b0dbcfbde24f5a2104562773f
-  data.tar.gz: 01d71388ee9ed9381abab2e89b0c07fb58096fcc
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGFiNDQ4MDBiM2ZmYjQ0NjJiMmQ1MjViMjcwY2YyNTM1YTY2MmQ0Yg==
+  data.tar.gz: !binary |-
+    MjNlMDMzZTUzMTVlYWEzY2FmODJhM2M1MDQzNzRhYjE0YzhiZTJkZQ==
 SHA512:
-  metadata.gz: 3053526a2a1dcce45c562a76a9a3609ebecc9e8fefb929d3443d9845107c90af1891b5439a8aed6403a81ad9c086d5bd456d8963dfd50b6c0f5c2fb56b2b5a59
-  data.tar.gz: 5d26ce0de01d737665becfd20e2e9223d0146001a956d4c188f5bcf9ce8f70829e5b3786d3d6f2dbf987ff1c2320438e6631f487054e3dbff54d00af2cfa2648
+  metadata.gz: !binary |-
+    MDcxNDAzMmIwMDU1ZWU4MGEwMWIwMzkyZmFlOTYyYzQ2NmY4NTQxMDkyOWY1
+    NjVlYTY4ZWE2ZTU0YmY4N2I0YTI0Mzg2MDliNGY0YzQwNmY0OGUxMWFlYWU3
+    YjVhMWI1NzQyYzFkMGIyZGM3ZmQ0MzJjNjE1ZGVmYzZlN2IxNzA=
+  data.tar.gz: !binary |-
+    Y2U4ZGYyYjFjNWFhZTNjMWVjMWUyZDM2OTU2NGNlZTYyNGY5ZjQwNDI1MzY2
+    NmI1MThiOTdmYzk4MzAyNjY1MDY0MWEyMjIyODhlZTIzZTJkYWVmYjMzOTQy
+    NTgyYzFhNDI5ZTJhNDMxZmFhYWQyZDFmYjRlYTUwYzBkMmRiODc=

data/README.md

@@ -14,7 +14,7 @@ And then execute:
 
     $ bundle
 
-That's it! ngannotate-rails integrates seamlessly into the Rails asset pipeline; your JavaScript or CoffeeScript assets will automatically be run through the ngannotate pre-minifier.
+That's it! ngannotate-rails integrates seamlessly into the Rails asset pipeline; your JavaScript or CoffeeScript assets will automatically be run through the ng-annotate pre-minifier.
 
 Usage
 -----
@@ -38,30 +38,58 @@ Examples,
     NG_FORCE=true RAILS_ENV=development bundle exec rake assets:clean assets:precompile
 
 
+Testing assets locally
+----------------------
+
+To allow testing precompiled assets locally in development environment.
+
+config/environments/development.yml
+
+    #
+    # to allow testing assets:precompile in development environment
+    # Usage:
+    #   time NG_FORCE=true RAILS_ENV=development bundle exec rake assets:clean assets:precompile:primary
+    #   NG_FORCE=true rails s -p 3001
+    #
+    if ENV['NG_FORCE'] == 'true'
+      config.assets.compress = true
+      config.assets.compile = false
+      config.assets.digest = true
+      config.assets.debug = false
+    end
+
+precompile & start server
+
+    time NG_FORCE=true RAILS_ENV=development bundle exec rake assets:clean assets:precompile:primary
+    NG_FORCE=true rails s -p 3001
+
+
 Versioning
 ----------
 
-The ngannotate-rails version number mirrors the version number for the version of ngannotate that is bundled with it.
+The ngannotate-rails version number mirrors the version number for the version of ng-annotate that is bundled with it.
+For minor patch releases, when ng-annotate version is not changing, 4th digit is used (For example, "0.9.6.1").
+Every released version is tagged with tag "v[VERSION]".
 
 Help
 ----
 
-  * **Q**: I installed ngannotate-rails, but my assets aren't getting processed with ngannotate.
+  * **Q**: I installed ngannotate-rails, but my assets aren't getting processed with ng-annotate.
 
     **A:** Remember to delete `tmp/cache/assets` or `touch` all the related asset files so that the cached versions get regenerated. If you've precompiled your assets into `public/assets`, you'll need to re-precompile them.
 
 Hacking
 -------
 
-### Upgrading ngannotate
+### Upgrading ng-annotate
 
-The actual ngannotate project is bundled into this gem via [Browserify](https://github.com/substack/node-browserify). You can update to the latest version of ngannotate via Rake:
+The actual ngannotate project is bundled into this gem via [Browserify](https://github.com/substack/node-browserify). You can update to the latest version of ng-annotate via Rake:
 
     rake ngannotate:build
 
 ### Test Application
 
-There is a Rails 3 application bundled in `example/` that you can use to test the asset pipeline integration. Don't forget to remove `tmp/cache/assets` after upgrading to the latest version of ngannotate.
+There is a Rails 3 application bundled in `example/` that you can use to test the asset pipeline integration. Don't forget to remove `tmp/cache/assets` after upgrading to the latest version of ng-annotate.
 
 Credits
 -------

data/lib/ngannotate/rails/version.rb

@@ -1,5 +1,5 @@
 module Ngannotate
   module Rails
-    VERSION = "0.9.6.2"
+    VERSION = "0.9.7"
   end
 end

data/vendor/ngannotate.js

@@ -1319,8 +1319,7 @@ function matchRegular(node, ctx) {
 // matches with --regexp "^require(.*)$"
 //   require("app-module").controller("MyCtrl", function($scope) {});
 function isReDef(node, ctx) {
-    var slice = ctx.src.slice(node.range[0], node.range[1]);
-    return ctx.re.test(slice);
+    return ctx.re.test(ctx.srcForRange(node.range));
 }
 
 // Long form: angular.module(*).controller("MyCtrl", function($scope, $timeout) {});
@@ -1521,6 +1520,9 @@ window.annotate = function ngAnnotate(src, options) {
         mode: mode,
         quot: quot,
         src: src,
+        srcForRange: function(range) {
+            return src.slice(range[0], range[1]);
+        },
         re: re,
         comments: comments,
         fragments: fragments,
@@ -1661,6 +1663,11 @@ function visitNodeFollowingNgInjectComment(node, ctx) {
         addRemoveInjectArray(d0.init.params, isSemicolonTerminated ? nr1 : d0.init.range[1], d0.id.name);
     } else if (ctx.isFunctionDeclarationWithArgs(node)) {
         addRemoveInjectArray(node.params, nr1, node.id.name);
+    } else if (node.type === "ExpressionStatement" && node.expression.type === "AssignmentExpression" &&
+        ctx.isFunctionExpressionWithArgs(node.expression.right)) {
+        var isSemicolonTerminated$0 = (ctx.src[nr1 - 1] === ";");
+        var name = ctx.srcForRange(node.expression.left.range);
+        addRemoveInjectArray(node.expression.right.params, isSemicolonTerminated$0 ? nr1 : node.expression.right.range[1], name);
     }
 
     function getIndent(pos) {
@@ -1687,7 +1694,7 @@ function visitNodeFollowingNgInjectComment(node, ctx) {
             var hasInjectArray = (nextNode.type === "ExpressionStatement" && assignment.type === "AssignmentExpression" &&
                 assignment.operator === "=" &&
                 (lvalue = assignment.left).type === "MemberExpression" &&
-                lvalue.computed === false && lvalue.object.name === name && lvalue.property.name === "$inject");
+                lvalue.computed === false && ctx.srcForRange(lvalue.object.range) === name && lvalue.property.name === "$inject");
 
             if (ctx.mode === "rebuild" && hasInjectArray) {
                 ctx.fragments.push({

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: ngannotate-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.6.2
+  version: 0.9.7
 platform: ruby
 authors:
 - Kari Ikonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: execjs
   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'
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Use ngannotate in the Rails asset pipeline.
@@ -96,18 +96,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: 'Summary: Use ngannotate in the Rails asset pipeline.'
+summary: ! 'Summary: Use ngannotate in the Rails asset pipeline.'
 test_files: []