locomotivecms_wagon 2.2.0 → 2.3.0.rc1

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: 55ff1190e3b91752f7334fb862258bc5cfd5fd42
4
- data.tar.gz: b1c1a5205b74637235899d5a52bc5d1e6bc546f5
3
+ metadata.gz: 42d8a0ec21a60e23ac46d3145892ac52e872a0b5
4
+ data.tar.gz: ba6672e7ac5931f072207cf7fe34e2a713b98f95
5
5
  SHA512:
6
- metadata.gz: aa84ed0a6a8dd4f8782d8bde63869e2fa2139f0e65d0a4ef2ebd965d72cac4d4b1a4fd25c352ac4ccd153c7efd296efbd834bf76d671097eb261ebc6d4db1c18
7
- data.tar.gz: a3ef2939ec27ba2339536fda9448e95b8f16961e6ed1e39c05a69b648e9b6c8c791d9506e8e36f64fec33d2e5fa3630a38550811f6c6b02de32ea1a26af136c4
6
+ metadata.gz: e6fae614c7691e8e299533f9fd89a01daa0af9271b473b9e1ec9d5d48083bb7165e18356a464bed160a1515fca999db2a02cf70382aed02eec3303a01c203ec3
7
+ data.tar.gz: 0f5fc9757aecc9d112d467d3bf9d261a06947ad808d2028d8c178a8113867d8d0f5f2119510ecefdde927eafce353abc882aaadf74388b61636adcf3df93bd74
data/.travis.yml CHANGED
@@ -1,7 +1,11 @@
1
1
  language: ruby
2
2
  rvm:
3
- - 2.1.1
3
+ - 2.3.3
4
4
  before_install:
5
5
  - export TZ=Paris
6
6
  - date
7
-
7
+ addons:
8
+ code_climate:
9
+ repo_token: 8d9c25de4eff1cd06d3accdc09775397e1a81be67e2a159453ba4e4408acae16
10
+ after_success:
11
+ - bundle exec codeclimate-test-reporter
data/Gemfile CHANGED
@@ -1,4 +1,3 @@
1
-
2
1
  source 'https://rubygems.org'
3
2
 
4
3
  # Specify your gem's dependencies in wagon.gemspec
@@ -9,7 +8,8 @@ gem 'rb-fsevent', '~> 0.9.1'
9
8
  # Development
10
9
  # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
11
10
  # gem 'locomotivecms_coal', github: 'locomotivecms/coal', ref: 'f4ff435', require: false
12
- # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'b439507', require: false
11
+ # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'b1feb8b', require: false
12
+ # gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
13
13
 
14
14
  # Local development
15
15
  # gem 'locomotivecms_coal', path: '../gems/coal', require: false
@@ -17,15 +17,17 @@ gem 'rb-fsevent', '~> 0.9.1'
17
17
  # gem 'locomotivecms_common', path: '../gems/common', require: false
18
18
 
19
19
  group :development, :test do
20
- gem 'pry-byebug', '~> 3.1.0'
20
+ gem 'pry-byebug', '~> 3.4.2'
21
21
  end
22
22
 
23
23
  group :test do
24
- gem 'rspec', '~> 3.2.0'
24
+ gem 'rspec', '~> 3.5.0'
25
25
  gem 'json_spec', '~> 1.1.4'
26
26
 
27
27
  gem 'webmock'
28
28
  gem 'vcr'
29
29
 
30
- gem 'coveralls', '~> 0.7.11', require: false
30
+ gem 'simplecov'
31
+ gem 'codeclimate-test-reporter', '~> 1.0.7', require: false
32
+ gem 'coveralls', '~> 0.8.19', require: false
31
33
  end
data/LICENSE.txt CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2012 Didier Lafforgue
1
+ Copyright (c) 2017 NoCoffee
2
2
 
3
3
  MIT License
4
4
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
19
  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20
20
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21
21
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/README.md CHANGED
@@ -61,4 +61,4 @@ Please, visit the documentation website of Locomotive.
61
61
 
62
62
  Feel free to contact me (did at locomotivecms dot com).
63
63
 
64
- Copyright (c) 2016 NoCoffee, released under the MIT license
64
+ Copyright (c) 2017 NoCoffee, released under the MIT license
data/Rakefile CHANGED
@@ -8,22 +8,14 @@ require 'rake'
8
8
  require 'vcr'
9
9
  require 'rspec'
10
10
  require 'rspec/core/rake_task'
11
- require 'rubygems/package_task'
12
11
 
13
12
  $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
14
13
 
15
14
  require 'locomotive/wagon'
16
15
  require 'locomotive/wagon/version'
17
16
 
18
- gemspec = eval(File.read('locomotivecms_wagon.gemspec'))
19
- Gem::PackageTask.new(gemspec) do |pkg|
20
- pkg.gem_spec = gemspec
21
- end
22
-
23
- desc 'build the gem and release it to rubygems.org'
24
- task release: :gem do
25
- sh "gem push pkg/locomotivecms_wagon-#{gemspec.version}.gem"
26
- end
17
+ # === Gems install tasks ===
18
+ Bundler::GemHelper.install_tasks
27
19
 
28
20
  require 'rspec/core/rake_task'
29
21
  RSpec::Core::RakeTask.new('spec')
@@ -33,6 +33,10 @@ content_type: <%= config[:content_type] -%>
33
33
  # editable_elements:
34
34
  # 'some_block/some_slug': "<text>"
35
35
  # 'some_block/some_slug': "<relative path to the file under the public/samples folder>"
36
+
37
+ # Control the display of the page in the back-office.
38
+ # display_settings:
39
+ # hidden: true # hidden for authors?
36
40
  ---
37
41
  {% extends parent %}
38
42
 
@@ -37,6 +37,10 @@ content_type: <%= config[:content_type] -%>
37
37
  # editable_elements:
38
38
  # 'some_block/some_slug': "<text>"
39
39
  # 'some_block/some_slug': "<relative path to the file under the public/samples folder>"
40
+
41
+ # Control the display of the page in the back-office.
42
+ # display_settings:
43
+ # hidden: true # hidden for authors?
40
44
  ---
41
45
  {% extends parent %}
42
46
 
@@ -28,7 +28,7 @@ EOF
28
28
  private
29
29
 
30
30
  def yaml_attributes(page, locale)
31
- keys = ['title', 'slug', 'handle', 'position', 'listed', 'published', 'redirect_url', 'is_layout', 'content_type', 'seo_title', 'meta_description', 'meta_keywords']
31
+ keys = ['title', 'slug', 'handle', 'position', 'listed', 'published', 'redirect_url', 'is_layout', 'content_type', 'seo_title', 'meta_description', 'meta_keywords', 'display_settings']
32
32
 
33
33
  keys << 'response_type' if page.attributes['response_type'] != 'text/html'
34
34
 
@@ -88,8 +88,8 @@ module Locomotive::Wagon
88
88
  def compress_and_minify(entity)
89
89
  begin
90
90
  sprockets_env[entity.short_relative_url].to_s
91
- rescue Locomotive::Steam::YUICompressorRuntimeError => e
92
- instrument :warning, message: "Unable to compress and minify it, number of errors (#{e.errors.size})\n#{e.errors.join("\n")}"
91
+ rescue Exception => e
92
+ instrument :warning, message: "Unable to compress and minify it, error: #{e.message}"
93
93
  # use the original file instead
94
94
  File.read(File.join(path, entity.source))
95
95
  end
@@ -75,9 +75,10 @@ module Locomotive::Wagon
75
75
  subscribe_to_notifications
76
76
 
77
77
  Locomotive::Steam.configure do |config|
78
- config.mode = :test
79
- config.adapter = { name: :filesystem, path: File.expand_path(path) }
80
- config.asset_path = File.expand_path(File.join(path, 'public'))
78
+ config.mode = :test
79
+ config.adapter = { name: :filesystem, path: File.expand_path(path) }
80
+ config.asset_path = File.expand_path(File.join(path, 'public'))
81
+ config.minify_assets = false
81
82
 
82
83
  if (port = options[:live_reload_port]).to_i > 0
83
84
  require 'rack-livereload'
@@ -10,17 +10,22 @@ module Locomotive
10
10
  end
11
11
 
12
12
  def source
13
- Locomotive::Coal::UploadIO.new(filepath, nil, filename)
13
+ Locomotive::Coal::UploadIO.new(_readfile(filepath), nil, filename)
14
14
  end
15
15
 
16
16
  def checksum
17
- Digest::MD5.hexdigest(File.read(filepath))
17
+ Digest::MD5.hexdigest(_readfile(filepath) { |io| io.read })
18
18
  end
19
19
 
20
20
  def filename
21
21
  File.basename(filepath)
22
22
  end
23
23
 
24
+ private
25
+
26
+ def _readfile(path, &block)
27
+ File.open(path, 'rb', &block)
28
+ end
24
29
  end
25
30
 
26
31
  end
@@ -53,6 +53,10 @@ module Locomotive
53
53
  value.try(:iso8601)
54
54
  end
55
55
 
56
+ def decorate_json_field(value)
57
+ value.to_json
58
+ end
59
+
56
60
  alias :decorate_time_field :decorate_date_time_field
57
61
 
58
62
  def to_hash
@@ -23,7 +23,8 @@ module Locomotive
23
23
  seo_title meta_keywords meta_description
24
24
  editable_elements
25
25
  content_type
26
- template)
26
+ template
27
+ display_settings)
27
28
 
28
29
  # remove the attributes that end-users might have modified in the back-office
29
30
  if persisted? && !__persist_content__
@@ -66,6 +67,10 @@ module Locomotive
66
67
  self[:parent]
67
68
  end
68
69
 
70
+ def display_settings
71
+ self[:display_settings]
72
+ end
73
+
69
74
  def content_type
70
75
  templatized? ? content_type_id : nil
71
76
  end
@@ -21,7 +21,7 @@ module Locomotive
21
21
  end
22
22
 
23
23
  def source
24
- Locomotive::Coal::UploadIO.new(filepath, nil, realname)
24
+ Locomotive::Coal::UploadIO.new(_readfile(filepath), nil, realname)
25
25
  end
26
26
 
27
27
  def priority
@@ -33,7 +33,7 @@ module Locomotive
33
33
  end
34
34
 
35
35
  def checksum
36
- Digest::MD5.hexdigest(File.read(filepath))
36
+ Digest::MD5.hexdigest(_readfile(filepath) { |io| io.read })
37
37
  end
38
38
 
39
39
  # - memoize it because it will not change even if we change the filepath (or source)
@@ -71,6 +71,10 @@ module Locomotive
71
71
  File.basename(filename, extension) + new_extension
72
72
  end
73
73
  end
74
+
75
+ def _readfile(path, &block)
76
+ File.open(path, 'rb', &block)
77
+ end
74
78
 
75
79
  end
76
80
 
@@ -16,6 +16,7 @@ module Locomotive::Wagon
16
16
  self.next
17
17
  rescue StandardError => error
18
18
  @error = error
19
+ puts error.inspect
19
20
  log_error
20
21
  render_error_page
21
22
  end
@@ -31,6 +32,9 @@ module Locomotive::Wagon
31
32
  def render_error_page
32
33
  _template = ERB.new(template, nil, '-')
33
34
  render_response(_template.result(binding))
35
+ rescue Exception => e
36
+ puts e.inspect
37
+ 'Unknown error'
34
38
  end
35
39
 
36
40
  def template
@@ -40,27 +44,75 @@ module Locomotive::Wagon
40
44
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
41
45
  <head>
42
46
  <title>Wagon - Rendering error</title>
47
+ <link href="https://fonts.googleapis.com/css?family=Muli:300,400,700" rel="stylesheet" />
48
+ <style>
49
+ body { margin: 0px; padding: 0px; font-family: 'Muli', sans-serif; }
50
+ div { padding: 20px; }
51
+ h1 {
52
+ margin: 0px;
53
+ padding: 20px 0px;
54
+ text-align: center;
55
+ color: #fff;
56
+ background: #E1535E;
57
+ }
58
+ h2 {
59
+ font-size: 40px;
60
+ text-align: center;
61
+ }
62
+ h3 {
63
+ text-transform: uppercase;
64
+ font-weight: normal;
65
+ }
66
+ h3 strong { font-weight: bold; text-transform: none; }
67
+ p {
68
+ font-weight: 300;
69
+ line-height: 22px;
70
+ margin: 20px 20px 30px;
71
+ }
72
+ pre {
73
+ margin: 20px 20px 30px;
74
+ padding: 20px 0px 20px 0px;
75
+ border-left: 4px solid #CACACA;
76
+ background: #FAFAFA;
77
+ box-sizing: border-box;
78
+ line-height: 20px;
79
+ }
80
+ pre strong {
81
+ margin-right: 20px;
82
+ }
83
+ </style>
43
84
  </head>
44
85
 
45
86
  <body>
46
- <h1>Arrrghhhh, we could not render page</h1>
47
- <h2><%= @error.message %></h2>
48
-
49
- <h3>File: <%= @error.respond_to?(:file) ? @error.file : '?' %></h3>
50
-
51
- <h3>Code</h3>
52
- <% if @error.respond_to?(:code_lines) %>
53
- <pre>
54
- <% @error.code_lines.each do |(line, statement)| -%>
55
- <strong><%= line %></strong> <%= statement %>
56
- <% end -%>
57
- </pre>
58
- <% else %>
59
- <p><i>No code</i></p>
60
- <% end %>
61
-
62
- <h3>Back trace</h3>
63
- <%= @error.backtrace.join("<br/>") %>
87
+ <h1>Arrrghhhh, we could not render your page</h1>
88
+
89
+ <div>
90
+ <h2><%= @error.message %></h2>
91
+
92
+ <% if @error.respond_to?(:file) %>
93
+ <h3>File:</h3>
94
+ <p><%= @error.file %></p>
95
+ <% end %>
96
+
97
+ <% if @error.respond_to?(:action) %>
98
+ <h3>Action:</h3>
99
+ <p><%= @error.action %></p>
100
+ <% end %>
101
+
102
+ <% if @error.respond_to?(:code_lines) %>
103
+ <h3>Code</h3>
104
+ <pre>
105
+ <% @error.code_lines.each do |(line, statement)| -%>
106
+ <strong><%= line %></strong> <%= ERB::Util.html_escape(statement) %>
107
+ <% end -%>
108
+ </pre>
109
+ <% else %>
110
+ <p><i>No code</i></p>
111
+ <% end %>
112
+
113
+ <h3>Backtrace</h3>
114
+ <p><%= @error.backtrace.join("<br/>") %></p>
115
+ </div>
64
116
 
65
117
  </body>
66
118
  </html>}
@@ -1,5 +1,5 @@
1
1
  module Locomotive
2
2
  module Wagon
3
- VERSION = '2.2.0'
3
+ VERSION = '2.3.0.rc1'
4
4
  end
5
5
  end
@@ -21,19 +21,18 @@ Gem::Specification.new do |gem|
21
21
 
22
22
  gem.add_development_dependency 'rake', '~> 10.0.4'
23
23
 
24
- gem.add_dependency 'thor', '~> 0.19.1'
25
- gem.add_dependency 'thin', '~> 1.6.3'
26
- gem.add_dependency 'rubyzip', '~> 1.1.7'
27
- gem.add_dependency 'netrc', '~> 0.10.3'
24
+ gem.add_dependency 'thor', '~> 0.19.4'
25
+ gem.add_dependency 'thin', '~> 1.7.0'
26
+ gem.add_dependency 'rubyzip', '~> 1.2.1'
27
+ gem.add_dependency 'netrc', '~> 0.11.0'
28
28
 
29
29
  gem.add_dependency 'locomotivecms_common', '~> 0.2.0'
30
- gem.add_dependency 'locomotivecms_coal', '~> 1.3.0'
31
- gem.add_dependency 'locomotivecms_steam', '~> 1.2.0'
30
+ gem.add_dependency 'locomotivecms_coal', '~> 1.4.0'
31
+ gem.add_dependency 'locomotivecms_steam', '~> 1.3.0.rc1'
32
32
 
33
33
  gem.add_dependency 'haml', '~> 4.0.7'
34
- gem.add_dependency 'listen', '~> 3.0.4'
34
+ gem.add_dependency 'listen', '~> 3.1.5'
35
35
  gem.add_dependency 'rack-livereload', '~> 0.3.16'
36
- gem.add_dependency 'yui-compressor', '~> 0.12.0'
37
36
 
38
37
  gem.add_dependency 'faker', '~> 1.6'
39
38
  end
@@ -8,13 +8,13 @@ http_interactions:
8
8
  string: email=john%40doe.net&password=asimplepassword
9
9
  headers:
10
10
  User-Agent:
11
- - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
11
+ - Faraday v0.9.2
12
12
  Accept:
13
13
  - application/json
14
14
  Accept-Encoding:
15
15
  - gzip,deflate
16
16
  Date:
17
- - Fri, 17 Jun 2016 08:02:04 GMT
17
+ - Thu, 09 Mar 2017 14:24:46 GMT
18
18
  Content-Type:
19
19
  - application/x-www-form-urlencoded
20
20
  response:
@@ -29,16 +29,16 @@ http_interactions:
29
29
  Cache-Control:
30
30
  - no-cache
31
31
  X-Request-Id:
32
- - b0c718fe-9812-411b-9824-367063c7c7c8
32
+ - e772514a-8b0c-44d6-b12a-d1ecc1d344f9
33
33
  X-Runtime:
34
- - '0.641600'
34
+ - '0.508672'
35
35
  Content-Length:
36
36
  - '40'
37
37
  body:
38
38
  encoding: UTF-8
39
39
  string: '{"message":"Invalid email or password."}'
40
40
  http_version:
41
- recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
41
+ recorded_at: Thu, 09 Mar 2017 14:24:46 GMT
42
42
  - request:
43
43
  method: post
44
44
  uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -47,13 +47,13 @@ http_interactions:
47
47
  string: account%5Bemail%5D=john%40doe.net&account%5Bname%5D=John&account%5Bpassword%5D=asimplepassword
48
48
  headers:
49
49
  User-Agent:
50
- - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
50
+ - Faraday v0.9.2
51
51
  Accept:
52
52
  - application/json
53
53
  Accept-Encoding:
54
54
  - gzip,deflate
55
55
  Date:
56
- - Fri, 17 Jun 2016 08:02:05 GMT
56
+ - Thu, 09 Mar 2017 14:24:46 GMT
57
57
  Content-Type:
58
58
  - application/x-www-form-urlencoded
59
59
  response:
@@ -64,20 +64,20 @@ http_interactions:
64
64
  Content-Type:
65
65
  - application/json
66
66
  Etag:
67
- - W/"0e3f9d0daf88f8fd4f0a2ec082a5a7e5"
67
+ - W/"80947389622b7865dea7bb4de66d8b0d"
68
68
  Cache-Control:
69
69
  - max-age=0, private, must-revalidate
70
70
  X-Request-Id:
71
- - ca31d12a-1fbb-41c6-a7eb-f2f36de12f0b
71
+ - c4df15b8-239a-4fec-b053-5333d1f5015b
72
72
  X-Runtime:
73
- - '0.158071'
73
+ - '0.099810'
74
74
  Content-Length:
75
75
  - '250'
76
76
  body:
77
77
  encoding: UTF-8
78
- string: '{"_id":"5763ae7d87f6437d12223b7e","created_at":"2016-06-17T08:02:05Z","updated_at":"2016-06-17T08:02:05Z","name":"John","email":"john@doe.net","locale":"en","api_key":"f3d9eb1da9dd7d755bf61cb78040eb3ac20054b7","super_admin":false,"local_admin":false}'
78
+ string: '{"_id":"58c165ae87f64357b620337c","created_at":"2017-03-09T14:24:46Z","updated_at":"2017-03-09T14:24:46Z","name":"John","email":"john@doe.net","locale":"en","api_key":"87ca7099bd26190211ba75867a64c96616a22bd9","super_admin":false,"local_admin":false}'
79
79
  http_version:
80
- recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
80
+ recorded_at: Thu, 09 Mar 2017 14:24:47 GMT
81
81
  - request:
82
82
  method: post
83
83
  uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -86,13 +86,13 @@ http_interactions:
86
86
  string: email=admin%40locomotivecms.com&password=locomotive
87
87
  headers:
88
88
  User-Agent:
89
- - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
89
+ - Faraday v0.9.2
90
90
  Accept:
91
91
  - application/json
92
92
  Accept-Encoding:
93
93
  - gzip,deflate
94
94
  Date:
95
- - Fri, 17 Jun 2016 08:02:05 GMT
95
+ - Thu, 09 Mar 2017 14:24:47 GMT
96
96
  Content-Type:
97
97
  - application/x-www-form-urlencoded
98
98
  response:
@@ -103,39 +103,39 @@ http_interactions:
103
103
  Content-Type:
104
104
  - application/json
105
105
  Etag:
106
- - W/"454972cc6e9c77359905d2dea5ba89ee"
106
+ - W/"547737c117de5d58a73948ce621cc79b"
107
107
  Cache-Control:
108
108
  - max-age=0, private, must-revalidate
109
109
  X-Request-Id:
110
- - cb777707-131e-4a7b-beff-040b267ac2c6
110
+ - 402d1585-4162-4c82-8482-1a02b1bc4d4e
111
111
  X-Runtime:
112
- - '0.022266'
112
+ - '0.020225'
113
113
  Content-Length:
114
114
  - '32'
115
115
  body:
116
116
  encoding: UTF-8
117
- string: '{"token":"HyqKxyBLmEH9x_GzYnWY"}'
117
+ string: '{"token":"2A9iTQyoACHbA4eAVLCH"}'
118
118
  http_version:
119
- recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
119
+ recorded_at: Thu, 09 Mar 2017 14:24:47 GMT
120
120
  - request:
121
121
  method: get
122
- uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=HyqKxyBLmEH9x_GzYnWY
122
+ uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=2A9iTQyoACHbA4eAVLCH
123
123
  body:
124
124
  encoding: UTF-8
125
125
  string: ''
126
126
  headers:
127
127
  User-Agent:
128
- - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
128
+ - Faraday v0.9.2
129
129
  Accept:
130
130
  - application/json
131
131
  Accept-Encoding:
132
132
  - gzip,deflate
133
133
  Date:
134
- - Fri, 17 Jun 2016 08:02:05 GMT
134
+ - Thu, 09 Mar 2017 14:24:47 GMT
135
135
  X-Locomotive-Account-Email:
136
136
  - admin@locomotivecms.com
137
137
  X-Locomotive-Account-Token:
