Download as
Browse Code »

Commit 38a62d97d4589f3327da74bdf2c651b2823d81de

Authored by Leandro Santos
2 parents 239ce4c7 e1efe793
Exists in production

Merge branch 'staging' into production

Showing 3 changed files with 53 additions and 13 deletions   Show diff stats
Gemfile
  Diff comments   View file @38a62d9
... ... @@ -11,9 +11,9 @@ gem 'will_paginate', '~> 3.0.3'
11 11 gem 'ruby-feedparser', '~> 0.7'
12 12 gem 'daemons', '~> 1.1.5'
13 13 #gem 'thin', '~> 1.3.1'
14   -#gem 'nokogiri', '~> 1.6.0'
  14 +gem 'nokogiri', '~> 1.6.0'
15 15 gem 'unicorn', '~> 4.8'
16   -gem 'nokogiri', '~> 1.5.5'
  16 +#gem 'nokogiri', '~> 1.5.5'
17 17 gem 'rake', :require => false
18 18 gem 'rest-client', '~> 1.6.7'
19 19 gem 'exception_notification', '~> 4.0.1'
... ...
Gemfile.lock
  Diff comments   View file @38a62d9
... ... @@ -8,6 +8,7 @@ GIT
8 8  
9 9 GEM
10 10 remote: https://rubygems.org/
  11 + remote: https://rubygems.org/
11 12 specs:
12 13 RedCloth (4.2.9)
13 14 actionmailer (3.2.22)
... ... @@ -39,7 +40,11 @@ GEM
39 40 multi_json (~> 1.0)
40 41 acts-as-taggable-on (3.4.4)
41 42 activerecord (>= 3.2, < 5)
  43 + addressable (2.3.8)
42 44 api-pagination (4.1.1)
  45 + api_smith (1.3.0)
  46 + hashie (>= 1.0, < 3.0)
  47 + httparty
43 48 arel (3.0.3)
44 49 axiom-types (0.1.1)
45 50 descendants_tracker (~> 0.0.4)
... ... @@ -57,6 +62,8 @@ GEM
57 62 chronic (0.10.2)
58 63 coercible (1.0.0)
59 64 descendants_tracker (~> 0.0.1)
  65 + css_parser (1.3.7)
  66 + addressable
60 67 cucumber (1.0.6)
61 68 builder (>= 2.1.2)
62 69 diff-lcs (>= 1.1.2)
... ... @@ -82,6 +89,10 @@ GEM
82 89 actionmailer (>= 3.0.4)
83 90 activesupport (>= 3.0.4)
84 91 execjs (2.6.0)
  92 + faraday (0.9.2)
  93 + multipart-post (>= 1.2, < 3)
  94 + faraday_middleware (0.10.0)
  95 + faraday (>= 0.7.4, < 0.10)
85 96 fast_gettext (0.6.12)
86 97 ffi (1.9.10)
87 98 gettext (2.2.1)
... ... @@ -89,7 +100,7 @@ GEM
89 100 gherkin (2.4.21)
90 101 json (>= 1.4.6)
91 102 git-version-bump (0.15.1)
92   - grape (0.12.0)
  103 + grape (0.13.0)
93 104 activesupport
94 105 builder
95 106 hashie (>= 2.1.0)
... ... @@ -99,21 +110,25 @@ GEM
99 110 rack-accept
100 111 rack-mount
101 112 virtus (>= 1.0.0)
102   - grape-entity (0.4.7)
  113 + grape-entity (0.4.8)
103 114 activesupport
104 115 multi_json (>= 1.3.2)
105 116 grape-swagger (0.10.2)
106 117 grape (>= 0.8.0)
107 118 grape-entity
108   - hashie (3.4.2)
  119 + hashie (2.1.2)
109 120 hike (1.2.3)
  121 + httparty (0.12.0)
  122 + json (~> 1.8)
  123 + multi_xml (>= 0.5.2)
110 124 i18n (0.7.0)
111 125 ice_nine (0.11.1)
112 126 journey (1.0.4)
113 127 json (1.8.3)
114 128 kgio (2.10.0)
115   - kramdown (1.8.0)
  129 + kramdown (1.9.0)
116 130 libv8 (3.16.14.11)
  131 + link_header (0.0.8)
117 132 liquid (3.0.6)
118 133 locale (2.0.9)
119 134 magic (0.2.9)
... ... @@ -123,18 +138,25 @@ GEM
123 138 treetop (~> 1.4.8)
124 139 metaclass (0.0.4)
125 140 mime-types (1.25.1)
  141 + mini_portile (0.6.2)
126 142 minitest (3.2.0)
127 143 mocha (1.1.0)
128 144 metaclass (~> 0.0.1)
129 145 multi_json (1.11.2)
130 146 multi_xml (0.5.5)
131   - nokogiri (1.5.11)
  147 + multipart-post (2.0.0)
  148 + nokogiri (1.6.6.2)
  149 + mini_portile (~> 0.6.0)
  150 + oai (0.3.1)
  151 + builder (>= 2.0.0)
  152 + faraday
  153 + faraday_middleware
132 154 pg (0.13.2)
133 155 polyglot (0.3.5)
134 156 rack (1.4.7)
135 157 rack-accept (0.4.5)
136 158 rack (>= 0.4)
137   - rack-cache (1.2)
  159 + rack-cache (1.5.0)
138 160 rack (>= 0.4)
139 161 rack-contrib (1.4.0)
140 162 git-version-bump (~> 0.15)
... ... @@ -165,12 +187,24 @@ GEM
165 187 thor (>= 0.14.6, < 2.0)
166 188 raindrops (0.15.0)
167 189 rake (10.4.2)
  190 + rdf (1.1.17.1)
  191 + link_header (~> 0.0, >= 0.0.8)
  192 + rdf-virtuoso (0.1.6)
  193 + api_smith (~> 1.3.0)
  194 + httparty (~> 0.12.0)
  195 + rdf (~> 1.1.0)
168 196 rdoc (3.12.2)
169 197 json (~> 1.4)
170 198 ref (2.0.0)
171 199 rest-client (1.6.9)
172 200 mime-types (~> 1.16)
173 201 rmagick (2.13.4)
  202 + roadie (3.0.5)
  203 + css_parser (~> 1.3.4)
  204 + nokogiri (~> 1.6.0)
  205 + roadie-rails (1.0.6)
  206 + railties (>= 3.0, < 4.3)
  207 + roadie (~> 3.0)
174 208 rspec (2.14.1)
175 209 rspec-core (~> 2.14.0)
176 210 rspec-expectations (~> 2.14.0)
... ... @@ -190,7 +224,7 @@ GEM
190 224 ruby-feedparser (0.9.3)
191 225 magic
192 226 rubyzip (1.1.7)
193   - sass (3.4.18)
  227 + sass (3.4.19)
194 228 sass-rails (3.2.6)
195 229 railties (~> 3.2.0)
196 230 sass (>= 3.1.10)
... ... @@ -218,7 +252,7 @@ GEM
218 252 treetop (1.4.15)
219 253 polyglot
220 254 polyglot (>= 0.3.1)
221   - tzinfo (0.3.44)
  255 + tzinfo (0.3.45)
222 256 uglifier (2.7.2)
223 257 execjs (>= 0.3.0)
224 258 json (>= 1.8.0)
... ... @@ -265,15 +299,20 @@ DEPENDENCIES
265 299 locale (~> 2.0.5)
266 300 minitest (~> 3.2.0)
267 301 mocha (~> 1.1.0)
268   - nokogiri (~> 1.5.5)
  302 + nokogiri (~> 1.6.0)
  303 + oai (= 0.3.1)
269 304 pg (~> 0.13.2)
270 305 rack-contrib
271 306 rack-cors
272 307 rails (~> 3.2.22)
273 308 rails_autolink (~> 1.1.5)
274 309 rake
  310 + rdf
  311 + rdf-virtuoso
275 312 rest-client (~> 1.6.7)
276 313 rmagick (~> 2.13.1)
  314 + roadie (= 3.0.5)
  315 + roadie-rails
277 316 rspec (~> 2.14.0)
278 317 rspec-rails (~> 2.14.1)
279 318 ruby-feedparser (~> 0.7)
... ...
plugins/virtuoso/Gemfile
  Diff comments   View file @38a62d9
1 1 source 'https://rubygems.org'
2 2 gem 'rdf'
3 3 gem 'rdf-virtuoso'
4   -gem 'oai'
  4 +gem 'oai', '0.3.1'
5 5 gem 'liquid', '~> 3.0.3'
6   -gem 'roadie'
  6 +gem 'roadie', '3.0.5'
7 7 gem 'roadie-rails'
  8 +#gem 'nokogiri', '1.6.6.2'
... ...