1.2.9 merge #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

thatdoogieguy wants to merge 83 commits into master from 1.2.9merge

.github/workflows/ci.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,11 +4,15 @@ on:
  
      push:

        branches:

          - master

          - 1-2

          - 1-1

          - 1-0

          - 0-8

      pull_request:

        branches:

          - master

          - 1-2

          - 1-1

          - 1-0

          - 0-8

    @@ -21,6 +25,7 @@ jobs:
  
          fail-fast: false

          matrix:

            ruby:

              - '3.0'

              - '2.7'

              - '2.6'

            database:

    @@ -40,11 +45,17 @@ jobs:
  
                version: '6.0'

              - name: 'active_record'

                version: '6.1'

              - name: 'active_record'

                version: '7.0'

              - name: 'sequel'

                version: '5'

            experimental: [false]

            feature: ['unit']

            include:

              - ruby: '3.0'

                feature: 'unit'

                orm:

                experimental: false

              - ruby: '2.7'

                feature: 'unit'

                orm:

    @@ -53,15 +64,45 @@ jobs:
  
                feature: 'unit'

                orm:

                experimental: false

              - ruby: '2.5'

                feature: 'unit'

              - ruby: '3.0'

                feature: 'rails'

                orm:

                  name: 'active_record'

                  version: '7.0'

                database: 'sqlite3'

                experimental: false

              - ruby: '3.0'

                feature: 'performance'

                experimental: false

              - ruby: '3.0'

                feature: 'i18n_fallbacks'

                experimental: false

              - ruby: '3.0'

                database: 'sqlite3'

                feature: 'unit'

                orm:

                  name: 'active_record'

                  version: 'edge'

                experimental: true

              - ruby: '3.0'

                database: 'mysql'

                feature: 'unit'

                orm:

                  name: 'active_record'

                  version: 'edge'

                experimental: true

              - ruby: '3.0'

                database: 'postgres'

                feature: 'unit'

                orm:

                  name: 'active_record'

                  version: 'edge'

                experimental: true

              - ruby: '2.7'

                feature: 'rails'

                orm:

                  name: 'active_record'

                  version: '6.1'

                  version: '7.0'

                database: 'sqlite3'

                experimental: false

              - ruby: '2.7'

    @@ -75,27 +116,47 @@ jobs:
  
                feature: 'unit'

                orm:

                  name: 'active_record'

                  version: '7.0'

                  version: 'edge'

                experimental: true

              - ruby: '2.7'

                database: 'mysql'

                feature: 'unit'

                orm:

                  name: 'active_record'

                  version: '7.0'

                  version: 'edge'

                experimental: true

              - ruby: '2.7'

                database: 'postgres'

                feature: 'unit'

                orm:

                  name: 'active_record'

                  version: '7.0'

                  version: 'edge'

                experimental: true

            exclude:

              - ruby: '2.6'

                orm:

                  name: 'active_record'

                  version: '7.0'

              - ruby: '2.7'

                orm:

                  name: 'active_record'

                  version: '4.2'

              - ruby: '3.0'

                orm:

                  name: 'active_record'

                  version: '4.2'

              - ruby: '3.0'

                orm:

                  name: 'active_record'

                  version: '5.0'

              - ruby: '3.0'

                orm:

                  name: 'active_record'

                  version: '5.1'

              - ruby: '3.0'

                orm:

                  name: 'active_record'

                  version: '5.2'

        env:

          DB: ${{ matrix.database }}

          BUNDLE_JOBS: 4

    @@ -133,9 +194,6 @@ jobs:
  
          - name: Install Postgres

            run: sudo apt-get install libpq-dev postgresql-client -y

            if: matrix.database == 'postgres'

          - name: Install MySQL

            run: sudo apt-get install libmysqlclient-dev mysql-client -y

            if: matrix.database == 'mysql'

          - id: cache-bundler

            uses: actions/cache@v2

            with:

CHANGELOG.md

-Original file line number
+Diff line change
@@ -1,11 +1,84 @@
     # Mobility Changelog
     ## Unreleased
-    - Assign blank values in pg hash backends
-      ([#516](https://github.com/shioyama/mobility/pull/516))
+    - Fix ActiveRecord JSONB blank values
+      ([#536](https://github.com/shioyama/mobility/pull/536))
+    - Support primary keys other then :id on model classes
+      ([#542](https://github.com/shioyama/mobility/pull/542))
+    - Clean up and refactor container backend
+      ([#543](https://github.com/shioyama/mobility/pull/543)),
+      thanks [doits](https://github.com/doits)!
+    - Update fallthrough_accessor regex to allow for ISO 639-2 codes
+      ([#580](https://github.com/shioyama/mobility/pull/580))
+      thanks [phil-allcock](https://github.com/phil-allcock)!
+    ## 1.2
+    ### 1.2.9
+    - Fix missing method `mobility_attribute?` on Rails 7
+      ([#582](https://github.com/shioyama/mobility/pull/582) and
+      [#584](https://github.com/shioyama/mobility/pull/584))
+    ### 1.2.8
+    - Fix issues with subclassing, such as when using AR STI,
+      fixes [#566](https://github.com/shioyama/mobility/issues/566)
+      ([#568](https://github.com/shioyama/mobility/pull/568))
+    - Handle `attribute_method_matchers` rename (part of
+      [#560](https://github.com/shioyama/mobility/pull/560))
+    ### 1.2.7
+    - Do not query same attribute more than once, fixes
+      [#564](https://github.com/shioyama/mobility/pull/578)
+      ([#577](https://github.com/shioyama/mobility/pull/577))
+    ### 1.2.6
+    - Require mfa on rubygems
+      ([#545](https://github.com/shioyama/mobility/pull/545))
+    ### 1.2.5
+    - Avoid referencing ActiveRecord::Base
+      ([#550](https://github.com/shioyama/mobility/pull/550))
+    ### 1.2.4
+    - Fix fallbacks performance regression
+      ([#548](https://github.com/shioyama/mobility/pull/548))
+    ### 1.2.3
+    - Fix passing wrong options to super in fallbacks plugin
+      ([#539](https://github.com/shioyama/mobility/pull/539))
+    ### 1.2.2
+    - Make models work with `Marshal.dump`
+      ([#532](https://github.com/shioyama/mobility/pull/532))
+    - Fix Sequel container op in Sequel
+      ([#533](https://github.com/shioyama/mobility/pull/533))
+    - Simplify Fallbacks plugin
+      ([#531](https://github.com/shioyama/mobility/pull/531))
+    ### 1.2.1
+    - Refactor ColumnFallback plugin
+      ([#530](https://github.com/shioyama/mobility/pull/530))
+    ### 1.2.0
+    - Add ColumnFallback plugin
+      ([#512](https://github.com/shioyama/mobility/pull/512))
+    - Fix Sequel querying on untranslated attributes in `i18n` block
+      ([#529](https://github.com/shioyama/mobility/pull/529))
+    - Allow passing configured backend class as third argument to setup
+      ([#528](https://github.com/shioyama/mobility/pull/528))
+    - Clearly distinguish backend classes from their configured subclasses
+      ([#527](https://github.com/shioyama/mobility/pull/527))
     ## 1.1
+    ### 1.1.3
+    - Do not swallow keyword args on ruby 3 in fallthrough accessors
+      ([#520](https://github.com/shioyama/mobility/pull/520)) thanks
+      [doits](https://github.com/doits)!
+    - Assign blank values in pg hash backends
+      ([#516](https://github.com/shioyama/mobility/pull/516))
     ### 1.1.2
     - Check whether class responds to mobility_attribute?
       ([#515](https://github.com/shioyama/mobility/pull/515))
@@ Expand Down @@

Gemfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,11 +8,11 @@ orm, orm_version = ENV['ORM'], ENV['ORM_VERSION']
  
    group :development, :test do

      case orm

      when 'active_record'

        orm_version ||= '6.1'

        orm_version ||= '7.0'

        case orm_version

        when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1'

        when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1', '7.0'

          gem 'activerecord', "~> #{orm_version}.0"

        when '7.0'

        when 'edge'

          git 'https://github.com/rails/rails.git', branch: 'main' do

            gem 'activerecord'

            gem 'activesupport'

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ Installation @@
     Add this line to your application's Gemfile:
     ```ruby
-    gem 'mobility', '~> 1.1.2'
+    gem 'mobility', '~> 1.2.9'
     ```
     ### ActiveRecord (Rails)
@@ Expand Down @@

certs/shioyama.pem

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    -----BEGIN CERTIFICATE-----

    MIIEODCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhjaHJp

    cy9EQz1kZWppbWF0YS9EQz1jb20wHhcNMjEwMjE4MTMxMzA5WhcNMjIwMjE4MTMx

    MzA5WjAjMSEwHwYDVQQDDBhjaHJpcy9EQz1kZWppbWF0YS9EQz1jb20wggGiMA0G

    cy9EQz1kZWppbWF0YS9EQz1jb20wHhcNMjIwMzAyMDMyMTA5WhcNMjMwMzAyMDMy

    MTA5WjAjMSEwHwYDVQQDDBhjaHJpcy9EQz1kZWppbWF0YS9EQz1jb20wggGiMA0G

    CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDURCKbt5oY0sCp4kYK1u5SLzVHg6Q1

    2LejeQvUGpR3gulWqrq/507XRxE/9FSpLfgo3cGGYio1/gg2Yp7pBI4ZNEz8d2Vg

    6caWLHYtHYF0/jlo177UspEF1bt3lCCmaA/ZyQpvoLi76Jf6VCBjepMqhLjeBSsA

    @@ -13,13 +13,13 @@ bRGON33BZ99gPiYdGfd3Pc/7FooteJASjKIO4Hman2ELRIdu6Bq+fIkTdJBcruS/
  
    XL6xoRitCG7CX0IqmMKuLiKA/J0amAikHGsCAwEAAaN3MHUwCQYDVR0TBAIwADAL

    BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFMNUGAhS68egZT6DOfJwrfIdCtT/MB0GA1Ud

    EQQWMBSBEmNocmlzQGRlamltYXRhLmNvbTAdBgNVHRIEFjAUgRJjaHJpc0BkZWpp

    bWF0YS5jb20wDQYJKoZIhvcNAQELBQADggGBAH1RnWhD9bum/ijqzAAlkGWYzGza

    h/3seA2bg1r5bbttFjD48f7RepfoAMxAqfiUWcukoukJeu7UY8jWmUIn9ut1oXct

    Fh0YnueLFzzmppCCU+/SX5mc1y7mHYZHiU5n8qy1wJ6ljLWXVeprgJ96NdnmxuVU

    dzPPSDTex/x7xBvHiaPc/uZSLc173N3qdY/Cd0B3/OflYeU2h5UpIHnmXrsONdMC

    Xohy+Rrr2yT09MPYG+llpLHDnXmTnPsOZUSL5Q4c/iolodv4xJZKwLMZwrm2hQl9

    9Or9Os+qxY0zWxmWuAtTFrskLAMhckCPDEcqSZmW4CT1a/quC2Oh0y1GsXPcqtqt

    hLRuwfTXGor6bg4CrU7GRbSqjvnBepct5lwZiZrOCnMEUpY+9Q8fwmG3o3B+wBsw

    eBMcZq0d1tbtv1M1UXND9mOfhLZ31YvoSTPkrJiRpljUNgD0+ugelnr1/5X/9k8y

    J9QOd3C5jpSShf/HMvpJnFuSYFm19cH9GrHjvw==

    bWF0YS5jb20wDQYJKoZIhvcNAQELBQADggGBAHJPxoU7brN6goci9iclRYUq1Prs

    51E87VRywUDysHpaHJoGRTqRJsQxi5aGZ9pIbiXGj9WJKKnrhiv5cM5fWtAsz564

    Ro+Zyx6UVt/2z9rcfYrnXtmC9wh+5/0UqAeoan9RiSd8lscQZ9pEY0E3cmzJRHSU

    t8kwB2ipVkFO17mdTVgc3C2ZbWRq80eTzkELDBb+8xO0Cskyh4sGMTOKfHs2RWcJ

    217Qeg0F9w0RcqwnORe5zmPihY9zswCPh0IUaJa1pNY+MLTff9LE/qTl3WVTgrif

    HsSSnstQYPSLJ3hSP/cu1aOmdXlJiim//XlDQ9DNp4KWje3UW3DMRdTwjW5wPmUq

    VA9Ij7DUPaZzUpy1NZEigf1GshvslOnvN5bgol1YFR46jpfZVlgt0K5XBQVNvp/A

    QHgocnSksU5GOM+G2UhjVycbTamd+bCxjWAZTEDZNafFt5CmnfK1D1UTIblR/ci9

    fUDdW+GhxhobB8N1mtDRlhELoxLLjx7mSvJ3Wg==

    -----END CERTIFICATE-----

lib/mobility.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,9 @@ class Comment @@
     plugin enabled.
     =end
+    def ruby2_keywords(*); end unless respond_to?(:ruby2_keywords, true)
     module Mobility
       # A generic exception used by Mobility.
       class Error < StandardError
@@ Expand Down @@

lib/mobility/backend.rb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -23,8 +23,8 @@ module Mobility
  
      corresponding to valid keys for configuring this backend.

    - implement a +configure+ class method to apply any normalization to the

      keys on the options hash included in +valid_keys+

    - call the +setup+ method yielding attributes and options to configure the

      model class

    - call the +setup+ method yielding attributes and options (and optionally the

      configured backend class) to configure the model class

    @example Defining a Backend

      class MyBackend

    @@ -49,6 +49,13 @@ def self.configure(options)
  
        setup do |attributes, options|

          # Do something with attributes and options in context of model class.

        end

        # The block can optionally take the configured backend class as its third

        # argument:

        #

        # setup do |attributes, options, backend_class|

        #   ...

        # end

      end

    @see Mobility::Translations

    @@ -147,9 +154,11 @@ def valid_keys
  
          def setup &block

            if @setup_block

              setup_block = @setup_block

              @setup_block = lambda do |*args|

                class_exec(*args, &setup_block)

                class_exec(*args, &block)

              exec_setup_block = method(:exec_setup_block)

              @setup_block = lambda do |attributes, options, backend_class|

                [setup_block, block].each do |blk|

                  exec_setup_block.call(self, attributes, options, backend_class, &blk)

                end

              end

            else

              @setup_block = block

    @@ -158,17 +167,6 @@ def setup &block
  
          def inherited(subclass)

            subclass.instance_variable_set(:@setup_block, @setup_block)

            subclass.instance_variable_set(:@options, @options)

            subclass.instance_variable_set(:@model_class, @model_class)

          end

          # Call setup block on a class with attributes and options.

          # @param model_class Class to be setup-ed

          # @param [Array<String>] attribute_names

          # @param [Hash] options

          def setup_model(model_class, attribute_names)

            return unless setup_block = @setup_block

            model_class.class_exec(attribute_names, options, &setup_block)

          end

          # Build a subclass of this backend class for a given set of options

    @@ -204,10 +202,30 @@ def #{name}
  
            EOM

          end

          # Show useful information about this backend class, if it has no name.

          # @return [String]

          def inspect

            name ? super : "#<#{superclass.name}>"

          def options

            raise_unconfigured!(:options)

          end

          def model_class

            raise_unconfigured!(:model_class)

          end

          def setup_model(_model_class, _attributes)

            raise_unconfigured!(:setup_model)

          end

          private

          def raise_unconfigured!(method_name)

            raise UnconfiguredError, "You are calling #{method_name} on an unconfigured backend class."

          end

          def exec_setup_block(model_class, *args, &block)

            if block.arity == 3

              model_class.class_exec(*args[0..2], &block)

            else

              model_class.class_exec(*args[0..1], &block)

            end

          end

        end

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

1.2.9 merge #2

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

1.2.9 merge #2

Are you sure you want to change the base?

Uh oh!

1.2.9 merge #2

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!