tbone 0.4.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -6
  3. data/Gemfile.lock +86 -124
  4. data/VERSION +1 -1
  5. data/lib/tbone/engine.rb +19 -17
  6. data/tbone.gemspec +7 -13
  7. metadata +4 -32
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5e67d35c442a40347e70411b3850f34815a2e56e
4
- data.tar.gz: d1b9971a426d7ca625443da4dfaee8ed51af73d6
3
+ metadata.gz: 173a7f71e396b60fab7ec8247bd407bb45e2e1fd
4
+ data.tar.gz: 18d00d8e472e1f01658b301a0b537112c03e7b3c
5
5
  SHA512:
6
- metadata.gz: 1eb6c4a471e7ffc15e1203caeeb03db74f0f5f4864ffd2ffbed992d27b16c889ca14384312b812e8da49b2f6821afeb6f13bd8b3ebe7a8c1f6fd7f6c69cfe7cd
7
- data.tar.gz: c8009b88c57cf7e9743e442afc0df09541a7cd0486451452dc59ff9a900cc3f7ececcd3c0b0a0df170b1f96d793e12936588197c0561138a09155c8b736c7aab
6
+ metadata.gz: 0d86e28df5aefaab7f5546e3ab0e38fe084526422d59d9ce0739ce4b3a66989b5d65d667e6235bfd76316651c8d9a179c6152dc768f605003fa2abe5c24b6ad6
7
+ data.tar.gz: 24ae270daa50fe35f935eadc1f04f7ab09046ba1ba42a972655b360e50d6c2ab4154226b31ae3e4e2205456d107e82e112fd55b8903fe62ebb93b5a834ed562a
data/Gemfile CHANGED
@@ -11,21 +11,16 @@ group :development do
11
11
  gem "jeweler"
12
12
  end
13
13
  group :assets do
14
- gem 'sass-rails'
15
14
  gem 'coffee-rails'
16
- gem 'twitter-bootstrap-rails'
17
15
  gem 'uglifier'
18
16
  gem 'therubyracer'
19
- gem 'less-rails'
20
17
  gem 'haml_coffee_assets'
21
18
  end
22
- gem 'i18n-js'
19
+ gem 'deep_merge', require: 'deep_merge/rails_compat'
23
20
  gem 'kaminari'
24
21
  gem 'haml-rails'
25
22
  gem 'coffee-filter'
26
23
  gem 'rabl'
27
- gem 'jquery-rails'
28
24
  gem 'yajl-ruby'
29
- gem 'rails-backbone'
30
25
  gem 'requirejs-rails'
31
26
  gem 'rake'
data/Gemfile.lock CHANGED
@@ -1,56 +1,46 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- actionmailer (3.2.21)
5
- actionpack (= 3.2.21)
6
- mail (~> 2.5.4)
7
- actionpack (3.2.21)
8
- activemodel (= 3.2.21)
9
- activesupport (= 3.2.21)
10
- builder (~> 3.0.0)
4
+ actionpack (4.2.1)
5
+ actionview (= 4.2.1)
6
+ activesupport (= 4.2.1)
7
+ rack (~> 1.6)
8
+ rack-test (~> 0.6.2)
9
+ rails-dom-testing (~> 1.0, >= 1.0.5)
10
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
11
+ actionview (4.2.1)
12
+ activesupport (= 4.2.1)
13
+ builder (~> 3.1)
11
14
  erubis (~> 2.7.0)
12
- journey (~> 1.0.4)
13
- rack (~> 1.4.5)
14
- rack-cache (~> 1.2)
15
- rack-test (~> 0.6.1)
16
- sprockets (~> 2.2.1)
17
- activemodel (3.2.21)
18
- activesupport (= 3.2.21)
19
- builder (~> 3.0.0)
20
- activerecord (3.2.21)
21
- activemodel (= 3.2.21)
22
- activesupport (= 3.2.21)
23
- arel (~> 3.0.2)
24
- tzinfo (~> 0.3.29)
25
- activeresource (3.2.21)
26
- activemodel (= 3.2.21)
27
- activesupport (= 3.2.21)
28
- activesupport (3.2.21)
29
- i18n (~> 0.6, >= 0.6.4)
30
- multi_json (~> 1.0)
31
- addressable (2.3.6)
32
- arel (3.0.3)
33
- builder (3.0.4)
34
- coffee-filter (0.1.2)
15
+ rails-dom-testing (~> 1.0, >= 1.0.5)
16
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
17
+ activesupport (4.2.1)
18
+ i18n (~> 0.7)
19
+ json (~> 1.7, >= 1.7.7)
20
+ minitest (~> 5.1)
21
+ thread_safe (~> 0.3, >= 0.3.4)
22
+ tzinfo (~> 1.1)
23
+ addressable (2.3.8)
24
+ builder (3.2.2)
25
+ coffee-filter (0.1.3)
35
26
  coffee-script (>= 2.2.0)
36
- haml (>= 3.0.18)
37
- coffee-rails (3.2.2)
27
+ haml (< 4.0)
28
+ coffee-rails (4.1.0)
38
29
  coffee-script (>= 2.2.0)
39
- railties (~> 3.2.0)
40
- coffee-script (2.3.0)
30
+ railties (>= 4.0.0, < 5.0)
31
+ coffee-script (2.4.1)
41
32
  coffee-script-source
42
33
  execjs
43
- coffee-script-source (1.8.0)
44
- commonjs (0.2.7)
34
+ coffee-script-source (1.9.1.1)
35
+ deep_merge (1.0.1)
45
36
  descendants_tracker (0.0.4)
46
37
  thread_safe (~> 0.3, >= 0.3.1)
47
- ejs (1.0.0)
48
38
  erubis (2.7.0)
49
- execjs (2.2.2)
50
- faraday (0.9.0)
39
+ execjs (2.5.2)
40
+ faraday (0.9.1)
51
41
  multipart-post (>= 1.2, < 3)
52
- git (1.2.8)
53
- github_api (0.12.2)
42
+ git (1.2.9.1)
43
+ github_api (0.12.3)
54
44
  addressable (~> 2.3)
55
45
  descendants_tracker (~> 0.0.4)
56
46
  faraday (~> 0.8, < 0.10)
@@ -58,23 +48,28 @@ GEM
58
48
  multi_json (>= 1.7.5, < 2.0)
59
49
  nokogiri (~> 1.6.3)
60
50
  oauth2
61
- haml (4.0.6)
51
+ haml (4.0.0.rc.1)
62
52
  tilt
63
- haml-rails (0.4)
64
- actionpack (>= 3.1, < 4.1)
65
- activesupport (>= 3.1, < 4.1)
66
- haml (>= 3.1, < 4.1)
67
- railties (>= 3.1, < 4.1)
53
+ haml-rails (0.8.2)
54
+ actionpack (>= 4.0.1)
55
+ activesupport (>= 4.0.1)
56
+ haml (>= 3.1, < 5.0)
57
+ html2haml (>= 1.0.1)
58
+ railties (>= 4.0.1)
68
59
  haml_coffee_assets (1.16.0)
69
60
  coffee-script (~> 2.0)
70
61
  sprockets (~> 2.0)
71
62
  tilt (~> 1.1)
72
- hashie (3.3.2)
73
- highline (1.6.21)
63
+ hashie (3.4.2)
64
+ highline (1.7.2)
74
65
  hike (1.2.3)
75
- i18n (0.6.11)
76
- i18n-js (2.1.2)
77
- i18n
66
+ hpricot (0.8.6)
67
+ html2haml (1.0.1)
68
+ erubis (~> 2.7.0)
69
+ haml (>= 4.0.0.rc.1)
70
+ hpricot (~> 0.8.6)
71
+ ruby_parser (~> 3.1.1)
72
+ i18n (0.7.0)
78
73
  jeweler (2.0.1)
79
74
  builder
80
75
  bundler (>= 1.0)
@@ -84,30 +79,20 @@ GEM
84
79
  nokogiri (>= 1.5.10)
85
80
  rake
86
81
  rdoc
87
- journey (1.0.4)
88
- jquery-rails (3.1.2)
89
- railties (>= 3.0, < 5.0)
90
- thor (>= 0.14, < 2.0)
91
- json (1.8.1)
92
- jwt (1.2.0)
93
- kaminari (0.16.1)
82
+ json (1.8.3)
83
+ jwt (1.5.0)
84
+ kaminari (0.16.3)
94
85
  actionpack (>= 3.0.0)
95
86
  activesupport (>= 3.0.0)
96
- less (2.6.0)
97
- commonjs (~> 0.2.7)
98
- less-rails (2.6.0)
99
- actionpack (>= 3.1)
100
- less (~> 2.6.0)
101
87
  libv8 (3.16.14.7)
102
- mail (2.5.4)
103
- mime-types (~> 1.16)
104
- treetop (~> 1.4.8)
105
- mime-types (1.25.1)
106
- mini_portile (0.6.1)
107
- multi_json (1.10.1)
88
+ loofah (2.0.2)
89
+ nokogiri (>= 1.5.9)
90
+ mini_portile (0.6.2)
91
+ minitest (5.7.0)
92
+ multi_json (1.11.0)
108
93
  multi_xml (0.5.5)
109
94
  multipart-post (2.0.0)
110
- nokogiri (1.6.5)
95
+ nokogiri (1.6.6.2)
111
96
  mini_portile (~> 0.6.0)
112
97
  oauth2 (1.0.0)
113
98
  faraday (>= 0.8, < 0.10)
@@ -115,67 +100,46 @@ GEM
115
100
  multi_json (~> 1.3)
116
101
  multi_xml (~> 0.5)
117
102
  rack (~> 1.2)
118
- polyglot (0.3.5)
119
- rabl (0.11.5)
103
+ rabl (0.11.6)
120
104
  activesupport (>= 2.3.14)
121
- rack (1.4.5)
122
- rack-cache (1.2)
123
- rack (>= 0.4)
124
- rack-ssl (1.3.4)
125
- rack
126
- rack-test (0.6.2)
105
+ rack (1.6.1)
106
+ rack-test (0.6.3)
127
107
  rack (>= 1.0)
128
- rails (3.2.21)
129
- actionmailer (= 3.2.21)
130
- actionpack (= 3.2.21)
131
- activerecord (= 3.2.21)
132
- activeresource (= 3.2.21)
133
- activesupport (= 3.2.21)
134
- bundler (~> 1.0)
135
- railties (= 3.2.21)
136
- rails-backbone (0.5.0)
137
- coffee-script (~> 2.2)
138
- ejs (~> 1.0.0)
139
- rails (~> 3.1)
140
- railties (3.2.21)
141
- actionpack (= 3.2.21)
142
- activesupport (= 3.2.21)
143
- rack-ssl (~> 1.3.2)
108
+ rails-deprecated_sanitizer (1.0.3)
109
+ activesupport (>= 4.2.0.alpha)
110
+ rails-dom-testing (1.0.6)
111
+ activesupport (>= 4.2.0.beta, < 5.0)
112
+ nokogiri (~> 1.6.0)
113
+ rails-deprecated_sanitizer (>= 1.0.1)
114
+ rails-html-sanitizer (1.0.2)
115
+ loofah (~> 2.0)
116
+ railties (4.2.1)
117
+ actionpack (= 4.2.1)
118
+ activesupport (= 4.2.1)
144
119
  rake (>= 0.8.7)
145
- rdoc (~> 3.4)
146
- thor (>= 0.14.6, < 2.0)
120
+ thor (>= 0.18.1, < 2.0)
147
121
  rake (10.4.2)
148
- rdoc (3.12.2)
149
- json (~> 1.4)
122
+ rdoc (4.2.0)
150
123
  ref (1.0.5)
151
- requirejs-rails (0.9.5)
124
+ requirejs-rails (0.9.8)
152
125
  railties (>= 3.1.1)
153
- sass (3.4.9)
154
- sass-rails (3.2.6)
155
- railties (~> 3.2.0)
156
- sass (>= 3.1.10)
157
- tilt (~> 1.3)
158
- sprockets (2.2.3)
126
+ ruby_parser (3.1.3)
127
+ sexp_processor (~> 4.1)
128
+ sexp_processor (4.6.0)
129
+ sprockets (2.12.3)
159
130
  hike (~> 1.2)
160
131
  multi_json (~> 1.0)
161
132
  rack (~> 1.0)
162
133
  tilt (~> 1.1, != 1.3.0)
163
- therubyracer (0.12.1)
134
+ therubyracer (0.12.2)
164
135
  libv8 (~> 3.16.14.0)
165
136
  ref
166
137
  thor (0.19.1)
167
- thread_safe (0.3.4)
138
+ thread_safe (0.3.5)
168
139
  tilt (1.4.1)
169
- treetop (1.4.15)
170
- polyglot
171
- polyglot (>= 0.3.1)
172
- twitter-bootstrap-rails (2.2.8)
173
- actionpack (>= 3.1)
174
- execjs
175
- rails (>= 3.1)
176
- railties (>= 3.1)
177
- tzinfo (0.3.42)
178
- uglifier (2.6.0)
140
+ tzinfo (1.2.2)
141
+ thread_safe (~> 0.1)
142
+ uglifier (2.7.1)
179
143
  execjs (>= 0.3.0)
180
144
  json (>= 1.8.0)
181
145
  yajl-ruby (1.2.1)
@@ -187,20 +151,18 @@ DEPENDENCIES
187
151
  bundler
188
152
  coffee-filter
189
153
  coffee-rails
154
+ deep_merge
190
155
  haml-rails
191
156
  haml_coffee_assets
192
- i18n-js
193
157
  jeweler
194
- jquery-rails
195
158
  kaminari
196
- less-rails
197
159
  rabl
198
- rails-backbone
199
160
  rake
200
161
  rdoc
201
162
  requirejs-rails
202
- sass-rails
203
163
  therubyracer
204
- twitter-bootstrap-rails
205
164
  uglifier
206
165
  yajl-ruby
166
+
167
+ BUNDLED WITH
168
+ 1.10.3
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.1
1
+ 0.4.2
data/lib/tbone/engine.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'rails'
2
2
  module Tbone
3
+ mattr_accessor :js_prefix
3
4
  class Engine < Rails::Engine
4
5
  initializer "tbone" do |app|
5
6
  conf = {
@@ -15,27 +16,28 @@ module Tbone
15
16
  'wrap' => true
16
17
  }
17
18
  jquery_plugs = [
18
- 'bootstrap-transition',
19
- 'bootstrap-alert',
20
- 'bootstrap-modal',
21
- 'bootstrap-dropdown',
22
- 'bootstrap-scrollspy',
23
- 'bootstrap-tab',
24
- 'bootstrap-tooltip',
25
- 'bootstrap-popover',
26
- 'bootstrap-button',
27
- 'bootstrap-collapse',
28
- 'bootstrap-carousel',
29
- 'bootstrap-typeahead'
19
+ 'transition',
20
+ 'alert',
21
+ 'modal',
22
+ 'dropdown',
23
+ 'scrollspy',
24
+ 'tab',
25
+ 'tooltip',
26
+ 'popover',
27
+ 'button',
28
+ 'collapse',
29
+ 'carousel',
30
+ 'affix'
30
31
  ]
31
32
  conf['paths'] = {}
32
33
  jquery_plugs.each { |e|
33
- conf['paths'][e] = "twitter/bootstrap/#{e}"
34
- conf['shim'][e] = ['jquery']
34
+ conf['paths']["bootstrap_#{e}"] = "#{Tbone.js_prefix}#{e}"
35
+ conf['shim']["bootstrap_#{e}"] = ['jquery']
35
36
  }
36
- conf['shim']['bootstrap-popover'] << 'bootstrap-tooltip'
37
- conf['shim']['bootstrap'] = jquery_plugs
38
- app.config.requirejs.user_config.deep_merge!(conf)
37
+ conf['shim']['bootstrap_popover'] << 'bootstrap_tooltip'
38
+ conf['shim']['bootstrap'] ||= []
39
+ conf['shim']['bootstrap'].concat jquery_plugs.map { |e| "bootstrap_#{e}" }
40
+ app.config.requirejs.user_config.deeper_merge!(conf)
39
41
  Rabl.configure do |config|
40
42
  config.include_json_root = false
41
43
  end
data/tbone.gemspec CHANGED
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: tbone 0.4.1 ruby lib
5
+ # stub: tbone 0.4.2 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "tbone"
9
- s.version = "0.4.1"
9
+ s.version = "0.4.2"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
13
13
  s.authors = ["Pavel Tatarsky"]
14
- s.date = "2014-12-12"
14
+ s.date = "2015-06-06"
15
15
  s.description = "Library for mixing together requirejs backbone and twitter bootstrap"
16
16
  s.email = "fazzzenda@mail.ru"
17
17
  s.extra_rdoc_files = [
@@ -86,35 +86,31 @@ Gem::Specification.new do |s|
86
86
  ]
87
87
  s.homepage = "http://github.com/vintikzzz/tbone"
88
88
  s.licenses = ["MIT"]
89
- s.rubygems_version = "2.4.2"
89
+ s.rubygems_version = "2.4.7"
90
90
  s.summary = "Library for mixing together requirejs backbone and twitter bootstrap"
91
91
 
92
92
  if s.respond_to? :specification_version then
93
93
  s.specification_version = 4
94
94
 
95
95
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
96
- s.add_runtime_dependency(%q<i18n-js>, [">= 0"])
96
+ s.add_runtime_dependency(%q<deep_merge>, [">= 0"])
97
97
  s.add_runtime_dependency(%q<kaminari>, [">= 0"])
98
98
  s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
99
99
  s.add_runtime_dependency(%q<coffee-filter>, [">= 0"])
100
100
  s.add_runtime_dependency(%q<rabl>, [">= 0"])
101
- s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
102
101
  s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
103
- s.add_runtime_dependency(%q<rails-backbone>, [">= 0"])
104
102
  s.add_runtime_dependency(%q<requirejs-rails>, [">= 0"])
105
103
  s.add_runtime_dependency(%q<rake>, [">= 0"])
106
104
  s.add_development_dependency(%q<rdoc>, [">= 0"])
107
105
  s.add_development_dependency(%q<bundler>, [">= 0"])
108
106
  s.add_development_dependency(%q<jeweler>, [">= 0"])
109
107
  else
110
- s.add_dependency(%q<i18n-js>, [">= 0"])
108
+ s.add_dependency(%q<deep_merge>, [">= 0"])
111
109
  s.add_dependency(%q<kaminari>, [">= 0"])
112
110
  s.add_dependency(%q<haml-rails>, [">= 0"])
113
111
  s.add_dependency(%q<coffee-filter>, [">= 0"])
114
112
  s.add_dependency(%q<rabl>, [">= 0"])
115
- s.add_dependency(%q<jquery-rails>, [">= 0"])
116
113
  s.add_dependency(%q<yajl-ruby>, [">= 0"])
117
- s.add_dependency(%q<rails-backbone>, [">= 0"])
118
114
  s.add_dependency(%q<requirejs-rails>, [">= 0"])
119
115
  s.add_dependency(%q<rake>, [">= 0"])
120
116
  s.add_dependency(%q<rdoc>, [">= 0"])
@@ -122,14 +118,12 @@ Gem::Specification.new do |s|
122
118
  s.add_dependency(%q<jeweler>, [">= 0"])
123
119
  end
124
120
  else
125
- s.add_dependency(%q<i18n-js>, [">= 0"])
121
+ s.add_dependency(%q<deep_merge>, [">= 0"])
126
122
  s.add_dependency(%q<kaminari>, [">= 0"])
127
123
  s.add_dependency(%q<haml-rails>, [">= 0"])
128
124
  s.add_dependency(%q<coffee-filter>, [">= 0"])
129
125
  s.add_dependency(%q<rabl>, [">= 0"])
130
- s.add_dependency(%q<jquery-rails>, [">= 0"])
131
126
  s.add_dependency(%q<yajl-ruby>, [">= 0"])
132
- s.add_dependency(%q<rails-backbone>, [">= 0"])
133
127
  s.add_dependency(%q<requirejs-rails>, [">= 0"])
134
128
  s.add_dependency(%q<rake>, [">= 0"])
135
129
  s.add_dependency(%q<rdoc>, [">= 0"])
metadata CHANGED
@@ -1,17 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tbone
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Tatarsky
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-12 00:00:00.000000000 Z
11
+ date: 2015-06-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: i18n-js
14
+ name: deep_merge
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - ">="
@@ -80,20 +80,6 @@ dependencies:
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
- - !ruby/object:Gem::Dependency
84
- name: jquery-rails
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- version: '0'
90
- type: :runtime
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - ">="
95
- - !ruby/object:Gem::Version
96
- version: '0'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: yajl-ruby
99
85
  requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
108
94
  - - ">="
109
95
  - !ruby/object:Gem::Version
110
96
  version: '0'
111
- - !ruby/object:Gem::Dependency
112
- name: rails-backbone
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - ">="
116
- - !ruby/object:Gem::Version
117
- version: '0'
118
- type: :runtime
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - ">="
123
- - !ruby/object:Gem::Version
124
- version: '0'
125
97
  - !ruby/object:Gem::Dependency
126
98
  name: requirejs-rails
127
99
  requirement: !ruby/object:Gem::Requirement
@@ -284,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
284
256
  version: '0'
285
257
  requirements: []
286
258
  rubyforge_project:
287
- rubygems_version: 2.4.2
259
+ rubygems_version: 2.4.7
288
260
  signing_key:
289
261
  specification_version: 4
290
262
  summary: Library for mixing together requirejs backbone and twitter bootstrap