maglove 1.1.5 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +68 -81
  3. data/lib/magloft/remote_resource.rb +2 -2
  4. data/lib/maglove/asset/theme.rb +0 -1
  5. data/lib/maglove/middleware/live_reload.rb +0 -4
  6. data/lib/maglove/version.rb +1 -1
  7. data/maglove.gemspec +5 -5
  8. metadata +8 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7209ca721b913ec0ef9b3751051a954f57aa853b
4
- data.tar.gz: fa30e9a309a9eb5ca85fe7916d07c650cfba103c
3
+ metadata.gz: 99b6cfb0ce69d3ae2470116d832fd31dd7395eac
4
+ data.tar.gz: 9f32e6987cadad523b1a8c16591f4dfe0242929f
5
5
  SHA512:
6
- metadata.gz: 9ae294e2a4d22cd831d671c2295ddd1aa4505477808c1d2686ef275bbae5b86bfa70ec5b20540ef8d0cea72d76c8181c2cffebd2400c42ee4002a8e68dffdc66
7
- data.tar.gz: 8106f04af268b07fd0acd26ca7a4ee612bccbda26fb043270f340e43d9f58d1457d0814463cd36f4551090b70046d6fb364d47c6186f52d1d10ca614d557b48e
6
+ metadata.gz: 076f66020a53ddf4b24e005bed6d5545388b89369ad84db3f27184d9df945b0d1731c1f52e28d092338903fd9af4374182b453e697c60ea35410295c144e8a86
7
+ data.tar.gz: 03e3502f0f745e8b0066cb48dc3aae56c294b6f05f948e331ad4f8ae64839ff85f20935c357dbe9285253ccdef5323af9f484a1163e6058440d29221731276f7
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- maglove (1.1.5)
5
- actionpack (>= 4.0, < 6.0)
6
- activesupport (>= 4.0, < 6.0)
4
+ maglove (2.0.0)
5
+ actionpack (>= 4.0)
6
+ activesupport (>= 4.0)
7
7
  bundler (~> 1.10)
8
8
  closure-compiler (~> 1.1)
9
9
  coffee-script (~> 2.4)
@@ -12,13 +12,13 @@ PATH
12
12
  dialers (~> 0.2)
13
13
  faye (~> 1.2)
14
14
  filewatcher (~> 0.5)
15
- haml (>= 4.0, < 6.0)
16
- hamloft (~> 0.2)
15
+ haml (~> 4.0)
16
+ hamloft (~> 0.2.4)
17
17
  image_optim (~> 0.21)
18
18
  image_optim_pack (~> 0.2)
19
19
  less (~> 2.6)
20
20
  logging (~> 2.0)
21
- maglove-widgets (~> 1.1)
21
+ maglove-widgets (~> 2.0)
22
22
  open_uri_redirections (~> 0.2)
23
23
  puma (~> 3.6)
24
24
  rubyzip (~> 1.1)
@@ -32,29 +32,29 @@ PATH
32
32
  GEM
33
33
  remote: https://rubygems.org/
34
34
  specs:
35
- actionpack (5.1.4)
36
- actionview (= 5.1.4)
37
- activesupport (= 5.1.4)
35
+ actionpack (5.0.2)
36
+ actionview (= 5.0.2)
37
+ activesupport (= 5.0.2)
38
38
  rack (~> 2.0)
39
- rack-test (>= 0.6.3)
39
+ rack-test (~> 0.6.3)
40
40
  rails-dom-testing (~> 2.0)
41
41
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
42
- actionview (5.1.4)
43
- activesupport (= 5.1.4)
42
+ actionview (5.0.2)
43
+ activesupport (= 5.0.2)
44
44
  builder (~> 3.1)
45
- erubi (~> 1.4)
45
+ erubis (~> 2.7.0)
46
46
  rails-dom-testing (~> 2.0)
47
47
  rails-html-sanitizer (~> 1.0, >= 1.0.3)
48
- activesupport (5.1.4)
48
+ activesupport (5.0.2)
49
49
  concurrent-ruby (~> 1.0, >= 1.0.2)
50
50
  i18n (~> 0.7)
51
51
  minitest (~> 5.1)
52
52
  tzinfo (~> 1.1)
53
- addressable (2.5.2)
54
- public_suffix (>= 2.0.2, < 4.0)
55
- ast (2.4.0)
53
+ addressable (2.5.1)
54
+ public_suffix (~> 2.0, >= 2.0.2)
55
+ ast (2.3.0)
56
56
  builder (3.2.3)
57
- closure-compiler (1.1.13)
57
+ closure-compiler (1.1.12)
58
58
  coffee-script (2.4.1)
59
59
  coffee-script-source
60
60
  execjs
@@ -62,7 +62,6 @@ GEM
62
62
  commonjs (0.2.7)
63
63
  concurrent-ruby (1.0.5)
64
64
  cookiejar (0.3.3)
65
- crass (1.0.3)
66
65
  crush (0.3.3)
67
66
  tilt (~> 1.3)
68
67
  cssminify (1.0.2)
@@ -76,19 +75,19 @@ GEM
76
75
  em-socksify (>= 0.3)
77
76
  eventmachine (>= 1.0.3)
78
77
  http_parser.rb (>= 0.6.0)
79
- em-socksify (0.3.2)
78
+ em-socksify (0.3.1)
80
79
  eventmachine (>= 1.0.0.beta.4)
81
- erubi (1.7.0)
82
- ethon (0.11.0)
80
+ erubis (2.7.0)
81
+ ethon (0.10.1)
83
82
  ffi (>= 1.3.0)
84
- eventmachine (1.2.5)
83
+ eventmachine (1.2.3)
85
84
  execjs (2.7.0)
86
- exifr (1.3.3)
87
- faraday (0.14.0)
85
+ exifr (1.2.5)
86
+ faraday (0.12.1)
88
87
  multipart-post (>= 1.2, < 3)
89
88
  faraday-conductivity (0.3.1)
90
89
  faraday (~> 0.8)
91
- faraday_middleware (0.12.2)
90
+ faraday_middleware (0.11.0.1)
92
91
  faraday (>= 0.7.4, < 1.0)
93
92
  faye (1.2.4)
94
93
  cookiejar (>= 0.3.0)
@@ -105,98 +104,86 @@ GEM
105
104
  filewatcher (0.5.4)
106
105
  trollop (~> 2.0)
107
106
  fspath (3.1.0)
108
- haml (5.0.4)
109
- temple (>= 0.8.0)
107
+ haml (4.0.7)
110
108
  tilt
111
- hamloft (0.2.7)
112
- haml (~> 5.0)
113
- nokogiri (~> 1.8)
109
+ hamloft (0.2.4)
110
+ haml (~> 4.0)
111
+ nokogiri (~> 1.6)
114
112
  http_parser.rb (0.6.0)
115
- i18n (0.9.3)
116
- concurrent-ruby (~> 1.0)
117
- image_optim (0.26.1)
113
+ i18n (0.8.1)
114
+ image_optim (0.24.2)
118
115
  exifr (~> 1.2, >= 1.2.2)
119
116
  fspath (~> 3.0)
120
117
  image_size (~> 1.5)
121
118
  in_threads (~> 1.3)
122
119
  progress (~> 3.0, >= 3.0.1)
123
- image_optim_pack (0.5.0.20180124)
120
+ image_optim_pack (0.3.1.20170318)
124
121
  fspath (>= 2.1, < 4)
125
122
  image_optim (~> 0.19)
126
123
  image_size (1.5.0)
127
- in_threads (1.5.0)
124
+ in_threads (1.4.0)
128
125
  less (2.6.0)
129
126
  commonjs (~> 0.2.7)
130
- libv8 (3.16.14.19)
127
+ libv8 (3.16.14.19-x86_64-darwin-16)
131
128
  little-plugger (1.1.4)
132
129
  logging (2.2.2)
133
130
  little-plugger (~> 1.1)
134
131
  multi_json (~> 1.10)
