adva 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f16fead7014a86e872d525253b6df9702dc1e6914b1b90278c314055d95c497
-  data.tar.gz: d0ce6569c64d50860f36fc695d3f7e881b92d39051bb44df2818f1dff1114fa6
+  metadata.gz: e08dd9649ae6dd11c6e37290d1117e0804a31f6fe8f5c351d075c04734f2818d
+  data.tar.gz: f3b4606e63ccf7079f0da6e0310b31c6679f01d411027edb4e773fac8ae3ec99
 SHA512:
-  metadata.gz: 0dfde419a4b47e88322f2df4d1d12f919d6c95366c5762d7a11440d10d5b12352fe2aaf44b2a75329de180751a7301fe35ede836fb7c6146a950b02d31179457
-  data.tar.gz: 17f54412e35104938c42bce0cdfeba484cc8a10691e3e2507846d8d889945e8c78b2d3701c6c293b05ebd011909cf2501feca5a0c7cf3efa7f9c693995cb970b
+  metadata.gz: f772ae34995d9068b01801c5176004a9a07c5c45e936235e80d82a2df626815d39143df4cb4f3a7576194f4336f921b6565930009fad1402f14a1169d9d532a8
+  data.tar.gz: 8d7355b2338f519f4244155fcf6b43ecc833d4fc40b5d3ad2e3e427d077fe49a87d546af49a8292cd41b07f71087f41922407b9820a1a303743c20ef6002ddde

data/adva.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "will_paginate"
   gem.add_dependency "awesome_nested_set"
+  gem.add_dependency "labelled_form"
   gem.add_dependency "ckeditor"
   gem.add_dependency "nacelle"
   gem.add_dependency "friendly_id", "~> 5.1.0" # 5.2.0 tries to call #slug= on invalid save

data/app/controllers/articles_controller.rb

@@ -39,15 +39,10 @@ class ArticlesController < BaseController
   end
 
   helper_method def tags
-    if !defined?(@tags)
-      @tags = if params[:tags]
-        names = params[:tags].split('+')
-        @tags = Tag.where(name: names).pluck(:name)
-        raise ActiveRecord::RecordNotFound unless @tags.size == names.size
-      else
-        []
-      end
-    end
+    return @tags if defined?(@tags)
+    names = params[:tags].to_s.split('+')
+    @tags = Tag.where(name: names).pluck(:name)
+    raise ActiveRecord::RecordNotFound if @tags.size != names.size
     @tags
   end
 

data/app/views/admin/page/links/_form.html.erb

@@ -10,7 +10,7 @@
     <%= f.text_field :body, class: 'big' %>
 
     <%= f.label :draft, "Save as Draft?" %>
-    <%= f.check_box :draft?, id: 'toggle_draft', label: "Yes, save this link as a draft" %>
+    <%= f.check_box :draft?, label: "Yes, save this link as a draft" %>
 
     <p class="show-if-previous-unchecked">
       <%= f.label :published_at, "Publish on this date" %>

data/lib/adva/extensible_forms.rb

@@ -76,35 +76,6 @@ module Adva
         end
     end
 
-    helpers = field_helpers + %w(select date_select datetime_select time_select time_zone_select collection_select) -
-                              %w(hidden_field label fields_for apply_form_for_options!)
-
-    helpers.each do |method_name|
-      class_eval <<-src, __FILE__, __LINE__
-        def #{method_name}(*args, &block)
-          type = #{method_name.to_sym.inspect}
-
-          options = args.extract_options!
-          options = add_default_class_names(options, type)
-          # options = add_tabindex(options, type)
-
-          label, wrap, hint = options.delete(:label), options.delete(:wrap), options.delete(:hint)
-          name = args.first
-
-          hint = I18n.t(hint) if hint.is_a?(Symbol)
-          options[:title] = hint
-
-          with_callbacks(name) do
-            tag = super(*(args << options), &block)
-            # remember_tabindex(tag, options)
-            tag = labelize(type, tag, name, label) if label || self.options[:labels]
-            tag = wrap(tag) if wrap || self.options[:wrap]
-            tag
-          end
-        end
-      src
-    end
-
     def field_set(*args, &block)
       options = args.extract_options!
       options = add_default_class_names(options, :field_set)
@@ -164,25 +135,6 @@ module Adva
 
     protected
 
-    def labelize(type, tag, method, label = nil)
-      label = case label
-      when String then label
-      when Symbol then I18n.t(label)
-      when TrueClass then
-        scope = [:activerecord, :attributes] + object.class.to_s.underscore.split('/')
-        string = I18n.t(method, :scope => scope)
-        string.is_a?(String) ? string : method.to_s.titleize
-      else nil
-      end
-
-      case type
-      when :check_box, :radio_button
-        tag + self.label(method, label, :class => 'inline light', :for => extract_id(tag), :id => "#{extract_id(tag)}_label")
-      else
-        self.label(method, label) + tag
-      end
-    end
-
     def wrap(tag)
       @template.content_tag(:p, tag)
     end

data/lib/adva/version.rb

@@ -1,3 +1,3 @@
 module Adva
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adva
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: labelled_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ckeditor
   requirement: !ruby/object:Gem::Requirement