inline_forms 3.0.5 → 3.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2MwNDlhZDIyOGE1NTZmZmFmYWExMzBjMzdlODNlY2EzODM5MTBlYw==
+    ZDg5MWUzOTM1NTUxYzE3NGFhOTAxZmQwYWMwZjFjZjczYjBhOTY2OA==
   data.tar.gz: !binary |-
-    MTRhNDgzNmUzM2EwOWViYjgyNjJkNDg4ZDEwZjhmZDQ5MWJkZTU1ZA==
+    ODAyMDJjYTBjZGIyYWQ5ZDVmNzYxMGZjYmFkYmU3MzVkN2IwNTA5OA==
 SHA512:
   metadata.gz: !binary |-
-    MjYzZDE0ODlkZDYwY2Y5NDYyMmJmYzk1YjM3NGU5MTZlYzk3NjhmMzJmNDg3
-    OGJkY2E3ZTAzMzM2MzAxNjNmMzBlMThhNDlhYTgyZmQwMmI5NmMxMjE5YjNi
-    MGE2OTQ2NjdmZGVlYmIzN2M3M2QxYTdlY2NkYjI5NTA0YjM4MmI=
+    ZTNiNmUzYzZmNmRiYzNhYjM2OGI4NGVjMTM1YmJlZjNjZmM0YTcyOWVmMzJl
+    MGNjNDQ4ZTgyNTJhZGIzZGUxMTg2YzIwZGM0NzFjODRhYzFjMjM4NGEzYTc0
+    ODJkNDZmOGUzNzI2ZWM4MTVlZjk1Y2FkMjYyYjdjZDA1ZDdkM2I=
   data.tar.gz: !binary |-
-    NzRiOGFkNDVhYjRlMmIyMjUyNmNmNGZkOTAwZjdlNGYzZTU0ODg1MmNmY2U1
-    NmMwMDFhYWJkNjM0Y2FkZDljYmYwMmZjN2YyOTczZDE4OGFlM2I5NzBlZGNj
-    ZGJjOTE2ZmU4Yjg2ZmViMGIyM2EyZGJkZWMwNDQwZTgyOWVjZjI=
+    MWQwZmYyODhlYTI5NjU0Zjg2NDAwNDk3ZTBjODY5NDM5NTQzM2M3ZjMzYjIw
+    NTE1MmQzNTg4NDQwNDI0M2QxMGQyOTQzOTM5MmQ4MjM3YzU5ZWJiMjE0Nzll
+    MzY0MTA4OTRiZjMxM2E3YjA0NWJmYmUxYzk4NTdjMjIwNTJkZGI=

data/bin/inline_forms

@@ -14,12 +14,8 @@ module InlineForms
     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'
-    # TODO ROYTJE specify sqlite OR mysql, and if none is specified, ASK THE USER.
-   
-    method_option :dry, :type => :boolean, :desc => 'dry run. Do not do most things. Only useful for development of inline_forms'
-    # TODO ROYTJE Remove ALL dry run code. We don't do dry runs anymore.
-    method_option :example, :type => :boolean, :desc => 'install the example app. incompatible with --dry and uses sqlite as development database'
+    method_option :database, :aliases => "-d", :banner => DATABASE_OPTIONS.join('|'), :desc => 'specify development database'
+    method_option :example, :type => :boolean, :desc => 'install the example app. 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'
@@ -34,18 +30,21 @@ module InlineForms
         options[:runtest]
       end
 
-      def self.dry_run?
-        options[:dry]
-      end
-
       def self.install_example?
         options[:example]
       end
 
       def self.database
-        DATABASE_OPTIONS.include?(options[:database]) ? options[:database] : 'sqlite'
+        @database ||= options[:database]
+        return @database if DATABASE_OPTIONS.include?(@database)
+        say "No Database specified please choose one database #{DATABASE_OPTIONS.join(' | ')}", :red
+        # if the database is not set ask user which database to use
+        while ! DATABASE_OPTIONS.include?(@database)
+          @database = ask "Database: "
+          return @database if DATABASE_OPTIONS.include?(@database)
+        end
       end
-      
+
       def self.using_sqlite?
         database == 'sqlite'
       end
@@ -58,18 +57,11 @@ module InlineForms
         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? && !using_sqlite?
         say "--example can only be used with an sqlite development database", :red
         exit 1
       end
 
-      say "This is a dry run. I hope you know what you are doing...", :red if dry_run?
-
       say "Creating #{app_name} with inline_forms v#{VERSION} and development database #{database}...", :green
 
       regex = /\A[0-9a-zA-Z][0-9a-zA-Z_-]+[0-9a-zA-Z]\Z/
@@ -83,9 +75,6 @@ module InlineForms
         exit 1
       end
 
-      # 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]
@@ -95,25 +84,28 @@ module InlineForms
         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 
+        # Creat a ruby-gemset rvm-file based on the version detected
         create_file "#{app_name}/.ruby-gemset", app_name
       else
         # Let the user know that he is installing inline_forms without RVM
         say "Installing inline_forms without RVM", :green
       end
 
-      if dry_run?
-        empty_directory(app_name)
-      else
-        empty_directory(app_name)
-        
-        # need to pass all agruments for app template
-        options.each do | k,v | 
+      say "Installing with #{options[:database]}", :green
+
+      # Creates the app directory
+      empty_directory(app_name)
+
+        # puts all options in environment to app_template
+        options.each do | k,v |
           ENV[k] = v.to_s
         end
+
         ENV['using_sqlite'] = using_sqlite?.to_s
+        ENV['database'] = database
         ENV['install_example'] = install_example?.to_s
         ENV['ruby_version'] = ruby_version
+        ENV['inline_forms_version'] = VERSION
 
 				app_template_file = File.join(File.dirname(__FILE__), 'inline_forms_app_template.rb')
 
@@ -121,8 +113,7 @@ module InlineForms
           say "Rails could not create the app '#{app_name}', maybe because it is a reserved word...", :red # TODO ROYTJE MAKE ERROR MESSAGE MORE RELEVANT # Rails could not create the app 'MyApp', maybe because it is a reserved word..
           exit 1
         end
-      end
     end
     Creator.start
   end
-end
+end

data/bin/inline_forms_installer_core.rb

@@ -1,4 +1,6 @@
-create_file 'Gemfile', '# created by inline_forms\n' # TODO include version
+GENERATOR_PATH = File.dirname(File.expand_path(__FILE__)) +  '/../'
+
+create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']}\n"
 
 add_source 'https://rubygems.org'
 
@@ -53,7 +55,7 @@ gem_group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'compass-rails' # you need this or you get an err
-end 
+end
 
 say "- Running bundle..."
 run "bundle install"
@@ -90,19 +92,69 @@ END_DATABASEYML
 say "- Devise install..."
 run "bundle exec rails g devise:install"
 
-# TODO ROYTJE Devise creates a model. That is a migration, a test, a route and a model. We delete the model, the route, and the test probably too. Is there another way to just create the migration instead of all the stuff that we are going to delete anyway !?
-
-say "- Devise User model install with added name and locale field..."
-run "bundle exec rails g devise User name:string locale_id:integer"
+say "- Create Devise route and add path_prefix..."
 
-say "- Replace Devise route and add path_prefix..."
-gsub_file "config/routes.rb", /devise_for :users/, "devise_for :users, :path_prefix => 'auth'"
-insert_into_file "config/routes.rb", <<-ROUTE.strip_heredoc, :after => "devise_for :users, :path_prefix => 'auth'\n"
+route <<-ROUTE.strip_heredoc
+devise_for :users, :path_prefix => 'auth'
   resources :users do
     post 'revert', :on => :member
-  end
+end
 ROUTE
 
+say "- Create devise migration file"
+
+sleep 1 # to get unique migration number
+create_file "db/migrate/" +
+  Time.now.utc.strftime("%Y%m%d%H%M%S") +
+  "_" +
+  "devise_create_users.rb", <<-DEVISE_MIGRATION.strip_heredoc
+class DeviseCreateUsers < ActiveRecord::Migration
+
+  def change
+    create_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+      t.string :name
+      t.integer :locale_id
+
+      t.timestamps
+    end
+
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    # add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,         unique: true
+  end
+end
+DEVISE_MIGRATION
+
 say "- Create User Controller..."
 create_file "app/controllers/users_controller.rb", <<-USERS_CONTROLLER.strip_heredoc
   class UsersController < InlineFormsController
@@ -110,8 +162,7 @@ create_file "app/controllers/users_controller.rb", <<-USERS_CONTROLLER.strip_her
   end
 USERS_CONTROLLER
 
-say "- Recreate User Model..."
-remove_file "app/models/user.rb" # the one that 'devise:install' created
+say "- Create User Model..."
 create_file "app/models/user.rb", <<-USER_MODEL.strip_heredoc
   class User < ActiveRecord::Base
 
@@ -134,7 +185,7 @@ create_file "app/models/user.rb", <<-USER_MODEL.strip_heredoc
 
     belongs_to :locale
     has_and_belongs_to_many :roles
-    
+
     # validations
     validates :name, :presence => true
 
@@ -201,7 +252,7 @@ append_to_file "db/seeds.rb", "Locale.create({ id: 1, name: 'en', title: 'Englis
 say "- Create roles"
 generate "inline_forms", "Role name:string description:text users:has_and_belongs_to_many _enabled:yes _presentation:\#{name}"
 sleep 1 # to get unique migration number
-create_file "db/migrate/" + 
+create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "inline_forms_create_join_table_user_role.rb", <<-ROLES_MIGRATION.strip_heredoc
@@ -213,7 +264,7 @@ create_file "db/migrate/" +
       end
       execute 'INSERT INTO roles_users VALUES (1,1);'
     end
-    
+
     def self.down
       drop_table roles_users
     end
@@ -222,14 +273,9 @@ ROLES_MIGRATION
 
 append_to_file "db/seeds.rb", "Role.create({ id: 1, name: 'superadmin', description: 'Super Admin can access all.' }, without_protection: true)\n"
 
-# TODO ROYTJE This above is all that: Devise creates a model. That is a migration, a test, a route and a model. We delete the model, the route, and the test probably too. Is there another way to just create the migration instead of all the stuff that we are going to delete anyway !?
-
 say "- Install ckeditor..."
 generate "ckeditor:install --backend=carrierwave"
 
-# TODO ROYTJE urgent, get ckeditor to work with carrierwave (the normal carrierwave, not -db)
-# Thanks for fixing ROYTJE! +1
-
 say "- Mount Ckeditor::Engine to routes..."
 route "mount Ckeditor::Engine => '/ckeditor'"
 
@@ -242,24 +288,24 @@ insert_into_file "app/assets/javascripts/application.js",
                  :before => "//= require_tree .\n"
 
 say "- Create ckeditor config.js"
-copy_file File.join(File.dirname(File.expand_path(__FILE__)) + '/../lib/app/assets/javascripts/ckeditor/config.js'), "app/assets/javascripts/ckeditor/config.js"
+copy_file File.join(GENERATOR_PATH, 'lib/app/assets/javascripts/ckeditor/config.js'), "app/assets/javascripts/ckeditor/config.js"
 
 say "- Add remotipart to application.js..."
 insert_into_file "app/assets/javascripts/application.js", "//= require jquery.remotipart\n", :before => "//= require_tree .\n"
 
 say "- Paper_trail install..."
-generate "paper_trail:install" # TODO One day, we need some management tools so we can actually SEE the versions, restore them etc. 
+generate "paper_trail:install" # TODO One day, we need some management tools so we can actually SEE the versions, restore them etc.
 
 say "- Installaing ZURB Foundation..."
 generate "foundation:install", "-f"
 
 # Create Translations
