paranoid_starlight 1.4.0 → 2.0

data/README.md

@@ -1,10 +1,20 @@
 # ParanoidStarlight
 
-This piece of gem contains some custom validators and converters for ActiveModel.
+This gem is pack of methods to convert or validate
+different formats of strings and texts in model,
+like telephone numbers (CZ/SK format),
+email, or (european) names (currently).
+Or to clean string of too much whitespaces.
 
-It has validations for email and name (European style).
-And validation and converter (to international format) of telephone number. (CZ/SK format)
-Few converters for texts and strings. Specs included.
+It provides *convert* methods for attributes of model
+(getter and setter method in object is enough).
+They are used in save hooks.
+
+There are also *validator* methods for ActiveModel
+nd hook for automatic ActiveRecord integration.
+Just type: (`require 'paranoid_starlight/active_record'`)
+
+Specs included.
 
 ## Installation
 
@@ -12,7 +22,7 @@ Add this line to your application's Gemfile:
 
     gem 'paranoid_starlight'
 
-If you want to have methods available for ActiveRecord models, use:
+If you want to have methods available for `ActiveRecord` models, use:
     
     gem 'paranoid_starlight', :require => 'paranoid_starlight/active_record'
 
@@ -28,7 +38,7 @@ Or install it yourself as:
 
     class MyModel
       include ActiveModel::Validations
-      include ParanoidStarlight::Validations
+      include ParanoidStarlight::Attributes::Validations
       
       attr_accessor :email
       validates_email_format_of :email
@@ -41,6 +51,8 @@ Or install it yourself as:
 
 If you required active_record hook, you can use:
 
+    require 'paranoid_starlight/active_record'
+
     class Person < ActiveRecord::Base
       attr_accessible :name, :telephone, :mobile, :email
       attr_accessible :address, :zip
@@ -63,23 +75,27 @@ If you required active_record hook, you can use:
       end
 
       def process_fields
-        clean_text([:address, :zip])
+        process_string([:address, :zip])
       end
     end
 
 Currently there are these possibilities:
+
+*Validations for ActiveModel*
+
 - validates_email_format_of
 - validates_name_format_of
 - validates_telephone_number_of
 
-- clean_text
-- clean_whitespaces
+*Converters for attributes* (getter and setter methods in object are enough)
+
+- process_string (substitutes one or more whitespaces with space)
 - convert_telephone_number
 
 It is easy to create own converter, just do:
 
     class Kiddie
-      include ::ParanoidStarlight::Converters
+      include ::ParanoidStarlight::Attributes::Converters
       attr_accessor :name
       
       def l33t
@@ -98,8 +114,12 @@ It is easy to create own converter, just do:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## TODO
+
+Separate email and name validators to own functions, to be independent from ActiveModel validators.
+
 ## Author
-Created by Ivan Stana  
-License: MIT
+Programmed in 2012  
+by Ivan Stana  
+License: MIT  
 
-I encourage to write me something

data/lib/paranoid_starlight.rb

@@ -1,180 +1,29 @@
 # -*- coding: UTF-8 -*-
 
+# This gem is pack of methods to convert or validate
+# different formats of strings and texts in model,
+# like telephone numbers (CZ/SK format),
+# email, or (european) names (currently).
+# Or to clean string of too much whitespaces.
+#
+# It provides *convert* methods for attributes of model
+# (getter and setter method in object is enough).
+# They are used in save hooks.
+#
+# There are also *validator* methods for ActiveModel
+# and hook for automatic ActiveRecord integration.
+# Just type: (require 'paranoid_starlight/active_record')
+#
+
 require "paranoid_starlight/version"
 require 'active_model'
 require 'twitter_cldr'
 require 'fast_gettext'
 
 module ParanoidStarlight
-
-  module Validators
-    class EmailValidator < ::ActiveModel::EachValidator
-      def validate_each(record, attribute, value)
-        # username in email may have @ in string
-        # username should be case sensitive, domain is not
-        unless value =~ %r{\A([^\s]+)@((?:[-a-zA-Z0-9]+\.)+[a-zA-Z]{2,})\z}
-          record.errors[attribute] << (options[:message] || 'is not an email')
-        end
-      end
-    end
-    
-    class NameValidator < ::ActiveModel::EachValidator
-      def validate_each(record, attribute, value)
-        fullname = '\p{Letter}+(-\p{Letter}+)*'
-        surname = fullname
-        short = '\p{Letter}\.'
-        unless value =~ /\A(?:#{fullname} ((#{fullname}|#{short}) )*#{surname})\z/
-          record.errors[attribute] << (options[:message] || 'is not a name')
-        end
-      end
-    end
-    
-    class TelephoneValidator < ::ActiveModel::EachValidator
-      def validate_each(record, attribute, value)
-        # SK/CZ format
-        valid = ::ParanoidStarlight::Converters.convert_telephone(value) rescue nil 
-        unless valid
-          record.errors[attribute] << (options[:message] || 'is not a telephone number')
-        end
-      end
-    end
-  end # end validators
-    
-  module Validations
-    def self.included(base)
-      base.send(:extend, self)
-    end
-  
-    def validates_email_format_of(*attr_names)
-      # _merge_attributes extracts options and flatten attrs
-      # :attributes => {attr_names} is lightweight option
-      validates_with ::ParanoidStarlight::Validators::EmailValidator, _merge_attributes(attr_names)
-    end
-    
-    def validates_name_format_of(*attr_names)
-      validates_with ::ParanoidStarlight::Validators::NameValidator, _merge_attributes(attr_names)
-    end
-    
-    def validates_telephone_number_of(*attr_names)
-      validates_with ::ParanoidStarlight::Validators::TelephoneValidator, _merge_attributes(attr_names)
-    end
-  end # end validations
-    
-    
-  module Converters
-    def self.convert_telephone(num, prefixcc = 421)
-      telephone = num.to_s
-      prefixcc = prefixcc.to_s
-      
-      # convert logic
-      # possible formats, with or without spaces
-        
-      # mobile (CZ/SK)
-      # CZ/SK have always 9 numbers
-      # (1) +421 949 123 456
-      # (2) 00421 949 123 456
-      # (3) 0949 123 456 (10 with leading zero, only SK)
-      # (4) 949 123 456
-      
-      # landline always 9 numbers
-      # other regions - 04x
-      # (3) 045 / 6893121
-      # bratislava - 02
-      # (3) 02 / 44250320
-      # (1) 421-2-44250320
-      # (1) +421 (2) 44250320
-      # (x) ()44 250 320 (no chance to guess NDC (geographic prefix here))
-      # and other formats from above
-      
-        
-      # output is integer
-      # 421949123456
-      
-      # remove all non-number characters
-      telephone.gsub!(/\D/, '')
-      
-      cc = '420|421'
-      
-      # + is stripped
-      if match = /\A((?:#{cc})\d{9})\z/.match(telephone)
-        return match[1]
-      elsif match = /\A00((?:#{cc})\d{9})\z/.match(telephone)
-        return match[1]
-      elsif match = /\A0(\d{9})\z/.match(telephone)
-        return prefixcc + match[1]
-      # number cannot begin with 0, when has 9 numbers
-      elsif match = /\A([1-9]\d{8})\z/.match(telephone)
-        return prefixcc + match[1]
-        
-      else
-        raise("Number is invalid")
-      end
-    end
-  
-    def convert_telephone_number(inattr, outattr = '')
-      basic_converter(self, inattr, outattr) do |telephone|
-        ::ParanoidStarlight::Converters.convert_telephone(
-          telephone, 
-          TwitterCldr::Shared::PhoneCodes.code_for_territory(
-            FastGettext.locale.to_sym
-          )
-        ) rescue nil
-      end
-    end
-    
-    def clean_string(inattr, outattr = '')
-      basic_converter(self, inattr, outattr) do |text|
-        text.to_s.strip.gsub(/\n/, ' ').gsub(/\s+/, ' ')
-      end
-    end
-    
-    def remove_whitespaces(inattr, outattr = '')
-      basic_converter(self, inattr, outattr) do |text|
-        array = text.to_s.strip.split("\n")
-        array.map {|line| line.gsub(/\s/, '')}.join("\n")
-      end
-    end
-    
-    private    
-    def basic_converter(obj, inattr, outattr, &code)
-      attributes = []
-      
-      # May be only one value, ideally string or symbol
-      outattr = outattr.to_sym
-      
-      
-      if inattr.is_a? Array
-        attributes = inattr
-      elsif obj.respond_to? inattr.to_sym
-        attributes << inattr
-        # hash, array and like haven't got to_sym defined
-        outattr = inattr if outattr.to_s == ''
-      else
-        raise("Attribute #{inattr} does not exist.")
-      end
-      
-      if attributes.size > 1 && outattr.to_s != ''
-        raise("Multiple attributes can be used only without output attribute")
-      end
-      
-      attributes.each do |attribute|
-        outattr = attribute if attributes.size > 1
-        
-        unless obj.respond_to? outattr
-          raise("Attribute #{outattr} does not exist.")
-        end
-      
-        setter = "#{outattr}=".to_sym
-        unless obj.respond_to? setter
-          raise("Setter #{setter} does not exist.")
-        end
-      
-        to_convert = obj.send(attribute.to_sym)
-        unless to_convert.nil?
-          obj.send(setter, code.call(to_convert))
-        end
-      end
-    end
-    
-  end # end converters
+  [
+    'converters', 'validators',
+    'attributes/converters', 'attributes/validations'].each do |req|
+    require_relative File.join('.', 'paranoid_starlight', req + '.rb')
+  end
 end 

data/lib/paranoid_starlight/active_record.rb

@@ -3,6 +3,6 @@
 require_relative "../paranoid_starlight.rb"
 
 require 'active_record'
-::ActiveRecord::Base.send(:include, ParanoidStarlight::Validators)
-::ActiveRecord::Base.send(:include, ParanoidStarlight::Converters)
+::ActiveRecord::Base.send(:include, ::ParanoidStarlight::Attributes::Validations)
+::ActiveRecord::Base.send(:include, ::ParanoidStarlight::Attributes::Converters)
 

data/lib/paranoid_starlight/attributes/converters.rb

@@ -0,0 +1,73 @@
+module ParanoidStarlight
+  module Attributes
+    module Converters
+    
+      def convert_telephone_number(inattr, outattr = '')
+        basic_converter(self, inattr, outattr) do |telephone|
+          ::ParanoidStarlight::Converters.convert_telephone(
+            telephone, 
+            TwitterCldr::Shared::PhoneCodes.code_for_territory(
+              FastGettext.locale.to_sym
+            )
+          ) rescue nil
+        end
+      end
+      
+      # currently it only processes whitespaces
+      def process_string(inattr, outattr = '')
+        basic_converter(self, inattr, outattr) do |text|
+          ::ParanoidStarlight::Converters.one_liner(text)
+        end
+      end
+=begin
+no purpose, needs improvement
+      def remove_whitespaces(inattr, outattr = '')
+        basic_converter(self, inattr, outattr) do |text|
+          array = text.to_s.strip.split("\n")
+          array.map {|line| line.gsub(/\s/, '')}.join("\n")
+        end
+      end
+=end
+    
+      def basic_converter(obj, inattr, outattr, &code)
+        attributes = []
+      
+        # May be only one value, ideally string or symbol
+        outattr = outattr.to_sym
+      
+        if inattr.is_a? Array
+          attributes = inattr
+        elsif obj.respond_to? inattr.to_sym
+          attributes << inattr
+          # hash, array and like haven't got to_sym defined
+          outattr = inattr if outattr.to_s == ''
+        else
+          raise("Attribute #{inattr} does not exist.")
+        end
+      
+        if attributes.size > 1 && outattr.to_s != ''
+          raise("Multiple attributes can be used only without output attribute")
+        end
+      
+        attributes.each do |attribute|
+          outattr = attribute if attributes.size > 1
+        
+          unless obj.respond_to? outattr
+            raise("Attribute #{outattr} does not exist.")
+          end
+      
+          setter = "#{outattr}=".to_sym
+          unless obj.respond_to? setter
+            raise("Setter #{setter} does not exist.")
+          end
+      
+          to_convert = obj.send(attribute.to_sym)
+          unless to_convert.nil?
+            obj.send(setter, code.call(to_convert))
+          end
+        end
+      end
+    
+    end
+  end
+end 

data/lib/paranoid_starlight/attributes/validations.rb

@@ -0,0 +1,23 @@
+module ParanoidStarlight
+  module Attributes
+    module Validations
+      def self.included(base)
+        base.send(:extend, self)
+      end
+  
+      def validates_email_format_of(*attr_names)
+        # _merge_attributes extracts options and flatten attrs
+        # :attributes => {attr_names} is lightweight option
+        validates_with ::ParanoidStarlight::Validators::EmailValidator, _merge_attributes(attr_names)
+      end
+    
+      def validates_name_format_of(*attr_names)
+        validates_with ::ParanoidStarlight::Validators::NameValidator, _merge_attributes(attr_names)
+      end
+    
+      def validates_telephone_number_of(*attr_names)
+        validates_with ::ParanoidStarlight::Validators::TelephoneValidator, _merge_attributes(attr_names)
+      end
+    end # end validations
+  end
+end 

data/lib/paranoid_starlight/converters.rb

@@ -0,0 +1,79 @@
+module ParanoidStarlight
+  module Converters
+    def convert_telephone(num, prefixcc = 421)
+      telephone = num.to_s
+      prefixcc = prefixcc.to_s
+      
+      # convert logic
+      # possible formats, with or without spaces
+        
+      # mobile (CZ/SK)
+      # CZ/SK have always 9 numbers
+      # (1) +421 949 123 456
+      # (2) 00421 949 123 456
+      # (3) 0949 123 456 (10 with leading zero, only SK)
+      # (4) 949 123 456
+      
+      # landline always 9 numbers
+      # other regions - 04x
+      # (3) 045 / 6893121
+      # bratislava - 02
+      # (3) 02 / 44250320
+      # (1) 421-2-44250320
+      # (1) +421 (2) 44250320
+      # (x) ()44 250 320 (no chance to guess NDC (geographic prefix here))
+      # and other formats from above
+      
+        
+      # output is string
+      # +421949123456
+      # make integer from it call with to_i
+      
+      # remove all non-number characters
+      # I don't care for alphabetic or special characters
+      # in number
+      telephone.gsub!(/\D/, '')
+      
+      cc = '420|421'
+
+      # + is stripped in all numbers
+      if match = /\A((?:#{cc})\d{9})\z/.match(telephone)
+        number = match[1]
+      elsif match = /\A00((?:#{cc})\d{9})\z/.match(telephone)
+        number = match[1]
+      elsif match = /\A0(\d{9})\z/.match(telephone)
+        number = prefixcc + match[1]
+      # number cannot begin with 0, when has 9 numbers
+      elsif match = /\A([1-9]\d{8})\z/.match(telephone)
+        number = prefixcc + match[1]
+        
+      else
+        raise("Number is invalid")
+      end
+      
+      '+' + number
+    end
+    
+    # There will be no .valid? function
+    # because it would need to handle number separators
+    # and other characters in harder way.
+    #
+    # This number needs to be converted  to international format
+    # before using it!
+    
+    def telephone_will_convert?(telephone)
+      valid = convert_telephone(telephone) rescue nil
+      valid.nil? ? false : true 
+    end
+    
+    def one_liner(input)
+      input.to_s.strip.gsub(/\s+/m, ' ')
+    end
+    
+    # make methods also acessible with direct call
+    module_function :convert_telephone, :telephone_will_convert?, :one_liner
+    public :convert_telephone, :telephone_will_convert?, :one_liner 
+    
+  end # end converters
+
+end 

data/lib/paranoid_starlight/validators.rb

@@ -0,0 +1,38 @@
+# -*- coding: UTF-8 -*-
+
+module ParanoidStarlight
+
+  module Validators
+    class EmailValidator < ::ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        # username in email may have @ in string
+        # username should be case sensitive, domain is not
+        unless value =~ %r{\A([^\s]+)@((?:[-a-zA-Z0-9]+\.)+[a-zA-Z]{2,})\z}
+          record.errors[attribute] << (options[:message] || 'is not an email')
+        end
+      end
+    end
+    
+    class NameValidator < ::ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        fullname = '\p{Letter}+(-\p{Letter}+)*'
+        surname = fullname
+        short = '\p{Letter}\.'
+        unless value =~ /\A(?:#{fullname} ((#{fullname}|#{short}) )*#{surname})\z/
+          record.errors[attribute] << (options[:message] || 'is not a name')
+        end
+      end
+    end
+    
+    class TelephoneValidator < ::ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        # SK/CZ format
+        valid = ::ParanoidStarlight::Converters.telephone_will_convert?(value) 
+        unless valid
+          record.errors[attribute] << (options[:message] || 'is not a telephone number')
+        end
+      end
+    end
+  end # end validators
+  
+end 

data/lib/paranoid_starlight/version.rb

@@ -1,3 +1,3 @@
 module ParanoidStarlight
-  VERSION = "1.4.0"
+  VERSION = "2.0"
 end

data/paranoid_starlight.gemspec

@@ -8,12 +8,23 @@ Gem::Specification.new do |gem|
   gem.version       = ParanoidStarlight::VERSION
   gem.author       = 'Ivan Stana'
   gem.email         = 'stiipa@centrum.sk'
-  gem.summary       = "Pack of custom validations and converters for ActiveModel. Or standalone."
+  gem.summary       = "Pack of custom validations and converters for ActiveModel. Also in standalone version."
   gem.description   = <<-EOF
-    It has validations for email and name (European style).
-    And validation and converter (to international format)
-    of telephone number. (CZ/SK format)
-    Few converters for texts and strings. Specs included.
+    This gem is pack of methods to convert or validate
+    different formats of strings and texts in model,
+    like telephone numbers (CZ/SK format),
+    email, or (european) names (currently).
+    Or to clean string of too much whitespaces.
+
+    It provides *convert* methods for attributes of model
+    (getter and setter method in object is enough).
+    They are used in save hooks.
+
+    There are also *validator* methods for ActiveModel
+    nd hook for automatic ActiveRecord integration.
+    Just type: (`require 'paranoid_starlight/active_record'`)
+
+    Specs included.
   EOF
   
   gem.homepage      = "http://github.com/istana/paranoid_starlight"

data/specs/paranoid_starlight/attributes_converters_spec.rb

@@ -0,0 +1,100 @@
+require_relative '../spec_helper.rb'
+
+class Fangirl
+  include ::ParanoidStarlight::Attributes::Converters
+  attr_accessor :telephone
+  attr_accessor :text
+  attr_accessor :basic_field, :basic_field2, :basic_field_out
+end
+
+describe ParanoidStarlight::Attributes::Converters do
+
+  describe 'convert_telephone_number' do
+    before :each do
+      FastGettext.locale = 'sk'      
+      @test = Fangirl.new
+      @test.telephone = '+421 123 456 789'
+    end
+    
+    it 'should convert telephone number into international format' do
+      @test.convert_telephone_number(:telephone)
+      
+      @test.telephone.should == '+421123456789'
+    end
+  end
+  
+  describe 'process_string' do
+    before { @test = Fangirl.new; @test.text = "  Some  \t\ntext.\n \t" }
+    it 'should get string in one line separated with spaces' do
+      @test.process_string(:text)
+      @test.text.should == "Some text."
+    end
+  end
+
+  describe 'template of converter' do
+    before do
+      @test = Fangirl.new
+      @test.basic_field = "Hello world!"
+      @test.basic_field2 = "World sends love to you!"
+    
+      def @test.upcase(input, output = '')
+        basic_converter(self, input, output) do |text|
+          text.upcase
+        end
+      end
+    end
+    
+    context 'supplies parameters in different format' do
+      it 'should accept anything in input with to_s' do
+        @test.upcase(:basic_field)
+        @test.basic_field.should == "HELLO WORLD!"
+        
+        @test.upcase('basic_field2')
+        @test.basic_field2.should == "WORLD SENDS LOVE TO YOU!"
+      end
+      
+      it 'should accept anything with to_s as output' do
+        @test.upcase(:basic_field, :basic_field_out)
+        @test.basic_field_out.should == "HELLO WORLD!"
+        
+        @test.upcase('basic_field2', 'basic_field_out')
+        @test.basic_field_out.should == "WORLD SENDS LOVE TO YOU!"
+      end
+    end
+    
+    context 'had one attribute supplied' do
+      it 'should overwrite attribute' do
+        @test.upcase(:basic_field)
+        
+        @test.basic_field.should == "HELLO WORLD!"
+      end
+    end
+    
+    context 'had two attributes supplied' do
+      it 'should put result to second attribute' do
+        @test.upcase(:basic_field, :basic_field_out)
+        
+        @test.basic_field.should == "Hello world!"
+        @test.basic_field_out.should == "HELLO WORLD!"
+      end
+    end
+    
+    context 'had array of attributes supplied' do
+      it 'should convert all attributes of array' do
+        @test.upcase([:basic_field, :basic_field2])
+        
+        @test.basic_field.should == "HELLO WORLD!"
+        @test.basic_field2.should == "WORLD SENDS LOVE TO YOU!"
+      end
+    end
+    
+    context 'had array of attributes and output supplied' do
+      it 'should raise error' do
+        expect {@test.upcase([:basic_field, :basic_field2],
+                 :basic_field_out) }.to raise_error(/Multiple attributes can/)
+      end
+    end
+    
+  end # end template of converter
+
+end 

data/specs/paranoid_starlight/attributes_validations_spec.rb

@@ -0,0 +1,77 @@
+require_relative '../spec_helper.rb'
+
+class WithValidations
+  include ActiveModel::Validations
+  include ParanoidStarlight::Attributes::Validations
+end
+
+class TestEmail < WithValidations
+  attr_accessor :email_field
+  validates_email_format_of :email_field
+end
+
+class TestName < WithValidations
+  attr_accessor :name_field
+  validates_name_format_of :name_field
+end
+
+class TestName < WithValidations
+  attr_accessor :name_field
+  validates_name_format_of :name_field
+end
+
+class TestTelephone < WithValidations
+  attr_accessor :telephone
+  validates_telephone_number_of :telephone
+end
+
+describe ParanoidStarlight::Attributes::Validations do 
+  # I won't test multiple attributes as argument
+  # it works, because it is copied from rails
+      
+  describe 'validates_email_format_of' do
+    subject { TestEmail.new() }
+    before { subject.email_field = email_value }
+
+    context 'is valid' do
+      let(:email_value) {'example@my.example.org'}
+      it {should be_valid }
+    end
+
+    context 'is invalid' do
+      let(:email_value) {'example'}
+      it { should be_invalid }
+    end
+  end
+
+  describe 'validates_name_format_of' do
+    subject { TestName.new() }
+    before { subject.name_field = name }
+
+    context 'is valid' do
+      let(:name) {'Geralt of Rivia'}
+      it { should be_valid }
+    end
+
+    context 'is invalid' do
+      let(:name) {'Shakespeare'}
+      it { should be_invalid }
+    end
+  end
+
+  describe 'validates_telephone_number_of' do
+    subject { TestTelephone.new() }
+    before { subject.telephone = telephone }
+
+    context 'is valid' do
+      let(:telephone) {'+421123456789'}
+      it { should be_valid }
+    end
+
+    context 'is invalid' do
+      let(:telephone) {'1111'}
+      it { should be_invalid }
+    end
+  end
+  
+end

data/specs/paranoid_starlight/converters_spec.rb

@@ -0,0 +1,77 @@
+require_relative '../spec_helper.rb'
+
+describe ParanoidStarlight::Converters do
+  before :all do
+    @p = ParanoidStarlight::Converters
+  end
+
+  describe 'convert_telephone' do
+  
+    it 'accepts all objects, which have to_s method' do
+      ['421123456789',
+        421123456789,
+       :"421123456789"].each do |num|
+        @p.convert_telephone(num).should == '+421123456789'
+      end
+    end
+    
+    it 'removes non-numeric characters' do
+      @p.convert_telephone(' +421 123 / 456789A').should == '+421123456789'
+    end
+    
+    it 'tests valid formats' do
+      ['+421 123 456 789',
+       '00421 123 456 789',
+       '123 456 789',
+       '0123 456 789'].each { |num|
+         @p.convert_telephone(num).should == '+421123456789'
+      }
+      @p.convert_telephone('043/5867890').should == '+421435867890'
+    end
+    
+    it 'tests some of invalid formats' do
+      ['043/586789',
+       '123',
+       # 10 digits
+       '4211234567890'
+      ].each { |num|
+        expect {@p.convert_telephone(num)}.to raise_error('Number is invalid')
+      }
+    end
+    
+    it 'tests with custom country code prefix' do
+      @p.convert_telephone('+421 123 456 789', 410).should == '+421123456789'
+      @p.convert_telephone('123 456 789', 410).should == '+410123456789'
+      @p.convert_telephone('0123 456 789', 410).should == '+410123456789'
+    end
+    
+    it 'to_i returns number as integer' do
+      @p.convert_telephone('+421 123 456 789').to_i.should == 421123456789
+    end
+    
+  end
+  
+  describe 'telephone_will_convert?' do
+    subject {@p.telephone_will_convert?(telephone)}
+    
+    context 'valid number' do
+      let(:telephone) {'+421 123 456 789'}
+      it {should be_true}
+    end
+    
+    context 'inconvertible (not invalid by notation!) number' do
+      let(:telephone) {'123'}
+      it {should be_false}
+    end
+  end
+  
+  describe 'one_liner' do
+    it 'converts succeeding whitespace(s) to space' do
+      @p.one_liner(
+        "  Some  \ttext. \t\n\n\n Hello\t\t\nworld."
+      ).should == 'Some text. Hello world.'
+    end
+  end
+
+end
+

data/specs/paranoid_starlight/validators_spec.rb

@@ -0,0 +1,78 @@
+require_relative '../spec_helper.rb'
+
+describe ParanoidStarlight::Validators do
+  before :all do
+    @validators = ParanoidStarlight::Validators
+  end
+  
+  before :each do
+    @mock = mock('model')
+    @mock.stub("errors").and_return([])
+    @mock.errors.stub('[]').and_return({})  
+    @mock.errors[].stub('<<')
+  end
+  
+  describe 'EmailValidator' do
+    before :each do
+      @email = @validators::EmailValidator.new({:attributes => {}})
+    end
+      
+    it "shouldn't add message to errors when valid email address" do
+      @mock.should_not_receive('errors')
+      @email.validate_each(@mock, "email", "example@example.org")
+      @email.validate_each(@mock, "email", "example@@example.org")
+      @email.validate_each(@mock, "email", "l0~gin@sub.examp-le.org")
+    end
+
+    it "should add message to errors when invalid email address" do
+      @mock.errors[].should_receive('<<')
+      @email.validate_each(@mock, "email", "notvalid")
+      @email.validate_each(@mock, "email", "x@exa$mple.org")
+    end
+  end
+  
+  describe 'NameValidator' do
+    before :each do
+      @name = @validators::NameValidator.new({:attributes => {}})
+    end
+      
+    it "shouldn't add message to errors when valid name" do
+      @mock.should_not_receive('errors')
+      [
+        'Ivan Stana', 'Ivan R. Stana', 'Ivan Ronon Stana',
+        'Jean Claude Van Damme', 'Jean-Pierre Cassel',
+        'Tatyana Sukhotina-Tolstaya',
+        'John R. R. Tolkien', 'I S'
+      ].each {
+        |name| @name.validate_each(@mock, "name", name)
+      }
+    end
+
+    it "should add message to errors when invalid name" do
+      @mock.errors[].should_receive('<<')
+      [
+        'J. R. R. Tolkien', 'J.R.R. Tolkien', 'Tolkien', ''
+      ].each {
+        |name| @name.validate_each(@mock, "name", name)
+      }
+    end
+  end 
+    
+  describe 'TelephoneValidator' do
+    before :each do
+      @telephone = @validators::TelephoneValidator.new({:attributes => {}})
+    end
+      
+    it "shouldn't add message to errors when valid telephone" do
+      @mock.should_not_receive('errors')
+      @telephone.validate_each(@mock, "telephone", '+421123456789')
+    end
+    
+    it "should add message to errors when invalid telephone" do
+      @mock.errors[].should_receive('<<')
+      @telephone.validate_each(@mock, "telephone", '123')
+    end
+  end
+  
+end
+

data/specs/spec_helper.rb

@@ -0,0 +1,2 @@
+require "rspec"
+require_relative File.join('..', 'lib', 'paranoid_starlight.rb')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paranoid_starlight
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: '2.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -75,9 +75,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    It has validations for email and name (European style).\n    And
-  validation and converter (to international format)\n    of telephone number. (CZ/SK
-  format)\n    Few converters for texts and strings. Specs included.\n"
+description: ! "    This gem is pack of methods to convert or validate\n    different
+  formats of strings and texts in model,\n    like telephone numbers (CZ/SK format),\n
+  \   email, or (european) names (currently).\n    Or to clean string of too much
+  whitespaces.\n\n    It provides *convert* methods for attributes of model\n    (getter
+  and setter method in object is enough).\n    They are used in save hooks.\n\n    There
+  are also *validator* methods for ActiveModel\n    nd hook for automatic ActiveRecord
+  integration.\n    Just type: (`require 'paranoid_starlight/active_record'`)\n\n
+  \   Specs included.\n"
 email: stiipa@centrum.sk
 executables: []
 extensions: []
@@ -89,9 +94,17 @@ files:
 - README.md
 - lib/paranoid_starlight.rb
 - lib/paranoid_starlight/active_record.rb
+- lib/paranoid_starlight/attributes/converters.rb
+- lib/paranoid_starlight/attributes/validations.rb
+- lib/paranoid_starlight/converters.rb
+- lib/paranoid_starlight/validators.rb
 - lib/paranoid_starlight/version.rb
 - paranoid_starlight.gemspec
-- specs/paranoid_starlight_spec.rb
+- specs/paranoid_starlight/attributes_converters_spec.rb
+- specs/paranoid_starlight/attributes_validations_spec.rb
+- specs/paranoid_starlight/converters_spec.rb
+- specs/paranoid_starlight/validators_spec.rb
+- specs/spec_helper.rb
 homepage: http://github.com/istana/paranoid_starlight
 licenses: []
 post_install_message: 
@@ -115,5 +128,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Pack of custom validations and converters for ActiveModel. Or standalone.
+summary: Pack of custom validations and converters for ActiveModel. Also in standalone
+  version.
 test_files: []

data/specs/paranoid_starlight_spec.rb

@@ -1,315 +0,0 @@
-require_relative '../lib/paranoid_starlight'
-require 'rspec'
-
-#ActiveRecord::Base.send(:include, ParanoidStarlight::Validators)
-#ActiveRecord::Base.send(:include, ParanoidStarlight::Converters)
-
-class Fangirl
-  include ::ParanoidStarlight::Converters
-  attr_accessor :telephone
-  attr_accessor :text
-  attr_accessor :basic_field, :basic_field2, :basic_field_out
-end
-
-describe ParanoidStarlight::Converters do
-  before :all do
-    @p = ParanoidStarlight::Converters
-  end
-  
-  describe 'convert_telephone' do
-
-    it 'accepts all objects, which have to_s' do
-      ['421123456789',
-       421123456789,
-       :"421123456789"].each do |num|
-        @p.convert_telephone(num).should == '421123456789'
-      end
-    end
-    
-    it 'removes non-numeric characters' do
-      @p.convert_telephone(' +421 123 / 456789A').should == '421123456789'
-    end
-    
-    it 'tests (un)polished valid formats' do
-      ['+421 123 456 789',
-       '00421 123 456 789',
-       '123 456 789',
-       '0123 456 789'].each { |num|
-         @p.convert_telephone(num).should == '421123456789'
-      }
-      @p.convert_telephone('043/5867890').should == '421435867890'
-    end
-    
-    it 'tests some of invalid formats' do
-      ['043/586789',
-       '123',
-       '4211234567890'
-      ].each { |num|
-        expect {@p.convert_telephone(num)}.to raise_error('Number is invalid')
-      }
-    end
-    
-    it 'tests with custom country code prefix' do
-      @p.convert_telephone('+421 123 456 789', 410).should == '421123456789'
-      @p.convert_telephone('123 456 789', 410).should == '410123456789'
-      @p.convert_telephone('0123 456 789', 410).should == '410123456789'
-    end
-    
-  end
-  
-  describe 'template of converter' do
-    before do
-      @test = Fangirl.new
-      @test.basic_field = "Hello world!"
-      @test.basic_field2 = "World sends love to you!"
-    
-      def @test.upcase(input, output = '')
-        basic_converter(self, input, output) do |text|
-          text.upcase
-        end
-      end
-    end
-    
-    context 'supplies parameters in different format' do
-      it 'should accept anything in input with to_s' do
-        @test.upcase(:basic_field)
-        @test.basic_field.should == "HELLO WORLD!"
-        @test.upcase('basic_field2')
-        @test.basic_field2.should == "WORLD SENDS LOVE TO YOU!"
-      end
-      
-      it 'should accept anything with to_s as output' do
-        @test.upcase(:basic_field, :basic_field_out)
-        @test.basic_field_out.should == "HELLO WORLD!"
-        @test.upcase('basic_field2', 'basic_field_out')
-        @test.basic_field_out.should == "WORLD SENDS LOVE TO YOU!"
-      end
-    end
-    
-    context 'had one attribute supplied' do
-      it 'should overwrite attribute' do
-        @test.upcase(:basic_field)
-        @test.basic_field.should == "HELLO WORLD!"
-      end
-    end
-    
-    context 'had two attributes supplied' do
-      it 'should put result to second attribute' do
-        @test.upcase(:basic_field, :basic_field_out)
-        @test.basic_field.should == "Hello world!"
-        @test.basic_field_out.should == "HELLO WORLD!"
-      end
-    end
-    
-    context 'had array of attributes supplied' do
-      it 'should convert all attributes of array' do
-        @test.upcase([:basic_field, :basic_field2])
-        @test.basic_field.should == "HELLO WORLD!"
-        @test.basic_field2.should == "WORLD SENDS LOVE TO YOU!"
-      end
-    end
-    
-    context 'had array of attributes and output supplied' do
-      it 'should raise error' do
-        expect {@test.upcase([:basic_field, :basic_field2],
-                 :basic_field_out) }.to raise_error(/Multiple attributes can/)
-      end
-    end
-    
-  end
-  
-  
-  describe 'convert_telephone_number (for attributes)' do
-    before :each do
-      FastGettext.locale = 'sk'      
-      @test = Fangirl.new
-      @test.telephone = '+421 123 456 789'
-    end
-    
-    it 'should convert telephone number into international format' do
-      @test.convert_telephone_number(:telephone)
-      @test.telephone.should == '421123456789'
-    end
-  end
-  
-  describe 'clean_string (for attributes)' do
-    before { @test = Fangirl.new; @test.text = "  Some  \t\ntext.\n \t" }
-    it 'should get words with spaces' do
-      @test.clean_string(:text)
-      @test.text.should == "Some text."
-    end
-  end
-  
-  describe 'remove_whitespaces (for attributes)' do
-    before do
-      @test = Fangirl.new;
-      @test.text = "  Some  \ttext. \t\n\n\n Hello\t\tworld."
-    end
-    
-    it 'should clean text of unwanted characters' do
-      @test.remove_whitespaces(:text)
-      @test.text.should == "Sometext.\n\n\nHelloworld."
-    end
-  end
-  
-end
-  
-describe 'ParanoidStarlight::Validations' do
-  before(:each) do
-    @validators = ParanoidStarlight::Validators
-    
-    @mock = mock('model')
-    @mock.stub("errors").and_return([])
-    @mock.errors.stub('[]').and_return({})  
-    @mock.errors[].stub('<<')
-  end
-    
-    describe 'EmailValidator' do
-      before :each do
-        @email = @validators::EmailValidator.new({:attributes => {}})
-      end
-      
-      it "should validate valid email address" do
-        @mock.should_not_receive('errors')
-        @email.validate_each(@mock, "email", "example@example.org")
-        @email.validate_each(@mock, "email", "example@@example.org")
-        @email.validate_each(@mock, "email", "l0~gin@sub.examp-le.org")
-      end
-
-      it "should validate invalid email address" do
-        @mock.errors[].should_receive('<<')
-        @email.validate_each(@mock, "email", "notvalid")
-        @email.validate_each(@mock, "email", "x@exa$mple.org")
-      end
-    end  
-    
-    describe 'NameValidator' do
-      before :each do
-        @name = @validators::NameValidator.new({:attributes => {}})
-      end
-      
-      it "should validate valid name" do
-        @mock.should_not_receive('errors')
-        [
-          'Ivan Stana', 'Ivan R. Stana', 'Ivan Ronon Stana',
-          'Jean Claude Van Damme', 'Jean-Pierre Cassel',
-          'Tatyana Sukhotina-Tolstaya',
-          'John R. R. Tolkien', 'I S'
-        ].each {
-          |name| @name.validate_each(@mock, "name", name)
-        }
-      end
-
-      it "should validate invalid name" do
-        @mock.errors[].should_receive('<<')
-        [
-          'J. R. R. Tolkien', 'J.R.R. Tolkien', 'Tolkien', ''
-        ].each {
-          |name| @name.validate_each(@mock, "name", name)
-        }
-      end
-    end 
-    
-    describe 'TelephoneValidator' do
-      before :each do
-        @telephone = @validators::TelephoneValidator.new({:attributes => {}})
-      end
-      
-      it "should validate valid telephone" do
-        @mock.should_not_receive('errors')
-        @telephone.validate_each(@mock, "telephone", '+421123456789')
-      end
-    
-      it "should validate invalid telephone" do
-        @mock.errors[].should_receive('<<')
-        @telephone.validate_each(@mock, "telephone", '123')
-      end
-    end
-
-    describe 'model Validators of' do
-      class TestEmail
-        include ActiveModel::Validations
-        include ParanoidStarlight::Validations
-        attr_accessor :email_field
-        validates_email_format_of :email_field
-      end
-    
-      class TestName
-        include ActiveModel::Validations
-        include ParanoidStarlight::Validations
-        attr_accessor :name_field
-        validates_name_format_of :name_field
-      end
-      
-      class TestName
-        include ActiveModel::Validations
-        include ParanoidStarlight::Validations
-        attr_accessor :name_field
-        validates_name_format_of :name_field
-      end
-      
-      class TestTelephone
-        include ActiveModel::Validations
-        include ParanoidStarlight::Validations
-        attr_accessor :telephone
-        validates_telephone_number_of :telephone
-      end
-      # I don't test multiple attributes as argument
-      # it works, because it is copied from rails
-      
-      
-      describe 'Email' do
-        subject { TestEmail.new() }
-        
-        before { subject.email_field = email_value }
-        
-        context 'is valid' do
-          let(:email_value) {'example@my.example.org'}
-          it {should be_valid }
-        end
-        
-        context 'is invalid' do
-          let(:email_value) {'example'}
-          it { should be_invalid }
-        end
-      end
-      
-      describe 'Name' do
-        subject { TestName.new() }
-        
-        before do
-          subject.name_field = name
-        end
-        
-        context 'is valid' do
-          let(:name) {'Geralt of Rivia'}
-          it { should be_valid }
-        end
-        
-        context 'is invalid' do
-          let(:name) {'Shakespeare'}
-          it { should be_invalid }
-        end
-      end
-      
-      describe 'Telephone' do
-        subject { TestTelephone.new() }
-        
-        before do
-          subject.telephone = telephone
-        end
-        
-        context 'is valid' do
-          let(:telephone) {'+421123456789'}
-          it { should be_valid }
-        end
-        
-        context 'is invalid' do
-          let(:telephone) {'1111'}
-          it { should be_invalid }
-        end
-      end
-            
-    end
-  
-end # end validations