locomotivecms_wagon 2.0.0.rc7 → 2.0.0.rc8

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 -3
  3. data/lib/locomotive/wagon/commands/pull_sub_commands/pull_content_types_command.rb +13 -0
  4. data/lib/locomotive/wagon/commands/serve_command.rb +4 -1
  5. data/lib/locomotive/wagon/version.rb +1 -1
  6. data/locomotivecms_wagon.gemspec +2 -2
  7. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9e8df3a287cbb05c29d2117ec271460129175326
4
- data.tar.gz: c89bdf2637d74db7d876754f7432db3ecaadf0d9
3
+ metadata.gz: a22af354d3f8831d3a4d2c513dd97940e78749cc
4
+ data.tar.gz: 8cddaab4857619ee9ae8aab9df7c27afbbe270a3
5
5
  SHA512:
6
- metadata.gz: 586b40e8f1f65cf0b72953b4aa78fa5296c974be3fdb9a92f67843b3b550b036e1c54e2e4709cae288794a304728ed94c9e497b34467ab7e9c0721e3595d9eb5
7
- data.tar.gz: 5578ece2a190b9a70761cd32745211394d5b54153f872500ae8eb2f003f646427874a5b1c4e649127e23f03060f56bbffa143dd6397cb5f2ac4c2d9baa196c59
6
+ metadata.gz: 25f103e701efa701a009b169b1b725841b348c99047832f2fad177b8bc4d22377d5ad158589594b87bd57d6d221c5168cfab4efe53a91f820682ac30e4bf284a
7
+ data.tar.gz: aa1a57772bae10a575dbcee606f4d6b12011550fd7710fcf8a795d54ef899c779d0930b729c3ac8e141e8797b9ad4d8c3a9f4a65ac6bfd6f23eb3502af260001
data/Gemfile CHANGED
@@ -5,10 +5,8 @@ gemspec
5
5
 
6
6
  gem 'rb-fsevent', '~> 0.9.1'
7
7
 
8
- gem 'therubyracer'
9
-
10
8
  # Development
11
- # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '7825b47', require: false
9
+ # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '940837b', require: false
12
10
  # gem 'locomotivecms_coal', github: 'locomotivecms/coal', ref: '32b2844', require: false
13
11
  # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '3046b79893', require: false
14
12
 
data/lib/locomotive/wagon/commands/pull_sub_commands/pull_content_types_command.rb CHANGED
@@ -30,9 +30,22 @@ module Locomotive::Wagon
30
30
 
31
31
  clean_attributes(attributes)
32
32
 
33
+ # select_options
34
+ attributes['select_options'] = select_options_yaml(attributes['select_options']) if field['type'] == 'select'
35
+
33
36
  { field['name'] => attributes }
34
37
  end
35
38
 
39
+ def select_options_yaml(options)
40
+ if locales.size > 1
41
+ locales.inject do |_options, locale|
42
+ _options[locale] = attributes.map { |option| options['name'][locale.to_s] }
43
+ end
44
+ else
45
+ options.map { |option| option['name'][default_locale] }
46
+ end
47
+ end
48
+
36
49
  def content_type_filepath(content_type)
37
50
  File.join('app', 'content_types', "#{content_type.slug}.yml")
38
51
  end
data/lib/locomotive/wagon/commands/serve_command.rb CHANGED
@@ -103,7 +103,10 @@ module Locomotive::Wagon
103
103
  # TODO: new feature -> pick the right Rack handler (Thin, Puma, ...etc)
104
104
  require 'thin'
105
105
 
106
- app = Locomotive::Steam::Server.to_app
106
+ # Thin in debug mode
107
+ # Thin::Logging.debug = true
108
+
109
+ app = Locomotive::Steam.to_app
107
110
 
108
111
  Thin::Server.new(options[:host], options[:port], { signals: true }, app).tap do |server|
109
112
  server.threaded = true
data/lib/locomotive/wagon/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Locomotive
2
2
  module Wagon
3
- VERSION = '2.0.0.rc7'
3
+ VERSION = '2.0.0.rc8'
4
4
  end
5
5
  end
data/locomotivecms_wagon.gemspec CHANGED
@@ -27,8 +27,8 @@ Gem::Specification.new do |gem|
27
27
  gem.add_dependency 'netrc', '~> 0.10.3'
28
28
 
29
29
  gem.add_dependency 'locomotivecms_common', '~> 0.0.5'
30
- gem.add_dependency 'locomotivecms_coal', '~> 1.0.0.rc4'
31
- gem.add_dependency 'locomotivecms_steam', '~> 1.0.0.rc10'
30
+ gem.add_dependency 'locomotivecms_coal', '~> 1.0.0'
31
+ gem.add_dependency 'locomotivecms_steam', '~> 1.0.0'
32
32
 
33
33
  gem.add_dependency 'listen', '~> 3.0.4'
34
34
  gem.add_dependency 'rack-livereload', '~> 0.3.16'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: locomotivecms_wagon
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc7
4
+ version: 2.0.0.rc8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-01-05 00:00:00.000000000 Z
12
+ date: 2016-01-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
@@ -101,28 +101,28 @@ dependencies:
101
101
  requirements:
102
102
  - - "~>"
103
103
  - !ruby/object:Gem::Version
104
- version: 1.0.0.rc4
104
+ version: 1.0.0
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - "~>"
110
110
  - !ruby/object:Gem::Version
111
- version: 1.0.0.rc4
111
+ version: 1.0.0
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: locomotivecms_steam
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - "~>"
117
117
  - !ruby/object:Gem::Version
118
- version: 1.0.0.rc10
118
+ version: 1.0.0
119
119
  type: :runtime
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - "~>"
124
124
  - !ruby/object:Gem::Version
125
- version: 1.0.0.rc10
125
+ version: 1.0.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: listen
128
128
  requirement: !ruby/object:Gem::Requirement