138
- - HyqKxyBLmEH9x_GzYnWY
138
+ - 2A9iTQyoACHbA4eAVLCH
139
139
  response:
140
140
  status:
141
141
  code: 200
@@ -144,39 +144,39 @@ http_interactions:
144
144
  Content-Type:
145
145
  - application/json
146
146
  Etag:
147
- - W/"7560269880972609752ff82cb3ed592f"
147
+ - W/"c10610a4a1a6b959915b802428da94ef"
148
148
  Cache-Control:
149
149
  - max-age=0, private, must-revalidate
150
150
  X-Request-Id:
151
- - 4fab7136-9216-46fb-a2ce-f25e5b40ca17
151
+ - 3c64529c-1b7f-476b-bcf6-7937615c86a6
152
152
  X-Runtime:
153
- - '0.037894'
153
+ - '0.032035'
154
154
  Content-Length:
155
155
  - '261'
156
156
  body:
157
157
  encoding: UTF-8
158
- string: '{"_id":"5763ad8487f6437cec5812c1","created_at":"2016-06-17T07:57:56Z","updated_at":"2016-06-17T07:57:56Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
158
+ string: '{"_id":"58c1659187f6435785cff941","created_at":"2017-03-09T14:24:17Z","updated_at":"2017-03-09T14:24:17Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
159
159
  http_version:
160
- recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
160
+ recorded_at: Thu, 09 Mar 2017 14:24:47 GMT
161
161
  - request:
162
162
  method: get
163
- uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=HyqKxyBLmEH9x_GzYnWY
163
+ uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=2A9iTQyoACHbA4eAVLCH
164
164
  body:
165
165
  encoding: UTF-8
166
166
  string: ''
167
167
  headers:
168
168
  User-Agent:
169
- - HTTPClient/1.0 (2.7.2, ruby 2.2.3 (2015-08-18))
169
+ - Faraday v0.9.2
170
170
  Accept:
171
171
  - application/json
172
172
  Accept-Encoding:
173
173
  - gzip,deflate
174
174
  Date:
175
- - Fri, 17 Jun 2016 08:02:05 GMT
175
+ - Thu, 09 Mar 2017 14:24:47 GMT
176
176
  X-Locomotive-Account-Email:
177
177
  - admin@locomotivecms.com
178
178
  X-Locomotive-Account-Token:
179
- - HyqKxyBLmEH9x_GzYnWY
179
+ - 2A9iTQyoACHbA4eAVLCH
180
180
  response:
181
181
  status:
182
182
  code: 200
@@ -185,18 +185,18 @@ http_interactions:
185
185
  Content-Type:
186
186
  - application/json
187
187
  Etag:
188
- - W/"7560269880972609752ff82cb3ed592f"
188
+ - W/"c10610a4a1a6b959915b802428da94ef"
189
189
  Cache-Control:
190
190
  - max-age=0, private, must-revalidate
191
191
  X-Request-Id:
192
- - ad034495-4fa7-42ab-9176-e24422eef3ff
192
+ - 6b1170a3-ec03-4a8c-b841-3c9cdb1f6ea8
193
193
  X-Runtime:
194
- - '0.025608'
194
+ - '0.019497'
195
195
  Content-Length:
196
196
  - '261'
197
197
  body:
198
198
  encoding: UTF-8
199
- string: '{"_id":"5763ad8487f6437cec5812c1","created_at":"2016-06-17T07:57:56Z","updated_at":"2016-06-17T07:57:56Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
199
+ string: '{"_id":"58c1659187f6435785cff941","created_at":"2017-03-09T14:24:17Z","updated_at":"2017-03-09T14:24:17Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
200
200
  http_version:
201
- recorded_at: Fri, 17 Jun 2016 08:02:05 GMT
202
- recorded_with: VCR 3.0.1
201
+ recorded_at: Thu, 09 Mar 2017 14:24:47 GMT
202
+ recorded_with: VCR 3.0.3