inline_forms 2.23 → 3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTU2ZmZiNTYxMGU3ODJlNWIzZWYwZjNiY2NhYmNlNWIyYWY3NDViMQ==
+    ODIwYWFkZGM0NTgwODE0NGRhNmFlNTliMjE3MDQ3YTEzMTc0YmRkYg==
   data.tar.gz: !binary |-
-    ZTNjM2E5MTI5ZTcwNjFkZGY0NDBmM2E3M2RjOWNlOTc3YTEwN2JjNw==
-!binary "U0hBNTEy":
+    MjU0NTk0NzgwNjJlMDRjNGM3NDU3YWQxZDJhZjVlZTRmNzUwMzYxMA==
+SHA512:
   metadata.gz: !binary |-
-    MTU3ODU1NmRjZGExMmVkMzRiNzE1ZWU0NzdmMWE2ODM5MDFhYmQ5ZmI3NDM0
-    ZDI4MDc4ODc0MDM2NWFhNDIxMWVmMDkxYzg1YWE4Njc4MzI4ZDcxMjI5ODli
-    ZDlkMjAxMzhkNzUxZDQzMWViOWExNjI2NmY5MzIzMDhhYjVmNDU=
+    ZjU1ZDI5MjA1YzBhMTIxMWYyNzA1MzlkZjdhOTdkMDcwOTdhZmUxNDcyMDcx
+    NmQyZDdiOGI2YTY2ZjY2ZjQzMzUyM2Q2YTU5YzEwYjcxNWVlM2VmNDJmNDAz
+    OTQxYjcyNWQyNjUyNzUwOThkNDRjYTA2NTM5MDQ1ZjY1MDNlZjk=
   data.tar.gz: !binary |-
-    MzhjYjFiODhjNjA1OGZhYThmZmMwYmE5NjM1YjU2MGQ5ZWU2NmZhMTE2MTE1
-    OTkxMWMyODhmZjdkOTUwNDUyNDMzMWYwYWIxNWVjOTlhZDYxNzNlZWNiY2Ux
-    NTE5ZWIyNjljNjNlMGIxMWJmN2JjY2QxNGNkNzQ1YjEzZDNlMTk=
+    MDEyN2RlMGM0MjQ2YjgxMTBhMDRhMmY3ZmY0YWZkOGJjOTM1MTFjZDlmZDdl
+    MDNhYjA5MDk5M2RlMWM3ZWFkZDkxNTk1ZmU2NWYwZTFiNjA5NWU3NThkMTFl
+    NTdkZDQ5MTE4MmYyMmNkNmMzNGRjMjdmMjQ2NWM1ZjVmMDVkNDI=

data/.gitignore

@@ -40,3 +40,8 @@ pkg
 #
 # For vim:
 #*.swp
+.project
+.ruby-version
+.ruby-gemset
+.gitignore
+bin/LETOVER

data/bin/inline_forms

@@ -1,33 +1,17 @@
 #!/usr/bin/env ruby
 module InlineForms
-
   require File.join(File.dirname(__FILE__), "../lib/inline_forms/version.rb")
 
-  require 'rvm'
-  if not RVM.current
-    puts "ruby or rvm not found"
-    exit 2
-  end
-
   # what is this?
   Signal.trap("INT") { puts; exit }
 
   require 'thor'
-
   class Creator < Thor
     include Thor::Actions
 
