scaffold_plus 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87cdca95970c67bcb7fffbb7624108b5d889e622
-  data.tar.gz: 8eb87613b8b7cdb4ebbf73b9573359a069325e86
+  metadata.gz: 3de785ac42f73968a486b8d7157760326b85bfb5
+  data.tar.gz: 01ef894b1cec18b39c4b2bc89c706e5f3a6dedce
 SHA512:
-  metadata.gz: 9965bd780a6f65704c4e6cd24a08c20a47e3179516e3b42b3e7b896c2a21114bcdf33ea239da4ec63fc349387365d0cb73ef8860a456e9930140da9c69689688
-  data.tar.gz: 14316209cd999b6d5be0f8f43f10d812cb50f90cd333dae3099fcc03be6fdd2c73738e4eed11993d14e8d72d2760f71336e0ac74626d23188fb6c7a031a18d44
+  metadata.gz: 69155f0155898a034bf851f35d446a2821a82c5efe3c97ed3d7c1e6e612469abe2f9c11ec7c8b65cdb87f3804ce42c00ee4805e87ee26f4cd4db196f904b749a
+  data.tar.gz: b8c550856d29d22da4ce436ed9bbe286a731a7c49a110796e6599e6a3b199fdfc82a5e10e8efdfd17fbb2a30556ee7bcec3501922a65f7700eada8101c9fb8fe

data/lib/generators/scaffold_plus/has_many/has_many_generator.rb

@@ -120,11 +120,11 @@ module ScaffoldPlus
       protected
 
       def before_array
-        options['before'] || []
+        options.before || []
       end
 
       def after_array
-        options['after'] || []
+        options.after || []
       end
 
       def dependent

data/lib/generators/scaffold_plus/many_to_many/many_to_many_generator.rb

@@ -10,8 +10,8 @@ module ScaffoldPlus
                desc: "The first object that has_many TWO objects through NAME"
       argument :two, type: :string,
                desc: "The second object that has_many ONE objects through NAME"
-      class_option :attributes, type: :array, banner: 'name:type [...]',
-               desc: 'Additional attributes for the join table'
+      class_option :add_attr, type: :array, banner: "FIELD[:TYPE][:INDEX] ...",
+               desc: 'Setup additional attributes for join table'
       class_option :dependent, type: :string, banner: 'ACTION',
                desc: 'Can be destroy, delete, or restrict'
       class_option :nested, type: :array, banner: 'attribute [...]',
@@ -27,84 +27,87 @@ module ScaffoldPlus
       class_option :index, type: :boolean, default: true,
                desc: 'Add an index to the migration'
       source_root File.expand_path('../templates', __FILE__)
-      
+
       def add_migration
         return unless options.migration?
         migration_template 'many_to_many_migration.rb', "db/migrate/#{migration_name}.rb"
       end
-      
+
       def add_counter
         return unless options.counter?
         migration_template 'counter_migration.rb', "db/migrate/#{counter_migration}.rb"
       end
-      
+
       def add_to_models
         [[one, two], [two, one]].each do |pair|
           current, partner = pair
           inject_into_class "app/models/#{current}.rb", current.camelize do
             text = before_array.include?(current) ? "\n" : ""
             text << "  has_many :#{table_name}"
-            text << ", dependent: :#{dependent}" if options[:dependent].present?
+            text << ", dependent: :#{dependent}" if options.dependent.present?
             text << "\n"
             text << "  has_many :#{partner.pluralize}, through: :#{table_name}\n"
             if current == one
-              text << "  accepts_nested_attributes_for :#{table_name}\n" if options[:nested].present?
+              text << "  accepts_nested_attributes_for :#{table_name}\n" if options.nested.present?
             end
             text << "\n" if after_array.include?(current)
             text
           end
         end
-        
+
         template 'many_to_many_model.rb', "app/models/#{name}.rb"
       end
-      
+
       def add_to_permit
-        return unless options[:nested].present?
-        list = options[:nested].map{|n| ":#{n}"}.join(', ')
+        return unless options.nested.present?
+        list = options.nested.map{|n| ":#{n}"}.join(', ')
         text = "#{table_name}_attributes: [ #{list} ]"
         file = "app/controllers/#{one.pluralize}_controller.rb"
         gsub_file file, /(permit\(.*)\)/, "\\1, #{text})"
         # Special case: no previous permit
         gsub_file file, /^(\s*params)\[:#{name}\]$/, "\\1.require(:#{name}).permit(#{text})"
       end
-      
+
       protected
-      
+
+      def added_fields
+        list = options.add_attr || []
+        array = []
+        list.each do |entry|
+          name, type, index = entry.split(':')
+          type, index = ["string", type] if %w(index uniq).include? type
+          array << [name, type || "string", index]
+        end
+        array
+      end
+
       def before_array
-        options['before'] || []
+        options.before || []
       end
-      
+
       def after_array
-        options['after'] || []
+        options.after || []
       end
-      
+
       def dependent
-        if options[:dependent].present? && options[:dependent] == "restrict"
+        if options.dependent.present? and options.dependent == "restrict"
           "restrict_with_exception"
         else
-          options[:dependent]
+          options.dependent
         end
       end
-      
+
       def migration_name
         "create_#{table_name}"
       end
-      
-      def create_index?
-        options.index?
-      end
-      
+
       def counter_migration
         "add_#{table_name}_count_to_#{one}"
       end
-      
+
       def counter_cache
         options.counter? ? ", counter_cache: true" : ""
       end
-      
-      def attributes
-        options[:attributes] || []
-      end
     end
   end
 end

data/lib/generators/scaffold_plus/many_to_many/templates/many_to_many_migration.rb

@@ -3,15 +3,22 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
     create_table :<%= table_name %> do |t|
       t.belongs_to :<%= one %>
       t.belongs_to :<%= two %>
-<%- attributes.each do |attribute| -%>
-      t.<%= attribute.split(':').second %> :<%= attribute.split(':').first %>
-<%- end -%>
+  <%- added_fields.each do |field| -%>
+      t.<%= field[1] %>  :<%= field[0] %>
+  <%- end -%>
 
       t.timestamps
     end
-<%- if create_index? -%>
+<%- if options.index? -%>
     add_index :<%= table_name %>, :<%= one %>_id
     add_index :<%= table_name %>, :<%= two %>_id
+  <%- added_fields.each do |field| -%>
+    <%- if field[2] == "uniq" -%>
+    add_index :<%= table_name %>, :<%= field[0] %>, unique: true
+    <%- elsif field[2] == "index" -%>
+    add_index :<%= table_name %>, :<%= field[0] %>
+    <%- end -%>
+  <%- end -%>
 <%- end -%>
   end
 end

data/lib/scaffold_plus/version.rb

@@ -1,3 +1,3 @@
 module ScaffoldPlus
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_plus
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord