adva 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e21414bd4e4a1bc2f2997b923f801e3d9975691f988db62aae1143c04c87f7f3
-  data.tar.gz: 59403cb73cdc450177df44dd4cd533be6373924e8cd1f709064ba0aa273b7cf2
+  metadata.gz: 978b534aa1c0c30a24a3cf729c1b3216a6a97c6488151c94a1b846f0b7e7c373
+  data.tar.gz: ac852a47a7167285e007538ed127c38a8d1e1f960cfa7c8477d6520ae212d21b
 SHA512:
-  metadata.gz: dbfb718c389be77270bc0f4bd61b64265f84273164e1a8cb3defd75581f46009600c506f812fcc87d5abbc91f066a828982a6b79d620f8eacf2e1670ac32b16f
-  data.tar.gz: 3060ae6ddb8cce65b26be5d390ba5f1a1f75126d90cf96e7f1dc5501867cedf2dbc7442eefaf843db29c036412a770a2acaea4e57ebbd8d2726c7705a20b27a9
+  metadata.gz: 0f1a614b3b38549dfa6159404f0db4fa77996336812570af9d9fdf942e3ba7435fb766333cf9343212292c15b52c87dba7302594e57f8f588815ad9537461a7a
+  data.tar.gz: 5c1efba1d71c1615249efea827c5dcc20141711478b159eccc8fd4f94caf53748019dea3f17532f6b620f2ce3ac8bc9a0b5e81237fb9730a4c29bd82f79f5f86

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/models/content.rb

@@ -2,6 +2,13 @@ require "adva/has_permalink"
 require "adva/belongs_to_author"
 
 class Content < ActiveRecord::Base
+  # Fix STI in dev
+  unless Rails.application.config.eager_load
+    def self.find_sti_class(type_name)
+      eval(type_name.to_s)
+    end
+  end
+
   acts_as_nested_set :scope => :section_id
 
   acts_as_taggable
@@ -145,3 +152,4 @@ class Content < ActiveRecord::Base
       end
     end
 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.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adva
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-12 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