-say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps 
+say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps
 generate "inline_forms", "InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\#{name}"
 generate "inline_forms", "InlineFormsKey name:string inline_forms_translations:has_many inline_forms_translations:associated _enabled:yes _presentation:\#{name}"
 generate "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 "db/migrate/" + 
+create_file "db/migrate/" +
   Time.now.utc.strftime("%Y%m%d%H%M%S") +
   "_" +
   "inline_forms_create_view_for_translations.rb", <<-VIEW_MIGRATION.strip_heredoc
@@ -281,7 +327,6 @@ create_file "db/migrate/" +
   end
 VIEW_MIGRATION
 
-
 say "- Migrating Database (only when using sqlite)"
 run "bundle exec rake db:migrate" if ENV['using_sqlite'] == 'true'
 
@@ -335,9 +380,9 @@ create_file "app/controllers/application_controller.rb", <<-END_APPCONTROLLER.st
       sign_out :user if user_signed_in?
       redirect_to new_user_session_path, :alert => exception.message
     end
-    
+
     ActionView::CompiledTemplates::MODEL_TABS = %w()
-    
+
     # Uncomment next line if you want I18n (based on subdomain)
     # before_filter :set_locale
 
@@ -383,7 +428,7 @@ create_file "app/models/ability.rb", <<-END_ABILITY.strip_heredoc
 END_ABILITY
 
 say "- Generating test files", :green
-# run "bundle exec rspec:install" # TODO: I need do this or simply copy the files in the spec folder ?
+
 create_file "spec/spec_helper.rb", <<-END_TEST_HELPER.strip_heredoc
   # This file is copied to spec/ when you run 'rails generate rspec:install'
   ENV["RAILS_ENV"] ||= 'development' # this need to be changed to test ???
@@ -392,12 +437,12 @@ create_file "spec/spec_helper.rb", <<-END_TEST_HELPER.strip_heredoc
   require 'rspec/rails'
   require 'rspec/autorun'
   require 'carrierwave/test/matchers'
-  
-  
+
+
   # Requires supporting ruby files with custom matchers and macros, etc,
   # in spec/support/ and its subdirectories.
   Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-  
+
   RSpec.configure do |config|
     config.include FactoryGirl::Syntax::Methods
     # ## Mock Framework
@@ -407,20 +452,20 @@ create_file "spec/spec_helper.rb", <<-END_TEST_HELPER.strip_heredoc
     # config.mock_with :mocha
     # config.mock_with :flexmock
     # config.mock_with :rr
-  
+
     # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
     config.fixture_path = Rails.root + "/spec/fixtures"
-  
+
     # If you're not using ActiveRecord, or you'd prefer not to run each of your
     # examples within a transaction, remove the following line or assign false
     # instead of true.
     config.use_transactional_fixtures = true
-  
+
     # If true, the base class of anonymous controllers will be inferred
     # automatically. This will be the default behavior in future versions of
     # rspec-rails.
     config.infer_base_class_for_anonymous_controllers = false
-  
+
     # Run specs in random order to surface order dependencies. If you find an
     # order dependency and want to debug it, you can fix the order by providing
     # the seed, which is printed after each run.
@@ -430,23 +475,23 @@ create_file "spec/spec_helper.rb", <<-END_TEST_HELPER.strip_heredoc
 END_TEST_HELPER
 
 say 'copy test image into rspec folder'
-copy_file File.join(File.dirname(File.expand_path(__FILE__)) + '/../lib/otherstuff/fixtures/rails.png'), "spec/fixtures/images/rails.png"
+copy_file File.join(GENERATOR_PATH,'lib/otherstuff/fixtures/rails.png'), "spec/fixtures/images/rails.png"
 say '- Creating factory_girl file'
 create_file "spec/factories/inline_forms.rb", <<-END_FACTORY_GIRL.strip_heredoc
   FactoryGirl.define do
     factory :apartment do
       name "Luxe House in Bandabou 147A" #string
