booletania 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7290fd84e48977e1d6b4684d2794a07f6f1c2f
-  data.tar.gz: 7b2b170dc90d2fb5fcab599f4d742bffebc3c826
+  metadata.gz: ede554f41aa09745752edb4854169d4963e1ed95
+  data.tar.gz: 5a30b3dafe3f9c28f9219ada50ac9010e0b5fdde
 SHA512:
-  metadata.gz: 57c575c2d5c130906903019a03959f2f275e22f76e536aac982be240e7b965533359ccd2c4ba2be45972b2782e264231b7e0dbf4eb1b22b96cb0f2e8f3693218
-  data.tar.gz: 25362bbda2696e947f631ede4998d6b402e9491ac686b3bddaa3267d7820a348d5f874f6db6cd3d0fa98355ae6b2bf69bf496df6de4942a6c79baa12948e0bc1
+  metadata.gz: 7f21d26ce0ae7bad0621cd7845387ab7cfa14d808d49a08a61650385d358f9f851ff5388503f49eef44e3db7bce76362f830091f985ea6a61ae399f65ee45da0
+  data.tar.gz: aca04acd22d101420233411e5cd15fe5c5e9f476b7b7a45622b3d48ba19c3f9b219b53bfe7e956e5b3288425335d8800e5d980bd60787316b1c49d85c86b9a4e

data/.travis.yml

@@ -1,3 +1,12 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.2.9
+  - 2.3.5
+  - 2.4.3
+  - 2.5.0
+before_install:
+  - gem update --system
+  - gem install bundler -v 1.16.1
+cache: bundler
+before_script:
+  - cp config/database.travis.yml config/database.yml

data/README.md

@@ -1,6 +1,8 @@
 # Booletania
 
-translating AR booleans in I18n files
+[![Build Status](https://travis-ci.org/ryoff/booletania.svg?branch=master)](https://travis-ci.org/ryoff/booletania)
+
+Translate ActiveRecord's boolean column
 
 ## Installation
 
@@ -22,7 +24,7 @@ Or install it yourself as:
 
 migration
 
-````ruby
+```ruby
 create_table(:invitations) do |t|
   t.boolean :accepted
 end
@@ -30,7 +32,7 @@ end
 
 model
 
-````ruby
+```ruby
 class Invitation < ActiveRecord::Base
   include Booletania
 end
@@ -38,7 +40,16 @@ end
 
 i18n
 
-````ruby
+```ruby
+ja:
+  activerecord:
+    attributes:
+      invitation/accepted:
+        'true': 承諾
+        'false': 拒否
+```
+or
+```ruby
 ja:
   booletania:
     invitation:
@@ -53,7 +64,7 @@ ja:
   - https://groups.google.com/forum/#!topic/rails-i18n/aL-Ed1Y1KGo
 
 ### #xxx_text
-````ruby
+```ruby
 invitation.accepted = true
 invitation.accepted_text # => "承諾"
 
@@ -68,7 +79,7 @@ invitation.accepted_text # => "accept"
 ```
 
 ### .xxx_options
-````ruby
+```ruby
 Invitation.accepted_options # => [['accept', true], ['deny', false]]
 
 I18n.locale = :ja
@@ -76,7 +87,7 @@ Invitation.accepted_options # => [["承諾", true], ["拒否", false]]
 ```
 
 for use in form
-````ruby
+```ruby
 f.collection_radio_buttons :accepted, Invitation.accepted_options, :last, :first
 ```
 

data/config/database.travis.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: sqlite3
+  database: ":memory:"
+  timeout: 500

data/lib/booletania/attribute.rb

@@ -3,22 +3,22 @@ module Booletania
     class << self
       def define_methods!(klass, boolean_columns)
         boolean_columns.each do |boolean_column|
-          column_obj = Booletania::Column.new(klass, boolean_column)
+          method_obj = Booletania::Method.new(klass, boolean_column)
 
-          define_attribute_text(column_obj)
+          define_attribute_text(method_obj)
 
-          define_attribute_options(column_obj)
+          define_attribute_options(method_obj)
         end
       end
 
       private
 
-      def define_attribute_text(column_obj)
-        column_obj.klass.class_eval column_obj._text, __FILE__, __LINE__ + 1
+      def define_attribute_text(method_obj)
+        method_obj.klass.class_eval method_obj._text, __FILE__, __LINE__ + 1
       end
 
-      def define_attribute_options(column_obj)
-        column_obj.klass.class_eval column_obj._options, __FILE__, __LINE__ + 1
+      def define_attribute_options(method_obj)
+        method_obj.klass.instance_eval method_obj._options, __FILE__, __LINE__ + 1
       end
     end
   end

data/lib/booletania/method.rb

@@ -0,0 +1,69 @@
+module Booletania
+  class Method
+    attr_reader :klass, :boolean_column
+
+    def initialize(klass, boolean_column)
+      @klass = klass
+      @boolean_column = boolean_column
+    end
+
+    def _text
+      i18n_true_keys = i18n_keys('true') + [true.to_s.humanize]
+      i18n_false_keys = i18n_keys('false') + [false.to_s.humanize]
+      <<-RUBY
+        def #{boolean_column.name}_text
+          keys = #{boolean_column.name}? ? #{i18n_true_keys} : #{i18n_false_keys}
+
+          I18n.t(keys[0], default: keys[1..-1])
+        end
+      RUBY
+    end
+
+    def _options
+      path_keys = i18n_path_keys + [{}]
+      <<-RUBY
+        def #{boolean_column.name}_options
+          I18n.t("#{path_keys[0]}", default: #{path_keys[1..-1]}).invert.map { |k, v| [k, v.to_b] }
+        end
+      RUBY
+    end
+
+    private
+
+    # For example,
+    #   [
+    #     :booletania.invitation.accepted.true,
+    #     :activerecord.attributes.invitation/accepted.true
+    #   ]
+    # For example,
+    #   [
+    #     :booletania.invitation.accepted.false,
+    #     :activerecord.attributes.invitation/accepted.false
+    #   ]
+    def i18n_keys(true_or_false)
+      i18n_path_keys.map do |i18n_path_key|
+        (i18n_path_key.to_s + '.' + true_or_false.to_b.to_s).to_sym
+      end
+    end
+
+    def i18n_path_keys
+      @i18n_path_keys ||= begin
+        [].tap do |list|
+          list << booletania_i18n_path_key
+          list << activerecord_i18n_path_key
+          list
+        end
+      end
+    end
+
+    # For example, :booletania.invitation.accepted
+    def booletania_i18n_path_key
+      :"booletania.#{klass.name.underscore}.#{boolean_column.name}"
+    end
+
+    # For example, :activerecord.attributes.invitation/accepted
+    def activerecord_i18n_path_key
+      :"activerecord.attributes.#{klass.name.underscore}/#{boolean_column.name}"
+    end
+  end
+end

data/lib/booletania/version.rb

@@ -1,3 +1,3 @@
 module Booletania
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/booletania.rb

@@ -1,13 +1,13 @@
 require "booletania/version"
-require "booletania/column"
+require "booletania/method"
 require "booletania/attribute"
 
 module Booletania
   extend ActiveSupport::Concern
 
   included do
-    fail ArgumentError, "booletania only support ActiveRecord" unless ancestors.include? ActiveRecord::Base
-    fail ArgumentError, "not found .columns method" unless respond_to? :columns
+    raise ArgumentError, "booletania only support ActiveRecord" unless ancestors.include? ActiveRecord::Base
+    raise ArgumentError, "not found .columns method" unless respond_to? :columns
 
     Booletania::Attribute.define_methods!(self, columns.select{ |column| column.type == :boolean })
   end

data/spec/booletania_spec.rb

@@ -25,63 +25,187 @@ describe Booletania do
   end
 
   describe "#_text" do
-    let!(:invitation) { Invitation.create(accepted: accepted) }
+    let!(:invitation) { Invitation.create(accepted1: accepted1, accepted2: accepted2, accepted3: accepted3, accepted4: accepted4) }
+    let(:accepted1) { true }
+    let(:accepted2) { true }
+    let(:accepted3) { true }
+    let(:accepted4) { true }
     after { Invitation.delete_all }
 
-    subject { invitation.accepted_text }
+    shared_examples_for 'translated by :booletania i18n key' do
+      context "lang is ja" do
+        before { I18n.locale = :ja }
 
-    context "lang is ja" do
-      before { I18n.locale = :ja }
+        context "column is true" do
+          let(:accepted) { true }
+          it { is_expected.to eq '承諾' }
+        end
 
-      context "column is true" do
-        let(:accepted) { true }
+        context "column is false" do
+          let(:accepted) { false }
+          it { is_expected.to eq '拒否' }
+        end
+      end
 
-        it { is_expected.to eq '承諾' }
+      context "lang is en" do
+        before { I18n.locale = :en }
+
+        context "column is true" do
+          let(:accepted) { true }
+          it { is_expected.to eq 'accept' }
+        end
+
+        context "column is false" do
+          let(:accepted) { false }
+          it { is_expected.to eq 'deny' }
+        end
       end
 
-      context "column is false" do
-        let(:accepted) { false }
+      context "lans is invalid" do
+        before { I18n.locale = :xx }
+        let(:accepted) { true }
 
-        it { is_expected.to eq '拒否' }
+        it { is_expected.to eq 'True' }
       end
     end
 
-    context "lang is en" do
-      before { I18n.locale = :en }
+    shared_examples_for 'translated by :activerecord i18n key' do
+      context "lang is ja" do
+        before { I18n.locale = :ja }
 
-      context "column is true" do
+        context "column is true" do
+          let(:accepted) { true }
+          it { is_expected.to eq '許可' }
+        end
+
+        context "column is false" do
+          let(:accepted) { false }
+          it { is_expected.to eq '不可' }
+        end
+      end
+
+      context "lang is en" do
+        before { I18n.locale = :en }
+
+        context "column is true" do
+          let(:accepted) { true }
+          it { is_expected.to eq 'ok' }
+        end
+
+        context "column is false" do
+          let(:accepted) { false }
+          it { is_expected.to eq 'ng' }
+        end
+      end
+
+      context "lans is invalid" do
+        before { I18n.locale = :xx }
         let(:accepted) { true }
 
-        it { is_expected.to eq 'accept' }
+        it { is_expected.to eq 'True' }
       end
+    end
 
-      context "column is false" do
-        let(:accepted) { false }
+    describe "#accepted1_text. has only a :booletania i18n key" do
+      subject { invitation.accepted1_text }
+      let(:accepted1) { accepted }
+      it_behaves_like 'translated by :booletania i18n key'
+    end
+
+    describe "#accepted2_text. has :booletania and :activerecord i18n keys" do
+      subject { invitation.accepted2_text }
+      let(:accepted2) { accepted }
+      it_behaves_like 'translated by :booletania i18n key'
+    end
+
+    describe "#accepted3_text. has only a :activerecord i18n key" do
+      subject { invitation.accepted3_text }
+      let(:accepted3) { accepted }
+      it_behaves_like 'translated by :activerecord i18n key'
+    end
+
+    describe "#accepted4_text. do not have any i18n keys" do
+      subject { invitation.accepted4_text }
 
-        it { is_expected.to eq 'deny' }
+      context "column is true" do
+        let(:accepted4) { true }
+        it { is_expected.to eq 'True' }
+      end
+
+      context "column is false" do
+        let(:accepted4) { false }
+        it { is_expected.to eq 'False' }
       end
     end
   end
 
   describe "._options" do
-    subject { Invitation.accepted_options }
+    shared_examples_for 'translated by :booletania i18n key' do
+      context "lang is ja" do
+        before { I18n.locale = :ja }
+        it { is_expected.to eq [['承諾', true], ['拒否', false]] }
+      end
+
+      context "lang is en" do
+        before { I18n.locale = :en }
+        it { is_expected.to eq [['accept', true], ['deny', false]] }
+      end
+
+      context "lans is invalid" do
+        before { I18n.locale = :xx }
+        it { is_expected.to eq [] }
+      end
+    end
+
+    shared_examples_for 'translated by :activerecord i18n key' do
+      context "lang is ja" do
+        before { I18n.locale = :ja }
+        it { is_expected.to eq [['許可', true], ['不可', false]] }
+      end
+
+      context "lang is en" do
+        before { I18n.locale = :en }
+        it { is_expected.to eq [['ok', true], ['ng', false]] }
+      end
 
-    context "lang is ja" do
-      before { I18n.locale = :ja }
+      context "lans is invalid" do
+        before { I18n.locale = :xx }
+        it { is_expected.to eq [] }
+      end
+    end
 
-      it { is_expected.to eq [['承諾', true], ['拒否', false]] }
+    describe ".accepted1_options. has only a :booletania i18n key" do
+      subject { Invitation.accepted1_options }
+      it_behaves_like 'translated by :booletania i18n key'
     end
 
-    context "lang is en" do
-      before { I18n.locale = :en }
+    describe ".accepted2_options. has :booletania and :activerecord i18n keys" do
+      subject { Invitation.accepted2_options }
+      it_behaves_like 'translated by :booletania i18n key'
+    end
 
-      it { is_expected.to eq [['accept', true], ['deny', false]] }
+    describe ".accepted3_options. has only a :activerecord i18n key" do
+      subject { Invitation.accepted3_options }
+      it_behaves_like 'translated by :activerecord i18n key'
     end
 
-    context "lans is invalid" do
-      before { I18n.locale = :xx }
+    describe ".accepted4_options. do not have any i18n keys" do
+      subject { Invitation.accepted4_options }
 
-      it { is_expected.to eq [] }
+      context "lang is ja" do
+        before { I18n.locale = :ja }
+        it { is_expected.to eq [] }
+      end
+
+      context "lang is en" do
+        before { I18n.locale = :en }
+        it { is_expected.to eq [] }
+      end
+
+      context "lans is invalid" do
+        before { I18n.locale = :xx }
+        it { is_expected.to eq [] }
+      end
     end
   end
 end

data/spec/fixtures/locales/en.yml

@@ -1,6 +1,17 @@
 en:
+  activerecord:
+    attributes:
+      invitation/accepted2:
+        'true': ok
+        'false': ng
+      invitation/accepted3:
+        'true': ok
+        'false': ng
   booletania:
     invitation:
-      accepted:
+      accepted1:
+        'true': accept
+        'false': deny
+      accepted2:
         'true': accept
         'false': deny

data/spec/fixtures/locales/ja.yml

@@ -1,6 +1,17 @@
 ja:
+  activerecord:
+    attributes:
+      invitation/accepted2:
+        'true': 許可
+        'false': 不可
+      invitation/accepted3:
+        'true': 許可
+        'false': 不可
   booletania:
     invitation:
-      accepted:
+      accepted1:
+        'true': 承諾
+        'false': 拒否
+      accepted2:
         'true': 承諾
         'false': 拒否

data/spec/support/setup_database.rb

@@ -1,10 +1,17 @@
-ActiveRecord::Base.configurations = {'test' => {adapter: 'sqlite3', database: ':memory:'}}
+ActiveRecord::Base.configurations = if ENV['TRAVIS']
+                                      YAML.load_file("config/database.yml")
+                                    else
+                                      { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
+                                    end
 ActiveRecord::Base.establish_connection :test
 
-class CreateAllTables < ActiveRecord::Migration
+class CreateAllTables < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration[4.2]
   def self.up
     create_table(:invitations) do |t|
-      t.boolean :accepted
+      t.boolean :accepted1
+      t.boolean :accepted2
+      t.boolean :accepted3
+      t.boolean :accepted4
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booletania
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - ryoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -137,9 +137,10 @@ files:
 - README.md
 - Rakefile
 - booletania.gemspec
+- config/database.travis.yml
 - lib/booletania.rb
 - lib/booletania/attribute.rb
-- lib/booletania/column.rb
+- lib/booletania/method.rb
 - lib/booletania/version.rb
 - spec/booletania_spec.rb
 - spec/fixtures/locales/en.yml
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: translating AR booleans in I18n files

data/lib/booletania/column.rb

@@ -1,30 +0,0 @@
-module Booletania
-  class Column
-    attr_accessor :klass, :boolean_column
-
-    def initialize(klass, boolean_column)
-      @klass = klass
-      @boolean_column = boolean_column
-    end
-
-    def booletania_i18n_path
-      "booletania.#{@klass.name.underscore}.#{@boolean_column.name}"
-    end
-
-    def _text
-      <<-RUBY
-        def #{@boolean_column.name}_text
-          I18n.t "#{booletania_i18n_path}." + #{@boolean_column.name}.__send__(:to_s), default: #{@boolean_column.name}.__send__(:to_s)
-        end
-      RUBY
-    end
-
-    def _options
-      <<-RUBY
-        def self.#{@boolean_column.name}_options
-          (I18n.t "#{booletania_i18n_path}", default: {}).invert.map { |k, v| [k, v.to_b] }
-        end
-      RUBY
-    end
-  end
-end