inline_forms 1.3.49 → 1.4.0

data/bin/inline_forms

@@ -33,6 +33,8 @@ module InlineForms
     method_option :database, :aliases => "-d", :default => DATABASE_OPTIONS.first, :banner => DATABASE_OPTIONS.join('|'), :desc => 'specify development database'
     method_option :dry, :type => :boolean, :desc => 'dry run. Do not do most things. Only useful for development of inline_forms'
     method_option :example, :type => :boolean, :desc => 'install the example app. incompatible with --dry and uses sqlite as development database'
+    method_option :email, :aliases => "-e", :default => "admin@example.com", :desc => 'specify admin email'
+    method_option :password, :aliases => "-p", :default => "admin999", :desc => 'specify admin password'
 
     def create(app_name)
 
@@ -44,14 +46,28 @@ module InlineForms
         options[:example]
       end
 
-      database = DATABASE_OPTIONS.include?(options[:database]) ? options[:database] : DATABASE_OPTIONS.first
+      def self.database
+        DATABASE_OPTIONS.include?(options[:database]) ? options[:database] : 'sqlite'
+      end
+      
+      def self.using_sqlite?
+        database == 'sqlite'
+      end
+
+      def self.email
+        options[:email]
+      end
+
+      def self.password
+        options[:password]
+      end
 
       if install_example? && dry_run?
         say "--example and --dry-run can not be used together", :red
         exit 1
       end
 
-      if install_example? && (database != 'sqlite')
+      if install_example? && !using_sqlite?
         say "--example can only be used with an sqlite development database", :red
         exit 1
       end
@@ -110,10 +126,12 @@ module InlineForms
           gem 'devise'
           gem 'cancan'
           gem 'inline_forms'
+          gem 'validation_hints'
           gem 'mini_magick'
           gem 'jquery_datepicker'
           gem 'yaml_db'
           gem 'rails-i18n'
+          gem 'i18n-active_record', :git => 'git://github.com/acesuares/i18n-active_record.git'
           gem 'unicorn'
           gem 'rvm'
           gem 'rvm-capistrano'
@@ -141,22 +159,22 @@ module InlineForms
   
         say "- Database setup: creating config/database.yml with development database #{database}"
         remove_file "#{app_name}/config/database.yml" # the one that 'rails new' created
-        if database == 'mysql'
+        if using_sqlite?
           create_file "#{app_name}/config/database.yml", <<-END_DATABASEYML.strip_heredoc_with_indent
           development:
-            adapter: mysql2
-            database: #{app_name}_dev
-            username: #{app_name}
-            password: #{app_name}
+            adapter: sqlite3
+            database: db/development.sqlite3
+            pool: 5
+            timeout: 5000
 
           END_DATABASEYML
         else
           create_file "#{app_name}/config/database.yml", <<-END_DATABASEYML.strip_heredoc_with_indent
           development:
-            adapter: sqlite3
-            database: db/development.sqlite3
-            pool: 5
-            timeout: 5000
+            adapter: mysql2
+            database: #{app_name}_dev
+            username: #{app_name}
+            password: #{app_name}
 
           END_DATABASEYML
         end
@@ -171,8 +189,88 @@ module InlineForms
         say "- Devise install..."
         RVM.run "bundle exec rails g devise:install" unless dry_run?
 
-        say "- Devise User model install with added name field..."
-        RVM.run "bundle exec rails g devise User name:string" unless dry_run?
+        say "- Devise User model install with added name and locale field..."
+        RVM.run "bundle exec rails g devise User name:string locale:string" unless dry_run?
+
+        say "- Replace Devise route and add path_prefix..."
+        gsub_file "#{app_name}/config/routes.rb", /devise_for :users/, "devise_for :users, :path_prefix => 'auth'"
+        insert_into_file "#{app_name}/config/routes.rb", <<-ROUTE.strip_heredoc_with_indent(2), :after => "devise_for :users, :path_prefix => 'auth'\n"
+          resources :users do
+            post 'revert', :on => :member
+          end
+        ROUTE
+
+        say "- Create User Controller..."
+        create_file "#{app_name}/app/controllers/users_controller.rb", <<-USERS_CONTROLLER.strip_heredoc_with_indent
+          class UsersController < InlineFormsController
+            set_tab :user
+          end
+        USERS_CONTROLLER
+
+        say "- Recreate User Model..."
+        remove_file "#{app_name}/app/models/user.rb" # the one that 'devise:install' created
+        create_file "#{app_name}/app/models/user.rb", <<-USER_MODEL.strip_heredoc_with_indent
+          class User < ActiveRecord::Base
+
+            # devise options
+            devise :database_authenticatable
+            # devise :registerable # uncomment this if you want people to be able to register
+            devise :recoverable
+            devise :rememberable
+            devise :trackable
+            devise :validatable
+            # devise :token_authenticatable
+            # devise :confirmable,
+            # devise :lockable
+            # devise :timeoutable
+            # devise :omniauthable
+
+            # Setup accessible (or protected) attributes for your model
+            attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :locale
+            attr_writer :inline_forms_attribute_list
+
+            # validations
+            validates :name, :must_be_present => true
+
+            # pagination
+            attr_reader :per_page
+            @per_page = 7
+
+            has_paper_trail
+
+            def _presentation
+              "\#{name}"
+            end
+
+            def inline_forms_attribute_list
+              @inline_forms_attribute_list ||= [
+                [ :name , 'name', :text_field ],
+                [ :email , 'email', :text_field ],
+                [ :password , 'Nieuw wachtwoord', :devise_password_field ],
+                [ :encrypted_password , 'encrypted_password', :info ],
+                [ :reset_password_token , 'reset_password_token', :info ],
+                [ :reset_password_sent_at , 'reset_password_sent_at', :info],
+                [ :remember_created_at , 'remember_created_at', :info ],
+                [ :sign_in_count , 'sign_in_count', :info ],
+                [ :current_sign_in_at , 'current_sign_in_at', :info ],
+                [ :last_sign_in_at , 'last_sign_in_at', :info ],
+                [ :current_sign_in_ip , 'current_sign_in_ip', :info ],
+                [ :last_sign_in_ip , 'last_sign_in_ip', :info ],
+                [ :created_at , 'created_at', :info ],
+                [ :updated_at , 'updated_at', :info ],
+              ]
+            end
+
+            def self.not_accessible_through_html?
+              false
+            end
+
+            def self.order_by_clause
+              'name'
+            end
+
+          end
+        USER_MODEL
 
         say "- Install ckeditor..."
         RVM.run "bundle exec rails g ckeditor:install" unless dry_run?
@@ -187,8 +285,45 @@ module InlineForms
         say "- Paper_trail install..."
         RVM.run "bundle exec rails g paper_trail:install" unless dry_run?
 
-        say "- Migrating Devise and Versions"
-        RVM.run "bundle exec rake db:migrate" unless dry_run?
+        say "- Generate models and tables and views for translations..."
+        RVM.run 'rails g inline_forms InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\'#{name}\''
+        RVM.run 'rails g inline_forms InlineFormsKey name:string inline_forms_translations:has_many inline_forms_translations:associated _enabled:yes _presentation:\'#{name}\''
+        RVM.run 'rails g inline_forms InlineFormsTranslation inline_forms_key:belongs_to inline_forms_locale:dropdown value:text interpolations:text is_proc:boolean _presentation:\'#{value}\''
+
+        sleep 1 # to get unique migration number
+        create_file "#{app_name}/db/migrate/" + 
+          Time.now.utc.strftime("%Y%m%d%H%M%S") +
+          "_" +
+          "inline_forms_create_view_for_translations.rb", <<-VIEW_MIGRATION.strip_heredoc_with_indent
+          class InlineFormsCreateViewForTranslations < ActiveRecord::Migration
+
+            def self.up
+              execute 'CREATE VIEW translations
+                       AS
+                         SELECT L.name AS locale,
+                                K.name AS thekey,
+                                T.value AS value,
+                                T.interpolations AS interpolations,
+                                T.is_proc AS is_proc
+                           FROM inline_forms_keys K, inline_forms_locales L, inline_forms_translations T
+                             WHERE T.inline_forms_key_id = K.id AND T.inline_forms_locale_id = L.id '
+            end
+
+            def self.down
+              execute 'DROP VIEW translations'
+            end
+
+          end
+        VIEW_MIGRATION
+        
+        say "- Migrating Database"
+        RVM.run "bundle exec rake db:migrate" unless (dry_run? || !using_sqlite?)
+
+        say "- Adding admin user with email: #{email}, password: #{password} to seeds.rb"
+        append_to_file "#{app_name}/db/seeds.rb", "User.new({ :email => '#{email}', :name => 'Admin', :password => '#{password}', :password_confirmation => '#{password}'}).save"
+
+        say "- Seeding the database"
+        RVM.run "bundle exec rake db:seed" unless (dry_run? || !using_sqlite?)
 
         say "- Creating header in app/views/inline_forms/_header.html.erb..."
         create_file "#{app_name}/app/views/inline_forms/_header.html.erb", <<-END_HEADER.strip_heredoc_with_indent
@@ -218,19 +353,43 @@ module InlineForms
           end
         END_APPHELPER
 
-        say "- Recreating ApplicationController to add devise and cancan stuff..."
+        say "- Recreating ApplicationController to add devise, cancan, I18n stuff..."
         remove_file "#{app_name}/app/controllers/application_controller.rb" # the one that 'rails new' created
         create_file "#{app_name}/app/controllers/application_controller.rb", <<-END_APPCONTROLLER.strip_heredoc_with_indent
-          class ApplicationController < ActionController::Base
+          class ApplicationController < InlineFormsApplicationController
             protect_from_forgery
 
-            # before_filter :authenticate_user!
-            # check_authorization :unless => :devise_controller?
+            # Uncomment next two lines if you want Devise authentication
+            before_filter :authenticate_user!
+            layout 'devise' if :devise_controller?
 
+            # Uncomment next 6 lines if you want CanCan authorization
+            # check_authorization :unless => :devise_controller?
+            #
             # rescue_from CanCan::AccessDenied do |exception|
             #  sign_out :user if user_signed_in?
             #  redirect_to new_user_session_path, :alert => exception.message
             # end
+
+            # Uncomment next line if you want I18n
+            # before_filter :set_locale
+
+            # Uncomment next line and specify default locale
+            # I18n.default_locale = :en
+
+            # Uncomment next line and specify available locales
+            # I18n.available_locales = [ :en, :nl, :pp ]
+
+            # Uncomment next nine line if you want locale based on subdomain, like 'it.example.com, de.example.com'
+            # def set_locale
+            #   I18n.locale = extract_locale_from_subdomain || I18n.default_locale
+            # end
+            #
+            # def extract_locale_from_subdomain
+            #   locale = request.subdomains.first
+            #   return nil if locale.nil?
+            #   I18n.available_locales.include?(locale.to_sym) ? locale.to_s : nil
+            # end
           end
         END_APPCONTROLLER
 
@@ -257,14 +416,9 @@ module InlineForms
           
         DEVISE_MAILER_STUFF
 
-        say "- Setting config.assets.compile to true in environments/production.rb..."
+        say "- Setting config.assets.compile to true in environments/production.rb (needed for ckeditor)..."
         insert_into_file "#{app_name}/config/environments/production.rb", "  config.assets.compile = false\n", :before => "end\n" if dry_run?
-        insert_into_file "#{app_name}/config/environments/production.rb", <<-COMPILE_ASSETS.strip_heredoc_with_indent(2), :after => "  config.assets.compile = false\n"
-          # Fallback to assets pipeline if a precompiled asset is missed, we need this for ckeditor
-          config.assets.compile = true
-        COMPILE_ASSETS
-          
-        comment_lines "#{app_name}/config/environments/production.rb", /config\.assets\.compile = false/
+        gsub_file "#{app_name}/config/environments/production.rb", /config.assets.compile = false/, "config.assets.compile = true"
 
         say "- Capify..."
         RVM.run 'capify .'

data/lib/app/helpers/inline_forms_helper.rb

@@ -11,25 +11,11 @@ module InlineFormsHelper
   def inline_forms_version
     InlineForms::VERSION
   end
-  private
-
-  # used as class name
-  def has_validations(object, attribute)
-    not object.class.validators_on(attribute).empty?
-  end
 
-  def validation_help_as_list_for(object, attribute)
-    "" and return unless has_validations(object, attribute)
-    content_tag(:ul, validation_help_for(object, attribute).map { |help_message| content_tag(:li, help_message ) }.to_s.html_safe )
-  end
+  private
 
-  # validation_help_for(object, attribute) extracts the help messages for
-  # attribute of object.class (in an Array)
-  def validation_help_for(object, attribute)
-    "" and return unless has_validations(object, attribute)
-    object.class.validators_on(attribute).map do |v|
-      t("inline_forms.validators.help.#{ActiveModel::Name.new(v.class).i18n_key.to_s.gsub(/active_model\/validations\//, '')}")
-    end.compact
+  def validation_hints_as_list_for(object, attribute)
+    object.has_validations? ? content_tag(:ul, object.hints.full_messages_for(attribute).map { |m| content_tag(:li, m ) }.join.html_safe )  : ""
   end
 
   # close link
@@ -58,10 +44,10 @@ module InlineFormsHelper
     end
   end
 
-#  # undo link
-#  def link_to_undo_destroy(object, update_span )
-#    link_to(t('inline_forms.view.undo'), revert_version_path(object.versions.scoped.last), :method => :post)
-#  end
+  #  # undo link
+  #  def link_to_undo_destroy(object, update_span )
+  #    link_to(t('inline_forms.view.undo'), revert_version_path(object.versions.scoped.last), :method => :post)
+  #  end
 
   # link_to_inline_edit
   def link_to_inline_edit(object, attribute, attribute_value='')
@@ -121,8 +107,8 @@ module InlineFormsHelper
 
   def translated_attribute(object,attribute)
     t("activerecord.attributes.#{object.class.name.underscore}.#{attribute}")
-#          "activerecord.attributes.#{attribute}",
-#          "attributes.#{attribute}" ] )
+    #          "activerecord.attributes.#{attribute}",
+    #          "attributes.#{attribute}" ] )
   end
 
   # get the values for an attribute

data/lib/app/validators/is_a_curacao_id_number_validator.rb

@@ -1,8 +1,5 @@
 # -*- encoding : utf-8 -*-
-# == usage:
-# in your model, add:
-#  validates :id_number, must_be_present => true, is_a_curacao_id_number => true;
-class IsACuracaoIdNumberValidator < ActiveModel::EachValidator
+class IsACuracaoIdNumberValidator < InlineFormsValidator
 
   def validate_each(record, attribute, value)
     if value =~ /^[0-9]{10}$/

data/lib/app/views/inline_forms/_new.html.erb

@@ -30,13 +30,13 @@
             <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
             <tr>
               <td valign="top">
-                <div class='<%= "has_validations " if has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <div class='<%= 'has_validations ' if @object.has_validations_for?(attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
                   <%= translated_attribute(@object, attribute) -%>
                 </div>
-                <% if has_validations(@object, attribute) %>
+                <% if @object.has_validations_for?(attribute) %>
                   <div class='validation_help_tooltip'>
                     <div class='validation_help_content'>
-                      <%= validation_help_as_list_for(@object, attribute) -%>
+                      <%= validation_hints_as_list_for(@object, attribute) -%>
                     </div>
                   </div>
                 <% end -%>

data/lib/app/views/inline_forms/_show.html.erb

@@ -16,13 +16,13 @@
     <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
     <tr>
       <td valign="top">
-        <div class='<%= "has_validations " if has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+        <div class='<%= 'has_validations ' if @object.has_validations_for?(attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
           <%= translated_attribute(@object, attribute) -%>
         </div>
-        <% if has_validations(@object, attribute) %>
+        <% if @object.has_validations_for?(attribute) %>
           <div class='validation_help_tooltip'>
             <div class='validation_help_content'>
-              <%= validation_help_as_list_for(@object, attribute) -%>
+              <%= validation_hints_as_list_for(@object, attribute) -%>
             </div>
           </div>
         <% end -%>

data/lib/generators/inline_forms_generator.rb

@@ -54,18 +54,18 @@ module InlineForms
 
       def migration?
         not ( column_type == :no_migration  ||
-              name == "_presentation"       ||
-              name == "_order"              ||
-              name == "_enabled"            ||
-              name == "_id" )
+            name == "_presentation"       ||
+            name == "_order"              ||
+            name == "_enabled"            ||
+            name == "_id" )
       end
 
       def attribute?
         not ( name == '_presentation'       ||
-              name == '_order'              ||
-              name == '_enabled'            ||
-              name == "_id"                 ||
-              relation? )
+            name == '_order'              ||
+            name == '_enabled'            ||
+            name == "_id"                 ||
+            relation? )
       end
 
 
@@ -100,9 +100,9 @@ module InlineForms
         @presentation             = "\n"
         @order                    = "\n"
         @order_by_clause          = "  def self.order_by_clause\n" +
-                                    "    \"name\"\n" +
-                                    "  end\n" +
-                                    "\n"
+          "    \"name\"\n" +
+          "  end\n" +
+          "\n"
         @carrierwave_mounters     = "\n"
         @inline_forms_attribute_list  = String.new
 
@@ -115,7 +115,7 @@ module InlineForms
             @carrierwave_mounters << '  mount_uploader :' + attribute.name + ', ' + "#{attribute.name}_uploader".camelcase + "\n"
           end
           if attribute.type         == :has_many ||
-             attribute.type         == :has_many_destroy
+              attribute.type         == :has_many_destroy
             @has_many << '  has_many :'             + attribute.name
             @has_many << ', :dependent => :destroy' if attribute.type == :has_many_destroy
             @has_many << "\n"
@@ -124,51 +124,57 @@ module InlineForms
             @has_one << '  has_one :'               + attribute.name + "\n"
           end
           if attribute.type         == :habtm ||
-             attribute.type         == :has_and_belongs_to_many ||
-             attribute.type         == :check_list
+              attribute.type         == :has_and_belongs_to_many ||
+              attribute.type         == :check_list
             @habtm << '  has_and_belongs_to_many :' + attribute.name + "\n"
           end
           if attribute.name == '_presentation'
             @presentation <<  "  def _presentation\n" +
-                              "    \"#{attribute.type.to_s}\"\n" +
-                              "  end\n" +
-                              "\n"
+              "    \"#{attribute.type.to_s}\"\n" +
+              "  end\n" +
+              "\n"
           end
           if attribute.name == '_order'
             @order <<         "  def <=>(other)\n" +
-                              "    self.#{attribute.type} <=> other.#{attribute.type}\n" +
-                              "  end\n" +
-                              "\n"
+              "    self.#{attribute.type} <=> other.#{attribute.type}\n" +
+              "  end\n" +
+              "\n"
             @order_by_clause = "  def self.order_by_clause\n" +
-                               "    \"#{attribute.type}\"\n" +
-                               "  end\n" +
-                               "\n"
+              "    \"#{attribute.type}\"\n" +
+              "  end\n" +
+              "\n"
           end
           if attribute.attribute?
             attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
             @inline_forms_attribute_list << commenter +
-                                        '     [ :' +
-                                        attribute.name +
-                                        ' , "' + attribute.name +
-                                        '", :' + attribute.attribute_type.to_s +
-                                        " ], \n"
+              '     [ :' +
+              attribute.name +
+              ' , "' + attribute.name +
+              '", :' + attribute.attribute_type.to_s +
+              " ], \n"
           end
         end
         unless @inline_forms_attribute_list.empty?
           @inline_forms_attribute_list =  "\n" +
-                                      "  def inline_forms_attribute_list\n" +
-                                      "    @inline_forms_attribute_list ||= [\n" +
-                                      @inline_forms_attribute_list +
-                                      "    ]\n" +
-                                      "  end\n" +
-                                      "\n"
+            "  def inline_forms_attribute_list\n" +
+            "    @inline_forms_attribute_list ||= [\n" +
+            @inline_forms_attribute_list +
+            "    ]\n" +
+            "  end\n" +
+            "\n"
         end
         template "model.erb", "app/models/#{model_file_name}.rb"
       end
     end
 
     def generate_resource_route
-      route "resources :#{resource_name} do\n  post 'revert', :on => :member\nend" if @flag_create_resource_route
+      if @flag_create_resource_route
+        route <<-ROUTE.strip_heredoc
+          resources :#{resource_name} do
+            post 'revert', :on => :member
+          end
+        ROUTE
+      end
     end 
 
     def generate_migration
@@ -185,11 +191,11 @@ module InlineForms
             if attribute.migration?
               attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
               @columns << commenter +
-                          '     t.' +
-                          attribute.column_type.to_s +
-                          " :" +
-                          attribute.name +
-                          " \n"
+                '     t.' +
+                attribute.column_type.to_s +
+                " :" +
+                attribute.name +
+                " \n"
             end
           end
         end
@@ -201,8 +207,8 @@ module InlineForms
       unless @flag_not_accessible_through_html
         copy_file "_inline_forms_tabs.html.erb", "app/views/_inline_forms_tabs.html.erb" unless File.exists?('app/views/_inline_forms_tabs.html.erb')
         inject_into_file "app/views/_inline_forms_tabs.html.erb",
-                "  <%= tab.#{name.underscore} '#{name}', #{name.pluralize.underscore + '_path'} %>\n",
-                :after => "<%= tabs_tag :open_tabs => { :id => \"tabs\" } do |tab| %>\n"
+          "  <%= tab.#{name.underscore} '#{name}', #{name.pluralize.underscore + '_path'} %>\n",
+          :after => "<%= tabs_tag :open_tabs => { :id => \"tabs\" } do |tab| %>\n"
       end
     end
     

data/lib/inline_forms.rb

@@ -143,6 +143,7 @@ module InlineForms
     paths["app/models"] << "lib/app/models"
     paths["app/views"] << "lib/app/views"
     paths["app/assets"] << "lib/app/assets"
+
     I18n.load_path << Dir[File.join(File.expand_path(File.dirname(__FILE__) + '/locales'), '*.yml')]
     I18n.load_path.flatten!
   end

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "1.3.49"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.3.49
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -218,8 +218,6 @@ files:
 - lib/app/validators/is_curacao_phone_validator.rb
 - lib/app/validators/is_email_address_validator.rb
 - lib/app/validators/must_be_a_value_validator.rb
-- lib/app/validators/must_be_present_validator.rb
-- lib/app/validators/must_be_unique_validator.rb
 - lib/app/views/devise/confirmations/new.html.erb
 - lib/app/views/devise/mailer/confirmation_instructions.html.erb
 - lib/app/views/devise/mailer/reset_password_instructions.html.erb

data/lib/app/validators/must_be_present_validator.rb

@@ -1,12 +0,0 @@
-# -*- encoding : utf-8 -*-
-class MustBePresentValidator  < ActiveModel::Validations::PresenceValidator
-
-  def error_message
-    "is not a unique."
-  end
-
-  def help_message
-    "Verplicht veld (moet ingevuld worden)."
-  end
-
-end

data/lib/app/validators/must_be_unique_validator.rb

@@ -1,9 +0,0 @@
-# -*- encoding : utf-8 -*-
-class MustBeUniqueValidator  < ActiveRecord::Validations::UniquenessValidator
-
-  def error_message
-    "is not a unique."
-  end
-
-
-end