ngannotate-rails 0.15.4 → 0.15.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f66edb3317d94529097c835b638af4cb1a94528
-  data.tar.gz: b4e683550940bd0fc9ba91a831d0fbdc17380638
+  metadata.gz: 803c3f028160ddb16f237bde0767253166634f9d
+  data.tar.gz: 39f5bff0e5db3f5ee4b28938411c8dba6da5e4b5
 SHA512:
-  metadata.gz: b2c9f1244e639417bb37679586dc4eff73cd8aa82f79c093d322de33bd8271ca5942c9cdb0f68b85a65607b061d971a5da30eb15cd2c6099d8d59a4308a9fce8
-  data.tar.gz: 1122a9a1c5db4c6cd1633ca63e98a673860ea2607863527c768c1e2d85c01643205e86803db771d1f4514e143f58037eb720d9991d4f4538263a88fc4f3dfce8
+  metadata.gz: ce2eea9455191842a3d04f6653d4711b0972336a00cfa24c1f637d936b560bd44a4b5b71eb257ce57f9feec9e7f29da9de8518a8b67a9c874c65082b5fb7889a
+  data.tar.gz: 350ee5ef46ae826c1158bb469fdff542cf9062b742de27e1ec443c79d9d19ed65d59ef9721b8f1ec5fc17b93164023eb15687dc223cab87fec768f1e2e071e7e

data/.gitignore

@@ -17,3 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 node_modules
+*.log

data/README.md

@@ -80,6 +80,30 @@ The ngannotate-rails version number mirrors the version number for the version o
 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]".
 
+Release Process
+---------------
+
+For ngannotate update:
+
+```bash
+git checkout master
+git pull
+rake ngannotate:build
+git citool
+# check that result makes sense and if so,
+# use comment: ngannotate: vX.Y.Z
+git tag vX.Y.Z
+git push
+git push --tags
+gem build ngannotate-rails.gemspec
+gem push ngannotate-rails-X.Y.Z.gems
+```
+
+For internal fixes:
+
+Similar except no ngannotate:build and new version is previous plus fourth digit for patch level (see Versioning).
+
+
 Help
 ----
 

data/lib/ngannotate/processor3.rb

@@ -0,0 +1,65 @@
+require 'execjs'
+
+module Ngannotate
+  class Processor
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.name
+      'Ngannotate::Processor'
+    end
+
+    def self.call(input)
+      instance.call(input)
+    end
+
+    def call(input)
+      data = input[:data]
+      return data if skip
+      prepare
+      opt = { add: true }.merge!(parse_opt)
+      r = @context.call 'window.annotate', data, opt
+      r['src']
+    end
+
+    def prepare
+      return if skip
+      ngannotate_source = File.open(File.join(File.dirname(__FILE__), '../../vendor/ngannotate.js')).read
+      @context = ExecJS.compile "window = {};" + ngannotate_source
+    end
+
+    #
+    # To allow testing assets compile in development environment
+    #
+    # To explicitly force assets compile in development environment
+    #  NG_FORCE=true RAILS_ENV=development bundle exec rake assets:clean assets:precompile
+    # or add to environments/development.rb
+    #  config.ng_annotate.process = true
+    #
+    def force
+      ENV['NG_FORCE'] == 'true'
+    end
+
+    #
+    # Skip processing in environments where it does not make sense.
+    # Override by NG_FORCE=true env variable
+    #
+    def skip
+      !force && !::Rails.configuration.ng_annotate.process
+    end
+
+    def parse_opt
+      opt = {}
+      opt_str = ENV['NG_OPT']
+      if opt_str
+        opt = Hash[opt_str.split(',').map { |e| e.split('=') }]
+        opt.symbolize_keys!
+      end
+      if ENV['NG_REGEXP']
+        opt[:regexp] = ENV['NG_REGEXP']
+      end
+      opt
+    end
+  end
+end

data/lib/ngannotate/rails/railtie.rb

@@ -1,5 +1,9 @@
 require 'active_support/core_ext/class/attribute'
-require 'ngannotate/processor'
+if Ngannotate.sprockets_v3?
+  require 'ngannotate/processor3'
+else
+  require 'ngannotate/processor'
+end
 
 module Ngannotate
   module Rails

data/lib/ngannotate/rails/version.rb

@@ -1,5 +1,5 @@
 module Ngannotate
   module Rails
-    VERSION = "0.15.4"
+    VERSION = "0.15.4.1"
   end
 end

data/lib/ngannotate-rails.rb

@@ -0,0 +1 @@
+require_relative 'ngannotate'

data/lib/ngannotate.rb

@@ -0,0 +1,8 @@
+module Ngannotate
+  def self.sprockets_v3?
+    gem = Gem.loaded_specs['sprockets']
+    !(gem.version.to_s =~ /\A3\..*\z/).nil?
+  end
+end
+
+require 'ngannotate/rails'

data/ngannotate-rails.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/kikonen/ngannotate-rails"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/).reject {|f| f.match /example/ }
+  spec.files         = `git ls-files`.split($/).reject {|f| f =~ /example/ || f =~ /test/}
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngannotate-rails
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.4.1
 platform: ruby
 authors:
 - Kari Ikonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,7 +80,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/ngannotate-rails.rb
+- lib/ngannotate.rb
 - lib/ngannotate/processor.rb
+- lib/ngannotate/processor3.rb
 - lib/ngannotate/rails.rb
 - lib/ngannotate/rails/railtie.rb
 - lib/ngannotate/rails/version.rb
@@ -111,4 +114,3 @@ signing_key:
 specification_version: 4
 summary: 'Summary: Use ngannotate in the Rails asset pipeline.'
 test_files: []
-has_rdoc: