usbunfreeze_web 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +0 -1
  3. data/config.ru +8 -1
  4. data/lib/usbunfreeze_web/{app/css/app.css → assets/stylesheets/application.css} +2 -0
  5. data/lib/usbunfreeze_web/server.rb +17 -9
  6. data/lib/usbunfreeze_web/version.rb +1 -1
  7. data/lib/usbunfreeze_web/views/usbunfreeze.haml +2 -2
  8. data/usbunfreeze_web.gemspec +10 -9
  9. metadata +37 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e4648f83abe472230027d040a8b5325d6d481d7a
4
- data.tar.gz: 80aa21b07d08e2f2b84df040056c15c31d8e154d
3
+ metadata.gz: c5fa88099401750df469e0103a99ce2a9856249d
4
+ data.tar.gz: 899df51533375ec9b9b28f649fac859416f94d07
5
5
  SHA512:
6
- metadata.gz: 43d68e9374191a5c321b7c7b62f04724fd87d781f0197b123e45f97120476e16c73bbeb489d1856defe3aaf4968af8a083662081316d39755bdc2615882a61a4
7
- data.tar.gz: 143205e36f641da6a553a50a1ee3ece3ce59bb584682f4af2408e394224780bfbecb88697bac9801319d61dc6fe7b6a9c17b59dcc2da5e4b28c34d5556d4fa12
6
+ metadata.gz: bc5eac9b404e881b86855cc54d45f9c9ed7a2063d53c369f0d697f3e4762fb448759e45448ffffb2f7c88e202052bfee106012f40ba9c2ebe07cfcc071330d91
7
+ data.tar.gz: 3430a8b6b7f07b198b8a6d6616870e69581a84a439831b92c8230501b390cadeef5885f50b4e72a5174ab9c51ff9137f1fe217b731a6c60592bf9ee21032189c
data/Rakefile CHANGED
@@ -1,2 +1 @@
1
1
  require "bundler/gem_tasks"
2
-
data/config.ru CHANGED
@@ -1,2 +1,9 @@
1
1
  require 'usbunfreeze_web'
2
- run UsbunfreezeWeb::App
2
+
3
+ map UsbunfreezeWeb::App.assets_prefix do
4
+ run UsbunfreezeWeb::App.sprockets
5
+ end
6
+
7
+ map '/' do
8
+ run UsbunfreezeWeb::App
9
+ end
data/lib/usbunfreeze_web/{app/css/app.css → assets/stylesheets/application.css} RENAMED
@@ -27,6 +27,7 @@ body {
27
27
  font-size:120%;
28
28
  outline:0;
29
29
  }
30
+
30
31
  .button:hover {
31
32
  background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #bc3315), color-stop(1, #d0451b));
32
33
  background:-moz-linear-gradient(top, #bc3315 5%, #d0451b 100%);
@@ -36,6 +37,7 @@ body {
36
37
  background:linear-gradient(to bottom, #bc3315 5%, #d0451b 100%);
37
38
  background-color:#bc3315;
38
39
  }
40
+
39
41
  .button:active {
40
42
  position:relative;
41
43
  top:1px;
data/lib/usbunfreeze_web/server.rb CHANGED
@@ -1,7 +1,8 @@
1
1
  # encoding: utf-8
2
2
 
3
- require 'sinatra'
4
- require 'sinatra/assetpack'
3
+ require 'sinatra/base'
4
+ require 'sprockets'
5
+ require 'sprockets-helpers'
5
6
  require 'sinatra/flash'
6
7
  require 'uri'
7
8
  require 'settingslogic'
@@ -14,14 +15,22 @@ module UsbunfreezeWeb
14
15
 
15
16
  class App < Sinatra::Application
16
17
 
17
- register Sinatra::AssetPack
18
- assets do
19
- css :application, [
20
- '/usbunfreeze-assets/css/app.css'
21
- ]
22
- serve '/usbunfreeze-assets', from: 'app'
18
+ set :sprockets, Sprockets::Environment.new(root)
19
+ set :assets_prefix, '/usbunfreeze-assets'
20
+
21
+ configure do
22
+ Sprockets::Helpers.configure do |config|
23
+ config.environment = sprockets
24
+ config.prefix = assets_prefix
25
+ config.digest = true
26
+ end
27
+ sprockets.append_path 'assets/stylesheets'
28
+ sprockets.append_path 'assets/javascripts'
29
+ sprockets.css_compressor = :scss
23
30
  end
24
31
 
32
+ helpers Sprockets::Helpers
33
+
25
34
  enable :sessions
26
35
  set :session_secret, Settings.session_secret
27
36
 
@@ -33,7 +42,6 @@ module UsbunfreezeWeb
33
42
 
34
43
  # GET - an index page
35
44
  get '/usbunfreeze' do
36
-
37
45
  haml :usbunfreeze
38
46
  end
39
47
 
data/lib/usbunfreeze_web/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module UsbunfreezeWeb
2
- VERSION = "0.2.2"
2
+ VERSION = "0.2.3"
3
3
  end
data/lib/usbunfreeze_web/views/usbunfreeze.haml CHANGED
@@ -2,7 +2,7 @@
2
2
  %html
3
3
  %head
4
4
  %title USB Unfreeze
5
- = css :application
5
+ =stylesheet_tag 'application'
6
6
  %meta{ :charset => "utf-8" }
7
7
  %body
8
8
  #container
@@ -19,4 +19,4 @@
19
19
  %button.button{:type => 'submit'}Unfreeze
20
20
 
21
21
  %p
22
- =styled_flash
22
+ =styled_flash
data/usbunfreeze_web.gemspec CHANGED
@@ -18,14 +18,15 @@ 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_development_dependency "bundler", "~> 1.7"
22
- spec.add_development_dependency "rake", "~> 10.0"
23
- spec.add_runtime_dependency "sinatra", "~> 1.4.5"
24
- spec.add_runtime_dependency "sinatra-assetpack", "~> 0.3.3"
25
- spec.add_runtime_dependency "haml", "~> 4.0.0"
26
- spec.add_runtime_dependency "settingslogic", "~> 2.0.0"
27
- spec.add_runtime_dependency "thin", "~> 1.6.0"
28
- spec.add_runtime_dependency "sinatra-flash", "~> 0.3.0"
21
+ spec.add_development_dependency "bundler", "~> 1"
22
+ spec.add_development_dependency "rake", "~> 10"
23
+ spec.add_runtime_dependency "sinatra", "~> 1.4"
24
+ spec.add_runtime_dependency "sprockets-helpers", "~> 1.2"
25
+ spec.add_runtime_dependency "sass", "~> 3.4"
26
+ spec.add_runtime_dependency "haml", "~> 4.0"
27
+ spec.add_runtime_dependency "settingslogic", "~> 2.0"
28
+ spec.add_runtime_dependency "thin", "~> 1.6"
29
+ spec.add_runtime_dependency "sinatra-flash", "~> 0.3"
29
30
  spec.add_runtime_dependency "aws-sdk", "~> 2"
30
- spec.add_runtime_dependency "tilt", "~> 1.4"
31
+ spec.add_runtime_dependency "tilt", "~> 2.0"
31
32
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: usbunfreeze_web
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - theirix
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-01 00:00:00.000000000 Z
11
+ date: 2016-01-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -16,112 +16,126 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.7'
19
+ version: '1'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.7'
26
+ version: '1'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '10.0'
33
+ version: '10'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '10.0'
40
+ version: '10'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: sinatra
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.4.5
47
+ version: '1.4'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.4.5
54
+ version: '1.4'
55
55
  - !ruby/object:Gem::Dependency
56
- name: sinatra-assetpack
56
+ name: sprockets-helpers
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.3.3
61
+ version: '1.2'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.3.3
68
+ version: '1.2'
69
+ - !ruby/object:Gem::Dependency
70
+ name: sass
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: '3.4'
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: '3.4'
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: haml
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
87
  - - "~>"
74
88
  - !ruby/object:Gem::Version
75
- version: 4.0.0
89
+ version: '4.0'
76
90
  type: :runtime
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
94
  - - "~>"
81
95
  - !ruby/object:Gem::Version
82
- version: 4.0.0
96
+ version: '4.0'
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: settingslogic
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - "~>"
88
102
  - !ruby/object:Gem::Version
89
- version: 2.0.0
103
+ version: '2.0'
90
104
  type: :runtime
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - "~>"
95
109
  - !ruby/object:Gem::Version
96
- version: 2.0.0
110
+ version: '2.0'
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: thin
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - "~>"
102
116
  - !ruby/object:Gem::Version
103
- version: 1.6.0
117
+ version: '1.6'
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - "~>"
109
123
  - !ruby/object:Gem::Version
110
- version: 1.6.0
124
+ version: '1.6'
111
125
  - !ruby/object:Gem::Dependency
112
126
  name: sinatra-flash
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - "~>"
116
130
  - !ruby/object:Gem::Version
117
- version: 0.3.0
131
+ version: '0.3'
118
132
  type: :runtime
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - "~>"
123
137
  - !ruby/object:Gem::Version
124
- version: 0.3.0
138
+ version: '0.3'
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: aws-sdk
127
141
  requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
142
156
  requirements:
143
157
  - - "~>"
144
158
  - !ruby/object:Gem::Version
145
- version: '1.4'
159
+ version: '2.0'
146
160
  type: :runtime
147
161
  prerelease: false
148
162
  version_requirements: !ruby/object:Gem::Requirement
149
163
  requirements:
150
164
  - - "~>"
151
165
  - !ruby/object:Gem::Version
152
- version: '1.4'
166
+ version: '2.0'
153
167
  description: Web application for Usbunfreeze kit
154
168
  email:
155
169
  - theirix@gmail.com
@@ -167,7 +181,7 @@ files:
167
181
  - config.ru
168
182
  - config/usbunfreeze_web.yaml.example
169
183
  - lib/usbunfreeze_web.rb
170
- - lib/usbunfreeze_web/app/css/app.css
184
+ - lib/usbunfreeze_web/assets/stylesheets/application.css
171
185
  - lib/usbunfreeze_web/server.rb
172
186
  - lib/usbunfreeze_web/settings.rb
173
187
  - lib/usbunfreeze_web/version.rb
@@ -193,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
193
207
  version: '0'
194
208
  requirements: []
195
209
  rubyforge_project:
196
- rubygems_version: 2.4.5
210
+ rubygems_version: 2.5.1
197
211
  signing_key:
198
212
  specification_version: 4
199
213
  summary: Usubunfreeze web server