Skip to content

Commit fc2b850

Browse files
stefanovernastefanoverna
committed
Merge pull request #21 from matjack1/master
Update to Rails4 and Globalize4
2 parents e7c3574 + b35b3c7 commit fc2b850

20 files changed

+189
-262
lines changed

‎.gitignore

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
coverage/
21
.bundle/
3-
log/*.log
4-
pkg/
5-
spec/dummy/db/*.sqlite3
6-
spec/dummy/log/*.log
7-
spec/dummy/tmp/
8-
spec/dummy/.sass-cache
9-
spec/dummy/public/uploads/*
2+
.bin
3+

‎Gemfile

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
1-
source "http://rubygems.org"
1+
source "https://rubygems.org"
22

3-
# Declare your gem's dependencies in simple_form_fancy_uploads.gemspec.
4-
# Bundler will treat runtime dependencies like base dependencies, and
5-
# development dependencies will be added by default to the :development group.
63
gemspec
74

8-
if Dir.exists?(File.expand_path('~/code/gems'))
9-
gem 'railsyard-backend' , path: File.expand_path('~/code/gems/railsyard-backend')
10-
else
11-
gem 'railsyard-backend' , git: 'git://github.com/cantierecreativo/railsyard-backend.git', branch: 'develop'
12-
end
13-
14-
group :development, :test do
15-
gem 'simplecov', require: false
16-
gem 'sqlite3'
17-
gem 'rspec-rails', '~> 2.8.1'
18-
gem 'webrat'
19-
gem 'friendly_id'
20-
end
5+
gem 'activeadmin', github: 'gregbell/active_admin', branch: 'master'
216

‎Gemfile.lock

Lines changed: 129 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,198 +1,162 @@
1-
PATH
2-
remote: .
3-
specs:
4-
railsyard-globalize (0.0.2)
5-
globalize3
6-
rails (~> 3.2.1)
7-
railsyard-backend
8-
9-
PATH
10-
remote: /Users/steffoz/code/gems/railsyard-backend
1+
GIT
2+
remote: git://github.com/gregbell/active_admin.git
3+
revision: f21cff30e7212706a39710e2c70ad0af8087ccea
4+
branch: master
115
specs:
12-
railsyard-backend (3.0.pre)
13-
blockenspiel
14-
cells
6+
activeadmin (1.0.0.pre)
7+
arbre (~> 1.0)
8+
bourbon
159
coffee-rails
16-
compass-rails
17-
formalize-rails
18-
humane-rails (= 2.8.0.0.1.2)
10+
devise (~> 3.2)
11+
formtastic (~> 2.3.0.rc2)
12+
inherited_resources (~> 1.3)
1913
jquery-rails
20-
kaminari
21-
rails
22-
responders
14+
jquery-ui-rails
15+
kaminari (~> 0.15)
16+
rails (>= 3.2, < 4.1)
17+
ransack (~> 1.0)
2318
sass-rails
24-
simple_form
25-
slim-rails
19+
20+
PATH
21+
remote: .
22+
specs:
23+
activeadmin-globalize (1.0.0)
24+
activeadmin
25+
globalize (~> 4.0.0)
2626

2727
GEM
28-
remote: http://rubygems.org/
28+
remote: https://rubygems.org/
2929
specs:
30-
actionmailer (3.2.1)
31-
actionpack (= 3.2.1)
32-
mail (~> 2.4.0)
33-
actionpack (3.2.1)
34-
activemodel (= 3.2.1)
35-
activesupport (= 3.2.1)
36-
builder (~> 3.0.0)
30+
actionmailer (4.0.2)
31+
actionpack (= 4.0.2)
32+
mail (~> 2.5.4)
33+
actionpack (4.0.2)
34+
activesupport (= 4.0.2)
35+
builder (~> 3.1.0)
3736
erubis (~> 2.7.0)
38-
journey (~> 1.0.1)
39-
rack (~> 1.4.0)
40-
rack-cache (~> 1.1)
41-
rack-test (~> 0.6.1)
42-
sprockets (~> 2.1.2)
43-
activemodel (3.2.1)
44-
activesupport (= 3.2.1)
45-
builder (~> 3.0.0)
46-
activerecord (3.2.1)
47-
activemodel (= 3.2.1)
48-
activesupport (= 3.2.1)
49-
arel (~> 3.0.0)
50-
tzinfo (~> 0.3.29)
51-
activeresource (3.2.1)
52-
activemodel (= 3.2.1)
53-
activesupport (= 3.2.1)
54-
activesupport (3.2.1)
55-
i18n (~> 0.6)
56-
multi_json (~> 1.0)
57-
arel (3.0.2)
58-
blockenspiel (0.4.5)
59-
builder (3.0.0)
60-
cells (3.8.5)
61-
actionpack (~> 3.0)
62-
railties (~> 3.0)
63-
chunky_png (1.2.6)
64-
coffee-rails (3.2.2)
37+
rack (~> 1.5.2)
38+
rack-test (~> 0.6.2)
39+
activemodel (4.0.2)
40+
activesupport (= 4.0.2)
41+
builder (~> 3.1.0)
42+
activerecord (4.0.2)
43+
activemodel (= 4.0.2)
44+
activerecord-deprecated_finders (~> 1.0.2)
45+
activesupport (= 4.0.2)
46+
arel (~> 4.0.0)
47+
activerecord-deprecated_finders (1.0.3)
48+
activesupport (4.0.2)
49+
i18n (~> 0.6, >= 0.6.4)
50+
minitest (~> 4.2)
51+
multi_json (~> 1.3)
52+
thread_safe (~> 0.1)
53+
tzinfo (~> 0.3.37)
54+
arbre (1.0.1)
55+
activesupport (>= 3.0.0)
56+
arel (4.0.1)
57+
atomic (1.1.14)
58+
bcrypt-ruby (3.1.2)
59+
bourbon (3.1.8)
60+
sass (>= 3.2.0)
61+
thor
62+
builder (3.1.4)
63+
coffee-rails (4.0.1)
6564
coffee-script (>= 2.2.0)
66-
railties (~> 3.2.0)
65+
railties (>= 4.0.0, < 5.0)
6766
coffee-script (2.2.0)
6867
coffee-script-source
6968
execjs
70-
coffee-script-source (1.3.3)
71-
compass (0.12.2)
72-
chunky_png (~> 1.2)
73-
fssm (>= 0.2.7)
74-
sass (~> 3.1)
75-
compass-rails (1.0.3)
76-
compass (>= 0.12.2, < 0.14)
77-
diff-lcs (1.1.3)
69+
coffee-script-source (1.6.3)
70+
devise (3.2.2)
71+
bcrypt-ruby (~> 3.0)
72+
orm_adapter (~> 0.1)
73+
railties (>= 3.2.6, < 5)
74+
thread_safe (~> 0.1)
75+
warden (~> 1.2.3)
7876
erubis (2.7.0)
79-
execjs (1.4.0)
80-
multi_json (~> 1.0)
81-
formalize-rails (0.1.3)
82-
railties (~> 3.1)
83-
friendly_id (4.0.8)
84-
fssm (0.2.9)
85-
globalize3 (0.2.0)
86-
activemodel (>= 3.0.0)
87-
activerecord (>= 3.0.0)
88-
paper_trail (~> 2)
89-
hike (1.2.1)
90-
humane-rails (2.8.0.0.1.2)
91-
i18n (0.6.0)
92-
journey (1.0.1)
93-
jquery-rails (2.1.2)
94-
railties (>= 3.1.0, < 5.0)
95-
thor (~> 0.14)
96-
json (1.6.5)
97-
kaminari (0.14.1)
77+
execjs (2.0.2)
78+
formtastic (2.3.0.rc2)
79+
actionpack (>= 3.0)
80+
globalize (4.0.0)
81+
activemodel (>= 4.0.0, < 5)
82+
activerecord (>= 4.0.0, < 5)
83+
has_scope (0.6.0.rc)
84+
actionpack (>= 3.2, < 5)
85+
activesupport (>= 3.2, < 5)
86+
hike (1.2.3)
87+
i18n (0.6.9)
88+
inherited_resources (1.4.1)
89+
has_scope (~> 0.6.0.rc)
90+
responders (~> 1.0.0.rc)
91+
jquery-rails (3.0.4)
92+
railties (>= 3.0, < 5.0)
93+
thor (>= 0.14, < 2.0)
94+
jquery-ui-rails (4.1.1)
95+
railties (>= 3.1.0)
96+
kaminari (0.15.1)
9897
actionpack (>= 3.0.0)
9998
activesupport (>= 3.0.0)
100-
mail (2.4.4)
101-
i18n (>= 0.4.0)
99+
mail (2.5.4)
102100
mime-types (~> 1.16)
103101
treetop (~> 1.4.8)
104-
mime-types (1.19)
105-
multi_json (1.0.4)
106-
nokogiri (1.5.0)
107-
paper_trail (2.6.3)
108-
activerecord (~> 3.0)
109-
railties (~> 3.0)
102+
mime-types (1.25.1)
103+
minitest (4.7.5)
104+
multi_json (1.8.4)
105+
orm_adapter (0.5.0)
106+
polyamorous (0.6.4)
107+
activerecord (>= 3.0)
110108
polyglot (0.3.3)
111-
rack (1.4.1)
112-
rack-cache (1.1)
113-
rack (>= 0.4)
114-
rack-ssl (1.3.2)
115-
rack
116-
rack-test (0.6.1)
109+
rack (1.5.2)
110+
rack-test (0.6.2)
117111
rack (>= 1.0)
118-
rails (3.2.1)
119-
actionmailer (= 3.2.1)
120-
actionpack (= 3.2.1)
121-
activerecord (= 3.2.1)
122-
activeresource (= 3.2.1)
123-
activesupport (= 3.2.1)
124-
bundler (~> 1.0)
125-
railties (= 3.2.1)
126-
railties (3.2.1)
127-
actionpack (= 3.2.1)
128-
activesupport (= 3.2.1)
129-
rack-ssl (~> 1.3.2)
112+
rails (4.0.2)
113+
actionmailer (= 4.0.2)
114+
actionpack (= 4.0.2)
115+
activerecord (= 4.0.2)
116+
activesupport (= 4.0.2)
117+
bundler (>= 1.3.0, < 2.0)
118+
railties (= 4.0.2)
119+
sprockets-rails (~> 2.0.0)
120+
railties (4.0.2)
121+
actionpack (= 4.0.2)
122+
activesupport (= 4.0.2)
130123
rake (>= 0.8.7)
131-
rdoc (~> 3.4)
132-
thor (~> 0.14.6)
133-
rake (0.9.2.2)
134-
rdoc (3.12)
135-
json (~> 1.4)
136-
responders (0.9.2)
137-
railties (~> 3.1)
138-
rspec (2.8.0)
139-
rspec-core (~> 2.8.0)
140-
rspec-expectations (~> 2.8.0)
141-
rspec-mocks (~> 2.8.0)
142-
rspec-core (2.8.0)
143-
rspec-expectations (2.8.0)
144-
diff-lcs (~> 1.1.2)
145-
rspec-mocks (2.8.0)
146-
rspec-rails (2.8.1)
124+
thor (>= 0.18.1, < 2.0)
125+
rake (10.1.1)
126+
ransack (1.1.0)
147127
actionpack (>= 3.0)
148-
activesupport (>= 3.0)
149-
railties (>= 3.0)
150-
rspec (~> 2.8.0)
151-
sass (3.2.1)
152-
sass-rails (3.2.5)
153-
railties (~> 3.2.0)
128+
activerecord (>= 3.0)
129+
polyamorous (~> 0.6.0)
130+
responders (1.0.0)
131+
railties (>= 3.2, < 5)
132+
sass (3.2.13)
133+
sass-rails (4.0.1)
134+
railties (>= 4.0.0, < 5.0)
154135
sass (>= 3.1.10)
155-
tilt (~> 1.3)
156-
simple_form (2.0.2)
157-
actionpack (~> 3.0)
158-
activemodel (~> 3.0)
159-
simplecov (0.5.4)
160-
multi_json (~> 1.0.3)
161-
simplecov-html (~> 0.5.3)
162-
simplecov-html (0.5.3)
163-
slim (1.3.0)
164-
temple (~> 0.4.1)
165-
tilt (~> 1.3.3)
166-
slim-rails (1.0.3)
167-
actionpack (~> 3.0)
168-
activesupport (~> 3.0)
169-
railties (~> 3.0)
170-
slim (~> 1.0)
171-
sprockets (2.1.2)
136+
sprockets-rails (~> 2.0.0)
137+
sprockets (2.10.1)
172138
hike (~> 1.2)
139+
multi_json (~> 1.0)
173140
rack (~> 1.0)
174141
tilt (~> 1.1, != 1.3.0)
175-
sqlite3 (1.3.5)
176-
temple (0.4.1)
177-
thor (0.14.6)
178-
tilt (1.3.3)
179-
treetop (1.4.10)
142+
sprockets-rails (2.0.1)
143+
actionpack (>= 3.0)
144+
activesupport (>= 3.0)
145+
sprockets (~> 2.8)
146+
thor (0.18.1)
147+
thread_safe (0.1.3)
148+
atomic
149+
tilt (1.4.1)
150+
treetop (1.4.15)
180151
polyglot
181152
polyglot (>= 0.3.1)
182-
tzinfo (0.3.33)
183-
webrat (0.7.3)
184-
nokogiri (>= 1.2.0)
153+
tzinfo (0.3.38)
154+
warden (1.2.3)
185155
rack (>= 1.0)
186-
rack-test (>= 0.5.3)
187156

188157
PLATFORMS
189158
ruby
190159

191160
DEPENDENCIES
192-
friendly_id
193-
railsyard-backend!
194-
railsyard-globalize!
195-
rspec-rails (~> 2.8.1)
196-
simplecov
197-
sqlite3
198-
webrat
161+
activeadmin!
162+
activeadmin-globalize!

‎README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
# ActiveAdmin::Globalize3
1+
# ActiveAdmin::Globalize
22
Makes it easy to translate your resource fields.
33

44
## Installation
55

66
```ruby
7-
gem "activeadmin-globalize3"
7+
gem "activeadmin-globalize", github: 'cantierecreativo/activeadmin-globalize',
8+
branch: 'master'
89
```
10+
We still need to use GitHub because ActiveAdmin is still in active development
11+
and there's no released gem compatible with Rails 4.
12+
913
## Your model
1014

1115
```ruby
@@ -36,12 +40,13 @@ If `switch_locale` is set, each tab will be rendered switching locale.
3640

3741
## Friendly ID
3842

39-
If you want to use Friendly ID together with Globalize3, please take a look
43+
If you want to use Friendly ID together with Globalize, please take a look
4044
at the `activeadmin-seo` gem.
4145

4246
## Hints
4347

44-
To use the dashed locale keys as 'pt-BR' or 'pt-PT' you need to convert a string to symbol (in application.rb)
48+
To use the dashed locale keys as 'pt-BR' or 'pt-PT' you need to convert a string
49+
to symbol (in application.rb)
4550

4651
config.i18n.available_locales = [:en, :it, :de, :es, :"pt-BR"]
4752

0 commit comments

Comments
 (0)