susanin 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby.yml +35 -0
  3. data/lib/susanin/resource.rb +4 -2
  4. data/lib/susanin/version.rb +1 -1
  5. data/susanin.gemspec +4 -4
  6. metadata +18 -18
  7. data/.cimon.yml +0 -39
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a128a12b362112ca1b6c0fa0aa6da6df22e20aa3084c5e4e737faf975b8eeac1
4
- data.tar.gz: 81d74deba88cc7876317a55b55d6e5e8153a86baf0a9b03cceca18a16f4847a2
3
+ metadata.gz: a0d2e26626b7792e2bbded08c10b9c219c957cc04b2fc49603254e453cf6728f
4
+ data.tar.gz: 56cc3d7e7bd0b9f530953c3784e2f3b2c097d7942798f115cc1540c2458f165c
5
5
  SHA512:
6
- metadata.gz: 176036032569931759b26752e781c31443d51447b956b90b0a55aa8cfa4d24c98f6fc236285f5994cdcfbd800bd3e9491963d6545236bf4e6dafb26039d52895
7
- data.tar.gz: b8a9ca0bac9579b4ee848fd6ee732fcd2dfba71fce3d6f098fc2856078693fdbe0ee7d5f35efa295aeba25dc3d7d5a9da446d31969b256bbf5b8da3b4f0c9c8a
6
+ metadata.gz: c6efe38491677b7832e87f4a8f19839718797ace7086f58ba2b3e76283fc90957ac1788dee8e9e12aee1b01522bf21ec49b7d527f833af9e5e0c4768a6a91f2a
7
+ data.tar.gz: d702e4e2b8a1221ff0ed7ba9af8075bd622b1c096ec04a60f3f861f4ca6dbd357961b8197175eba4846b9c5dd7c03ae9c42206b99918f5acac9bdedf3a6a1063
data/.github/workflows/ruby.yml ADDED
@@ -0,0 +1,35 @@
1
+ # This workflow uses actions that are not certified by GitHub.
2
+ # They are provided by a third-party and are governed by
3
+ # separate terms of service, privacy policy, and support
4
+ # documentation.
5
+ # This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
6
+ # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
7
+
8
+ name: Ruby
9
+
10
+ on:
11
+ push:
12
+ branches: [ master ]
13
+ pull_request:
14
+ branches: [ master ]
15
+
16
+ jobs:
17
+ test:
18
+
19
+ runs-on: ubuntu-latest
20
+ strategy:
21
+ matrix:
22
+ ruby-version: ['2.6', '2.7', '3.0']
23
+
24
+ steps:
25
+ - uses: actions/checkout@v2
26
+ - name: Set up Ruby
27
+ # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
28
+ # change this to (see https://github.com/ruby/setup-ruby#versioning):
29
+ # uses: ruby/setup-ruby@v1
30
+ uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
31
+ with:
32
+ ruby-version: ${{ matrix.ruby-version }}
33
+ bundler-cache: true # runs 'bundle install' and caches installed gems automatically
34
+ - name: Run tests
35
+ run: bundle exec rake
data/lib/susanin/resource.rb CHANGED
@@ -11,7 +11,8 @@ module Susanin
11
11
 
12
12
  def url_parameters(record_or_hash_or_array, options={})
13
13
  params = self.get(Array.wrap(record_or_hash_or_array)).flatten
14
- merged_options(params, options={})
14
+ opts, params = params.partition { |i| i.is_a?(Hash) }
15
+ merged_options(params, opts.inject(options) { |acc, i| acc.merge(i) })
15
16
  end
16
17
 
17
18
  #
@@ -189,7 +190,8 @@ module Susanin
189
190
  end
190
191
  end
191
192
 
192
- record
193
+ opts, r = record.partition { |i| i.is_a?(Hash) }
194
+ opts.any? ? [*r, opts.inject({}, :merge)] : r
193
195
  end
194
196
 
195
197
  #
data/lib/susanin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Susanin
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.4"
3
3
  end
data/susanin.gemspec CHANGED
@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ["lib"]
20
20
 
21
- spec.add_dependency "actionpack", ">= 5.0.0", "< 7.0"
21
+ spec.add_dependency "actionpack", ">= 5.0.0", "< 8.0"
22
22
 
23
- spec.add_development_dependency "bundler", "~> 2.1"
24
- spec.add_development_dependency "rake", "~> 13.0"
23
+ spec.add_development_dependency "bundler"
24
+ spec.add_development_dependency "rake"
25
25
  spec.add_development_dependency "pry"
26
- spec.add_development_dependency "minitest", "~> 5.1"
26
+ spec.add_development_dependency "minitest"
27
27
  spec.add_development_dependency "simplecov"
28
28
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: susanin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexey Osipenko
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-11-10 00:00:00.000000000 Z
11
+ date: 2021-12-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: 5.0.0
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: '7.0'
22
+ version: '8.0'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,35 +29,35 @@ dependencies:
29
29
  version: 5.0.0
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: '7.0'
32
+ version: '8.0'
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: bundler
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - "~>"
37
+ - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: '2.1'
39
+ version: '0'
40
40
  type: :development
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
- - - "~>"
44
+ - - ">="
45
45
  - !ruby/object:Gem::Version
46
- version: '2.1'
46
+ version: '0'
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - "~>"
51
+ - - ">="
52
52
  - !ruby/object:Gem::Version
53
- version: '13.0'
53
+ version: '0'
54
54
  type: :development
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
- - - "~>"
58
+ - - ">="
59
59
  - !ruby/object:Gem::Version
60
- version: '13.0'
60
+ version: '0'
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: pry
63
63
  requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
76
76
  name: minitest
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
- - - "~>"
79
+ - - ">="
80
80
  - !ruby/object:Gem::Version
81
- version: '5.1'
81
+ version: '0'
82
82
  type: :development
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - "~>"
86
+ - - ">="
87
87
  - !ruby/object:Gem::Version
88
- version: '5.1'
88
+ version: '0'
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: simplecov
91
91
  requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ executables:
111
111
  extensions: []
112
112
  extra_rdoc_files: []
113
113
  files:
114
- - ".cimon.yml"
114
+ - ".github/workflows/ruby.yml"
115
115
  - ".gitignore"
116
116
  - Gemfile
117
117
  - LICENSE.txt
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  requirements: []
147
- rubygems_version: 3.1.2
147
+ rubygems_version: 3.2.3
148
148
  signing_key:
149
149
  specification_version: 4
150
150
  summary: polymorphic_url extention to help with route generation
data/.cimon.yml DELETED
@@ -1,39 +0,0 @@
1
- services:
2
- ruby21:
3
- from: ruby:2.1.8
4
- cache:
5
- - /bundle
6
- build:
7
- - gem install bundler
8
- ruby22:
9
- from: ruby:2.2.4
10
- cache:
11
- - /bundle
12
- build:
13
- - gem install bundler
14
- ruby23:
15
- from: ruby:2.3.0
16
- cache:
17
- - /bundle
18
- build:
19
- - gem install bundler
20
-
21
- default: &default
22
- prepare:
23
- - bundle install --path /bundle
24
- folder: /app
25
- cmd: bin/rake
26
- env:
27
- - COVERAGE=true
28
-
29
- test21:
30
- <<: *default
31
- service: ruby21
32
-
33
- test22:
34
- <<: *default
35
- service: ruby22
36
-
37
- test23:
38
- <<: *default
39
- service: ruby23