-    String.class_eval do
-      def strip_heredoc_with_indent(indent=0)
-        new_indent = ( self.empty? ? 0 : ( scan(/^[ \t]*(?=\S)/).min.size - indent ) )
-        gsub(/^[ \t]{#{new_indent}}/, '')
-      end
-    end
-
     def self.source_root
       File.dirname(__FILE__)+"/.."
     end
-
     desc "create APP", "create an application with inline_forms v#{VERSION}"
     DATABASE_OPTIONS = %w(sqlite mysql)
     method_option :database, :aliases => "-d", :default => DATABASE_OPTIONS.first, :banner => DATABASE_OPTIONS.join('|'), :desc => 'specify development database'
@@ -35,8 +19,17 @@ module InlineForms
     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'
+    method_option :runtest, :aliases => "\-\-run-test", :default => false, :desc => 'run tests'
+    method_option :skiprvm, :aliases => "\-\-no-rvm", :type => :boolean, :default => false, :desc => 'install inline_forms without RVM'
 
     def create(app_name)
+      def self.skiprvm
+        options[:skiprvm]
+      end
+
+      def self.runtest
+        options[:runtest]
+      end
 
       def self.dry_run?
         options[:dry]
@@ -87,412 +80,46 @@ module InlineForms
         exit 1
       end
 
-      if dry_run?
-        empty_directory(app_name)
+      # TODO: optioneel, detecteren dat er RVM er is als het niet zo is dan zonder RVM instaleren
+      # Maybe via the method.options (THOR)?? 
+      # using_rvm = false # for testing purpose only need to do this another way.
+      require 'rvm'
+      # if RVM is detected and the user has not disabled using rvm via command than use rvm else without
+      if RVM.current && !options[:skiprvm]
+        # Let the user know that he are installing the inline_forms with support of RVM
+        say "Installing inline_forms with RVM", :green
+        # which ruby version is currently activated?
+        ruby_version = (%x[rvm current]).gsub(/@.*/,'')
+        # Create a ruby rvm-file version based on the version detected
+        create_file "#{app_name}/.ruby-version", ruby_version
+        # Creat a ruby-gemset rvm-file based on the version detected 
+        create_file "#{app_name}/.ruby-gemset", app_name
       else
-        if ! run("rails new #{app_name} --skip-bundle --skip-gemfile --skip-test-unit")
-          say "Rails could not create the app '#{app_name}', maybe because it is a reserved word...", :red
-          exit 1
-        end
+        # Let the user know that he is installing inline_forms without RVM
+        say "Installing inline_forms without RVM", :green
       end
 
-      ruby_version = (%x[rvm current]).gsub(/@.*/,'')
-      create_file "#{app_name}/.ruby-version", "#{ruby_version.chop}@#{app_name}"
-
-      say "chdir: '#{app_name}'...", :green
-      RVM.chdir(app_name) do
-        RVM.gemset_use! app_name
-        say "- Working directory is now #{`pwd`}"
-        say "- RVM gemset is now #{%x[rvm current]}"
-  
-        create_file "#{app_name}/Gemfile", <<-END_GEMFILE.strip_heredoc_with_indent
-          # generated by inline_forms v#{VERSION}
-
-          source 'http://rubygems.org'
-
-          gem 'rails', '3.2.12'
-          gem 'rake', '10.0.4'
-          gem 'jquery-rails', '~> 2.3.0'
-          gem 'jquery-ui-rails'
-          gem 'capistrano'
-          gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git'
-          gem 'tabs_on_rails', :git => 'git://github.com/acesuares/tabs_on_rails.git', :branch => 'update_remote'
-          gem 'ckeditor'
-          gem 'cancan', :git => 'git://github.com/acesuares/cancan.git', :branch => '2.0'
-          gem 'carrierwave'
-          gem 'remotipart', '~> 1.0'
-          gem 'paper_trail'
-          gem 'devise'
-          gem 'inline_forms'
-          gem 'validation_hints'
-          gem 'mini_magick'
-          gem 'jquery-ui-rails'
-          gem 'yaml_db'
-          gem 'rails-i18n', '~> 3.0.0'
-          gem 'i18n-active_record', :git => 'git://github.com/acesuares/i18n-active_record.git'
-          gem 'unicorn'
-          gem 'rvm'
-          gem 'rvm-capistrano'
-
-          # Include everything needed to run rake, tests, features, etc.
-          group :development do
-            gem 'sqlite3'
-            gem 'rspec-rails'
-            gem 'shoulda', '>= 0'
-            gem 'bundler'
-            gem 'jeweler'
-            # gem 'rcov', '>= 0'
-          end
-
-         # these are just for production
-         group :production do
-           gem 'mysql2'
-           gem 'therubyracer'
-           gem 'uglifier', '>= 1.0.3'
-         end
-
-         group :assets do
-           gem 'sass-rails',   '~> 3.2.3'
-           gem 'coffee-rails', '~> 3.2.1'
-           gem 'uglifier', '>= 1.0.3'
-           gem 'compass-rails' # you need this or you get an err
-           gem 'zurb-foundation', '~> 4.0.0'
-        end 
-        END_GEMFILE
-
-        say "- Running bundle..."
-        run("bundle") unless dry_run?
-  
-        say "- Database setup: creating config/database.yml with development database #{database}"
-        remove_file "#{app_name}/config/database.yml" # the one that 'rails _3.2.12_ new' created
-        if using_sqlite?
-          create_file "#{app_name}/config/database.yml", <<-END_DATABASEYML.strip_heredoc_with_indent
-          development:
-            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: mysql2
-            database: #{app_name}_dev
-            username: #{app_name}
-            password: #{app_name}
-
-          END_DATABASEYML
-        end
-        append_file "#{app_name}/config/database.yml", <<-END_DATABASEYML.strip_heredoc_with_indent
-          production:
-            adapter: mysql2
-            database: #{app_name}_p
-            username: #{app_name}
-            password: #{app_name}444
-        END_DATABASEYML
-
-        say "- Devise install..."
-        run "bundle exec rails g devise:install" unless dry_run?
-
-        say "- Devise User model install with added name and locale field..."
-        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 "- Mount Ckeditor::Engine to routes..."
-        insert_into_file "#{app_name}/config/routes.rb", "\nmount Ckeditor::Engine => \"/ckeditor\"\n", :after => "routes.draw do\n"
-
-        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, :presence => 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/carrierwave..."
-        #        run "bundle exec rails generate ckeditor:install --orm=active_record --backend=carrierwave" unless dry_run?
-
-        say "- Create ckeditor config.js"
-        copy_file "lib/app/assets/javascripts/ckeditor/config.js", "#{app_name}/app/assets/javascripts/ckeditor/config.js"
-
-        say "- Add remotipart to application.js..."
-        create_file "#{app_name}/app/assets/javascripts/application.js", "//= require_tree .\n" if dry_run?
-        insert_into_file "#{app_name}/app/assets/javascripts/application.js", "//= require jquery.remotipart\n", :before => "//= require_tree .\n"
-
-        say "- Add ckeditor to application.js..."
-        insert_into_file "#{app_name}/app/assets/javascripts/application.js", "//= require ckeditor/init\n", :before => "//= require_tree .\n"
-
-        say "- Paper_trail install..."
-        run "bundle exec rails g paper_trail:install" unless dry_run?
-
-        say "- Installaing ZURB Foundation..."
-        run "bundle exec rails g foundation:install"
-
-        say "- Generate models and tables and views for translations..."
-        run 'bundle exec rails g inline_forms InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\'#{name}\''
-        run 'bundle exec rails g inline_forms InlineFormsKey name:string inline_forms_translations:has_many inline_forms_translations:associated _enabled:yes _presentation:\'#{name}\''
-        run 'bundle exec 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
+      if dry_run?
+        empty_directory(app_name)
+      else
+        empty_directory(app_name)
         
-        say "- Migrating Database"
-        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"
-        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
-            <div id='Header'>
-              <div id='title'>
-                #{app_name} v<%= inline_forms_version -%>
-              </div>
-              <% if current_user -%>
-              <div id='logout'>
-                <%= link_to \"Afmelden: \#{current_user.name}\", destroy_user_session_path, :method => :delete %>
-              </div>
-              <% end -%>
-              <div style='clear: both;'></div>
-            </div>
-        END_HEADER
-
-        say "- Recreating ApplicationHelper to set application_name and application_title..."
-        remove_file "#{app_name}/app/helpers/application_helper.rb" # the one that 'rails new' created
-        create_file "#{app_name}/app/helpers/application_helper.rb", <<-END_APPHELPER.strip_heredoc_with_indent
-          module ApplicationHelper
-            def application_name
-              '#{app_name}'
-            end
-            def application_title
-              '#{app_name}'
-            end
-          end
-        END_APPHELPER
-
-        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 < InlineFormsApplicationController
-            protect_from_forgery
-
-            # Comment next two lines if you don't want Devise authentication
-            before_filter :authenticate_user!
-            layout 'devise' if :devise_controller?
-
-            # Comment next 6 lines if you want CanCan authorization
-            enable_authorization :unless => :devise_controller?
-
-            rescue_from CanCan::Unauthorized 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 (based on subdomain)
-            # 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
-
-        say "- Creating Ability model so that the user with id = 1 can access all..."
-        create_file "#{app_name}/app/models/ability.rb", <<-END_ABILITY.strip_heredoc_with_indent
-          class Ability
-            include CanCan::Ability
-
-            def initialize(user)
-              # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-
-              user ||= user.new # guest user
-
-              if user.id == 1 #quick hack
-                can :access, :all
-              else
-                # put restrictions for other users here
-              end
-            end
-          end
-        END_ABILITY
-
-        # create environments/production.rb if it's a dry run
-        create_file "#{app_name}/config/environments/production.rb", "  # config.assets.precompile += %w( search.js )\nend\n" if dry_run?
-
-        say "- Injecting precompile assets stuff in environments/production.rb..."
-        insert_into_file "#{app_name}/config/environments/production.rb",
-          "  config.assets.precompile += %w(inline_forms_application.js inline_forms_application.css devise.css)\n",
-          :after => "  # config.assets.precompile += %w( search.js )\n"
-    
-        say "- Injecting devise mailer stuff in environments/production.rb..."
-        insert_into_file "#{app_name}/config/environments/production.rb", <<-DEVISE_MAILER_STUFF.strip_heredoc_with_indent(2), :before => "end\n"
-
-          # for devise
-          config.action_mailer.default_url_options = { :protocol => 'https', :host => 'YOURHOSTNAME' }
-          config.action_mailer.delivery_method = :smtp
-          config.action_mailer.smtp_settings = {
-            :address => 'YOURMAILSERVER',
-            :enable_starttls_auto => true,
-            :password => 'YOURPASSWORD',
-            :user_name => 'YOURUSERNAME'
-          }
-          
-        DEVISE_MAILER_STUFF
-
-        say "- Setting autoload paths for ckeditor..."
-        insert_into_file "#{app_name}/config/application.rb", '  config.autoload_paths += %W(#{config.root}/app/models/ckeditor)' + "\n", :after => "modules you want to be autoloadable.\n" unless dry_run?
-
-        say "- Adding cancan authorization to ckeditor"
-        gsub_file "#{app_name}/config/initializers/ckeditor.rb", "# config.authorize_with :cancan", "config.authorize_with :cancan" if File.exists?("#{app_name}/config/initializers/ckeditor.rb")
-
-        say "- Capify..."
-        run 'capify .'
-        remove_file "#{app_name}/config/deploy.rb" # remove the file capify created!
-        copy_file "lib/generators/templates/deploy.rb", "#{app_name}/config/deploy.rb"
-
-        say "- Unicorn Config..."
-        copy_file "lib/generators/templates/unicorn.rb", "#{app_name}/config/unicorn.rb"
-
-        say "- Initializing git..."
-        run 'git init'
-        create_file "#{app_name}/.gitignore", "/tmp\n" if dry_run?
-        insert_into_file "#{app_name}/.gitignore", <<-GITIGNORE.strip_heredoc_with_indent, :after => "/tmp\n"
-          # netbeans
-          nbproject
-          # remotipart uploads
-          public/uploads
-        GITIGNORE
+        # need to pass all agruments for app template
+        options.each do | k,v | 
+          ENV[k] = v.to_s
+        end
+        ENV['using_sqlite'] = using_sqlite?.to_s
+        ENV['install_example'] = install_example?.to_s
+        ENV['ruby_version'] = ruby_version
 
-        run 'git add .'
-        run 'git commit -a -m " * Initial"'
+				app_template_file = File.join(File.dirname(__FILE__), 'inline_forms_app_template.rb')
 
-        if install_example?
-          say "\nInstalling example application..."
-          run 'bundle exec rails g inline_forms Picture name:string caption:string image:image_field description:text apartment:belongs_to _presentation:\'#{name}\''
-          run 'bundle exec rails generate uploader Image'
-          run 'bundle exec rails g inline_forms Apartment name:string title:string description:text pictures:has_many pictures:associated _enabled:yes _presentation:\'#{name}\''
-          run 'bundle exec rake db:migrate'
-          say "\nDone! Now point your browser to http://localhost:3000/apartments !", :yellow
-          say "\nPress ctlr-C to quit...", :yellow
-          run 'bundle exec rails s'
-        else
-          say "\nDone! Now make your tables with 'bundle exec rails g inline_forms ...", :yellow
-          #say "- Don't forget: edit .rvmrc, config/{routes.rb, deploy.rb}, .git/config, delete public/index.html\n"
+        if ! run("rails _3.2.12_ new #{app_name} -m #{app_template_file} --skip-bundle --skip-gemfile --skip-test-unit")
+          say "Rails could not create the app '#{app_name}', maybe because it is a reserved word...", :red
+          exit 1
         end
-
       end
     end
     Creator.start
   end
-end
+end