inline_forms 3.0 → 3.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODIwYWFkZGM0NTgwODE0NGRhNmFlNTliMjE3MDQ3YTEzMTc0YmRkYg==
+    Y2RmZjU4YmYwMWZkMjFkNWQxNzkxMjVhYjUwMjc4ODliMjdlMjllNg==
   data.tar.gz: !binary |-
-    MjU0NTk0NzgwNjJlMDRjNGM3NDU3YWQxZDJhZjVlZTRmNzUwMzYxMA==
+    MzIxMjY2ODI4NzljMjllMzk0YTI3MzI3M2UyOGNlZTc2YjBlMjdjMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjU1ZDI5MjA1YzBhMTIxMWYyNzA1MzlkZjdhOTdkMDcwOTdhZmUxNDcyMDcx
-    NmQyZDdiOGI2YTY2ZjY2ZjQzMzUyM2Q2YTU5YzEwYjcxNWVlM2VmNDJmNDAz
-    OTQxYjcyNWQyNjUyNzUwOThkNDRjYTA2NTM5MDQ1ZjY1MDNlZjk=
+    ZGJhOWFmNTI2Zjk4ODk5YWZkNDI4OGEwMzk1NWQ2YTVhOGViZWExMThlMDg1
+    NzI3ZjYwYjdhNDI3MDFjNGU3ZDBhMDFkMTNiOWE4ZTRhNDUzYjA1NTQ5ZGY0
+    YmJiYjlmMTc3M2UyOThmYzY2ZjdhZTRkNDc3ZTZhZWYyZjRmNDc=
   data.tar.gz: !binary |-
-    MDEyN2RlMGM0MjQ2YjgxMTBhMDRhMmY3ZmY0YWZkOGJjOTM1MTFjZDlmZDdl
-    MDNhYjA5MDk5M2RlMWM3ZWFkZDkxNTk1ZmU2NWYwZTFiNjA5NWU3NThkMTFl
-    NTdkZDQ5MTE4MmYyMmNkNmMzNGRjMjdmMjQ2NWM1ZjVmMDVkNDI=
+    ZGM5YzRjZDFhMWVhYWRlMWE1MTZkNjBmNWY3M2UwMzQ1YjI1ZTZmZmU1YmY2
+    Y2E0YzZkY2ZlMWU1MTU3NWQ2YzMwMjA3NjgzMGM0NWMxYmI5MTZiMzA3ZWIz
+    ZDFmYTBkNjhjZDA4YjFlYmE1MzAxMmM4ZjEwZDhkZmIxOWE4MWE=

data/bin/inline_forms

@@ -15,7 +15,10 @@ module InlineForms
     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 :email, :aliases => "-e", :default => "admin@example.com", :desc => 'specify admin email'
     method_option :password, :aliases => "-p", :default => "admin999", :desc => 'specify admin password'
@@ -115,7 +118,7 @@ module InlineForms
 				app_template_file = File.join(File.dirname(__FILE__), 'inline_forms_app_template.rb')
 
         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
+          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

data/bin/inline_forms_app_template.rb

@@ -4,10 +4,14 @@ if RVM.current && ENV['skiprvm'] !='true'
   rvm_version = "#{ENV['ruby_version']}@#{app_name}"
   RVM.chdir "../#{app_name}" do
     say "Working directory is #{`pwd`}"
-    RVM.use_from_path! '.'
+    RVM.use_from_path! '.' # TODO ROYTJE FIX THIS BELOW
+# Warning! PATH is not properly set up, '/home/vagrant/.rvm/gems/ruby-2.0.0-p247@MyApp/bin' is not available,
+         # usually this is caused by shell initialization files - check them for 'PATH=...' entries,
+         # it might also help to re-add RVM to your dotfiles: 'rvm get stable --auto-dotfiles',
+         # to fix temporarily in this shell session run: 'rvm use ruby-2.0.0-p247@MyApp'.
     rvm_gemset = %x[rvm current]
     say "RVM GEMSET is now #{rvm_gemset}"
-    say "Installing using gemset : #{RVM.current}", :green
+    say "Installing using gemset : #{RVM.current.environment_name}", :green
   end
 else
   say "Installing without RVM", :green

data/bin/inline_forms_installer_core.rb

@@ -90,6 +90,8 @@ 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:string"
 
@@ -173,14 +175,22 @@ create_file "app/models/user.rb", <<-USER_MODEL.strip_heredoc
   end
 USER_MODEL
 
+# 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)
+
+
 say "- Mount Ckeditor::Engine to routes..."
 route "mount Ckeditor::Engine => '/ckeditor'"
 
 say "- Add ckeditor autoload_paths to application.rb..."
-application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)"
+application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)" # TODO ROYTJE is this still needed?
+
+
 
 say "- Add ckeditor/init to application.js..."
 insert_into_file "app/assets/javascripts/application.js",
@@ -194,15 +204,12 @@ 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"
+generate "paper_trail:install" # TODO One day, we need some management tools so we can actually SEE the versions, restore them etc. 
 
-say "- Generate models and tables and views for translations..."
-# using generate this way http://api.rubyonrails.org/classes/Rails/Generators/Actions.html#method-i-generate
-# run "bundle install"
 say "- Installaing ZURB Foundation..."
 generate "foundation:install"
 
-say "- Generate models and tables and views for 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 
 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}"

data/lib/app/assets/javascripts/ckeditor/config.js

@@ -26,8 +26,9 @@ CKEDITOR.editorConfig = function( config )
     config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
 
     // The location of a script that handles file uploads in the Image dialog.
-    config.filebrowserImageUploadUrl = "/ckeditor/pictures";
-  
+    var token = $('meta[name=csrf-token]').attr('content');
+    var param = $('meta[name=csrf-param]').attr('content');
+    config.filebrowserImageUploadUrl = "/ckeditor/pictures" + "?" + token + "=" + param;
     // The location of a script that handles file uploads.
     config.filebrowserUploadUrl = "/ckeditor/attachment_files";
   

data/lib/app/helpers/form_elements/image_field.rb

@@ -3,7 +3,7 @@ InlineForms::SPECIAL_COLUMN_TYPES[:image_field]=:string
 
 def image_field_show(object, attribute)
   o = object.send(attribute)
-  msg = o.to_s
+  msg = "<i class='fi-plus'></i>".html_safe
   if o.send(:present?)
     if o.respond_to? :palm
       msg = image_tag(o.send(:palm).send(:url))

data/lib/inline_forms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: 3.0.1
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm