i18n_attributes 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.1.1
+
+* use vkill_gems_method gem
+
+
 == 0.1.0
 
 * First release

data/README.markdown

@@ -15,7 +15,7 @@ I18nAttributes is a generate model attributes I18n locale files plugin for Rails
 
 In your app's `Gemfile`, add:
 
-    gem "i18n_attributes", "~> 0.1.0"
+    gem "i18n_attributes", "~> 0.1.1"
 
 Then run:
 

data/i18n_attributes.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "guard-rspec"
   s.add_dependency "rails", "~> 3.0"
+  s.add_dependency "vkill_gems_methods", "~> 0.1.0"
 end
 

data/lib/generators/i18n_attributes/model/model_generator.rb

@@ -6,6 +6,8 @@ class I18nAttributes::ModelGenerator < Rails::Generators::NamedBase
 
   include I18nAttributes::GeneratorHelpers
 
+  SUPPORTED_ORMS = %w(active_record active_model mongoid)
+
   def create_model_i18n_file
 
     orm = options.orm.to_s
@@ -21,7 +23,7 @@ class I18nAttributes::ModelGenerator < Rails::Generators::NamedBase
 
   private
     def attributes_hash
-      Hash[ attributes.map {|attribute| [attribute.name, attribute.human_name] } ]
+      Hash[ attributes.map {|attribute| [attribute.name, attribute.type] } ]
     end
 end
 

data/lib/generators/i18n_attributes/revise_model/revise_model_generator.rb

@@ -3,6 +3,9 @@ class I18nAttributes::ReviseModelGenerator < Rails::Generators::Base
 
   class_option :orm, :required => false, :default => "active_record"
 
+  include ::VkillGemsMethods::Rails::Generators::Base
+  ::ActiveRecord::Base.send :include, ::VkillGemsMethods::ActiveRecord::Base
+
   include I18nAttributes::GeneratorHelpers
 
   SUPPORTED_ORMS = %w(active_record)
@@ -13,30 +16,14 @@ class I18nAttributes::ReviseModelGenerator < Rails::Generators::Base
 
     say_error "#{orm} [not found]" unless SUPPORTED_ORMS.include? orm
 
-    models do |model|
-      I18nAttributes::Configuration.locales.each do |locale|
+    ::ActiveRecord::Base.models do |model, columns|
+      ::I18nAttributes::Configuration.locales.each do |locale|
         create_file "config/locales/model_#{ locale }/#{ model.name.underscore }.yml",
-                generate_yaml_file_data(locale, model.model_name.underscore, model.model_name, attributes_hash(model), orm)
+                generate_yaml_file_data(locale, model.model_name.underscore, model.model_name, columns, orm)
       end
     end
 
   end
 
-  private
-    def models(&block)
-      Rails.application.eager_load!
-      ActiveRecord::Base.descendants.each do |model|
-        next unless model.respond_to?(:columns_hash)
-        next unless model.table_exists?
-        next if model.abstract_class?
-        next if model.columns_hash.keys.include?('type') and model.descendants.size > 0
-        yield model
-      end
-    end
-
-    def attributes_hash(model)
-      Hash[ model.columns_hash.map { |k,v| [k, k.to_s.humanize] } ]
-    end
-
 end
 

data/lib/i18n_attributes/generator_helpers.rb

@@ -3,28 +3,7 @@ require "yaml"
 module I18nAttributes
   module GeneratorHelpers
 
-    SUPPORTED_ORMS = %w(active_record active_model mongoid)
-
-    def say_custom(type='warn', text) #example, type choise in FATAL,ERROR,WARN,INFO,DEBUG
-      ansicolor = #more ansicolor => https://github.com/flori/term-ansicolor
-        case type.downcase.to_s
-        when 'fatal'; '31m'
-        when 'error'; '31m'
-        when 'warn'; '36m'
-        when 'info'; '32m'
-        when 'debug'; '34m'
-        else; '0m'
-        end
-      say "\033[1m\033[#{ ansicolor }" + type.to_s.upcase.rjust(10) + "\033[0m" + "  #{text}"
-    end
-    def say_fatal(text); say_custom('fatal', text); exit; end
-    def say_error(text); say_custom('error', text); exit; end
-    def say_warn(text); say_custom('warn', text); end
-    def say_info(text); say_custom('info', text); end
-    def say_debug(text); say_custom('debug', text); end
-
-
-    def generate_yaml_file_data(locale, singular_name, human_name, attributes_hash, orm="active_record")
+    def generate_yaml_file_data(locale, singular_name, human_name, attributes, orm="active_record")
       YAML.dump_stream(
         {
           locale.to_s => {
@@ -33,7 +12,7 @@ module I18nAttributes
                 singular_name => human_name.to_s
               },
               "attributes" => {
-                singular_name => attributes_hash.merge(enums_hash(attributes_hash.keys))
+                singular_name => columns_hash(attributes).merge(enums_hash(attributes))
               }
             }
           }
@@ -42,11 +21,14 @@ module I18nAttributes
     end
 
     private
+      def columns_hash(attributes)
+        Hash[ attributes.keys.map {|k| [k.to_s, k.to_s.humanize]} ]
+      end
 
       def enums_hash(attributes)
         enums = {}
         I18nAttributes::Configuration.enums_attributes.each do |k,v|
-          attributes.index(k) ? enums.merge!(k => v) : next
+          attributes.keys.index(k) ? enums.merge!(k => v) : next
         end
         enums.empty? ? {} : { "enums" => enums }
       end

data/lib/i18n_attributes/version.rb

@@ -1,4 +1,4 @@
 module I18nAttributes
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000 Z
+date: 2011-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77307330 !ruby/object:Gem::Requirement
+  requirement: &71077170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77307330
+  version_requirements: *71077170
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &77307120 !ruby/object:Gem::Requirement
+  requirement: &71076960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77307120
+  version_requirements: *71076960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77306910 !ruby/object:Gem::Requirement
+  requirement: &71076750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77306910
+  version_requirements: *71076750
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &77306700 !ruby/object:Gem::Requirement
+  requirement: &71076540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77306700
+  version_requirements: *71076540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &77306450 !ruby/object:Gem::Requirement
+  requirement: &71076290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,18 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *77306450
+  version_requirements: *71076290
+- !ruby/object:Gem::Dependency
+  name: vkill_gems_methods
+  requirement: &71076040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *71076040
 description: A generate model attributes I18n locale files plugin for Rails3.
 email:
 - vkill.net@gmail.com