inline_forms 1.0.11 → 1.0.12

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -98,12 +98,16 @@ module InlineForms
         @has_attached_files       = "\n"
         @presentation             = "\n"
         @order                    = "\n"
+        @carrierwave_mounters     = "\n"
         @inline_forms_attribute_list  = String.new
 
         for attribute in attributes
           if attribute.column_type  == :belongs_to # :drop_down, :references and :belongs_to all end up with the column_type :belongs_to
             @belongs_to << '  belongs_to :'         + attribute.name + "\n"
           end
+          if attribute.column_type  == :image_field # upload images via carrierwave
+            @carrierwave_mounters << '  mount_uploader :' + attribute.name + ', ' + "#{attribute.name}_uploader".camelcase + "\n"
+          end
           if attribute.type         == :has_many ||
              attribute.type         == :has_many_destroy
             @has_many << '  has_many :'             + attribute.name
@@ -118,10 +122,6 @@ module InlineForms
              attribute.type         == :check_list
             @habtm << '  has_and_belongs_to_many :' + attribute.name + "\n"
           end
-          if attribute.type         == :image
-            @has_attached_files << "  has_attached_file :#{attribute.name},
-                 :styles => { :medium => \"300x300>\", :thumb => \"100x100>\" }\n"
-          end
           if attribute.name == '_presentation'
             @presentation <<  "  def _presentation\n" +
                               "    \"#{attribute.type.to_s}\"\n" +

data/lib/generators/inline_forms/templates/model.erb

@@ -2,7 +2,7 @@ class <%= name %> < ActiveRecord::Base
   attr_reader :per_page
   @per_page = 7
   attr_writer :inline_forms_attribute_list
-
+<%= @carrierwave_mounters if @carrierwave_mounters.length > 1 -%>
 <%= @belongs_to if @belongs_to.length > 1 -%>
 <%= @has_many if @has_many.length > 1 -%>
 <%= @has_one if @has_one.length > 1 -%>

data/lib/inline_forms/version.rb

@@ -1,3 +1,3 @@
 module InlineForms
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

data/lib/otherstuff/bump

@@ -0,0 +1,13 @@
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  file = 'lib/GEM_NAME/version.rb'
+
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
+
+  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
+end

data/lib/otherstuff/ckeditor/config.js

@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+	// Define changes to default configuration here. For example:
+	// config.language = 'fr';
+	// config.uiColor = '#AADC6E';
+	
+  /* Filebrowser routes */
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
+  config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
+  config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of a script that handles file uploads in the Flash dialog.
+  config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
+  
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog.
+  config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog.
+  config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
+
+  // The location of a script that handles file uploads in the Image dialog.
+  config.filebrowserImageUploadUrl = "/ckeditor/pictures";
+  
+  // The location of a script that handles file uploads.
+  config.filebrowserUploadUrl = "/ckeditor/attachment_files";
+  
+  // Rails CSRF token
+  config.filebrowserParams = function(){
+    var csrf_token = $('meta[name=csrf-token]').attr('content'),
+        csrf_param = $('meta[name=csrf-param]').attr('content'),
+        params = new Object();
+    
+    if (csrf_param !== undefined && csrf_token !== undefined) {
+      params[csrf_param] = csrf_token;
+    }
+    
+    return params;
+  };
+  
+  /* Extra plugins */
+  // works only with en, ru, uk locales
+  config.extraPlugins = "embed,attachment";
+
+    config.height = '400px';
+    config.width = '600px';
+
+
+
+    config.language = 'nl';
+
+
+    config.toolbar = 'Minimal';
+
+    config.toolbarCanCollapse = false;
+
+    config.toolbar_Minimal =
+        [
+            ['Format','-','Bold','Italic','-','NumberedList','BulletedList','-','Link'],
+            ['PasteFromWord','Source','Undo','Redo','RemoveFormat'],
+        ];
+
+/* Toolbars */
+  config.toolbar = 'Easy';
+  
+  config.toolbar_Easy =
+    [
+        ['Source','-','Preview'],
+        ['Cut','Copy','Paste','PasteText','PasteFromWord',],
+        ['Undo','Redo','-','SelectAll','RemoveFormat'],
+        ['Styles','Format'], ['Subscript', 'Superscript', 'TextColor'], ['Maximize','-','About'], '/',
+        ['Bold','Italic','Underline','Strike'], ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
+        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+        ['Link','Unlink','Anchor'], ['Image', 'Attachment', 'Flash', 'Embed'],
+        ['Table','HorizontalRule','Smiley','SpecialChar','PageBreak']
+    ];
+
+   config.toolbar_None =
+     [ '-' ];
+
+
+};

data/lib/otherstuff/mk31-app

@@ -13,3 +13,6 @@ echo devise User
 rails g devise User
 echo ckeditor:install
 rails g ckeditor:install
+mkdir app/assets/javascripts/ckeditor
+cp ../config.js app/assets/javascripts/ckeditor
+rails g remotipart:install

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Ace Suares
@@ -184,6 +184,8 @@ files:
 - lib/inline_forms/version.rb
 - lib/otherstuff/Gemfile
 - lib/otherstuff/add_roles.sql
+- lib/otherstuff/bump
+- lib/otherstuff/ckeditor/config.js
 - lib/otherstuff/database.yml
 - lib/otherstuff/diffie
 - lib/otherstuff/mk-ice-ts