susanin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a128a12b362112ca1b6c0fa0aa6da6df22e20aa3084c5e4e737faf975b8eeac1
-  data.tar.gz: 81d74deba88cc7876317a55b55d6e5e8153a86baf0a9b03cceca18a16f4847a2
+  metadata.gz: a0d2e26626b7792e2bbded08c10b9c219c957cc04b2fc49603254e453cf6728f
+  data.tar.gz: 56cc3d7e7bd0b9f530953c3784e2f3b2c097d7942798f115cc1540c2458f165c
 SHA512:
-  metadata.gz: 176036032569931759b26752e781c31443d51447b956b90b0a55aa8cfa4d24c98f6fc236285f5994cdcfbd800bd3e9491963d6545236bf4e6dafb26039d52895
-  data.tar.gz: b8a9ca0bac9579b4ee848fd6ee732fcd2dfba71fce3d6f098fc2856078693fdbe0ee7d5f35efa295aeba25dc3d7d5a9da446d31969b256bbf5b8da3b4f0c9c8a
+  metadata.gz: c6efe38491677b7832e87f4a8f19839718797ace7086f58ba2b3e76283fc90957ac1788dee8e9e12aee1b01522bf21ec49b7d527f833af9e5e0c4768a6a91f2a
+  data.tar.gz: d702e4e2b8a1221ff0ed7ba9af8075bd622b1c096ec04a60f3f861f4ca6dbd357961b8197175eba4846b9c5dd7c03ae9c42206b99918f5acac9bdedf3a6a1063

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/lib/susanin/resource.rb

@@ -11,7 +11,8 @@ module Susanin
 
     def url_parameters(record_or_hash_or_array, options={})
       params = self.get(Array.wrap(record_or_hash_or_array)).flatten
-      merged_options(params, options={})
+      opts, params = params.partition { |i| i.is_a?(Hash) }
+      merged_options(params, opts.inject(options) { |acc, i| acc.merge(i) })
     end
 
     #
@@ -189,7 +190,8 @@ module Susanin
         end
       end
 
-      record
+      opts, r = record.partition { |i| i.is_a?(Hash) }
+      opts.any? ? [*r, opts.inject({}, :merge)] : r
     end
 
     #

data/lib/susanin/version.rb

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

data/susanin.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionpack", ">= 5.0.0", "< 7.0"
+  spec.add_dependency "actionpack", ">= 5.0.0", "< 8.0"
 
-  spec.add_development_dependency "bundler", "~> 2.1"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "minitest", "~> 5.1"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: susanin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alexey Osipenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -19,7 +19,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,35 +29,35 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cimon.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: polymorphic_url extention to help with route generation

data/.cimon.yml

@@ -1,39 +0,0 @@
-services:
-  ruby21:
-    from: ruby:2.1.8
-    cache:
-      - /bundle
-    build:
-      - gem install bundler
-  ruby22:
-    from: ruby:2.2.4
-    cache:
-      - /bundle
-    build:
-      - gem install bundler
-  ruby23:
-    from: ruby:2.3.0
-    cache:
-      - /bundle
-    build:
-      - gem install bundler
-
-default: &default
-  prepare:
-    - bundle install --path /bundle
-  folder: /app
-  cmd: bin/rake
-  env:
-    - COVERAGE=true
-
-test21:
-  <<: *default
-  service: ruby21
-
-test22:
-  <<: *default
-  service: ruby22
-
-test23:
-  <<: *default
-  service: ruby23