puttext 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ea19d0b5142d39af84debf1a5554e54cd7b28e
-  data.tar.gz: 7e5b71ded6723ffc5a5eab512b871baedb1fe9ce
+  metadata.gz: 0c7e0324ec2fadafc1532c4a71ff53f526b45251
+  data.tar.gz: 912c93608cc1f8a5b534c0a0cb9a9ed50989873b
 SHA512:
-  metadata.gz: c31494729c4e056cdd9eb79f983a232e99f0840ea0786bac4cab16f60b5322ad66d8af1f17e06a00e49c10f2076e4ef9c17f9e396480c8aa6a31dd84558aac3c
-  data.tar.gz: 8d30e26ee2bbbf93ea71260094f23859459fbb6f99723dc0d185111c3fe8a50ecbe7f177425e1028cfd9a0764f5b1a6aa2532cfee4c4ee027ba99070e2cfba10
+  metadata.gz: 2bbf61f00429e95b98f21882dd3bd7093852d45bc2a08bb9b6143aa0341cf27e9bf5ff60fde4c7c4ccabbd3007966ea9181592028de35f4e381019d72fb0dbdf
+  data.tar.gz: 13da779357b574a70f9bc6b7ef80904287ac81c4f07a325533c27984ea8001d77d7052795b5ab6300ab723ac0af2ab369c7c7b6855424ff09a7d8b93a2d40067

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puttext (0.2.1)
+    puttext (0.3.2)
       parser (>= 2.4.0.0, < 3.0)
       unindent
 

data/lib/puttext/parser/base.rb

@@ -4,9 +4,6 @@ require_relative '../po_entry'
 
 module PutText
   module Parser
-    # Thrown when any error parsing a file occurs
-    class ParseError < StandardError; end
-
     class Base
       # Parse gettext strings from a file in the path.
       # @param [String] path the path of the file to parse.

data/lib/puttext/parser/ruby.rb

