aaf-lipstick 2.1.0 → 3.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 78339380470c5a1fe853df1126f9543149a06026
4
- data.tar.gz: 47ef5e9ee5e0f4f844b399de936fda41029070e6
3
+ metadata.gz: 93e1198bdc898a7e82d6f144f47d501f8eb9eb33
4
+ data.tar.gz: 5fc825d84d6047fcf8e974eaac6cc8c3a860b780
5
5
  SHA512:
6
- metadata.gz: 4a44f22a9fa04952f9f774b706fbdcda003b910cf54c4a375150557548c57022fd8e0bfcf40880c0299bcd7ab51e298ed7c4ec48965c56df70c146229662776d
7
- data.tar.gz: 7446fede20b046f4859cbc2eb67a2b5de839534d951bde0f315d16df479a1e8074660e207c02df2ecd4676506fecdad1f3c1093f59aa84fda21536cb6c088541
6
+ metadata.gz: 2c7ed8998b9808a710d860f2fce5a480ccc388c40cec99afd5b426752834af7f00da476c2f38bf557d1a3e68de176910591a66e400ea85a25f20046a3ca32f19
7
+ data.tar.gz: f086c71a83158f0b9f468c59c33e13909b6ed2039abfd17dcf12d01d0e5623390eea63d60a889f8bf397cb900d0eb1695811f0eaa7306e2f391ed4ea9dbb6267
@@ -10,7 +10,7 @@ require 'lipstick/errors/static_errors'
10
10
  require 'lipstick/helpers'
11
11
  require 'lipstick/email_message'
12
12
  require 'lipstick/images'
13
- require 'lipstick/filterable' if defined?(Arel)
14
- require 'lipstick/auto_validation' if defined?(ActiveModel)
15
- require 'lipstick/engine' if defined?(Rails::Engine)
13
+ require 'lipstick/filterable'
14
+ require 'lipstick/auto_validation'
15
+ require 'lipstick/engine'
16
16
  require 'lipstick/version'
@@ -39,7 +39,7 @@ module Lipstick
39
39
  CollatedArelAttribute.new(arel_table[f], 'utf8_unicode_ci')
40
40
  .matches(term)
41
41
  end
42
- scope.where(conds.reduce { |a, e| a.or(e) })
42
+ scope.where(conds.reduce { |acc, elem| acc.or(elem) })
43
43
  end
44
44
  end
45
45
 
@@ -7,7 +7,6 @@ end
7
7
  require 'lipstick/helpers/layout_helper'
8
8
  require 'lipstick/helpers/nav_helper'
9
9
  require 'lipstick/helpers/form_validation_builder'
10
- require 'lipstick/helpers/bootstrap_form_builder' if defined?(ActionView)
11
- require 'lipstick/helpers/form_helper' if defined?(ActionView)
10
+ require 'lipstick/helpers/bootstrap_form_builder'
11
+ require 'lipstick/helpers/form_helper'
12
12
  require 'lipstick/helpers/pagination_link_renderer'
13
- require 'lipstick/helpers/compatibility_hacks'
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Lipstick
3
- VERSION = '2.1.0'
3
+ VERSION = '3.0.0'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aaf-lipstick
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shaun Mangelsdorf
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-13 00:00:00.000000000 Z
11
+ date: 2016-11-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: erubis
@@ -95,33 +95,25 @@ dependencies:
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
- name: actionpack
98
+ name: rails
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
102
- - !ruby/object:Gem::Version
103
- version: '0'
104
- type: :runtime
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - ">="
101
+ - - ">"
109
102
  - !ruby/object:Gem::Version
110
- version: '0'
111
- - !ruby/object:Gem::Dependency
112
- name: activerecord
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - ">="
103
+ version: '4.0'
104
+ - - "<"
116
105
  - !ruby/object:Gem::Version
117
- version: '0'
106
+ version: '6.0'
118
107
  type: :runtime
119
108
  prerelease: false
120
109
  version_requirements: !ruby/object:Gem::Requirement
121
110
  requirements:
122
- - - ">="
111
+ - - ">"
123
112
  - !ruby/object:Gem::Version
124
- version: '0'
113
+ version: '4.0'
114
+ - - "<"
115
+ - !ruby/object:Gem::Version
116
+ version: '6.0'
125
117
  - !ruby/object:Gem::Dependency
126
118
  name: nokogiri
127
119
  requirement: !ruby/object:Gem::Requirement
@@ -150,20 +142,6 @@ dependencies:
150
142
  - - ">="
151
143
  - !ruby/object:Gem::Version
152
144
  version: '0'
153
- - !ruby/object:Gem::Dependency
154
- name: rails
155
- requirement: !ruby/object:Gem::Requirement
156
- requirements:
157
- - - ">="
158
- - !ruby/object:Gem::Version
159
- version: '0'
160
- type: :development
161
- prerelease: false
162
- version_requirements: !ruby/object:Gem::Requirement
163
- requirements:
164
- - - ">="
165
- - !ruby/object:Gem::Version
166
- version: '0'
167
145
  - !ruby/object:Gem::Dependency
168
146
  name: sqlite3
169
147
  requirement: !ruby/object:Gem::Requirement
@@ -313,6 +291,7 @@ extra_rdoc_files: []
313
291
  files:
314
292
  - Rakefile
315
293
  - app/assets/images/aaf-icon.png
294
+ - app/assets/images/favicon.ico
316
295
  - app/assets/images/favicon.png
317
296
  - app/assets/images/logo.png
318
297
  - app/assets/javascripts/aaf-lipstick.js
@@ -337,7 +316,6 @@ files:
337
316
  - lib/lipstick/filterable.rb
338
317
  - lib/lipstick/helpers.rb
339
318
  - lib/lipstick/helpers/bootstrap_form_builder.rb
340
- - lib/lipstick/helpers/compatibility_hacks.rb
341
319
  - lib/lipstick/helpers/form_helper.rb
342
320
  - lib/lipstick/helpers/form_validation_builder.rb
343
321
  - lib/lipstick/helpers/layout_helper.rb
@@ -346,7 +324,6 @@ files:
346
324
  - lib/lipstick/images.rb
347
325
  - lib/lipstick/images/email_banner.rb
348
326
  - lib/lipstick/images/processor.rb
349
- - lib/lipstick/sprockets_asset_data_url_helper.rb
350
327
  - lib/lipstick/version.rb
351
328
  homepage: https://github.com/ausaccessfed/aaf-lipstick
352
329
  licenses:
@@ -368,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
368
345
  version: '0'
369
346
  requirements: []
370
347
  rubyforge_project:
371
- rubygems_version: 2.5.1
348
+ rubygems_version: 2.6.6
372
349
  signing_key:
373
350
  specification_version: 4
374
351
  summary: A gem for applying AAF branding to our services
@@ -1,39 +0,0 @@
1
- # frozen_string_literal: true
2
- module Lipstick
3
- module Helpers
4
- module CompatibilityHacks
5
- def concat(content)
6
- @_out_buf << content
7
- end
8
-
9
- def content_tag(name, content_or_opts = nil, opts = nil, &block)
10
- opts = content_or_opts if block_given?
11
- content = block_given? ? capture(&block) : content_or_opts
12
- "<#{name}#{html_attrs(opts)}>#{content}</#{name}>"
13
- end
14
-
15
- def tag(name, opts = nil)
16
- "<#{name}#{html_attrs(opts)}/>"
17
- end
18
-
19
- def capture
20
- old = @_out_buf
21
- @_out_buf = io = StringIO.new
22
- result = yield
23
- io_length = io.length
24
- io_length.positive? ? io.string : result
25
- ensure
26
- @_out_buf = old
27
- end
28
-
29
- private
30
-
31
- def html_attrs(opts)
32
- return '' if opts.nil?
33
- opts.reduce('') do |a, (k, v)|
34
- %(#{a} #{k}="#{v}")
35
- end
36
- end
37
- end
38
- end
39
- end
@@ -1,14 +0,0 @@
1
- # frozen_string_literal: true
2
- require 'sass'
3
-
4
- module Lipstick
5
- module SprocketsAssetDataURL
6
- def asset_data_url(path)
7
- ::Sass::Script::String.new(
8
- "url(#{sprockets_context.asset_data_uri(path.value)})"
9
- )
10
- end
11
- end
12
-
13
- ::Sass::Script::Functions.send(:include, SprocketsAssetDataURL)
14
- end