foraneus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjUyZWQ0OTM3OTA4MWE0MzBlNmEyZmUzYWI5ZGM2ZTdlYzBiMTJhOQ==
+    MzE1YmEwZTI1OThmZDhkNjIxOGIyM2ZkYWQzMDJjMjYxYmUxYWU4NA==
   data.tar.gz: !binary |-
-    NTcyZjkzYjM3NWE3N2QzYjQ3MzYyNjMyOGQ3ZTBiZjE1Mjc5Y2VmOQ==
+    MjVjZjQwOTQ2MGE2OWQ5MWEzN2MyMDU3ZWVhZTEyZGVhOTkyMWJjNA==
 SHA512:
   metadata.gz: !binary |-
-    ZTMzMzNhYjg4MmJkYTZkODhmZTllYTgwN2ZhZDQ0NjA5OTM1NWUxNDU5YjA5
-    ZjQ5YzY1NjZhMDc4OThlNmJkN2YxNWE4MDQ0MzQ5YjBjMjMwODQ1MTczZTJl
-    NjExNmI0OWQyMWNlOTNmYjA5NzE0YzUwOWViYjQwZWY2NGU4Mzk=
+    ZjM1OTA2MDZmNjZjOWRkYmUyODVmZjRmMTc2N2U1NGY1MTc2OTI1NzM3MTJj
+    YzlhNDY1OWVmYTc5YzEzMzE5NGY4ZDE2MDg5M2EyOGExMzE0YzM1OGQyYTU2
+    N2JlYTA1MTY1YTFkMzQwNTY2YjJiY2I3OWM2ODJhYjQ2MGI1NmY=
   data.tar.gz: !binary |-
-    ZjllNzU3NzQxNWUzZGEzOTk2OWMwNWUwZTY1OGQ4NTkxYWNiZWI1Mjg1N2Jh
-    YzMxZjc3YTI1OGM1MWViNzI4ZDg2ZTdjYzYxOWE0YTM1Yzc0ODMxNDI2MDJh
-    MzcxMzVlYWE0ZTM0OThiYmI1NGY1YmUxZmJlOTc1OTI1MmVkZDM=
+    YzEzM2VkYWQ5Y2NlOTU5MTMwY2U4MDliOTg2ZTkzNmMzZTBhMGY2NDgwZTVi
+    OWJhYjlhOGFjNzZiZDdkMzdiMDcwNGQ2NjVhZGE4OWIxNTc2ZGYxMGFjYjJi
+    OTQ1NWI4YzIxYmNlMDgwYmFkYjRiNmM1OTQ0MzQ1OGJiOGIwYzE=

data/README.md

@@ -2,12 +2,13 @@
 
 ## Usage
 
-``` ruby
-class MyForm < Foraneus
-  integer :delay
-  float :duration
-end
-```
+ - Declaration:
+  ``` ruby
+  class MyForm < Foraneus
+    integer :delay
+    float :duration
+  end
+  ```
 
  - From the outside:
 
@@ -22,7 +23,7 @@ end
 
   ``` ruby
   form.data   # => { :delay => 5, :duration => 2.14 }
-  form[]     # => { :delay => '5', :duration => '2.14' }
+  form[]      # => { :delay => '5', :duration => '2.14' }
   ```
 
   ``` ruby
@@ -30,7 +31,7 @@ end
   form.errors   # => {}
   ```
 
- - From the inside
+ - From the inside:
 
   ``` ruby
   form = MyForm.new
@@ -41,11 +42,11 @@ end
   form[:delay]  # => nil
   ```
 
- - From the inside
+ - From the inside:
 
   ``` ruby
   form = MyForm.raw(:delay => 5, :duration => 2.14)
-  ``` ruby
+  ```
 
   ``` ruby
   form.delay    # => 5
@@ -54,9 +55,28 @@ end
 
   ``` ruby
   form.data   # => { :delay => 5, :duration => 2.14 }
-  form[]     # => { :delay => '5', :duration => '2.14' }
+  form[]      # => { :delay => '5', :duration => '2.14' }
+  ```
+
+## Installation
+
+ - Install `foraneus` as a gem.
+
+    ``` shell
+    gem install foraneus
+    ```
+
+## Running tests
+
+Tests are written in RSpec. To run them all just execute the following from your command line:
+
+  ``` shell
+  rspec
   ```
 
+## Badges
+
+[![Build Status](https://travis-ci.org/snmgian/foraneus.svg?branch=master)](https://travis-ci.org/snmgian/foraneus) [![Code Climate](https://codeclimate.com/github/snmgian/foraneus.png)](https://codeclimate.com/github/snmgian/foraneus)
 
 ## License
 

data/lib/foraneus/converters/decimal.rb

@@ -42,7 +42,6 @@ class Foraneus
 
         "#{s}#{zeros}"
       end
-
     end
 
   end

data/lib/foraneus/converters/float.rb

@@ -2,12 +2,54 @@ class Foraneus
   module Converters
 
     class Float
+
+      DEFAULT_SEPARATOR = '.'
+
+      DELIMITED_REGEX = /(\d)(?=(\d\d\d)+(?!\d))/
+
+      def initialize(opts = {})
+        @delimiter = opts[:delimiter]
+        @precision = opts[:precision]
+        @separator = opts[:separator] || DEFAULT_SEPARATOR
+      end
+
       def parse(s)
-        Kernel.Float(s)
+        if s == ''
+          raise ArgumentError, 'invalid value for Float(): ""'
+        end
+
+        parts = s.split(@separator)
+
+        integer_part = parts[0] || '0'
+
+        if @delimiter
+          integer_part.gsub!(@delimiter, '')
+        end
+
+        fractional_part = parts[1] || '0'
+
+        Kernel.Float("#{integer_part}.#{fractional_part}")
       end
 
       def raw(v)
-        v.to_s
+        left, right = v.to_s.split('.')
+
+        if @precision && right.length < @precision
+          right = add_trailing_zeros(right, @precision - right.length)
+        end
+
+        if @delimiter
+          left.gsub!(DELIMITED_REGEX) { "#{$1}#{@delimiter}" }
+        end
+
+        "#{left}#{@separator}#{right}"
+      end
+
+      private
+      def add_trailing_zeros(s, n)
+        zeros = '0' * n
+
+        "#{s}#{zeros}"
       end
     end
 

data/lib/foraneus/converters/integer.rb

@@ -2,12 +2,26 @@ class Foraneus
   module Converters
 
     class Integer
+      DELIMITED_REGEX = /(\d)(?=(\d\d\d)+(?!\d))/
+
+      def initialize(opts = {})
+        @delimiter = opts[:delimiter]
+      end
+
       def parse(s)
+        s = s.gsub(@delimiter, '') if @delimiter
+
         Kernel.Integer(s)
       end
 
       def raw(v)
-        v.to_s
+        s = v.to_s
+
+        if @delimiter
+          s.gsub!(DELIMITED_REGEX) { "#{$1}#{@delimiter}" }
+        end
+
+        s
       end
     end
 

data/lib/foraneus.rb

@@ -66,29 +66,36 @@ class Foraneus
     parsed_data = {}
 
     raw_data.each do |k, v|
-      field = k.to_s
-      converter = fields[field]
-      next unless converter
-
-      instance[k] = v
-      begin
-        v = if v.nil?
-          nil
-        else
-          converter.parse(v)
-        end
-
-        instance.send("#{field}=", v)
-        instance.data[k] = v
-      rescue
-        error = Foraneus::Error.new($!.class.name, $!.message)
-        instance.instance_variable_get(:@errors)[k] = error
-      end
+      __parse_raw_datum(instance, k, v)
     end
 
     instance
   end
 
+  # @param [Foraneus] foraneus
+  # @param [String, Symbol] k
+  # @param [String] v
+  def self.__parse_raw_datum(foraneus, k, v)
+    field = k.to_s
+    converter = fields[field]
+
+    return unless converter
+
+    foraneus[k] = v
+
+    unless v.nil?
+      v = converter.parse(v)
+    end
+
+    foraneus.send("#{field}=", v)
+    foraneus.data[k] = v
+
+  rescue
+    error = Foraneus::Error.new($!.class.name, $!.message)
+    foraneus.instance_variable_get(:@errors)[k] = error
+  end
+  private_class_method :__parse_raw_datum
+
   def self.raw(data)
     instance = self.new
 

data/spec/lib/foraneus/converters/decimal_converter_spec.rb

@@ -66,12 +66,17 @@ describe Foraneus::Converters::Decimal do
         Foraneus::Converters::Decimal.new(:precision => 2)
       }
 
-      it 'x' do
+      it 'fills with zeros when value precision is smaller than converter precision' do
         n = BigDecimal.new('3.1')
         converter.raw(n).should eq('3.10')
       end
 
-      it 'y' do
+      it 'does not affect the representation when precision and converter precision are both equal' do
+        n = BigDecimal.new('3.14')
+        converter.raw(n).should eq('3.14')
+      end
+
+      it 'does not truncate the representation when precision is larger than converter precision' do
         n = BigDecimal.new('3.145')
         converter.raw(n).should eq('3.145')
       end

data/spec/lib/foraneus/converters/float_converter_spec.rb

@@ -37,6 +37,26 @@ describe Foraneus::Converters::Float do
       end
     end
 
+    context 'when separator and delimiter are given' do
+      subject(:converter) {
+        Foraneus::Converters::Float.new(:delimiter => '.', :separator => ',')
+      }
+
+      it 'parses a float representation' do
+        s = '1.234.567,89'
+        n = 1_234_567.89
+
+        converter.parse(s).should eq(n)
+      end
+
+      it 'parses a float representation when no integer part' do
+        s = ',56'
+        n = 0.56
+
+        converter.parse(s).should eq(n)
+      end
+    end
+
     context 'with invalid values' do
       let(:raw_invalid) { 'INVALID' }
 
@@ -68,5 +88,40 @@ describe Foraneus::Converters::Float do
     it 'returns a string representation' do
       subject.raw(2.34).should eq('2.34')
     end
+
+    context 'when separator and delimiter are given' do
+      subject(:converter) {
+        Foraneus::Converters::Float.new(:delimiter => '.', :separator => ',')
+      }
+
+      it 'returns a float representation' do
+        n = 1_234_567.89
+        s = '1.234.567,89'
+
+        converter.raw(n).should eq(s)
+      end
+    end
+
+    context 'when precision is given' do
+      subject(:converter) {
+        Foraneus::Converters::Float.new(:precision => 2)
+      }
+
+      it 'fills with zeros when value precision is smaller than converter precision' do
+        n = 3.1
+        converter.raw(n).should eq('3.10')
+      end
+
+      it 'does not affect the representation when precision and converter precision are both equal' do
+        n = 3.14
+        converter.raw(n).should eq('3.14')
+      end
+
+      it 'does not truncate the representation when precision is larger than converter precision' do
+        n = 3.145
+        converter.raw(n).should eq('3.145')
+      end
+    end
+
   end
 end

data/spec/lib/foraneus/converters/integer_converter_spec.rb

@@ -37,6 +37,19 @@ describe Foraneus::Converters::Integer do
       end
     end
 
+    context 'when delimiter is given' do
+      subject(:converter) {
+        Foraneus::Converters::Integer.new(:delimiter => '.')
+      }
+
+      it 'parses an integer representation' do
+        s = '1.234.567'
+        n = 1_234_567
+
+        converter.parse(s).should eq(n)
+      end
+    end
+
     context 'with invalid values' do
       let(:raw_invalid) { 'INVALID' }
 
@@ -68,6 +81,20 @@ describe Foraneus::Converters::Integer do
     it 'returns a string representation' do
       subject.raw(2).should eq('2')
     end
+
+    context 'when delimiter is given' do
+      subject(:converter) {
+        Foraneus::Converters::Integer.new(:delimiter => '.')
+      }
+
+      it 'parses an integer representation' do
+        n = 1_234_567
+        s = '1.234.567'
+
+        converter.raw(n).should eq(s)
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foraneus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Gianfranco Zas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec