babylonia-rails 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1738c0ddff03c286598096590afe14d374dd3131
-  data.tar.gz: e060718b02decf056a932effd4df2ff08af92a16
+  metadata.gz: 23b9f13165bbb20bfdb7df78223d70aeac3a2786
+  data.tar.gz: 9852997ff2602bb4a6fdc3df158849ac70dfcba1
 SHA512:
-  metadata.gz: 81db6ab131ac20297f73280f6c1147768d9a99c0a7368bd877142158e42c1c86d884fc02eee657b063f71cdc5d72263674d156d475ef68cf687759bfe8c9966f
-  data.tar.gz: 1f87e602d62a067f580890d4dc94a1aaa2ff9229691def7b7ff5969ed8d8efd1a73c83d1501073edaa425b3fab7bab00901d0490b1ac09dca5347102895b3984
+  metadata.gz: 75121a38895577938c5c73c80118aa150621435dd096a28d4b720de9a7ccf0a509ac17f5b48ce0ce8edf3f532b0799eabafe5a3976a5dccd6720f0dbb6bd5812
+  data.tar.gz: 8e1847e0126bd7f30da95912610795719f64e3411b1b69c6f7295bc103ac27f2f5c401becbfe8da221720ead3eb02a09a6c91b631fb182995eed8da2f55c5c7d

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 *.gem
 *.rbc
 .bundle
@@ -16,3 +17,6 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+# Gemnasium gem configuration file
+config/gemnasium.yml

data/.ruby-gemset

@@ -0,0 +1 @@
+babylonia-rails

data/.ruby-version

@@ -0,0 +1 @@
+2.0

data/.travis.yml

@@ -1,6 +1,11 @@
+services: mysql
+before_script:
+  - mysql -e "CREATE DATABASE babylonia_test;"
 language: ruby
+env:
+  - "ACTIVE_RECORD_VERSION='~> 3.2'"
+  - "ACTIVE_RECORD_VERSION='>= 4.0.0'"
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - rbx-19mode

data/Gemfile

@@ -5,7 +5,11 @@ gemspec
 group :development do
   gem "yard",       ">= 0.7.4"
   gem "bundler",    ">= 1.0.0"
-  gem "mysql2"
+  if ENV['RUBY_VERSION'] =~ /jruby/
+    gem 'activerecord-jdbcmysql-adapter'
+  else
+    gem "mysql2"
+  end
 end
 
 group :test do

data/babylonia-rails.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
   s.require_paths     = ["lib"]
   
-  s.add_dependency              "babylonia", ">= 0.0.2"
-  s.add_dependency              "activerecord", ">= 3.2.0"
+  active_record       = ENV["ACTIVE_RECORD_VERSION"] || ">= 3.2.0"
+  
+  s.add_dependency              "babylonia", ">= 0.0.3"
+  s.add_dependency              "activerecord", active_record
   s.add_development_dependency  "bundler", ">= 1.0.0"
 end
 

data/lib/babylonia/rails/validator.rb

@@ -9,7 +9,10 @@ class LanguagesValidator < ActiveModel::EachValidator
   def validate_languages_present(record, attribute, languages)
     is     = record_attribute_languages(record, attribute)
     unless is == languages
-      record.errors[attribute] << (options[:message] || "should also be translated in #{(languages - is).map(&:upcase).to_sentence}")
+      record.errors[attribute] << (options[:message] || "should be filled in #{(languages - is).map(&:upcase).to_sentence}")
+      (languages - is).each do |lang|
+        record.errors[:"#{attribute}_#{lang}"] << (options[:message] || "should be filled")
+      end
     end
   end
   
@@ -17,7 +20,10 @@ class LanguagesValidator < ActiveModel::EachValidator
     all          = record_attribute_languages(record, attribute)
     in_range     = keys_not_matching(record, attribute){|k,v| !range.include?(v.size) }
     unless all.empty? || all == in_range
-      record.errors[attribute] << (options[:message] || "should be between #{range.first} and #{range.last} characters for #{(all - in_range).map(&:upcase).to_sentence}")
+      record.errors[attribute] << (options[:message] || "should be between #{range.first} and #{range.last} characters in #{(all - in_range).map(&:upcase).to_sentence}")
+      (all - in_range).each do |lang|
+        record.errors[:"#{attribute}_#{lang}"] << (options[:message] || "should be between #{range.first} and #{range.last} characters")
+      end
     end
   end
   

data/lib/babylonia/rails/version.rb

@@ -1,5 +1,5 @@
 module Babylonia
   module Rails
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/spec/babylonia-rails/persistence_spec.rb

@@ -5,11 +5,14 @@ describe LanguagesValidator do
   class BabylonianField < ActiveRecord::Base
     
     build_babylonian_tower_on :marshes
-    validates :marshes, languages: { present: %i(de en it), length: 5..11 }
+    validates :marshes, languages: { present: [:de, :en, :it], length: 5..11 }
     
   end
   
   describe "persistence" do
+    before(:each) do
+      I18n.stub available_locales: [:de, :en, :it]
+    end
     subject { BabylonianField.new(marshes: {en: 'Hello', de: 'Hello', it: 'Hello'})}
     it "should be possible to store the string value" do
       subject.save!

data/spec/babylonia-rails/validator_spec.rb

@@ -5,30 +5,39 @@ describe LanguagesValidator do
   class BabylonianField < ActiveRecord::Base
     
     build_babylonian_tower_on :marshes
-    validates :marshes, languages: { present: %i(de en it), length: 5..11 }
+    validates :marshes, languages: { present: [:de, :en, :it], length: 5..11 }
     
   end
   
   describe "validations" do
     subject { BabylonianField.new(marshes: "Hello") }
     before(:each) do
-      I18n.stub locale: :en
+      I18n.stub locale: :en, available_locales: [:de, :en, :it]
     end
     context "presence validations" do
       context "when invalid" do
         it "should indicate which languages are not translated" do
           subject.should_not be_valid
-          subject.errors[:marshes].first.should == "should also be translated in DE and IT"
+          subject.errors[:marshes].first.should == "should be filled in DE and IT"
+          subject.errors[:marshes_en].should be_empty
+          subject.errors[:marshes_de].first.should == "should be filled"
+          subject.errors[:marshes_it].first.should == "should be filled"
         end
         it "should indicate remaining incomplete languages if some are updated" do
           subject.marshes = {it: 'SOMETHING'}
           subject.should_not be_valid
-          subject.errors[:marshes].first.should == "should also be translated in DE"
+          subject.errors[:marshes].first.should == "should be filled in DE"
+          subject.errors[:marshes_en].should be_empty
+          subject.errors[:marshes_it].should be_empty
+          subject.errors[:marshes_de].first.should == "should be filled"
         end
         it "should work when attributes are deleted" do
           subject.marshes = ''
           subject.should_not be_valid
-          subject.errors[:marshes].first.should == "should also be translated in DE, EN, and IT"
+          subject.errors[:marshes].first.should == "should be filled in DE, EN, and IT"
+          subject.errors[:marshes_en].first.should == "should be filled"
+          subject.errors[:marshes_de].first.should == "should be filled"
+          subject.errors[:marshes_it].first.should == "should be filled"
         end
       end
       context "when valid" do
@@ -47,7 +56,9 @@ describe LanguagesValidator do
       context "when invalid" do
         it "should indicate that the languages that are not in length" do
           subject.should_not be_valid
-          subject.errors[:marshes].first.should == "should be between 5 and 11 characters for EN and IT"
+          subject.errors[:marshes].first.should == "should be between 5 and 11 characters in EN and IT"
+          subject.errors[:marshes_en].first.should == "should be between 5 and 11 characters"
+          subject.errors[:marshes_it].first.should == "should be between 5 and 11 characters"
         end
       end
       context "when valid" do

data/spec/support/database.yml

@@ -4,7 +4,7 @@ global: &global
   encoding: utf8
 
 base: &base
-  username: developer
+  username: travis
   password:
   host: 127.0.0.1
   application_timezone: :local

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babylonia-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Beat Richartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babylonia
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -61,9 +61,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - babylonia-rails.gemspec

data/Gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: .
-  specs:
-    babylonia-rails (0.0.1)
-      activerecord (>= 3.2.0)
-      babylonia (>= 0.0.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
-      builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.1)
-    atomic (1.1.14)
-    babylonia (0.0.2)
-      i18n (>= 0.5.0)
-    builder (3.1.4)
-    diff-lcs (1.2.5)
-    i18n (0.6.5)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    mysql2 (0.3.14)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-    yard (0.8.7.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  babylonia-rails!
-  bundler (>= 1.0.0)
-  mysql2
-  rspec
-  yard (>= 0.7.4)