currency_select 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34966f5e01826eea10afd72d0482a6b206086c84ae9c1b3daff05abfb71b5e0c
-  data.tar.gz: 9848694b180fe61281b0f042560c606d1a4f0b13140b3f18311f6f7162ac1ced
+  metadata.gz: 7d100fa5d8db54cfe83c7b6b22af1b074fda179bbc8372a6be10fe724a284b2d
+  data.tar.gz: cbcbdd178abaf13fc1ecf6bbee7c9e9486c46139e3bca4ae761685deedbb14f4
 SHA512:
-  metadata.gz: 542ce884664c90151e0fe52bdd81e12175b51b444784d8c30c1aabd645f2bb2b607b2ae2532b4fafde242bb021cd1aae6b83dc2723ea933a885d1cb6027698d1
-  data.tar.gz: 40fd4238f223fb9b6d045744c777cc8b4fabfadf2179e85b22cc160d90811a6a0ec89a4d36c5ada145db503465d693466d166811b77bcc507d0b4612c82446af
+  metadata.gz: 736a8e8842996e681149fc24c0dae6483ac45cf0bd5ed71a43b99b6a2571783d5ad0a1d0ddf44b8cff3ab10c166f787a04008169a0f7da20daea18fa46596633
+  data.tar.gz: e7c241ca7915f93e32cec7fb0ce60b9ee9c04e546ded9fd6f5d95b11a640ca7e04a2647971cb317942f886db1c4c4f1f10601f572b37d7608ac0baf2c2f5f505

data/CHANGELOG.md

@@ -13,6 +13,19 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Removed
 
+## 5.0.0
+
+### Added
+- Add official support for Ruby 3.2 (#125)
+
+### Changed
+- Allow the non-formbuilder version to set the selected option (#134)
+- Drop whitespace between HTML tags (#115)
+
+### Removed
+- Drop support for Rails 5.2 (#112)
+- Drop support for Ruby 2.6 and 2.7 (#111, #132)
+
 ### Fixed
 
 ### Security

data/VERSION

@@ -1 +1 @@
-4.1.0
+5.0.0

data/currency_select.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version = version
   s.license = 'MIT'
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 3.0.0'
 
   s.homepage = 'https://github.com/braingourmets/currency_select'
   s.authors = ['Trond Arve Nordheim', 'Oliver Klee']
@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
   ]
   s.extra_rdoc_files = %w[CHANGELOG.md LICENSE README.md]
 
-  s.add_runtime_dependency 'actionview', '>= 5.2.0', '< 7.1'
+  s.add_runtime_dependency 'actionview', '>= 6.0.0', '< 7.1'
   s.add_runtime_dependency 'money', '~> 6.0'
 
   s.add_development_dependency 'rspec-rails', '~> 5.1.0'
-  s.add_development_dependency 'rubocop', '~> 1.25.1'
+  s.add_development_dependency 'rubocop', '~> 1.26.0'
   s.add_development_dependency 'rubocop-rails', '~> 2.13.2'
   s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   s.add_development_dependency 'rubocop-rspec', '~> 2.8.0'

data/lib/currency_select.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'currency_select_tag'
+require 'form_builder'
+require 'form_options_helper'
 require 'money'
 
 ##
@@ -67,99 +70,3 @@ module CurrencySelect
     end
   end
 end
-
-# CurrencySelect
-module ActionView
-  module Helpers
-    ##
-    # Module for the form options.
-    #
-    module FormOptionsHelper
-      # Return select and option tags for the given object and method, using
-      # currency_options_for_select to generate the list of option tags.
-      def currency_select(
-        object, method, priority_currencies = nil, options = {},
-        html_options = {}
-      )
-        tag = CurrencySelectTag.new(object, method, self, options)
-        tag.to_currency_select_tag(priority_currencies, options, html_options)
-      end
-
-      # Returns a string of option tags for all available currencies. Supply
-      # a currency ISO code as +selected+ to have it marked as the selected
-      # option tag. You can also supply an array of currencies as
-      # +priority_currencies+, so that they will be listed above the rest of
-      # the list.
-      def currency_options_for_select(selected = nil, priority_currencies = nil)
-        currency_options = ''.html_safe
-
-        if priority_currencies
-          currency_options += options_for_select(
-            ::CurrencySelect.priority_currencies_array(priority_currencies),
-            selected
-          )
-          raw = '<option value="" disabled="disabled">-------------</option>'
-          currency_options += raw.html_safe + "\n"
-
-          # prevents selected from being included twice in the HTML which causes
-          # some browsers to select the second selected option (not priority)
-          # which makes it harder to select an alternative priority country
-          selected = nil if priority_currencies.include?(selected)
-        end
-
-        # All the countries included in the country_options output.
-        currency_options + options_for_select(
-          ::CurrencySelect.currencies_array, selected
-        )
-      end
-    end
-
-    ##
-    # Tag.
-    #
-    module ToCurrencySelectTag
-      def to_currency_select_tag(priority_currencies, options, html_options)
-        html_options = html_options.stringify_keys
-        add_default_name_and_id(html_options)
-        value = if method(:value).arity.zero?
-                  value()
-                else
-                  value(object)
-                end
-        content_tag(
-          'select',
-          add_options(
-            currency_options_for_select(value, priority_currencies),
-            options,
-            value
-          ),
-          html_options
-        )
-      end
-    end
-
-    ##
-    # Tag.
-    #
-    class CurrencySelectTag < Tags::Base
-      include ToCurrencySelectTag
-    end
-
-    ##
-    # Form builder.
-    #
-    class FormBuilder
-      def currency_select(
-        method, priority_currencies = nil, options = {}, html_options = {}
-      )
-        @template.currency_select(
-          @object_name,
-          method,
-          priority_currencies,
-          options.merge(object: @object),
-          html_options
-        )
-      end
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: currency_select
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Trond Arve Nordheim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -146,14 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Currency select plugin for Rails