custom_attributes_scaffold 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb5d6cc4379a5c143e91793d0b58a4cdc0a2cbd3
-  data.tar.gz: 120788e1adae8c4c43595a84d0bbdb873e465049
+  metadata.gz: 7970f62ea0887f6ca181d74a9387db5a0d99d32f
+  data.tar.gz: a7ad54b0f73040ee73d9e26ca1c25c1b08c12094
 SHA512:
-  metadata.gz: 6af0ebda1900c30632328840d44a154f53dd59081b7186bc175a0b441cc552d8f6f9a4f0708c78e7a2c0c0cf9083d07e2f090e990fffb80ea04ef6ba13e72267
-  data.tar.gz: b0e389949a2702b934d0736a12a7c297a549d153692c888a8cda652f7dbddce9d6a8bd115b66ef12ac00d79333fe84711b86d8991cd4a4eaf127bd49390978d8
+  metadata.gz: 940ab3bec3d9be62c741d6c7175e2d250f0040f05680a2b7e9e03d074e7d33534538868e0d4057cb1fa69b7277897fd8a0fe004d917c14ba97c1b06800ecfca3
+  data.tar.gz: 69932678d6fc56dc33ee5c39d38e2543df93c39f7951c493ed7455f00954502e0651f4b9b6d1b61bf82d4de566ac220ca59b6b1c2d969da7888c0237e46e9ea1

data/app/models/custom_attributes/custom_attribute_definition.rb

@@ -2,9 +2,13 @@ module CustomAttributes
   module CustomAttributeDefinition
     extend ActiveSupport::Concern
     included do
-    
-    # For future additions to the custom attribute defintion functionality
+      scope :by_sort_order, -> { order('sort_order ASC') }
+      validates :attr_name, format: { with: /^[a-zA-Z\_\s]+$/, multiline: true, message: 'cannot contain special characters.' }
+      validates :default_value, format: { with: /^[\+\-]?\d*\.?\d*$/, multiline: true, message: 'should be a number.' }, if: :number_type?
 
+      def number_type?
+        [CustomAttributes::CustomAttribute::TYPE_NUMBER, CustomAttributes::CustomAttribute::TYPE_DECIMAL].include?(attr_type)
+      end
     end
   end
-end
+end

data/app/models/custom_attributes/custom_attribute_value.rb

@@ -7,6 +7,12 @@ module CustomAttributes
         custom_attribute_defn.attr_name
       end
 
+      def apply_default_value
+        unless custom_attribute_defn.default_value.blank?
+          self.value = custom_attribute_defn.default_value
+        end
+      end
+
     end
   end
 end

data/app/views/custom_attributes/custom_attribute_definitions/_form_fields_only.html.erb

@@ -11,6 +11,11 @@
   <%= f.select :attr_type, custom_attribute_types.invert, {}, {disabled: !new_record}%>
 </div>
 
+<div class="custom-attribute-definition title <%=titleClass%>">Default Value:</div>
+<div class="custom-attribute-definition field <%=fieldClass%>">
+  <%= f.text_field :default_value %>
+</div>
+
 <% if new_record %>
 <%= f.hidden_field :sort_order %>
 <% end %>

data/lib/custom_attributes/version.rb

@@ -1,3 +1,3 @@
 module CustomAttributes
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/generators/custom_attributes/templates/application_helper.rb

@@ -2,12 +2,12 @@ module CustomAttributes
   module CustomAttributesHelper
     def custom_attribute_types
       types = {
-        CustomAttribute::TYPE_NUMBER          => "Number",
-        CustomAttribute::TYPE_DECIMAL         => "Decimal",
-#        CustomAttribute::TYPE_DATE            => "Date",
-#        CustomAttribute::TYPE_DATE_TIME       => "Date Time",
-        CustomAttribute::TYPE_TEXT            => "Single Line Text",
-        CustomAttribute::TYPE_MULTILINE_TEXT  => "Paragraph Text"
+        CustomAttributes::CustomAttribute::TYPE_NUMBER          => "Number",
+        CustomAttributes::CustomAttribute::TYPE_DECIMAL         => "Decimal",
+#       CustomAttributes::CustomAttribute::TYPE_DATE            => "Date",
+#       CustomAttributes::CustomAttribute::TYPE_DATE_TIME       => "Date Time",
+        CustomAttributes::CustomAttribute::TYPE_TEXT            => "Single Line Text",
+        CustomAttributes::CustomAttribute::TYPE_MULTILINE_TEXT  => "Paragraph Text"
       }
     end
   end

data/lib/generators/custom_attributes/templates/custom_attribute_definition_model.rb

@@ -1,17 +1,13 @@
 class <%= name %>CustomAttributeDefinition < ActiveRecord::Base
     include CustomAttributes::CustomAttributeDefinition
-    scope :by_sort_order, -> { order('sort_order ASC') }
-    <% if options.tenant %>
-      validates_uniqueness_of :attr_name, message: " a custom attribute with this name already exisits."
-    <% else %>
-      validates_uniqueness_of :attr_name, scope: :<%= options.tenant %>_id, message: " a custom attribute with this name already exisits."
-    <% end %>
-
-    <% if options.tenant %>
+<% if options.tenant %>
+    validates :attr_name, uniqueness: { scope: :<%= options.tenant %>_id, message: " has already been taken." }
+<% else %>
+    validates :attr_name, uniqueness: true, message: " has already been taken."
+<% end %>
+<% if options.tenant %>
     scope :current_tenant, -> <%= options.tenant %>_id { where(<%= options.tenant %>_id: <%= options.tenant %>_id) }
     # Uncomment the following if you want to define a default_scope instead
     # default_scope { where(<%= options.tenant %>_id: Tenant.current_tenant) }
-    <% end %>
-    validates_uniqueness_of :attr_name, scope: :company_id, message: 'a custom field with this name already exists.'
-    validates_format_of :attr_name, with: /^[a-zA-Z0-9\_\s]+$/, multiline: true, message: 'special characters are not allowed in the name.'
+<% end %>
 end

data/lib/generators/custom_attributes/templates/custom_attributes_concern.rb

@@ -1,8 +1,20 @@
 module <%= name %>CustomAttributes
   extend ActiveSupport::Concern
+  # TODO: Move most of this file to a common parent
 
   included do
     has_many :custom_attribute_values, :class_name=>'<%= name %>CustomAttributeValue', autosave: true
+    after_initialize :add_custom_attributes_with_default_values
+  end
+
+  def add_custom_attributes_with_default_values
+    return unless self.new_record?
+    return if self.custom_attributes.blank?
+    self.custom_attributes.each do |cav|
+      unless cav.custom_attribute_defn.default_value.blank?
+        self.custom_attribute_values.push(cav)
+      end
+    end
   end
 
   def custom_attributes=(map_of_custom_attributes)

data/lib/generators/custom_attributes/templates/custom_attributes_inline_editing.js.erb

@@ -1,6 +1,6 @@
 $.fn.inline_editable = function() {
 
-  var CLICK_TO_EDIT_HTML = "<span style='font-style: italic; font-size: 0.9em'>Click to edit</i>"
+  var CLICK_TO_EDIT_HTML = "--"
 
   return this.each(function () {
     var $this = $(this);
@@ -8,35 +8,45 @@ $.fn.inline_editable = function() {
     var attr_name = $(this).data('attr-name');
     var controller = $(this).data('controller');
 
-    if ($("div.value", $this).text().trim()==='') {
+    if ($("div.value", $this).text().trim()=='') {
       $("div.value", $this).html(CLICK_TO_EDIT_HTML);
     }
 
     $("div.value", $this).click(function() {
       $("div.value", $this).hide();
       $("div.field", $this).show();
-      $("div.field input", $this).value($("div.value", $this).text());
-      $("div.field input", $this).focus();
+      $("div.field input,textarea", $this).focus();
     });
 
-    $("div.field input,textarea", $this).blur(function() {
+    $("div.field input,textarea", $this).focusout(function() {
+      if (! this.validity.valid) {
+        var attrName = $(this).closest("div.custom-attributes.editable-inline").find("div.custom-attributes.title").text().trim()
+        alert("Invalid value for \'"+ attrName + "\'.");
+        $("div.field input", $this).val($("div.value", $this).text().trim());
+        $("div.field", $this).hide();
+        $("div.value", $this).show();
+        return;
+      }
+
       var url = '/' + controller  + '.json';
       var value = this.value;
       $.ajax({
-           type:'POST',
-           url: url,
-           data: $.param({ owner_id: owner_id, name: attr_name, value: value }),
-           success: function(data) {
+           type:'POST'
+           ,url: url
+           ,data: $.param({ owner_id: owner_id, name: attr_name, value: value })
+           ,success: function(data) {
               if (data.value) {
-                $("div.value", $this).text(data.value);
+                strValue = '' + data.value;
+                $("div.field input,textarea", $this).val(data.value);
+                $("div.value", $this).html(strValue.replace(/\n/g, '<br/>'));
               } else {
                 $("div.value", $this).html(CLICK_TO_EDIT_HTML);
               }
+
+              $("div.field", $this).hide();
+              $("div.value", $this).show();
            }
       });
-
-      $("div.field", $this).hide();
-      $("div.value", $this).show();
     });
 
   });

data/lib/generators/custom_attributes/templates/migration.rb

@@ -4,6 +4,7 @@ class CreateCustomAttributesFor<%= name %> < ActiveRecord::Migration
     create_table (:<%= singular_table_name %>_custom_attribute_definitions) do |t|
       t.string :attr_name
       t.string :attr_type
+      t.text   :default_value
       t.integer :sort_order
   <% if options.tenant %>
       t.integer :<%= options.tenant.underscore %>_id, foreign_key: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_attributes_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tariq Hussain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails