hanami-i18n 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a22c9aa18a54d0afb2db554c3d03b048ba4fd7f12e1f244b4761acd4de8292d7
-  data.tar.gz: 9f1807800e93d74f5a4c813ca2e07a9e84cda0a59e34579edac055dcee22d056
+  metadata.gz: 02fb431b3963d4308fffc13818866cb21f3e716fd97de6f189a29ba5dfccf8f1
+  data.tar.gz: f86ff8f554804468dabc7b2809fc98792990d87ed16f390e35171f35937e9d74
 SHA512:
-  metadata.gz: 8ebed58d20e27678580cdf7f3da375edc66bcbb0932f282a3d064d5881ec24629713175784a915fedb8ab67ac65c4cd1e183ecbe64e10064dfee57c5b7e4e643
-  data.tar.gz: 69c51f597f40ffc5f107a419d91dffcf7d384418921a8831a42633f10028a56a63d30676f2932a50c2d59c05d6b17e2043fbb3839356936f12b892838ba18eaa
+  metadata.gz: 054aa463996ea4d9d2c23113f1a7e4b1f54d4da0e53afb9d953280de740d0611c944e62293fe1509e189a2df6dd4234d39be630db0c842c901ef0fd99c3d3aa1
+  data.tar.gz: 694fe6e8daf80f97a3c8fc27b34dcb93e07594362ed3d6711519714509313d40da83d758a798d255628e5079c72b024a0821517f02d41ddc801901d25e1fc081

data/.byebug_history

@@ -0,0 +1,170 @@
+continue
+validator.validate.errors(full: true)
+validator.validate.errors
+validator.validate
+continue
+validator.validate.errors(full: true)
+validator.validate.errors
+validator.validate
+validator
+continue
+validator.validate
+validator
+continue
+n
+s
+validator.validate.errors(full: true)
+validator.validate.errors
+continue
+validator.validate.errors(full: true)
+validator.validate.errors
+continue
+validator.validate.errors
+validator.validate
+continue
+validator.validate.errors(full: true)
+continue
+self
+messages.rule('テスト')
+rule
+messages.rule(rule, opts)
+messages.rule
+messages
+n
+full?
+n
+template
+teampltea
+teamplate
+template
+tokens
+rule
+tokens
+template
+text
+s
+message_text(rule, template, tokens, options)
+options
+tokens
+template
+rule
+n
+template
+n
+path
+rule
+n
+options.update(tokens)
+n
+base_opts.update(lookup_options(arg_vals: arg_vals, input: input))
+input
+n
+message_tokens(args)
+n
+val
+arg_vals
+n
+args.map(&:last)
+args
+predicate
+n
+s
+n
+s
+merge(other.update(path: [*path, *other[:path]]))
+s
+other
+oTHer
+rule
+n
+s
+args
+node[1]
+node
+s
+n
+s
+merge(other.update(path: [*path, *other[:path]]))
+s
+visit(other, opts.(rule: rule))
+n
+s
+n
+s
+n
+s
+n
+s
+continue
+left
+n
+right
+left
+s
+node
+self.dump
+self
+node
+n
+merge(other.update(path: [*path, *other[:path]]))
+other
+s
+visit(other, opts.(rule: rule))
+other
+rule
+n
+node
+s
+node[0]
+args
+node
+s
+n
+s
+n
+s
+n
+s
+continue
+messages.flatten
+messages
+n
+__send__(:"visit_#{node[0]}", node[1], *args)
+s
+ast
+MessageSet[ast.map { |node| visit(node) }, failures: options.fetch(:failures, true)].dump
+MessageSet[ast.map { |node| visit(node) }, failures: options.fetch(:failures, true)]
+n
+results.map(&:to_ast)
+n
+self
+options
+messages
+s
+self
+n
+s
+message_compiler.with(options).(result_ast).dump
+message_compiler.with(options).(result_ast)
+s
+message_set(options.merge(hints: false)).dump
+message_set(options.merge(hints: false))
+n
+s
+continue
+n
+ast
+n
+results.map(&:to_ast)
+results
+n
+s
+messages
+self
+n
+new_options
+s
+options
+n
+step
+h

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.6

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "hanami-1.3" do
+  gem 'rake'
+  gem 'hanami',       '~> 1.3'
+  gem 'hanami-model', '~> 1.3'
+
+  gem 'sqlite3'
+end

data/Gemfile

@@ -4,3 +4,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in hanami-i18n.gemspec
 gemspec
+
+gem 'byebug'

data/Gemfile.lock

@@ -1,132 +1,115 @@
 PATH
   remote: .
   specs:
-    hanami-i18n (0.1.1)
+    hanami-i18n (0.1.2)
       dry-inflector
-      dry-validation
-      hanami-helpers (~> 1.2)
-      hanami-model (~> 1.2)
+      hanami-helpers
+      hanami-validations
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     ast (2.4.0)
-    concurrent-ruby (1.0.5)
+    byebug (11.1.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    dry-configurable (0.7.0)
+    dry-configurable (0.11.5)
       concurrent-ruby (~> 1.0)
-    dry-container (0.6.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.6)
+    dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.1)
-    dry-inflector (0.1.2)
-    dry-initializer (1.4.1)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
     dry-logic (0.4.2)
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-struct (0.3.1)
-      dry-configurable (~> 0.1)
-      dry-core (~> 0.3)
-      dry-equalizer (~> 0.2)
-      dry-types (~> 0.9, >= 0.9.0)
-      ice_nine (~> 0.11)
-    dry-types (0.11.1)
+    dry-types (0.12.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
-      dry-logic (~> 0.4, >= 0.4.0)
+      dry-logic (~> 0.4, >= 0.4.2)
       inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.11.0)
