inline_forms 3.0.2 → 3.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTRmMzMzY2RkZTdhZjdiZGU2OTVmMDAxZTMxYWJhYWU5M2Q0MDRiMw==
+    MzYyMzA0NWNkNmJhZWQyODgwNDYxZGEwMDhkOWIwN2E2YTdhMmUyZg==
   data.tar.gz: !binary |-
-    ZTNjNWUxY2VmMjJhNjc5NDgzY2JhYWQ0ODAzNDUxM2VkMWRhOTJkMg==
+    Njc5ODMyZTk2ZWFiNjZkM2MxNDMwZGM0MTRlMGNkZjVhZGM0ZWM1YQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmIxYmFhZThlZTk4YjZhYTFjNzQ3NDhiMDVlMzA3YWM3MzQ2NDExZjIxNzBk
-    YjQyMzE4OGM4MmZlNGFlZDkxYWI1NGExZjgzMzVkNDdjMmEwNDIxN2ZlN2Rm
-    NTA0MmExM2ExMWY4MTQxNGZkZDYwNWI2NDJjZTZjYWQ4ZDdjYzY=
+    NGU0NDU1MzlhNjdjZThkODRmNmY1MzE5OTc5NDVmNmZjYTVjYzgyYTgyZGZh
+    YmU2MzBkYjhhYmY4NjhjNWM2ZGJhMGRhZTQ3MGZhYzQ3MjM2MWJlMjJhOTYy
+    ODIwODljZWM2MTEwZTI1NTEzNGVmMmVmOTIzYjIyMmZmZjYwOGI=
   data.tar.gz: !binary |-
-    Y2U0OTg2MmZhNDdjNGNkMjcxZmZjNDBlYzM4NjY4MjJlMjFmZjY3ZGEyODAx
-    OWU4NzliY2QwNmIzODRlYzEyMGQ5YjllZWMxNDlmNjY1NTM4ZDkxNDgyMWRj
-    YjNhZjljODJiNTQ2ZDYyYjk4NWIyNTkyYzRmYjIxZTUzZDZhNWI=
+    MmVjMmZmZjZkZWQwZTZiM2Q3ZWU1OTkzNzEwNGQ3ODc1YmM4OTU1YmJlYzFk
+    MTA3Nzg2ZjAxNzlhZDkwYTc2NGExNmI2ZGVjYzMyMjIyMGRmNTBkZjg5ODBh
+    ZmY3Mjk2MjVhNTAwYjViOGI0YjE4OGU5NDRjZGIxYzUwMTY0MGM=

data/bin/inline_forms_installer_core.rb

@@ -182,7 +182,7 @@ 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'"
@@ -207,7 +207,7 @@ 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. 
 
 say "- Installaing ZURB Foundation..."
-generate "foundation:install"
+generate "foundation:install", "-f"
 
 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}"
@@ -336,95 +336,157 @@ 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 ???
-require File.expand_path("../../config/environment", __FILE__)
-require 'capybara/rspec'
-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
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # 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.
-  #     --seed 1234
-  config.order = "random"
-end
+  ENV["RAILS_ENV"] ||= 'development' # this need to be changed to test ???
+  require File.expand_path("../../config/environment", __FILE__)
+  require 'capybara/rspec'
+  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
+    #
+    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+    #
+    # 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.
+    #     --seed 1234
+    config.order = "random"
+  end
 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"
 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 
-    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 
-    description "A beatiful House at the edge of the <strong>sea</strong>" #text
+  FactoryGirl.define do
+    factory :apartment do
+      name "Luxe House in Bandabou 147A" #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 
+      description "A beatiful House at the edge of the <strong>sea</strong>" #text
+    end
   end
-end
 END_FACTORY_GIRL
 remove_file 'spec/factories/users.rb' 
 remove_file 'spec/models/user_spec.rb'
+
+# environments/production.rb
+#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 "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"
+ 
+# 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... :-( 
+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' }
+  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
+
+# assets
+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?
+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?
+
+# Unicorn
+say "- Unicorn Config..."
+copy_file File.join(File.dirname(File.expand_path(__FILE__)) + '/../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
+  # remotipart uploads
+  public/uploads
+GITIGNORE
+
+run 'git add .'
+run 'git commit -a -m " * Initial"'
+
+# example
 if ENV['install_example'] == 'true'
-          say "\nInstalling example application..."
-          run 'bundle exec rails g inline_forms Photo name:string caption:string image:image_field description:text apartment:belongs_to _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
-          run 'bundle exec rails generate uploader Image'
-          run 'bundle exec rails g inline_forms Apartment name:string title:string description:text photos:has_many photos:associated _enabled:yes _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
-          run 'bundle exec rake db:migrate'
-          say '-Adding example test'
-          create_file "spec/models/#{app_name}_example.rb", <<-END_EXAMPLE_TEST.strip_heredoc
-            require "spec_helper"
-            describe Apartment do
-              it "insert an appartment and retrieve it" do
-                appartment_data = create(:apartment)
-                first =  Apartment.first.id
-                expect(Apartment.first.id).to eq(first)
-              end
-            end
-          END_EXAMPLE_TEST
-        # run tests
-        if ENV['runtest'] == 'true' # Not Dry 
-        run "rspec"
-        end
-          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
-        # run tests
-        if ENV['runtest'] == 'true'
-        run "rspec"
+  say "\nInstalling example application..."
+  run 'bundle exec rails g inline_forms Photo name:string caption:string image:image_field description:text apartment:belongs_to _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
+  run 'bundle exec rails generate uploader Image'
+  run 'bundle exec rails g inline_forms Apartment name:string title:string description:text photos:has_many photos:associated _enabled:yes _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
+  run 'bundle exec rake db:migrate'
+  say '-Adding example test'
+  create_file "spec/models/#{app_name}_example.rb", <<-END_EXAMPLE_TEST.strip_heredoc
+    require "spec_helper"
+    describe Apartment do
+      it "insert an appartment and retrieve it" do
+        appartment_data = create(:apartment)
+        first =  Apartment.first.id
+        expect(Apartment.first.id).to eq(first)
       end
-        end
+    end
+  END_EXAMPLE_TEST
+
+  # run tests
+  # if ENV['runtest'] == 'true' # Not Dry 
+  #   run "rspec"
+  # end
+  run "rspec" if ENV['runtest'] # Drier!
+
+  # done!
+  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
+  # run tests
+  run "rspec" if ENV['runtest']
+  # done!
+  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/app/assets/javascripts/inline_forms_application.js

@@ -9,7 +9,6 @@
 //= require jquery.ui.all
 //= require jquery.ui.datepicker-nl.js
 //= require foundation
-//= require jquery-scrollto
 //= require jquery.remotipart
 //= require ckeditor/init
 //= require inline_forms

data/lib/generators/templates/deploy.rb

@@ -76,8 +76,6 @@ namespace :deploy do
     run "ln -s #{shared_path}/sockets #{release_path}/tmp/sockets"
     run "cd #{shared_path} && mkdir -p uploads"
     run "ln -s #{shared_path}/uploads #{release_path}/public/uploads"
-    raise "Rails environment not set" unless rails_env
-    run "cd #{release_path} && RAILS_ENV=#{rails_env} bundle exec rails g ckeditor:install -f"
   end
 
 

data/lib/inline_forms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -271,6 +271,7 @@ files:
 - lib/otherstuff/add_roles.sql
 - lib/otherstuff/bump
 - lib/otherstuff/diffie
+- lib/otherstuff/fixtures/rails.png
 - lib/otherstuff/mkiftrans
 - lib/otherstuff/mkrole
 - lib/otherstuff/roles_users.sql