vinber 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4a239685dad6d433c85b7f7bc324eed89635ec6d
-  data.tar.gz: 586e58c4dbe8ae46b22a6951bb9ab147d0ab9ef5
+SHA256:
+  metadata.gz: 7d88a36583dc665923d7501eb8d362d2ec5b82097cb0e17a48a048573c25460b
+  data.tar.gz: cd68c15583f3ef1e6387f01e1588dbc1752cf3df31072f46e75b1a20d5be0171
 SHA512:
-  metadata.gz: da51f69910a0343affc046b921f302df20efac1a0c56b2dbd3e39df2d89ff99ea7d60cf9c83c5685d2dc18ec37443f422be4273f31e1c4921319fcd8ceb69913
-  data.tar.gz: 01b7e272785dbbe2adf28d3d48cfd9e69eb6cc055ed317a677ac2774b4fbbd16eaec5d45b8344bb886ffce36ef017374000a18395b45e80d8d62bda18c8aa1bf
+  metadata.gz: d31db2f637cacacf108a40b3e9a6ec3e478b7dc779f745d54b81eafb9f2ccc05391b52781549d59d1f238a758aec283a1fcb17e2ea099de9accdf05edc77cee7
+  data.tar.gz: ef89d9a27bc7aa608dc62d7bf85f05a2a1fa72c0af4d7a604911ce1705879f75e291aae747c5ff2fb296ab17626a99f8d2d247a0c506235d10addc01a4e278f0

data/lib/vinber.rb

@@ -1,7 +1,7 @@
 require_relative 'vinber/version'
 require_relative 'vinber/translate'
-require_relative 'vinber/vinber_list'
-require_relative 'vinber/vinber_value'
+require_relative 'vinber/vinber_klass'
+require_relative 'vinber/vinber_instance'
 require_relative 'vinber/current_vinbers'
 
 module Vinber
@@ -19,9 +19,11 @@ module Vinber
 
   def vinber(definitions)
     need_validates = definitions.delete(:validates)
+    need_scope = definitions.delete(:scope)
     definitions.each do |name, values|
       detect_vinber_conflict! name
       validates_from_vinber name, values if need_validates
+      scope_from_vinber name, values if need_scope
       defined_vinbers[name.to_s] = case
       when values.is_a?(Hash)
         values.with_indifferent_access
@@ -59,6 +61,14 @@ module Vinber
     class_eval { validates name.to_sym, inclusion: {in: val} }
   end
 
+  def scope_from_vinber(name, val)
+    if val.is_a?(Hash)
+      val.each do |key, value|
+        class_eval { scope key, -> { where(name => value) } }
+      end
+    end
+  end
+
   def raise_vinber_conflict_error(name, source)
     raise ArgumentError, VINBER_CONFLICT_MESSAGE % {
       name: name,
@@ -72,6 +82,6 @@ end
 # Extend/Include to ActiveRecord::Base
 ActiveRecord::Base.class_eval do
   extend  Vinber
-  extend  Vinber::List
-  include Vinber::Value
+  extend  Vinber::Klass
+  include Vinber::Instance
 end

data/lib/vinber/translate.rb

@@ -1,6 +1,8 @@
 module Vinber
   class Translate
 
+    VALUE_BOOL_LABLE = "vinber.%{key}"
+    VALUE_COMMON_LABLE = "vinber.%{attribute}_%{key}"
     VALUE_LABLE = "vinber.%{klass}.%{attribute}_%{key}"
 
     def initialize(klass, attribute, attribute_vinber_key)
@@ -16,7 +18,9 @@ module Vinber
     end
 
     def text
-      @text ||= I18n.t (VALUE_LABLE % label), default: label[:key].to_s.humanize
+      @text ||= I18n.t((VALUE_LABLE % label), default: nil) ||
+        I18n.t((VALUE_COMMON_LABLE % label), default: nil) ||
+        I18n.t((VALUE_BOOL_LABLE % label), default: label[:key].to_s.humanize)
     end
 
     alias_method :to_s, :text

data/lib/vinber/version.rb

@@ -1,3 +1,3 @@
 module Vinber
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/vinber/{vinber_value.rb → vinber_instance.rb}

@@ -1,5 +1,5 @@
 module Vinber
-  module Value
+  module Instance
 
     def vinber_value(attribute, options = {})
       obj   = self
@@ -12,6 +12,8 @@ module Vinber
 
         attribute_vinber_key = attribute_vinber.key val
         t ? Vinber::Translate.new(klass, attribute, attribute_vinber_key).to_s : attribute_vinber_key.to_s
+      elsif [true, false].include?(val)
+        Vinber::Translate.new(klass, attribute, val).to_s
       else
         val
       end

data/lib/vinber/{vinber_list.rb → vinber_klass.rb}

@@ -1,5 +1,5 @@
 module Vinber
-  module List
+  module Klass
 
     def vinber_list(attribute, options = {}, &block)
       klass = self
@@ -17,5 +17,19 @@ module Vinber
       end.to_a
     end
 
+    def vinber_value(attribute, key_or_value)
+      klass = self
+      raise VinberUndefined, "Vinber was undefined in #{klass.name}" unless klass.vinber_defined?
+
+      if key_or_value.is_a?(Symbol)
+        key = key_or_value
+      else
+        attribute_vinber = vinbers.defined_vinbers || {}
+        key = attribute_vinber.key key_or_value
+      end
+
+      Vinber::Translate.new(klass, attribute, key).to_s
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vinber
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - cenxky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,8 +58,8 @@ files:
 - lib/vinber/current_vinbers.rb
 - lib/vinber/translate.rb
 - lib/vinber/version.rb
-- lib/vinber/vinber_list.rb
-- lib/vinber/vinber_value.rb
+- lib/vinber/vinber_instance.rb
+- lib/vinber/vinber_klass.rb
 - vinber.gemspec
 homepage: https://github.com/cenxky/vinber
 licenses:
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Vinber is a rails enumeration tool, much easier for i18n.