135
- loofah (2.1.1)
136
- crass (~> 1.0.2)
132
+ loofah (2.0.3)
137
133
  nokogiri (>= 1.5.9)
138
- maglove-widgets (1.1.9)
139
- bundler (~> 1.14)
140
- hamloft (~> 0.2)
141
- mini_portile2 (2.3.0)
142
- minitest (5.11.3)
143
- multi_json (1.13.1)
134
+ maglove-widgets (2.0.0)
135
+ bundler (~> 1.10)
136
+ haml (~> 4.0)
137
+ hamloft (~> 0.2.4)
138
+ mini_portile2 (2.1.0)
139
+ minitest (5.10.1)
140
+ multi_json (1.12.1)
144
141
  multipart-post (2.0.0)
145
- nokogiri (1.8.2)
146
- mini_portile2 (~> 2.3.0)
142
+ nokogiri (1.7.1)
143
+ mini_portile2 (~> 2.1.0)
147
144
  open_uri_redirections (0.2.1)
148
- parallel (1.12.1)
149
- parser (2.4.0.2)
150
- ast (~> 2.3)
145
+ parser (2.3.1.2)
146
+ ast (~> 2.2)
151
147
  powerpack (0.1.1)
152
- progress (3.4.0)
153
- public_suffix (3.0.1)
154
- puma (3.11.2)
155
- rack (2.0.4)
156
- rack-test (0.8.2)
157
- rack (>= 1.0, < 3)
158
- rails-dom-testing (2.0.3)
159
- activesupport (>= 4.2.0)
160
- nokogiri (>= 1.6)
148
+ progress (3.3.1)
149
+ public_suffix (2.0.5)
150
+ puma (3.8.2)
151
+ rack (2.0.1)
152
+ rack-test (0.6.3)
153
+ rack (>= 1.0)
154
+ rails-dom-testing (2.0.2)
155
+ activesupport (>= 4.2.0, < 6.0)
156
+ nokogiri (~> 1.6)
161
157
  rails-html-sanitizer (1.0.3)
162
158
  loofah (~> 2.0)
163
- rainbow (3.0.0)
164
- rb-fsevent (0.10.2)
165
- rb-inotify (0.9.10)
166
- ffi (>= 0.5.0, < 2)
159
+ rainbow (2.1.0)
167
160
  ref (2.0.0)
168
- rubocop (0.52.1)
169
- parallel (~> 1.10)
170
- parser (>= 2.4.0.2, < 3.0)
161
+ rubocop (0.42.0)
162
+ parser (>= 2.3.1.1, < 3.0)
171
163
  powerpack (~> 0.1)
172
- rainbow (>= 2.2.2, < 4.0)
164
+ rainbow (>= 1.99.1, < 3.0)
173
165
  ruby-progressbar (~> 1.7)
174
166
  unicode-display_width (~> 1.0, >= 1.0.1)
175
- ruby-progressbar (1.9.0)
167
+ ruby-progressbar (1.8.1)
176
168
  rubyzip (1.2.1)
177
- sass (3.5.5)
178
- sass-listen (~> 4.0.0)
169
+ sass (3.4.23)
179
170
  sass-css-importer (1.0.0.beta.0)
180
171
  sass (>= 3.1)
181
- sass-listen (4.0.0)
182
- rb-fsevent (~> 0.9, >= 0.9.4)
183
- rb-inotify (~> 0.9, >= 0.9.7)
184
- temple (0.8.0)
185
172
  therubyracer (0.12.3)
186
173
  libv8 (~> 3.16.14.15)
187
174
  ref
188
- thor (0.20.0)
175
+ thor (0.19.4)
189
176
  thread_safe (0.3.6)
190
177
  tilt (1.4.1)
191
178
  trollop (2.1.2)
192
- typhoeus (1.3.0)
179
+ typhoeus (1.1.2)
193
180
  ethon (>= 0.9.0)
194
- tzinfo (1.2.5)
181
+ tzinfo (1.2.3)
195
182
  thread_safe (~> 0.1)
196
- unicode-display_width (1.3.0)
197
- websocket-driver (0.7.0)
183
+ unicode-display_width (1.1.0)
184
+ websocket-driver (0.6.5)
198
185
  websocket-extensions (>= 0.1.0)
199
- websocket-extensions (0.1.3)
186
+ websocket-extensions (0.1.2)
200
187
 
201
188
  PLATFORMS
202
189
  ruby
@@ -206,4 +193,4 @@ DEPENDENCIES
206
193
  rubocop (~> 0.32)
207
194
 
208
195
  BUNDLED WITH
209
- 1.16.1
196
+ 1.14.6
data/lib/magloft/remote_resource.rb CHANGED
@@ -5,7 +5,7 @@ module MagLoft
5
5
 
6
6
  def initialize(attributes = {})
7
7
  allowed_attributes = attributes.slice(*self.class.remote_attributes)
8
- Dialers::AssignAttributes.call(self, allowed_attributes.except(:id))
8
+ Dialers::AssignAttributes.call(self, allowed_attributes.without(:id))
9
9
  end
10
10
 
11
11
  def changed?
@@ -22,7 +22,7 @@ module MagLoft
22
22
  if self.id.nil?
23
23
  transformable = Api.client.api_caller.post(self.class.endpoint, self.changed_data)
24
24
  else
25
- transformable = Api.client.api_caller.put("#{self.class.endpoint}/#{self.id}", self.changed_data.except(:id))
25
+ transformable = Api.client.api_caller.put("#{self.class.endpoint}/#{self.id}", self.changed_data.without(:id))
26
26
  end
27
27
  transformable.transform_to_existing(self)
28
28
  self.clear_changed_data!
data/lib/maglove/asset/theme.rb CHANGED
@@ -20,7 +20,6 @@ module MagLove
20
20
  "less" => "css",
21
21
  "scss" => "css",
22
22
  "coffee" => "js",
23
- "js" => "js",
24
23
  "yml" => "json"
25
24
  }
26
25
 
data/lib/maglove/middleware/live_reload.rb CHANGED
@@ -63,8 +63,6 @@ module MagLove
63
63
  if workspace_file(".", filename).exists? and event != :delete
64
64
  if filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.coffee}
65
65
  path = "theme.coffee"
66
- elsif filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.js}
67
- path = "theme.coffee"
68
66
  elsif filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.less}
69
67
  path = "theme.less"
70
68
  elsif filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.scss}
@@ -75,8 +73,6 @@ module MagLove
75
73
  path = "theme.scss"
76
74
  elsif filename =~ %r{^src/themes/#{@theme}/.*\.coffee}
77
75
  path = "theme.coffee"
78
- elsif filename =~ %r{^src/themes/#{@theme}/.*\.js}
79
- path = "theme.coffee"
80
76
  else
81
77
  path = filename.gsub("src/themes/#{@theme}/", '')
82
78
  end
data/lib/maglove/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MagLove
2
- VERSION = "1.1.5"
2
+ VERSION = "2.0.0"
3
3
  end
data/maglove.gemspec CHANGED
@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
14
14
  s.description = "This gem contains development and built tools for creating MagLoft themes."
15
15
  s.required_rubygems_version = '>= 2.4.7'
16
16
  s.add_runtime_dependency "bundler", "~> 1.10"
17
- s.add_runtime_dependency 'haml', ">= 4.0", "< 6.0"
17
+ s.add_runtime_dependency 'haml', "~> 4.0"
18
18
  s.add_runtime_dependency "thor", "~> 0.19"
19
- s.add_runtime_dependency 'hamloft', "~> 0.2"
20
- s.add_runtime_dependency "activesupport", ">= 4.0", "< 6.0"
21
- s.add_runtime_dependency "actionpack", ">= 4.0", "< 6.0"
22
- s.add_runtime_dependency "maglove-widgets", "~> 1.1"
19
+ s.add_runtime_dependency 'hamloft', "~> 0.2.4"
20
+ s.add_runtime_dependency "activesupport", ">= 4.0"
21
+ s.add_runtime_dependency "actionpack", ">= 4.0"
22
+ s.add_runtime_dependency "maglove-widgets", "~> 2.0"
23
23
  s.add_runtime_dependency "open_uri_redirections", "~> 0.2"
24
24
  s.add_runtime_dependency "logging", "~> 2.0"
25
25
  s.add_runtime_dependency "tilt", "~> 1.4"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: maglove
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tobias Strebitzer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-02-06 00:00:00.000000000 Z
11
+ date: 2017-04-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -28,22 +28,16 @@ dependencies:
28
28
  name: haml
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '4.0'
34
- - - "<"
35
- - !ruby/object:Gem::Version
36
- version: '6.0'
37
34
  type: :runtime
38
35
  prerelease: false
39
36
  version_requirements: !ruby/object:Gem::Requirement
40
37
  requirements:
41
- - - ">="
38
+ - - "~>"
42
39
  - !ruby/object:Gem::Version
43
40
  version: '4.0'
44
- - - "<"
45
- - !ruby/object:Gem::Version
46
- version: '6.0'
47
41
  - !ruby/object:Gem::Dependency
48
42
  name: thor
49
43
  requirement: !ruby/object:Gem::Requirement
@@ -64,14 +58,14 @@ dependencies:
64
58
  requirements:
65
59
  - - "~>"
66
60
  - !ruby/object:Gem::Version
67
- version: '0.2'
61
+ version: 0.2.4
68
62
  type: :runtime
69
63
  prerelease: false
70
64
  version_requirements: !ruby/object:Gem::Requirement
71
65
  requirements:
72
66
  - - "~>"
73
67
  - !ruby/object:Gem::Version
74
- version: '0.2'
68
+ version: 0.2.4
75
69
  - !ruby/object:Gem::Dependency
76
70
  name: activesupport
77
71
  requirement: !ruby/object:Gem::Requirement
@@ -79,9 +73,6 @@ dependencies:
79
73
  - - ">="
80
74
  - !ruby/object:Gem::Version
81
75
  version: '4.0'
82
- - - "<"
83
- - !ruby/object:Gem::Version
84
- version: '6.0'
85
76
  type: :runtime
86
77
  prerelease: false
87
78
  version_requirements: !ruby/object:Gem::Requirement
@@ -89,9 +80,6 @@ dependencies:
89
80
  - - ">="
90
81
  - !ruby/object:Gem::Version
91
82
  version: '4.0'
92
- - - "<"
93
- - !ruby/object:Gem::Version
94
- version: '6.0'
95
83
  - !ruby/object:Gem::Dependency
96
84
  name: actionpack
97
85
  requirement: !ruby/object:Gem::Requirement
@@ -99,9 +87,6 @@ dependencies:
99
87
  - - ">="
100
88
  - !ruby/object:Gem::Version
101
89
  version: '4.0'
102
- - - "<"
103
- - !ruby/object:Gem::Version
104
- version: '6.0'
105
90
  type: :runtime
106
91
  prerelease: false
107
92
  version_requirements: !ruby/object:Gem::Requirement
@@ -109,23 +94,20 @@ dependencies:
109
94
  - - ">="
110
95
  - !ruby/object:Gem::Version
111
96
  version: '4.0'
112
- - - "<"
113
- - !ruby/object:Gem::Version
114
- version: '6.0'
115
97
  - !ruby/object:Gem::Dependency
116
98
  name: maglove-widgets
117
99
  requirement: !ruby/object:Gem::Requirement
118
100
  requirements:
119
101
  - - "~>"
120
102
  - !ruby/object:Gem::Version
121
- version: '1.1'
103
+ version: '2.0'
122
104
  type: :runtime
123
105
  prerelease: false
124
106
  version_requirements: !ruby/object:Gem::Requirement
125
107
  requirements:
126
108
  - - "~>"
127
109
  - !ruby/object:Gem::Version
128
- version: '1.1'
110
+ version: '2.0'
129
111
  - !ruby/object:Gem::Dependency
130
112
  name: open_uri_redirections
131
113
  requirement: !ruby/object:Gem::Requirement