locomotivecms_mounter 1.5.0 → 1.5.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8f209dbffa2e246e39048d073252752052349057
4
- data.tar.gz: 5d567b2a2e79a3bda8247283ff1833f1c4b4eed6
3
+ metadata.gz: 615cfc25ce353c25deefee2a3e0ca3a4c0dc7c77
4
+ data.tar.gz: 4cd366c8f55e97ba071bb42db48d03a9f8bd08bf
5
5
  SHA512:
6
- metadata.gz: 74e99e2982545980ce4bb993a7332ad3124bed53d47e16cc6e85502b4a0e2316318295895670a102bc3cb72eddc176ab23e962cf3ec1bcbc84050cdd118b9457
7
- data.tar.gz: aa9fa4a15dbb7c030c69bdfa7be922830795dd0025b76a4eaaa05e2ba02dc2b168b5fae324a63691c3a805353ca8d7069d51fa395fbe8043f5d480c3cbf8781a
6
+ metadata.gz: 30f2cdc5a2f82b38b90e39407e0372938c510a3d58f86bc4212c333f7f906405d200294c0c230aa29e6f237bf71a6cfd8b6120e8767ea2938f61acbee9c26df7
7
+ data.tar.gz: 3ee3a7872b678ea31e4940e5a5b263ac433898590e093ca8e93e22641c6694ca1f539cc4b8a7dcd689f4779f791bdaf434e8eb7fee12662c5c40c17663010097
data/.gitignore CHANGED
@@ -4,4 +4,9 @@
4
4
  .push-tmp/
5
5
  .DS_Store
6
6
  /spec/fixtures/default/deploy.yml
7
- pkg
7
+ pkg
8
+
9
+ .bundle
10
+ .gems
11
+ .ruby-version
12
+ .rbenv-gemsets
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- locomotivecms_mounter (1.5.0)
4
+ locomotivecms_mounter (1.5.1)
5
5
  RedCloth (~> 4.2.3)
6
6
  activesupport (~> 3.2.21)
7
7
  chronic (~> 0.10.2)
@@ -40,14 +40,14 @@ GEM
40
40
  coffee-script-source (1.8.0)
41
41
  colorize (0.5.8)
42
42
  commonjs (0.2.7)
43
- compass (1.0.1)
43
+ compass (1.0.3)
44
44
  chunky_png (~> 1.2)
45
- compass-core (~> 1.0.1)
45
+ compass-core (~> 1.0.2)
46
46
  compass-import-once (~> 1.0.5)
47
47
  rb-fsevent (>= 0.9.3)
48
48
  rb-inotify (>= 0.9)
49
49
  sass (>= 3.3.13, < 3.5)
50
- compass-core (1.0.1)
50
+ compass-core (1.0.3)
51
51
  multi_json (~> 1.0)
52
52
  sass (>= 3.3.0, < 3.5)
53
53
  compass-import-once (1.0.5)
@@ -57,7 +57,7 @@ GEM
57
57
  diff-lcs (1.2.5)
58
58
  execjs (2.2.2)
59
59
  ffi (1.9.6)
60
- haml (4.0.5)
60
+ haml (4.0.6)
61
61
  tilt
62
62
  hike (1.2.3)
63
63
  httmultiparty (0.3.10)
@@ -67,7 +67,7 @@ GEM
67
67
  json (~> 1.8)
68
68
  multi_xml (>= 0.5.2)
69
69
  i18n (0.6.11)
70
- json (1.8.1)
70
+ json (1.8.2)
71
71
  less (2.2.2)
72
72
  commonjs (~> 0.2.6)
73
73
  libv8 (3.16.14.3)
@@ -94,7 +94,7 @@ GEM
94
94
  rspec-mocks (2.14.6)
95
95
  ruby-debug-wrapper (0.0.1)
96
96
  safe_yaml (1.0.4)
97
- sass (3.4.7)
97
+ sass (3.4.10)
98
98
  sprockets (2.12.3)
99
99
  hike (~> 1.2)
100
100
  multi_json (~> 1.0)
@@ -179,6 +179,9 @@ module Locomotive
179
179
 
180
180
  params = self.filter_attributes %w(name slug description label_field_name group_by_field_name order_by order_direction public_submission_enabled raw_item_template)
181
181
 
182
+ # group by
183
+ params[:group_by_field_name] = self.group_by_field.name if self.group_by_field
184
+
182
185
  # order by
183
186
  params[:order_by] = '_position' if self.order_by == 'manually'
184
187
 
@@ -268,4 +271,4 @@ module Locomotive
268
271
 
269
272
  end
270
273
  end
271
- end
274
+ end
@@ -2,7 +2,7 @@
2
2
  module Locomotive
3
3
  module Mounter #:nodoc
4
4
 
5
- VERSION = '1.5.0'
5
+ VERSION = '1.5.1'
6
6
 
7
7
  end
8
8
  end
@@ -26,9 +26,11 @@ module Locomotive
26
26
  self.parameters[:data] ||= false
27
27
 
28
28
  credentials = self.parameters.select { |k, _| %w(uri email password api_key).include?(k.to_s) }
29
+ ssl_version = self.parameters[:ssl_version] ? self.parameters[:ssl_version].to_sym : :SSLv3
29
30
  self.uri = credentials[:uri]
30
31
 
31
32
  begin
33
+ Locomotive::Mounter::EngineApi.ssl_version(ssl_version)
32
34
  Locomotive::Mounter::EngineApi.set_token(credentials)
33
35
  rescue Exception => e
34
36
  raise Locomotive::Mounter::WriterException.new("unable to get an API token: #{e.message}")
@@ -69,4 +71,4 @@ module Locomotive
69
71
  end
70
72
  end
71
73
  end
72
- end
74
+ end
@@ -5,7 +5,7 @@ Encoding.default_internal = Encoding.default_external = 'UTF-8'
5
5
 
6
6
  # Remove I18n warnings
7
7
  require 'i18n'
8
- I18n.config.enforce_available_locales = false
8
+ I18n.enforce_available_locales = false
9
9
 
10
10
  require 'logger'
11
11
  require 'colorize'
@@ -103,4 +103,4 @@ module Locomotive
103
103
 
104
104
  end
105
105
 
106
- end
106
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: locomotivecms_mounter
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Didier Lafforgue
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-24 00:00:00.000000000 Z
11
+ date: 2015-01-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tilt