+    dry-validation (0.11.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
-      dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.11.0)
-    hanami-helpers (1.2.0)
-      hanami-utils (~> 1.2)
-    hanami-model (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-types (~> 0.11.0)
-      hanami-utils (~> 1.2)
-      rom (~> 3.3, >= 3.3.3)
-      rom-repository (~> 1.4)
-      rom-sql (~> 1.3, >= 1.3.5)
-    hanami-utils (1.2.0)
+      dry-logic (~> 0.4.2)
+      dry-types (~> 0.12.0)
+    hanami-helpers (1.3.3)
+      hanami-utils (~> 1.3)
+    hanami-utils (1.3.6)
       concurrent-ruby (~> 1.0)
       transproc (~> 1.0)
-    i18n (1.0.1)
+    hanami-validations (1.3.6)
+      dry-logic (~> 0.4.2, < 0.5)
+      dry-validation (~> 0.11, < 0.12)
+      hanami-utils (~> 1.3)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     inflecto (0.0.2)
-    parallel (1.12.1)
-    parser (2.5.0.5)
+    jaro_winkler (1.5.4)
+    method_source (1.0.0)
+    parallel (1.19.1)
+    parser (2.7.1.1)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rom (3.3.3)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.3)
-      dry-equalizer (~> 0.2)
-      dry-initializer (~> 1.3)
-      dry-types (~> 0.9, >= 0.9.4)
-      rom-mapper (~> 0.5, >= 0.5.1)
-    rom-mapper (0.5.1)
-      dry-core (~> 0.2, >= 0.2.3)
-      dry-equalizer (~> 0.2)
-      transproc (~> 1.0)
-    rom-repository (1.4.0)
-      dry-core (~> 0.3, >= 0.3.1)
-      dry-struct (~> 0.3)
-      rom (~> 3.3)
-      rom-mapper (~> 0.5)
-    rom-sql (1.3.5)
-      dry-core (~> 0.3)
-      dry-equalizer (~> 0.2)
-      dry-types (~> 0.11.0)
-      rom (~> 3.2, >= 3.2.2)
-      sequel (~> 4.43)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.54.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    sequel (4.49.0)
-    transproc (1.0.2)
-    unicode-display_width (1.3.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.10.1)
+    thor (1.0.1)
+    transproc (1.1.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  appraisal
+  bundler
+  byebug
   hanami-i18n!
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  pry
+  rake
+  rspec
   rubocop
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -1,83 +1,73 @@
 # Hanami::I18n
 
-This gem provide i18n for hanami
+It is a gem that integrates Hanami and i18n.
 
-## Installation
+## Getting start
 
-Add this line to your application's Gemfile:
+Add Gemfile
 
 ```ruby
 gem 'hanami-i18n'
 ```
 
-And then execute:
+Next, put the initialization file of I18n in `config/locale.rb`.
+Then place the locale file in any location.
+*Important: `config/initalizers` will not work.*
 
-    $ bundle
+例:
 
-Or install it yourself as:
-
-    $ gem install hanami-i18n
-
-## Usage
+```ruby
+# config/locale.rb
+I18n.load_path << Dir[File.expand_path("config/locales") + "/*.yml"]
+I18n.default_locale = :en # (note that `en` is already the default!)
+```
 
-### Prepare locales file
 
-In your hanami application, you should prepare locales file to `config/locale`.
+```yaml
+# config/locales/en.yml
 
-```yml
-ja: # config/locale/ja.yml
-  model:
-    entities:
-      user: ユーザー
-      book: 本
+en:
+  models:
     attributes:
       user:
-        name: 名前
-        email: メールアドレス
-      book:
-        title: タイトル
-        auther: 著者
+        name: "My name"
+        email: "My E-mail"
 
+  errors:
+    filled?: "MUST be filled!"
 ```
 
-### Initialize I18n
+Then it can be used as follows.
 
-In your initializer, you should set available locales and load path.
+### form
 
 ```ruby
-# config/initializers/i18n.rb
-
-I18n.available_locales = [:ja, :en]
-I18n.default_locale = :ja
-I18n.load_path += Dir[Hanami.root.join('config', 'locale', '*.{rb,yml}')]
-
+form_for :user, routes.users_path do
+  label :name
+  label :email
+end
 ```
 
-and you can use i18n in your application!
-
-## Form
+```html
+<form>
+  <label>My name</label>
+  <label>My E-mail</label>
+</form>
+```
 
-In your view, if you defined yml file above, you can use translation in your form label.
+### validation
 
-```rhtml
-<%=
-  form_for :user routes.user_path do
-    label :name # => 名前
-    text_field :name
-    
-    label :email # => メールアドレス
-    text_field :email
+```ruby
+params do
+  required(:user).schema do
+    required(:name).filled(:str?)
+    required(:email).filled(:str?)
   end
-%>
-```
+end
 
-## View
 
-```rhtml
-<%= Book.t %> <% # => 本 %>
-<%= Book.t(:title) %> <% # => タイトル %>
-<%= Book.t(:auther) %> <% # => 著者 %>
 
+params.errors(full: true) # => { user: {:email=>["My name MUST be filled!"], :post=>{:title=>["My E-mail MUST be filled!"]}} }
 ```
 
 ## Development

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/hanami_1.3.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "hanami", "~> 1.3"
+gem "hanami-model", "~> 1.3"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/hanami_1.3.gemfile.lock

@@ -0,0 +1,201 @@
+PATH
+  remote: ..
+  specs:
+    hanami-i18n (0.1.1)
+      dry-inflector
+      hanami-helpers
+      hanami-validations
+      i18n
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    byebug (11.1.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.3)
+    dry-configurable (0.11.5)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-initializer (1.4.1)
+    dry-logic (0.4.2)
+      dry-container (~> 0.2, >= 0.2.6)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-struct (0.3.1)
+      dry-configurable (~> 0.1)
+      dry-core (~> 0.3)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.9, >= 0.9.0)
+      ice_nine (~> 0.11)
+    dry-types (0.11.1)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1)
+      dry-container (~> 0.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4, >= 0.4.0)
+      inflecto (~> 0.0.0, >= 0.0.2)
+    dry-validation (0.11.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4, >= 0.4.0)
+      dry-types (~> 0.11.0)
+    hanami (1.3.3)
+      bundler (>= 1.6, < 3)
+      concurrent-ruby (~> 1.0)
+      hanami-assets (~> 1.3)
+      hanami-cli (~> 0.3)
+      hanami-controller (~> 1.3)
+      hanami-helpers (~> 1.3)
+      hanami-mailer (~> 1.3)
+      hanami-router (~> 1.3)
+      hanami-utils (~> 1.3)
+      hanami-validations (>= 1.3, < 3)
+      hanami-view (~> 1.3)
+    hanami-assets (1.3.4)
+      hanami-helpers (~> 1.3)
+      hanami-utils (~> 1.3)
+      tilt (~> 2.0, >= 2.0.2)
+    hanami-cli (0.3.1)
+      concurrent-ruby (~> 1.0)
+      hanami-utils (~> 1.3)
+    hanami-controller (1.3.3)
+      hanami-utils (~> 1.3)
+      rack (~> 2.0)
+    hanami-helpers (1.3.3)
+      hanami-utils (~> 1.3)
+    hanami-mailer (1.3.2)
+      hanami-utils (~> 1.3)
+      mail (~> 2.6)
+      tilt (~> 2.0, >= 2.0.1)
+    hanami-model (1.3.2)
+      concurrent-ruby (~> 1.0)
+      dry-logic (~> 0.4.2, < 0.5)
+      dry-types (~> 0.11.0)
+      hanami-utils (~> 1.3)
+      rom (~> 3.3, >= 3.3.3)
+      rom-repository (~> 1.4)
+      rom-sql (~> 1.3, >= 1.3.5)
+    hanami-router (1.3.2)
+      hanami-utils (~> 1.3)
+      http_router (= 0.11.2)
+      rack (~> 2.0)
+    hanami-utils (1.3.6)
+      concurrent-ruby (~> 1.0)
+      transproc (~> 1.0)
+    hanami-validations (1.3.6)
+      dry-logic (~> 0.4.2, < 0.5)
+      dry-validation (~> 0.11, < 0.12)
+      hanami-utils (~> 1.3)
+    hanami-view (1.3.3)
+      hanami-utils (~> 1.3)
+      tilt (~> 2.0, >= 2.0.1)
+    http_router (0.11.2)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    inflecto (0.0.2)
+    jaro_winkler (1.5.4)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (1.0.0)
+    mini_mime (1.0.2)
+    parallel (1.19.1)
+    parser (2.7.1.1)
+      ast (~> 2.4.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.2)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rexml (3.2.4)
+    rom (3.3.3)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.3)
+      dry-equalizer (~> 0.2)
+      dry-initializer (~> 1.3)
+      dry-types (~> 0.9, >= 0.9.4)
+      rom-mapper (~> 0.5, >= 0.5.1)
+    rom-mapper (0.5.1)
+      dry-core (~> 0.2, >= 0.2.3)
+      dry-equalizer (~> 0.2)
+      transproc (~> 1.0)
+    rom-repository (1.4.0)
+      dry-core (~> 0.3, >= 0.3.1)
+      dry-struct (~> 0.3)
+      rom (~> 3.3)
+      rom-mapper (~> 0.5)
+    rom-sql (1.3.5)
+      dry-core (~> 0.3)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.11.0)
+      rom (~> 3.2, >= 3.2.2)
+      sequel (~> 4.43)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.10.1)
+    sequel (4.49.0)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
+    tilt (2.0.10)
+    transproc (1.1.1)
+    unicode-display_width (1.7.0)
+    url_mount (0.2.1)
+      rack
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  byebug
+  hanami (~> 1.3)
+  hanami-i18n!
+  hanami-model (~> 1.3)
+  pry
+  rake
+  rspec
+  rubocop
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/hanami-i18n.gemspec

@@ -31,14 +31,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dry-validation'
-  spec.add_dependency 'dry-inflector'
-  spec.add_dependency 'hanami-helpers', '~> 1.2'
-  spec.add_dependency 'hanami-model', '~> 1.2'
   spec.add_dependency 'i18n'
+  spec.add_dependency 'hanami-helpers'
+  spec.add_dependency 'hanami-validations'
+  spec.add_dependency 'dry-inflector'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "byebug"
 end

data/lib/hanami/i18n.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 require 'hanami/i18n/version'
-require 'hanami/i18n/entity'
-require 'hanami/i18n/helpers/form_helper/form_builder'
-require 'hanami/i18n/view'
+require 'hanami/i18n/helpers/form'
+require 'hanami/i18n/validations'
 
-::Hanami::View.configure do
-  prepare do
-    include Hanami::I18n::View
-  end
+if Hanami.respond_to?(:root)
+  require Hanami.root.join('config/locale.rb')
 end

data/lib/hanami/i18n/helpers/form.rb

@@ -0,0 +1,40 @@
+require 'dry/inflector'
+
+module Hanami
+  module I18n
+    module Form
+      def self.prepended(_klass)
+        private :_i18n_content, :_model_name
+      end
+
+      def label(content = nil, **attributes, &blk)
+        attributes[:for] ||= content
+        super(_i18n_content(content), **attributes, &blk)
+      end
+
+      def _i18n_content(content)
+        ::I18n.t("models.attributes.#{_model_name}.#{content}",
+                 default: nil) || content
+      end
+
+      def _model_name
+        model = @name.to_s
+                     .gsub('[', '.')
+                     .delete(']')
+                     .split('.')
+                     .last
+        Dry::Inflector.new.singularize(model)
+      end
+    end
+  end
+end
+
+module Hanami
+  module Helpers
+    module FormHelper
+      class FormBuilder
+        prepend Hanami::I18n::Form
+      end
+    end
+  end
+end

data/lib/hanami/i18n/validations.rb

@@ -0,0 +1,45 @@
+module Hanami
+  module I18n
+    module Validations
+      module Settings
+        def self.prepended(klass)
+          klass.singleton_class.alias_method :_included, :included
+          klass.singleton_class.prepend ClassMethods
+        end
+
+        module ClassMethods
+          def included(klass)
+            _included(klass)
+
+            klass.messages :i18n
+          end
+        end
+      end
+
+      module MessageCompiler
+        def message_text(rule, template, tokens, opts)
+          model_name = (opts.path - [rule]).last
+          rule = ::I18n.t("models.attributes.#{model_name}.#{rule}", default: nil) ||
+                 ::I18n.t("models.entities.#{rule}", default: nil) ||
+                 rule
+
+          super(rule, template, tokens, opts)
+        end
+      end
+    end
+  end
+end
+
+module Hanami
+  module Validations
+    prepend Hanami::I18n::Validations::Settings
+  end
+end
+
+module Dry
+  module Validation
+    class MessageCompiler
+      prepend Hanami::I18n::Validations::MessageCompiler
+    end
+  end
+end

data/lib/hanami/i18n/version.rb

@@ -2,6 +2,6 @@
 
 module Hanami
   module I18n
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/templates/locale.rb

@@ -0,0 +1,2 @@
+I18n.load_path << Dir[File.expand_path("config/locales") + "/*.yml"]
+I18n.default_locale = :en # (note that `en` is already the default!)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: hanami-i18n
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ippachi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,41 +39,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hanami-helpers
+  name: hanami-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hanami-model
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,49 +81,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,11 +171,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".byebug_history"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tool-versions"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -155,16 +186,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/hanami_1.3.gemfile
+- gemfiles/hanami_1.3.gemfile.lock
 - hanami-i18n.gemspec
 - lib/hanami/i18n.rb
-- lib/hanami/i18n/dry/validation/result.rb
-- lib/hanami/i18n/entity.rb
-- lib/hanami/i18n/form.rb
-- lib/hanami/i18n/helpers/form_helper/form_builder.rb
-- lib/hanami/i18n/validation.rb
+- lib/hanami/i18n/helpers/form.rb
+- lib/hanami/i18n/validations.rb
 - lib/hanami/i18n/version.rb
-- lib/hanami/i18n/view.rb
 - locale/ja.yml
+- templates/locale.rb
 homepage: https://github.com/ippachi/hanami-i18n
 licenses: []
 metadata:
@@ -184,8 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: i18n for hanami

data/lib/hanami/i18n/dry/validation/result.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/validation/result'
-require 'hanami/i18n/validation'
-
-module Dry
-  module Validation
-    class Result
-      # prepend Hanami::I18n::Validation
-    end
-  end
-end

data/lib/hanami/i18n/entity.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'i18n'
-require 'dry/inflector'
-require 'hanami/model'
-
-module Hanami
-  class Entity
-    # Translate entity name and attribute names.
-    #
-    # @param attribute [Symbol] attribute name you want translate.
-    #
-    # @return [String] translated entity name or attribute name.
-    #
-    # @example
-    #
-    # # en:
-    # #   model:
-    # #     entities:
-    # #       user: 'User'
-    # #     attributes:
-    # #       user:
-    # #         name: 'Name'
-    #
-    # User.t # => 'User'
-    # User.t(:name) # => 'Name'
-    #
-    def self.t(attribute = nil)
-      inflector = Dry::Inflector.new
-      entity_name = inflector.singularize(inflector.tableize(name))
-
-      if attribute
-        ::I18n.t(attribute,
-                 scope: "model.attributes.#{entity_name}")
-      else
-        ::I18n.t(entity_name,
-                 scope: 'model.entities')
-      end
-    end
-  end
-end

data/lib/hanami/i18n/form.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami::I18n
-  module Form
-    # Translate form label
-    #
-    # override Hanami::Helpers::FormHelper::FormBuilder#label
-    def label(content, attributes = {})
-      content = I18n.t(content,
-                       scope: "model.attributes.#{@name}",
-                       default: Hanami::Utils::String.capitalize(content))
-      super(content, attributes)
-    end
-  end
-end

data/lib/hanami/i18n/helpers/form_helper/form_builder.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'hanami/helpers/form_helper/form_builder'
-require 'hanami/i18n/form.rb'
-
-module Hanami
-  module Helpers
-    module FormHelper
-      class FormBuilder
-        prepend Hanami::I18n::Form
-      end
-    end
-  end
-end

data/lib/hanami/i18n/validation.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'i18n'
-
-module Hanami::I18n
-  module Validation
-    def errors(options = {}.freeze)
-      h = super(options)
-      h.each_with_object({}) do |(k1, v1), hash1|
-        hash1[k1] = v1.each_with_object({}) do |(k2, v2), hash2|
-          hash2[I18n.t(k2,
-                       scope: "model.attributes.#{k1}",
-                       default: Hanami::Utils::String.capitalize(k2))] = v2[0]
-        end
-      end
-    end
-
-    def messages(options = {}.freeze)
-      h = super(options)
-      h.each_with_object({}) do |(k1, v1), hash1|
-        hash1[k1] = v1.each_with_object({}) do |(k2, v2), hash2|
-          hash2[I18n.t(k2,
-                       scope: "model.attributes.#{k1}",
-                       default: Hanami::Utils::String.capitalize(k2))] = v2[0]
-        end
-      end
-    end
-  end
-end

data/lib/hanami/i18n/view.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami::I18n
-  module View
-    # Translate specific word
-    #
-    # @param object_str [String] i18n string you want translate
-    # @param options [Hash] i18n options
-    #
-    # @return [String] translated word
-    #
-    # @example
-    # # apps/web/templates/users/index.html.erb
-    # # en:
-    # #   users:
-    # #     index:
-    # #       title: hello
-    #
-    # <%= t('.title') %> # => 'hello'
-    # <%= t('users.index.title') %>  # => 'hello'
-    #
-    def t(object_str, options = {})
-      if object_str[0] == '.'
-        file_path = template.instance_variable_get(:@_template).file
-
-        dir_structure = file_path.gsub(/\.html\..*/, '').split('/')
-
-        index = dir_structure.index('templates')
-        translation_path = dir_structure[index + 1..-1].join('.')
-        options[:scope] = translation_path
-      end
-
-      I18n.t(object_str, options)
-    end
-  end
-end