translateable 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1568846c469cec338d192c62938cbe251ca177b7
-  data.tar.gz: 4c6e9f4d15edbdd175ad0fb3b8fa303c9e07db0d
+  metadata.gz: 74e5653f87bacd831d822678ab07d712e528312a
+  data.tar.gz: a89a68ddbbf4fc1477aab71edd138b10a5d8448b
 SHA512:
-  metadata.gz: 30508916028a562c23edd5a58d48b0a3faa3bff3859fc8769ceb5ee14ec0c59f7418cdeae2142fff895d00b66505ca14cfa2de066e496e7a387721082b5fdf25
-  data.tar.gz: e98d9b39fc4655a43b071282ee8c02e2bd7f39e6eb9bd5c048e2bc4e3ef091d80b5044ce9c8db845857fed11a0993f1edda1017d021c141e503f112e7a48ada5
+  metadata.gz: 546f7856b6fb230c8dbc606efee2aa077e1fcdbd193413c4c48921ad67411f71cb9e5cc95ae148d0cd6fd90d7b7bd136eaa4df745368e99e59d299e3758e31a2
+  data.tar.gz: 52c05cf36d6e1610c4964483ff90f21a7e0fe3c5163b857b87d54ba8f9253d73515171034a628936c13e1a248cc89bc4244d4cb144efb33387fd8acb8d895c62

data/README.md

@@ -1,12 +1,13 @@
 # Translateable
 
 [![Build Status](https://travis-ci.org/olegantonyan/translateable.svg)](https://travis-ci.org/olegantonyan/translateable)
+[![Gem Version](https://badge.fury.io/rb/translateable.svg)](https://badge.fury.io/rb/translateable)
 
-Allows you to store text data in multiple languages with your ActiveRecord models. Similar to [globalize](https://github.com/globalize/globalize), but have a few differences:
+Allows you to store text data in multiple languages with your ActiveRecord models. Similar to [globalize](https://github.com/globalize/globalize), but with a few differences:
 
 1. Works with Rails 5
 2. Uses single field in the table. No additional tables required to store translated data. PostgreSQL 9.4 is required to do this (JSONB)
-3. Provides easy integration with forms using nested attributes so you can create records with multiple translations in one form. Together with [nested_form_fields](https://github.com/ncri/nested_form_fields) you can dynamically add/delete/update tranlations without a single line of JavaScript.
+3. Provides easy integration with forms using nested attributes so you can create records with multiple translations in one form. Together with [nested_form_fields](https://github.com/ncri/nested_form_fields) you can dynamically add/delete/update translations without a single line of JavaScript.
 
 ```ruby
 I18n.locale = :en
@@ -21,7 +22,7 @@ I18n.locale = :en
 post.title #=> hello
 ```
 
-It adds very thin abstraction layer on top of JSONB field. All data is stored in a simple JSON structure: `{ "locale_name": "data" }`. JSONB can be indexed (this is a main reason why use it instead of just JSON, which is available in previous postgres versions).
+It adds very thin abstraction layer on top of JSONB field. All data is stored in a simple JSON structure: `{ "locale_name": "data" }`. JSONB can be indexed (this is the main reason to ​use​ it instead of just JSON, ​available​ in earlier Postgres versions).
 
 ## Requirements
 
@@ -80,7 +81,16 @@ You can pass multiple attributes:
 translateable :title, :body
 ```
 
-If there is no translation for a selected locale, than `I18n.default_locale` will be used. If there is no translation for `I18n.default_locale`, than first available will be used.
+If there is no translation for a selected locale, than `I18n.default_locale` will be used. If there is no translation for `I18n.default_locale`, than the first available ​one will be used. You can override this behavior with `strict` option, in this case you'll get `nil` if there is no translation for the selected locale:
+```ruby
+I18n.locale = :en
+post = Post.create(title: 'hello')
+post.title #=> hello
+
+I18n.locale = :ru
+post.title #=> hello
+post.title(strict: true) #=> nil
+```
 
 You can assign all locales data as a hash at once:
 ```ruby
@@ -129,11 +139,11 @@ end
 # `translateable_permitted_attributes` method provides strong_params for all translateable attributes
 # for example with `title` attribute those will be: `title_translateable_attributes: [:locale, :data, :_destroy]`
 ```
-Now you can add/delete/update `title` attribute value in different languages via single form.
+Now you can add/delete/update `title` attribute value in different languages via a single form.
 
 ### Migration
 
-Attributes must exist with `JSONB` type in database, so create a migration:
+Attributes must exist with `JSONB` type in a database, so create a migration:
 ```ruby
 class AddTitleToPosts < ActiveRecord::Migration
   def change
@@ -142,11 +152,11 @@ class AddTitleToPosts < ActiveRecord::Migration
 end
 ```
 
-If you already have a data and want to migrate it to new translateable structure, use provided generator:
+If you already have data​ and you want to migrate it to a new translateable structure, use ​a generator provided:
 ```
 bin/rails generate translateable:migration posts title
 ```
-This will create a reversible migration for data in `title` field of the `posts` table. By default, existent data will be moved into `I18n.default_locale`. If you want to use another locale, provide it as third argument:
+This will create a reversible migration for data in `title` field of the `posts` table. By default, the existent data will be moved into `I18n.default_locale`. If you want to use another locale, provide it as a third argument:
 ```
 bin/rails generate translateable:migration posts title ru
 ```
@@ -204,20 +214,19 @@ module JsonbQuerable
       if case_sens
         where("EXISTS (SELECT 1 FROM jsonb_each_text(#{ta}) j WHERE j.value LIKE ?)", "%#{value}%")
       else
-        q = "%#{Unicode.downcase(value.to_s)}%" # Unicode came from 'unicode' gem https://github.com/blackwinter/unicode
-        where("EXISTS (SELECT 1 FROM jsonb_each_text(#{ta}) j WHERE lower(j.value) LIKE ?)", q)
+        where("EXISTS (SELECT 1 FROM jsonb_each_text(#{ta}) j WHERE lower(j.value) LIKE lower(?))", "%#{value}%")
       end
     }
   end
 end
 ```
 
-Refer to [postgres documentation](http://www.postgresql.org/docs/9.4/static/functions-json.html).
+Refer to the [Postgres documentation](http://www.postgresql.org/docs/9.4/static/functions-json.html).
 
 ## TODO
 
 - Add options (fallback locales lookup behavior maybe?)
-- More clever database management for testing (temp schema or so)
+- More clever database management for testing (temp schema or similar)
 
 ## Development
 

data/lib/translateable.rb

@@ -21,7 +21,7 @@ module Translateable
     def translateable_sanity_check(attr)
       attr = attr.to_s
       raise ArgumentError, "no such column '#{attr}' in '#{name}' model" unless column_names.include?(attr)
-      raise ArgumentError, "'#{attr}' column must be of JSONB type" unless columns_hash[attr].type.to_s.casecmp('jsonb') == 0
+      raise ArgumentError, "'#{attr}' column must be of JSONB type" unless columns_hash[attr].type.to_s.casecmp('jsonb').zero?
     end
 
     def define_translateable_strong_params(*attrs)
@@ -51,9 +51,9 @@ module Translateable
         end
       end
 
-      define_method(attr) do
+      define_method(attr) do |**args|
         value = send("#{attr}_fetch_translateable")
-        value[I18n.locale] || value[I18n.default_locale] || value.values.first
+        value[I18n.locale] || (value[I18n.default_locale] unless args[:strict]) || (value.values.first unless args[:strict])
       end
 
       define_method("#{attr}=") do |arg|

data/lib/translateable/version.rb

@@ -1,3 +1,3 @@
 module Translateable
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: translateable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Oleg Antonyan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler