beautiful_scaffold 0.3.6 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: d1fe3aee750d2046a19d5f956820fb36e03a49ecac78cef8046d75e573e44e5e
+  data.tar.gz: aa521359c646d5171eeb3981f67ba5c7138ef9f422f2f88856e04280acc4b434
+SHA512:
+  metadata.gz: a3816f89d26548eccf73546dd698a3606f739bd1637e70fc53b19eaa27e7455ce61ea65a18fdc504ec8a8bea5f24dfd2d3bf6d030480c84f077e427d1481a447
+  data.tar.gz: 1256a2a3b5534405148fb3a0f9f2c3a404703e4ea2ff521887e8bb5f61c6937da8793a69fcfa8e4a584c131cd6af44c9d14c8bc8886b0daf97bfb54be4f98ebe

data/.gitattributes

@@ -0,0 +1,2 @@
+lib/generators/templates/app/assets/stylesheets/* linguist-vendored
+lib/generators/templates/app/assets/javascripts/* linguist-vendored

data/.gitignore

@@ -0,0 +1,2 @@
+test/dummy/log/test.log
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,70 @@
+== master
+
+* enhancement
+
+* bugfix
+
+== 2.0.0
+
+* enhancement
+  * Bootstrap 4.5 for search field.
+
+* bugfix
+  * Beautiful migration & Rails 6 (fix #23)
+
+== 2.0.0.pre
+
+* enhancement
+  * replace chardinjs by driverjs : https://github.com/kamranahmedse/driver.js
+  * replace bootstrapdatetimepicker by https://tempusdominus.github.io/bootstrap-4/Usage/
+  * Update JStreeview
+  * Update Bootstrap 4.2
+  * Update FontAwesome 5
+  * Generate beautiful scaffold for mountable engine
+  * Tests generators works !
+  * Refactoring ruby code.
+
+* bugfix
+  * Bugfix for engine
+
+== 1.0.3
+
+* enhancement
+  * You can generate scaffold in a mountable engine, now. (see README for syntax)
+
+* Bugfix
+  * I18n translation default value (model.column).
+
+== 1.0.2
+
+* enhancement
+  * Using static twitter bootstrap files
+  * UI : button back & submit on the same line
+  * Add tests (better late than never :/)
+
+* bugfix
+  * Fix #18 : Responsive Theme Navbar Overlaps Content When Resizing Below ~979px
+  * Fix generator locales
+  * Fix icon datetimepicker
+  * render nothing: true replace with head :ok
+
+== 1.0.1
+
+* enhancement
+  * Change datetimepicker (eyecon.ro -> eonasdan)
+  * Support CamelCase syntaxe for models.
+
+* bugfix
+  * Change keys symbol into string on session (begin at 0.3.5)
+
+== 1.0.0.pre
+
+* enhancement
+  * Remove Markitup
+  * Remove Livequery
+  * Compatibility Rails 5
+  * Update gem (prawn, ransack, willpaginate)
+
 == 0.3.6
 
 * enhancement
@@ -166,4 +233,4 @@
 
 == Previous versions
 
-* See commits on github
+* See commits on github

data/Gemfile

@@ -2,20 +2,27 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 4.0"
-# Pagination
-gem "will_paginate"
-# Search and filter
-gem "ransack"
-# Pdf
-gem 'prawn', '1.0.0.rc2'
-# Textile
-gem 'RedCloth'
-# BBCode
-gem 'bb-ruby'
-# Markdown
-gem 'bluecloth'
-# Markdown
-gem 'rdiscount'
-# Clear html tag
-gem 'sanitize'
+gem "rails", "~> 6.0"
+
+group :test do
+  gem 'sqlite3'
+
+  gems = {
+      'will_paginate' => nil, # v 3.1.5
+      'ransack' => nil, #'2.3.2',
+      'jquery-ui-rails' => nil,
+      'prawn' => nil, #'2.1.0',
+      'prawn-table' => nil, #'0.2.2',
+      'sanitize' => nil,
+      'bootstrap' => '~> 4.3.1',
+      'font-awesome-rails' => '4.7.0.5',
+      'momentjs-rails' => '>= 2.9.0',
+      'bootstrap4-datetime-picker-rails' => nil,
+      'jquery-rails' => '4.3.1'
+  }
+
+  gems.each{ |gem_to_add, version|
+    gem(gem_to_add, version)
+  }
+end
+

data/README.rdoc

@@ -2,98 +2,110 @@
 
 Beautiful Scaffold is a gem which propose generators for a complete scaffold with paginate, sort and filter.
 Fully customizable.
-More info : http://www.beautiful-scaffold.com/
-Demo : http://demo.beautiful-scaffold.com/
+Info : https://github.com/rivsc/Beautiful-Scaffold
+Demo : http://beautiful-scaffold.rivsc.ovh/
 
 == Install
 
-=== RubyOnRails 4.1
-
-Add this in your Gemfile :
-gem 'beautiful_scaffold', '0.3.4'
-
-=== RubyOnRails 4.2
-
-Add this in your Gemfile :
-gem 'beautiful_scaffold', '0.3.5'
+Add this in the Gemfile of your rails app or engine :
+    gem 'beautiful_scaffold'
 
 === Next
 
 And run
-bundle install
+
+    bundle install
 
 == Usage
 
 === Scaffold
 
-rails generate beautiful_scaffold model attr:type attr:type... [--namespace=name] [--donttouchgem=name]
+    # model : underscore and singular
+    # mountable_engine : underscore
+    # namespace : underscore
+    rails generate beautiful_scaffold model attr:type attr:type... [--namespace=name] [--donttouchgem=yes] [--mountable_engine=name]
 
-type available :
+Types available:
 * integer
 * float
 * text
 * string
 * price
 * color
-* richtext
 * wysiwyg
 
+(See below #label-Barcodes)
+
 # Example : products
-rails g beautiful_scaffold product name:string price:price tva:float description:richtext visible:boolean && rake db:migrate
+
+    rails g beautiful_scaffold product name:string price:price tva:float description:wysiwyg visible:boolean && rake db:migrate
 
 # Example : admin products
-rails g beautiful_scaffold product name:string price:price tva:float description:richtext overview_description:richtext visible:boolean --namespace=admin && rake db:migrate
+
+    rails g beautiful_scaffold product name:string price:price tva:float description:wysiwyg overview_description:wysiwyg visible:boolean --namespace=admin && rake db:migrate
+
+# Example (for an engine) :
+    # You need to add beautiful-scaffold to the gemfile of the engine (not the gemspec !).
+
+    rails g beautiful_scaffold user code:string --mountable-engine=faq
+    rails g beautiful_scaffold question title:string description:wysiwyg user:references resolved:boolean --mountable-engine=faq
+    rails g beautiful_scaffold answer description:wysiwyg user:references up:integer down:integer --mountable-engine=faq
+    rails g beautiful_migration AddPositionToFaqAnswers position:integer --mountable-engine=faq
+    rails g beautiful_jointable answer tag --mountable-engine=faq
 
 === Migration (Use Add[Field]To[ModelPluralize] syntax)
 
-rails g beautiful_migration AddFieldToModels field:type
+    rails g beautiful_migration AddFieldToModels field:type
 
 === Locale (i18n) (Example)
 
-Run rake db:migrate before rail g beautiful_locale (to get lastest attribute translation)
+Run `rake db:migrate` before `rails g beautiful_locale` (to get lastest attribute translation)
 
-rails g beautiful_locale all
-rails g beautiful_locale en
-rails g beautiful_locale fr
-rails g beautiful_locale de
+    rails g beautiful_locale all
+    rails g beautiful_locale en
+    rails g beautiful_locale fr
+    rails g beautiful_locale de
 
 === Join Table (has_and_belongs_to_many relation)
 
-rails g beautiful_jointable model1 model2
+    rails g beautiful_jointable model1 model2
 
+TODO replace Devise by Sorcery & Cancan by Cancancan
 === Install et Configure Devise (authentification) and Cancan (authorization)
 
-rails g beautiful_devisecancan model
+    rails g beautiful_devisecancan model
 
 === In views
 
 ==== Barcodes
 
 Set code like this :
-<span class="barcode" data-barcode="1234567890128" data-type-barcode="ean13"></span>
+
+    <span class="barcode" data-barcode="1234567890128" data-type-barcode="ean13"></span>
 
 data-type-barcode can be :
 
-codabar
-code11 (code 11)
-code39 (code 39)
-code93 (code 93)
-code128 (code 128)
-ean8 (ean 8)
-ean13 (ean 13)
-std25 (standard 2 of 5 - industrial 2 of 5)
-int25 (interleaved 2 of 5)
-msi
-datamatrix (ASCII + extended)
+    codabar
+    code11 (code 11)
+    code39 (code 39)
+    code93 (code 93)
+    code128 (code 128)
+    ean8 (ean 8)
+    ean13 (ean 13)
+    std25 (standard 2 of 5 - industrial 2 of 5)
+    int25 (interleaved 2 of 5)
+    msi
+    datamatrix (ASCII + extended)
+
+==== Driverjs (overlay instructions)
+
+Example : when you click on the #bs-help tag presentation tour display on screen !
 
-==== Chardinjs (overlay instructions)
+If you want to add 'slide' :
 
-Example : This button triggers chardinjs on element with 'menu' id.
-<a href="#" class="bs-chardinjs" data-selector="#menu">Help Menu</a>
+For add instruction to element, add this to your markup :
 
-If you want display all chardinjs :
-<a href="#" class="bs-chardinjs" data-selector="body">Help</a>
+id="myunique-id-in-the-page" data-present-title="Title for the slide" data-present-description="Short description" data-present-order="1"
 
-Just add class="bs-chardinjs" in a button / link for trigger chardinjs. Beautiful-Scaffold does the job !
+And Beautiful-Scaffold does the job !
 
-For add instruction to element, read official documentation : https://github.com/heelhook/chardin.js#adding-data-for-the-instructions

data/Rakefile

@@ -0,0 +1,29 @@
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Beautiful-Scaffold'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load 'rails/tasks/engine.rake'
+load 'rails/tasks/statistics.rake'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task default: :test

data/beautiful_scaffold.gemspec

@@ -1,18 +1,19 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
+require "beautiful_scaffold/version"
+
 Gem::Specification.new do |s|
   s.name        = "beautiful_scaffold"
-  s.version     = "0.3.6"
+  s.version     = BeautifulScaffold::VERSION
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"
-  s.homepage    = "http://beautiful-scaffold.com"
-  s.description = "Beautiful Scaffold generate a complete scaffold (sort, export, paginate and filter data) http://www.beautiful-scaffold.com"
+  s.homepage    = "https://blog.rivsc.ovh"
+  s.description = "Beautiful Scaffold generate a complete scaffold (sort, export, paginate and filter data) http://beautiful-scaffold.rivsc.ovh"
   s.authors     = ['Sylvain Claudel']
-  s.files       = `git ls-files`.split("\n")
-
-  s.rubyforge_project = "beautiful_scaffold"
+  s.files       = `git ls-files`.split("\n").reject{ |filepath| filepath.start_with? 'test/' }
+  s.licenses    = ['MIT']
 
-  s.require_paths = ["lib","lib/generators"]
+  s.require_paths = ["lib","lib/generators","test/*"]
 end

data/lib/beautiful_scaffold/version.rb

@@ -0,0 +1,3 @@
+module BeautifulScaffold
+  VERSION = '2.0.0'
+end

data/lib/generators/beautiful_devisecancan_generator.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 class BeautifulDevisecancanGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   source_root File.expand_path('../templates', __FILE__)

data/lib/generators/beautiful_jointable_generator.rb

@@ -1,11 +1,13 @@
 # encoding : utf-8
 class BeautifulJointableGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   source_root File.expand_path('../templates', __FILE__)
 
   argument :join_models, :type => :array, :default => [], :banner => "model model"
+
+  class_option :mountable_engine, default: nil
   
   def create_join_table
     if join_models.length != 2 then
@@ -13,14 +15,21 @@ class BeautifulJointableGenerator < Rails::Generators::Base
     else
       sorted_model = join_models.sort
 
+      prefix_str = ''
+      if engine_name.present?
+        prefix_str = "#{engine_opt}_"
+      end
+
+      join_table_name = "#{prefix_str}#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}"
+
       # Generate migration
       migration_content = "
-      create_table :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, :id => false do |t|
+      create_table :#{join_table_name}, :id => false do |t|
         t.integer :#{sorted_model[0]}_id
         t.integer :#{sorted_model[1]}_id
       end
 
-      add_index :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, [:#{sorted_model[0]}_id, :#{sorted_model[1]}_id]
+      add_index :#{join_table_name}, [:#{sorted_model[0]}_id, :#{sorted_model[1]}_id]
       "
 
       migration_name = "create_join_table_for_#{sorted_model[0]}_and_#{sorted_model[1]}"
@@ -31,11 +40,35 @@ class BeautifulJointableGenerator < Rails::Generators::Base
       inject_into_file(filename, migration_content, :after => "def change")
 
       # Add habtm relation
-      inject_into_file("app/models/#{sorted_model[0]}.rb", "\n  has_and_belongs_to_many :#{sorted_model[1].pluralize}", :after => "ActiveRecord::Base")
-      inject_into_file("app/models/#{sorted_model[1]}.rb", "\n  has_and_belongs_to_many :#{sorted_model[0].pluralize}", :after => "ActiveRecord::Base")
-      inject_into_file("app/models/#{sorted_model[0]}.rb", ":#{sorted_model[1]}_ids, ", :after => "attr_accessible ")
-      inject_into_file("app/models/#{sorted_model[1]}.rb", ":#{sorted_model[0]}_ids, ", :after => "attr_accessible ")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[0]}.rb", "\n  #{engine_name.present? ? '  ' : ''}has_and_belongs_to_many :#{sorted_model[1].pluralize}", :after => "ApplicationRecord")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[1]}.rb", "\n  #{engine_name.present? ? '  ' : ''}has_and_belongs_to_many :#{sorted_model[0].pluralize}", :after => "ApplicationRecord")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[0]}.rb", "{ :#{sorted_model[1]}_ids => [] }, ", :after => "permitted_attributes
+      return ")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[1]}.rb", "{ :#{sorted_model[0]}_ids => [] }, ", :after => "permitted_attributes
+      return ")
     end
   end
 
+  def add_habtm_field_in_forms
+    models = join_models.sort
+
+    2.times do
+      html = "<%=
+    render :partial => 'layouts/#{engine_name}form_habtm_tag', :locals => {
+      :model_class => @#{models[0]},
+      :model_name => '#{models[0]}',
+      :plural_model_name => '#{models[0].pluralize}',
+      :linked_model_name => '#{models[1]}',
+      :plural_linked_model_name => '#{models[1].pluralize}',
+      :namespace_bs => '',
+      :engine_bs => '#{engine_opt}',
+      :field_to_search_for_linked_model => 'name',
+      :attr_to_show => 'caption',
+      :f => f
+  } %>"
+
+      inject_into_file("app/views/#{engine_name}#{models[0].pluralize}/_form.html.erb", html, :before => "<!-- Beautiful_scaffold - AddField - Do not remove -->")
+      models = models.reverse
+    end
+  end
 end

data/lib/generators/beautiful_locale_generator.rb

@@ -1,26 +1,23 @@
 # encoding : utf-8
 class BeautifulLocaleGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :name, :type => :string, :desc => "type of locale : fr OR en OR de OR all..."
+  argument :name, :type => :string, :desc => "type of locale : fr OR en OR de OR ja all..."
+
+  class_option :mountable_engine, :default => nil
+
+  def list_locales
+    availablelocale = ["fr", "en", "ja"]
+
+    localestr = name.downcase
+    (localestr == 'all' ? availablelocale : [localestr])
+  end
   
   def install_locale
-    availablelocale = ["fr", "en"]
-    
-    localestr = name.downcase
-    
-    locale_to_process = []
-
-    if localestr == 'all' then
-      locale_to_process = availablelocale
-    else
-      locale_to_process << localestr
-    end
-    
-    locale_to_process.each{ |temp_locale|
+    list_locales.each{ |temp_locale|
       filename = "beautiful_scaffold.#{temp_locale}.yml"
       gem_localepath = "app/locales/#{filename}"
       app_localepath = "config/locales/#{filename}"
@@ -54,86 +51,112 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   def regenerate_app_locale
     require 'net/http'
 
-    already_processed = { name.downcase => {}}
+    app_name = (Rails.root || engine_opt)
+    engine_or_apps = (Rails.application.class.parent_name || engine_opt).downcase
+    prefix = engine_opt.blank? ? '' : "#{engine_opt.camelize}::"
 
-    filepath = File.join(Rails.root, 'config', 'locales', "#{Rails.application.class.parent_name.downcase}.#{name.downcase}.yml")
-    begin
-      hi18n                                   = YAML.load_file(filepath)
-    rescue
-      puts "Error loading locale file : #{filepath}"
-    end
-
-    hi18n                                 ||= { name.downcase => {} }
-    hi18n[name.downcase]                  ||= { 'app' => {} }
-    hi18n[name.downcase]['app']           ||= { 'models' => {} }
-    hi18n[name.downcase]['app']['models'] ||= {}
+    already_processed = {}
+    hi18n = {}
 
-    # Feed data already translated
-    hi18n[name.downcase]['app']['models'].each{ |modelname,hshtranslations|
-      hshtranslations['bs_attributes'].each{ |attr, translated_attr|
-        already_processed[name.downcase][attr] = translated_attr
-      }
-    }
+    list_locales.each do |locale_str|
+      locale = locale_str.downcase
 
-    Dir.glob("app/models/**/*").each { |model_file|
-      puts model_file
-      next if File.directory?(model_file) or File.basename(model_file).first == '.'
-      model = File.basename(model_file, File.extname(model_file))
-      klass = model.camelize.constantize
+      already_processed[locale] ||= {}
 
+      filepath = File.join(app_name, 'config', 'locales', "#{engine_or_apps}.#{locale}.yml")
       begin
-        sorted_attr = klass.attribute_names.sort
+        if File.exist?(filepath)
+          hi18n = YAML.load_file(filepath)
+        end
       rescue
-        next
+        puts "Error loading locale file (YAML invalid?) : #{filepath}"
       end
 
-      newmodel = !hi18n[name.downcase]['app']['models'].has_key?(model)
+      hi18n[locale]                  ||= { 'app' => {} }
+      hi18n[locale]['app']           ||= { 'models' => {} }
+      hi18n[locale]['app']['models'] ||= {}
+
+      # Feed data already translated
+      hi18n[locale]['app']['models'].each do |modelname, hshtranslations|
+        hshtranslations['bs_attributes'].each do |attr, translated_attr|
+          already_processed[locale][attr] = translated_attr
+        end
+      end
 
-      hi18n[name.downcase]['app']['models'][model] ||= {
+      Dir.glob("app/models/**/*").each do |model_file|
+        puts model_file
+
+        next if File.directory?(model_file) or
+          File.basename(model_file).first == '.' or
+          model_file.include?('/concerns/') or
+          model_file.include?('pdf_report.rb') or
+          model_file.include?('application_record.rb')
+
+        model = File.basename(model_file, File.extname(model_file))
+
+        klass = "#{prefix}#{model}".camelize.constantize
+        sorted_attr = klass.attribute_names.sort
+
+        newmodel = !hi18n[locale]['app']['models'].has_key?(model)
+
+        hi18n[locale]['app']['models'][model] ||= {
           'bs_caption'            => model,
           'bs_caption_plural'     => model.pluralize,
           'bs_attributes'         => {},
-      }
-
-      if newmodel then
-        bs_caption          = (begin translate_string(name.downcase, model) rescue model end)
-        bs_caption_plural   = (begin translate_string(name.downcase, model.pluralize) rescue model.pluralize end)
+        }
+
+        if newmodel then
+          bs_caption = ""
+          begin
+            bs_caption = translate_string(locale, model)
+          rescue Exception => e
+            puts "Erreur traduction #{e.backtrace}"
+            bs_caption = model
+          end
+          bs_caption_plural = ""
+          begin
+            bs_caption_plural = translate_string(locale, model.pluralize)
+          rescue Exception => e
+            puts "Erreur traduction #{e.backtrace}"
+            bs_caption_plural = model.pluralize
+          end
 
-        hi18n[name.downcase]['app']['models'][model]['bs_caption'] = bs_caption
-        hi18n[name.downcase]['app']['models'][model]['bs_caption_plural'] = bs_caption_plural
-      end
+          hi18n[locale]['app']['models'][model]['bs_caption'] = bs_caption
+          hi18n[locale]['app']['models'][model]['bs_caption_plural'] = bs_caption_plural
+        end
 
-      hi18n[name.downcase]['app']['models'][model]['bs_attributes'] ||= {}
-
-      sorted_attr.each { |k|
-        # Si pas déjà renseigné
-        if hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k].blank? then
-          # Si pas déjà traduit
-          if already_processed[name.downcase][k].nil? then
-            begin
-              attr_translate = translate_string(name.downcase, k)
-              already_processed[name.downcase][k] = attr_translate
-            rescue
-              puts "Plantage translate API"
-              attr_translate = k
+        hi18n[locale]['app']['models'][model]['bs_attributes'] ||= {}
+
+        sorted_attr.each do |k|
+          # Si pas déjà renseigné
+          if hi18n[locale]['app']['models'][model]['bs_attributes'][k].blank?
+            # Si pas déjà traduit
+            if already_processed[locale][k].blank?
+              begin
+                attr_translate = translate_string(locale, k)
+                already_processed[locale][k] = attr_translate
+              rescue
+                puts "Plantage translate API"
+                attr_translate = k
+              end
+            else
+              attr_translate = already_processed[locale][k]
             end
           else
-            attr_translate = already_processed[name.downcase][k]
+            # Récupère l'attribut traduit
+            attr_translate = hi18n[locale]['app']['models'][model]['bs_attributes'][k]
           end
-        else
-          # Récupère l'attribut traduit
-          attr_translate = hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k]
-        end
 
-        hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k] = attr_translate
-      }
-    }
+          hi18n[locale]['app']['models'][model]['bs_attributes'][k] = attr_translate
+        end
+      end
 
-    File.unlink(filepath) if File.exist?(filepath)
+      File.unlink(filepath) if File.exist?(filepath)
 
-    file = File.open(filepath, "w")
-    file.write(hi18n.to_yaml)
-    file.close
+      file = File.open(filepath, "w")
+      file.write(hi18n.to_yaml)
+      file.close
+    end
   end
 
   private
@@ -141,14 +164,13 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   def translate_string(locale, str)
     # See http://www.microsofttranslator.com/dev/
     #
-    if locale == "en" then
+    if locale == "en"
       attr_translate = "#{str.gsub(/_/, " ")}"
     else
-      url_domain    = "mymemory.translated.net"
-      url_translate = "/api/get?q=to_translate&langpair=en%7C#{locale}"
+      url_domain = "api.mymemory.translated.net"
+      url_query = "/get?q=#{str.gsub(/_/, "%20")}&langpair=en%7C#{locale}"
 
-      urlstr = url_translate.gsub(/to_translate/, str.gsub(/_/, "%20"))
-      json = JSON.parse(Net::HTTP.get(url_domain, urlstr))
+      json = JSON.parse(Net::HTTP.get(url_domain, url_query))
       attr_translate = json["responseData"]["translatedText"].strip.downcase
     end
     raise 'Free Limit' if attr_translate =~ /mymemory/