-      title "A dream house in a dream place" # string 
+      title "A dream house in a dream place" # string
       description "A beatiful House at the edge of the <strong>sea</strong>" #text
     end
     factory :large_text do
       name "Luxe House in Bandabou 147A" #string
-      title "A dream house in a dream place" # string 
+      title "A dream house in a dream place" # string
       description "A beatiful House at the edge of the <strong>sea</strong>" #text
     end
   end
 END_FACTORY_GIRL
-remove_file 'spec/factories/users.rb' 
+remove_file 'spec/factories/users.rb'
 remove_file 'spec/models/user_spec.rb'
 
 # environments/production.rb
@@ -455,18 +500,18 @@ remove_file 'spec/models/user_spec.rb'
 # insert_into_file "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"
- 
- 
+
+
 # add stuff to application.css
 say "- Injecting stylesheets into app/assets/stylesheets/application.css..."
 insert_into_file  "app/assets/stylesheets/application.css",
                   "*= require devise\n*= require inline_forms\n",
                   :before => "*= require_self\n"
- 
- 
+
+
 # devise mailer stuff
 say "- Injecting devise mailer stuff in environments/production.rb..."
-# strip_heredoc_with_indent(2) became strip_heredoc(2), but only in rails 4... :-( 
+# strip_heredoc_with_indent(2) became strip_heredoc(2), but only in rails 4... :-(
 insert_into_file "config/environments/production.rb", <<-DEVISE_MAILER_STUFF.strip_heredoc, :before => "end\n"
   # for devise
   config.action_mailer.default_url_options = { :protocol => 'https', :host => 'YOURHOSTNAME' }
@@ -485,21 +530,24 @@ say "- Setting config.assets.compile to true in environments/production.rb (need
 #insert_into_file "#{app_name}/config/environments/production.rb", "config.assets.compile = false\n", :before => "end\n" if dry_run?
 gsub_file "config/environments/production.rb", /config.assets.compile = false/, "config.assets.compile = true"
 
+
+
+
 # capify
 say "- Capify..."
 run 'capify .'
 remove_file "config/deploy.rb" # remove the file capify created!
-copy_file File.join(File.dirname(File.expand_path(__FILE__)) + '/../lib/generators/templates/deploy.rb'), "config/deploy.rb"
-# TODO: ROYJE isn't there a better way to find the path?
+copy_file File.join(GENERATOR_PATH,'lib/generators/templates/deploy.rb'), "config/deploy.rb"
 
 # Unicorn
 say "- Unicorn Config..."
-copy_file File.join(File.dirname(File.expand_path(__FILE__)) + '/../lib/generators/templates/unicorn.rb'), "config/unicorn.rb"
+copy_file File.join(GENERATOR_PATH,'lib/generators/templates/unicorn.rb'), "config/unicorn.rb"
+
 
 # Git
 say "- Initializing git..."
 run 'git init'
-#create_file "#{app_name}/.gitignore", "/tmp\n" if dry_run?
+
 insert_into_file ".gitignore", <<-GITIGNORE.strip_heredoc, :after => "/tmp\n"
   # netbeans
   nbproject
@@ -529,11 +577,7 @@ if ENV['install_example'] == 'true'
     end
   END_EXAMPLE_TEST
 
-  # run tests
-  # if ENV['runtest'] == 'true' # Not Dry 
-  #   run "rspec"
-  # end
-  run "rspec" if ENV['runtest'] # Drier!
+  run "rspec" if ENV['runtest']
 
   # done!
   say "\nDone! Now point your browser to http://localhost:3000/apartments !", :yellow
@@ -546,5 +590,4 @@ else
   say "\nDone! Now make your tables with 'bundle exec rails g inline_forms ...", :yellow
 end
 
-
 #say "- Don't forget: edit .rvmrc, config/{routes.rb, deploy.rb}, .git/config, delete public/index.html\n"

data/lib/inline_forms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm