PoParser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ef3b40331e9ddb92b0e2e80cecdda8931c792d
-  data.tar.gz: fb04bd5618a796539cc22654c35f819cfaa1ba95
+  metadata.gz: 066ad9b453a020a745330142e832c8922e95a0da
+  data.tar.gz: 8ce3ba60280751f10fb1b3a749d4ceb51247ab13
 SHA512:
-  metadata.gz: 5db31ba15259828ab3fbd12f39ac9929ce3baa7244e2f51511ac9d46f31278c13aa40606af22c249e74d2ae3ccbc65b4996f9b0b0a62936dedaa2724260609ac
-  data.tar.gz: 351db54dfc9b1e1b75945c13a1ecc4ad7da2cd7c6d4a0e659466f904f1b319c538081042dbb4b790ffd6ebbf580e9686fa066dd510eaad2870cfdacac5ff9c35
+  metadata.gz: 72264188d5c4bd28a4837cb29ba9cd5389618138ba3cd545c40fb563c0eaa2aff1ec159a8d302e63a0f7e8b2533070356e79e5290a19094071429ed9d7eea71c
+  data.tar.gz: 02465743b232b2649580b9dc89a5b6757412ef3e71abc14129a0bec89a5a831859078a12a64cc9590af2550efe418e616ff6d7511d6150472307f7dd772fa6ee

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.1.1
+
+* Fix bug of "str" and "to_str" on Messages
+* Small refactoring
+
 ## Version 0.1.0
 
 * initial release

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/arashm/PoParser.svg?branch=master)](https://travis-ci.org/arashm/PoParser)
 [![Coverage Status](https://img.shields.io/coveralls/arashm/PoParser.svg)](https://coveralls.io/r/arashm/PoParser)
+[![Code Climate](https://codeclimate.com/github/arashm/PoParser.png)](https://codeclimate.com/github/arashm/PoParser)
 
 A Ruby PO file parser, editor and generator. PO files are translation files generated by GNU/Gettext tool. This GEM is compatible with [GNU PO file specification](https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html). report misbehaviours and bugs, to the [issue tracker](https://github.com/arashm/PoParser/issues).
 
@@ -103,10 +104,10 @@ entry.plural?
 You can get or edit each of property of the `Entry`:
 
 ```ruby
-entry.msgid
+entry.msgid.to_s
 #=> "This is an msgid that needs to get translated"
 entry.translate = "This entry is translated" # or msgstr= alias
-entry.msgstr
+entry.msgstr.to_s
 #=> "This entry is translated"
 ```
 

data/lib/poparser/entry.rb

@@ -1,27 +1,22 @@
 module PoParser
   class Entry
     # TODO: raise error if a label is not known
-    def initialize(args= {})
+    def initialize(args = {})
       # Defining all instance variables to prevent warnings
       LABELS.each do |label|
         instance_variable_set "@#{label.to_s}".to_sym, nil
       end
 
       # Set passed arguments
-      args.each do |type, string|
-        if COMMENTS_LABELS.include? type
-          instance_variable_set "@#{type.to_s}".to_sym, Comment.new(type, string)
-        elsif ENTRIES_LABELS.include? type
-          instance_variable_set "@#{type.to_s}".to_sym, Message.new(type, string)
-        elsif type.to_s.match(/^msgstr\[[0-9]\]/)
-          # If it's a plural msgstr
-          @msgstr ||= []
-          @msgstr << Message.new(type, string)
-        end
+      args.each do |name, value|
+        set_instance_variable(name, value)
       end
 
-      define_writer_methods
+      define_writer_methods(COMMENTS_LABELS, 'Comment')
+      define_writer_methods(ENTRIES_LABELS, 'Message')
       define_reader_methods
+
+      self.class.send(:alias_method, :translate, :msgstr=)
     end
 
     # Checks if the entry is untraslated
@@ -106,38 +101,35 @@ module PoParser
   
   private
 
-    def define_writer_methods
-      COMMENTS_LABELS.each do |type, mark|
-        unless Entry.method_defined? "#{type}=".to_sym
-          self.class.send(:define_method, "#{type}=".to_sym, lambda { |val|
-            if instance_variable_get("@#{type}".to_sym).is_a? Comment
-              comment = instance_variable_get "@#{type}".to_sym
-              comment.type = type
-              comment.str = val
-            else
-              instance_variable_set "@#{type}".to_sym, Comment.new(type, val)
-            end
-            instance_variable_get "@#{type}".to_sym
-          })
-        end
+    def set_instance_variable(name, value)
+      if COMMENTS_LABELS.include? name
+        instance_variable_set "@#{name.to_s}".to_sym, Comment.new(name, value)
+      elsif ENTRIES_LABELS.include? name
+        instance_variable_set "@#{name.to_s}".to_sym, Message.new(name, value)
+      elsif name.to_s.match(/^msgstr\[[0-9]\]/)
+        # If it's a plural msgstr
+        @msgstr ||= []
+        @msgstr << Message.new(name, value)
       end
+    end
 
-      ENTRIES_LABELS.each do |type, mark|
+    def define_writer_methods(labels, object)
+      object = PoParser.const_get(object)
+      labels.each do |type, mark|
         unless Entry.method_defined? "#{type}=".to_sym
           self.class.send(:define_method, "#{type}=".to_sym, lambda { |val|
-            if instance_variable_get("@#{type}".to_sym).is_a? Message
-              message = instance_variable_get "@#{type}".to_sym
-              message.type = type
-              message.str = val
+            if instance_variable_get("@#{type}".to_sym).is_a? object
+              klass      = instance_variable_get "@#{type}".to_sym
+              klass.type = type
+              klass.str  = val
             else
-              instance_variable_set "@#{type}".to_sym, Message.new(type, val)
+              instance_variable_set "@#{type}".to_sym, object.new(type, val)
             end
+            # return value
             instance_variable_get "@#{type}".to_sym
           })
         end
       end
-
-      self.class.send(:alias_method, :translate, :msgstr=)
     end
 
     def define_reader_methods

data/lib/poparser/message.rb

@@ -11,7 +11,7 @@ module PoParser
     end
 
     def str
-      @str.join
+      @str.is_a?(Array) ? @str.join : @str
     end
 
     def to_s(with_label = false)
@@ -30,7 +30,7 @@ module PoParser
     end
 
     def to_str
-      @str.join
+      @str.is_a?(Array) ? @str.join : @str
     end
 
   private

data/lib/poparser/version.rb

@@ -1,3 +1,3 @@
 module PoParser
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: PoParser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Arash Mousavi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -148,7 +148,6 @@ files:
 - spec/poparser/test.po
 - spec/poparser/tokenizer_spec.rb
 - spec/poparser/transformer_spec.rb
-- spec/poparser/version_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/arashm/poparser
 licenses:
@@ -187,5 +186,4 @@ test_files:
 - spec/poparser/test.po
 - spec/poparser/tokenizer_spec.rb
 - spec/poparser/transformer_spec.rb
-- spec/poparser/version_spec.rb
 - spec/spec_helper.rb

data/spec/poparser/version_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-# Just as test to ensure that test suit is working correctly
-describe 'Version' do
-  it 'shows the version correctly' do
-    expect(PoParser::VERSION).to eq('0.0.1')
-  end
-end