@@ -15,8 +15,10 @@ module PutText
       METHODS = {
         gettext:   :regular,
         _:         :regular,
+        N_:        :regular,
         ngettext:  :plural,
         n_:        :plural,
+        Nn_:       :plural,
         sgettext:  :context_sep,
         s_:        :context_sep,
         nsgettext: :context_sep_plural,
@@ -62,17 +64,11 @@ module PutText
         case ast_node.type
         when :str
           ast_node.children[0]
-        else
-          raise ParseError,
-                format('unsupported AST node type: %s', ast_node.type)
         end
       end
 
       def po_entry_from_ast_node(ast_node, type)
-        filename = ast_node.location.expression.source_buffer.name
-        line     = ast_node.location.line
-
-        entry_attrs = { references: ["#{filename}:#{line}"] }
+        entry_attrs = { references: [ast_node_location(ast_node)] }
 
         PARAMS[type].each_with_index do |name, index|
           next if name == :_ # skip parameters named _
@@ -81,7 +77,14 @@ module PutText
           entry_attrs[name] = param if param
         end
 
-        PutText::POEntry.new(entry_attrs)
+        PutText::POEntry.new(entry_attrs) if entry_attrs[:msgid]
+      end
+
+      def ast_node_location(ast_node)
+        filename = ast_node.location.expression.source_buffer.name
+        line     = ast_node.location.line
+
+        "#{filename}:#{line}"
       end
 
       def find_strings_in_ast(ast_node)
@@ -96,7 +99,7 @@ module PutText
           entries += find_strings_in_each_ast(ast_node.children)
         end
 
-        entries
+        entries.compact
       end
 
       def find_strings_in_each_ast(ast_nodes)

data/puttext.gemspec

@@ -4,7 +4,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name     = 'puttext'
-  s.version  = '0.2.1'
+  s.version  = '0.3.2'
   s.date     = Date.today.to_s
   s.summary  = 'Extract gettext strings from Ruby source'
   s.authors  = ['Mantas Norvaiša']

data/spec/unit/parser/ruby_spec.rb

@@ -15,8 +15,10 @@ describe PutText::Parser::Ruby do
               [
                 gettext('gettext'),
                 _('underscore'),
+                N_('nothing underscore'),
                 ngettext('1 ngettext', '%d ngettexts', 5),
                 n_('1 underscore', '%d underscores', 5),
+                Nn_('1 nothing', '%d nothings', 5),
                 sgettext('context|sgettext'),
                 s_('context---s underscore', '---'),
                 nsgettext('context|1 nsgettext', '%d nsgettexts', 5),
@@ -45,7 +47,7 @@ describe PutText::Parser::Ruby do
       end
 
       it 'extracts the correct number of strings' do
-        expect(PutText::POEntry).to have_received(:new).exactly(12).times
+        expect(PutText::POEntry).to have_received(:new).exactly(14).times
       end
 
       it 'correctly extracts string from gettext calls' do
@@ -62,11 +64,18 @@ describe PutText::Parser::Ruby do
         )
       end
 
+      it 'correctly extracts string from N_ calls' do
+        expect(PutText::POEntry).to have_received(:new).with(
+          msgid: 'nothing underscore',
+          references: ['test.rb:13']
+        )
+      end
+
       it 'correctly extracts string from ngettext calls' do
         expect(PutText::POEntry).to have_received(:new).with(
           msgid: '1 ngettext',
           msgid_plural: '%d ngettexts',
-          references: ['test.rb:13']
+          references: ['test.rb:14']
         )
       end
 
@@ -74,14 +83,22 @@ describe PutText::Parser::Ruby do
         expect(PutText::POEntry).to have_received(:new).with(
           msgid: '1 underscore',
           msgid_plural: '%d underscores',
-          references: ['test.rb:14']
+          references: ['test.rb:15']
+        )
+      end
+
+      it 'correctly extracts string from Nn_ calls' do
+        expect(PutText::POEntry).to have_received(:new).with(
+          msgid: '1 nothing',
+          msgid_plural: '%d nothings',
+          references: ['test.rb:16']
         )
       end
 
       it 'correctly extracts string from sgettext calls' do
         expect(PutText::POEntry).to have_received(:new).with(
           msgid: 'context|sgettext',
-          references: ['test.rb:15']
+          references: ['test.rb:17']
         )
       end
 
@@ -89,7 +106,7 @@ describe PutText::Parser::Ruby do
         expect(PutText::POEntry).to have_received(:new).with(
           msgid: 'context---s underscore',
           separator: '---',
-          references: ['test.rb:16']
+          references: ['test.rb:18']
         )
       end
 
@@ -97,7 +114,7 @@ describe PutText::Parser::Ruby do
         expect(PutText::POEntry).to have_received(:new).with(
           msgid: 'context|1 nsgettext',
           msgid_plural: '%d nsgettexts',
-          references: ['test.rb:17']
+          references: ['test.rb:19']
         )
       end
 
@@ -106,7 +123,7 @@ describe PutText::Parser::Ruby do
           msgid: 'context---1 ns underscore',
           msgid_plural: '%d ns underscores',
           separator: '---',
-          references: ['test.rb:18']
+          references: ['test.rb:20']
         )
       end
 
@@ -114,7 +131,7 @@ describe PutText::Parser::Ruby do
         expect(PutText::POEntry).to have_received(:new).with(
           msgctxt: 'context',
           msgid: 'pgettext',
-          references: ['test.rb:19']
+          references: ['test.rb:21']
         )
       end
 
@@ -122,7 +139,7 @@ describe PutText::Parser::Ruby do
         expect(PutText::POEntry).to have_received(:new).with(
           msgctxt: 'context',
           msgid: 'p underscore',
-          references: ['test.rb:20']
+          references: ['test.rb:22']
         )
       end
 
@@ -131,7 +148,7 @@ describe PutText::Parser::Ruby do
           msgctxt: 'context',
           msgid: '1 npgettext',
           msgid_plural: '%d npgettexts',
-          references: ['test.rb:21']
+          references: ['test.rb:23']
         )
       end
 
@@ -140,7 +157,7 @@ describe PutText::Parser::Ruby do
           msgctxt: 'context',
           msgid: '1 np underscore',
           msgid_plural: '%d np underscores',
-          references: ['test.rb:22']
+          references: ['test.rb:24']
         )
       end
     end
@@ -166,10 +183,8 @@ describe PutText::Parser::Ruby do
         RUBY
       end
 
-      it 'throws a PutText::Parser::ParseError error' do
-        expect { subject.strings_from_source(ruby_code) }.to raise_error(
-          PutText::Parser::ParseError
-        )
+      it 'skips the entry, returns an empty array' do
+        expect(subject.strings_from_source(ruby_code)).to eq([])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puttext
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Mantas Norvaiša
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser