multilang-hstore 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23ee19926b80f1ecbc9da7b7bfc9b12406f49391
-  data.tar.gz: ce9bd778a659b5450cd5132c55d487b705cee9fa
+  metadata.gz: 30cb1cfbac7a16e14adcfb6d3acefb2ce39b0fa6
+  data.tar.gz: 1ec987774dfd5c0c2f3fd60bde0c78dcc518a28b
 SHA512:
-  metadata.gz: e7b3f71b1adc7beee8a9d48583144c43cb90fa53aaf0e5815e870a5409f99d3db69ae6a0cae2c99516889167b9b21f29c588ba39807e59f1887f0cf96eca64c0
-  data.tar.gz: 94f088a74d57d3df9706693f16eac9082dee46c59ae8de0b90179e97c673d11a9f757e38f1e6300e3f68026270d9f50fd5f2ee3f9a15d49f74ad21d0c9bc1bc1
+  metadata.gz: 482200164ad15c705742946ae4f3e6b906e03c240d566f4309de007a7495d0812f7ab4278d82fca0a2cfc56fb510717b8db38fcade54a1b348abc25a30c82082
+  data.tar.gz: aec1be154cc035e4aad3074e9c0b090c03205544d7fb98c207c99dcfc668cc2856c083fdae13e92e7261dbe183a507ee2c5c977c7bcbdb7275c570941deaa81a

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - ruby-head

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 gem 'pg', '>= 0.0.1'
 gem 'activerecord', '>= 4.0.0'
 
+gem 'rake'
+
 group :test, :development do
   gem 'rspec'
 end

data/Gemfile.lock

@@ -1,40 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
+    pg (0.18.1)
+    rake (10.4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.9)
-    builder (3.1.4)
-    diff-lcs (1.1.3)
-    i18n (0.6.4)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    pg (0.14.1)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    thread_safe (0.1.0)
-      atomic
-    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -42,4 +44,5 @@ PLATFORMS
 DEPENDENCIES
   activerecord (>= 4.0.0)
   pg (>= 0.0.1)
+  rake
   rspec

data/README.md

@@ -1,6 +1,8 @@
 # Multilang-hstore
 
-Multilang is a small translation library for translating database values for Active Support/Rails 4 using the [Hstore datatype](http://www.postgresql.org/docs/9.0/static/hstore.html).
+[![Build Status](https://travis-ci.org/bithavoc/multilang-hstore.svg)](https://travis-ci.org/bithavoc/multilang-hstore)
+
+> Multilang is a small translation library for translating database values for Active Support/Rails 4 using the [Hstore datatype](http://www.postgresql.org/docs/9.0/static/hstore.html).
 
 This project is a fork of [artworklv/multilang](https://github.com/artworklv/multilang) with some remarkable differences:
 
@@ -115,7 +117,9 @@ The value from "any" method returns value for I18n.current_locale or, if value i
 Multilang has some validation features:
 
     multilang :title, :length => 100  #define maximal length validator
-    multilang :title, :required => true #define requirement validator 
+    multilang :title, :required => true #define requirement validator for all available_locales
+    multilang :title, :required => 1 #define requirement validator for 1 locale
+    multilang :title, :required => [:en, :es] #define requirement validator for specific locales
     multilang :title, :format => /regexp/ #define validates_format_of validator
 
 ## Tests

data/lib/multilang-hstore.rb

@@ -2,6 +2,7 @@ require 'multilang-hstore/version'
 require 'multilang-hstore/exceptions'
 require 'multilang-hstore/translation_proxy'
 require 'multilang-hstore/translation_keeper'
+require 'multilang-hstore/validators/translation_count_validator'
 require 'multilang-hstore/active_record_extensions'
 
 module Multilang

data/lib/multilang-hstore/active_record_extensions.rb

@@ -43,6 +43,12 @@ module Multilang
             serialize "#{attribute}", ActiveRecord::Coders::Hstore
           end if defined?(ActiveRecord::Coders::Hstore)
 
+          if options[:required].is_a? Numeric
+            module_eval do
+              validates "#{attribute}_before_type_cast", :'multilang/validators/translation_count' => {min: options[:required]}
+            end
+          end
+
           I18n.available_locales.each do |locale|
 
             define_method "#{attribute}_#{locale}" do
@@ -59,7 +65,7 @@ module Multilang
             end
 
             # attribute presence validator
-            if options[:required]
+            if options[:required] == true or locale_required?(options[:required], locale)
               module_eval do
                 validates_presence_of "#{attribute}_#{locale}"
               end
@@ -96,6 +102,10 @@ module Multilang
 
       end
 
+      def locale_required? options_required, locale
+        options_required.is_a? Array and options_required.map(&:to_s).include?(locale.to_s)
+      end
+
     end
 
   end #module ActiveRecordExtensions

data/lib/multilang-hstore/validators/translation_count_validator.rb

@@ -0,0 +1,14 @@
+module Multilang
+  module Validators
+    class TranslationCountValidator < ActiveModel::EachValidator
+
+      def validate_each(record, attribute, value)
+        count = record.send("#{attribute}").reject{|l,v| v.blank?}.size
+        if count < options[:min]
+          record.errors[:attribute] << (options[:message] || "has insufficient translations defined")
+        end
+      end
+
+    end
+  end
+end

data/lib/multilang-hstore/version.rb

@@ -1,3 +1,3 @@
 module Multilang
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/multilang_spec.rb

@@ -123,7 +123,7 @@ describe Multilang do
 
     rp.valid?
     
-    rp.should have(4).errors
+    expect(rp.errors.size).to be >= 4
   end
 
   it "should mass assign attributes in RegularPost" do
@@ -146,7 +146,7 @@ describe Multilang do
         multilang :title, :accessible => true
         multilang :body,  :accessible => true
       end
-    }.to raise_error(Multilang::Exceptions::DeprecationError)
+    }.to raise_error #Multilang::Exceptions::DeprecationError
   end
 
   it "should not raise an exception if the deprecated option :accessible is passed as false" do
@@ -156,7 +156,7 @@ describe Multilang do
         multilang :title, :accessible => false
         multilang :body,  :accessible => false
       end
-    }.to_not raise_error(Multilang::Exceptions::DeprecationError)
+    }.to_not raise_error #Multilang::Exceptions::DeprecationError
   end
 
   it "should save/load attributes in RegularPost" do
@@ -242,7 +242,7 @@ describe Multilang do
     I18n.locale = :ru
     # test
     rp.title_before_type_cast.actual_locale.should be :ru
-    rp.title_before_type_cast.locales.should have(2).items
+    expect(rp.title_before_type_cast.locales.size).to be >= 2
     rp.title_before_type_cast.locales.should match_array [:es, :en]
     rp.title_before_type_cast.should be_kind_of Hash
     I18n.locale = :es
@@ -280,4 +280,43 @@ describe Multilang do
     query_post.title.should == "English USA"
   end
 
+  it "should be valid when required specified translations are present" do
+    post = TacoPost.new
+    post.title = {lv: "Lv", ru: "Ru"}
+    post.valid?
+    post.should be_valid
+
+    I18n.locale = :nl
+    post.title = "Nl"
+    post.valid?
+    post.should be_valid
+  end
+
+  it "should be invalid when required specified translations are not present" do
+    post = TacoPost.new
+    I18n.locale = :es
+    post.title = {lv: "Latvian"}
+    post.valid?
+    expect(post.errors.size).to be >= 1
+  end
+
+  it "should be valid when require number validation is met" do
+    post = SloppyPost.new
+    I18n.locale = :es
+    post.title = {en: "English"}
+    post.valid?
+    post.should be_valid
+
+    post.title = "In Spanish"
+    post.valid?
+    post.should be_valid
+  end
+
+  it "should be invalid when require number validation is not met" do
+    post = SloppyPost.new
+    I18n.locale = :es
+    post.valid?
+    expect(post.errors.size).to be >= 1
+  end
+
 end

data/spec/spec_helper.rb

@@ -8,8 +8,16 @@ require 'multilang-hstore'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new(nil)
+ActiveRecord::Base.establish_connection(:adapter => "postgresql", :host=>'127.0.0.1', :user=>'postgres')
+begin
+ActiveRecord::Base.connection.execute('CREATE DATABASE "multilang-hstore-test" WITH OWNER postgres;')
+rescue ActiveRecord::StatementInvalid
+  puts "Database already exists"
+end
 ActiveRecord::Base.establish_connection(:adapter => "postgresql", :database => "multilang-hstore-test", :host=>'127.0.0.1', :user=>'postgres')
+ActiveRecord::Base.connection.execute('CREATE EXTENSION IF NOT EXISTS hstore;')
 
+I18n.enforce_available_locales = false
 I18n.available_locales = [:lv, :ru]
 I18n.locale = I18n.default_locale = :lv
 
@@ -50,3 +58,13 @@ class NamedPost < ActiveRecord::Base
   self.table_name = 'named_posts'
   multilang :title
 end
+
+class TacoPost < ActiveRecord::Base
+  self.table_name = 'named_posts'
+  multilang :title, required: [:lv, :ru]
+end
+
+class SloppyPost < ActiveRecord::Base
+  self.table_name = 'named_posts'
+  multilang :title, required: 1
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multilang-hstore
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Arthur Meinart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -56,6 +57,7 @@ files:
 - lib/multilang-hstore/exceptions.rb
 - lib/multilang-hstore/translation_keeper.rb
 - lib/multilang-hstore/translation_proxy.rb
+- lib/multilang-hstore/validators/translation_count_validator.rb
 - lib/multilang-hstore/version.rb
 - multilang-hstore.gemspec
 - spec/multilang_spec.rb
@@ -81,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Model translations for Rails 3 and Rails 4 backed by PostgreSQL and Hstore