buttercms-ruby 1.1.3 → 1.2.0

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: fd0cec560c6a8cbc301cb66c4c7c7ce08dd7fbc5
4
- data.tar.gz: c338d395d4ca2f4e7dfaa0ba2d64f7aab01f2571
3
+ metadata.gz: ac278c4393b2e128e1bf08b1545d0b398e8d40e5
4
+ data.tar.gz: 8cee1f47a82ad04e272a15eb8c3a85fdb8ca19f8
5
5
  SHA512:
6
- metadata.gz: 6337314aac5222e1e5c34b1aa4559c53b2bfd63ac59c91e332a39e8d0b7174824a4f790369e1a54a7e198ec373463c177c9028e2f165437c307bf9f606b40eb0
7
- data.tar.gz: f697193937a8942f1487e0c374869cf610959521912c62bb492c046c5720212a5cb080fd1fcbb717670d3498499255cdec81dcaf2225b668be8a0840c1d6be75
6
+ metadata.gz: 911f9a25ccc98f3673ea0754607a71305ce4dce177c7a88b769a139585f2046a18b0af89adaba4a532b271bcc0c29b61e3b86d179543e0cc41e63e000d38d2b6
7
+ data.tar.gz: b4327c828a90b1f62fae70e8a05aaacc1e8f0fa7ab756aa956b73204e0517f0e07b6eecf961ae34006a4b0c460b086abbf5d38e274c630e7c30ddcb58bc4874a
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.3
1
+ 1.2.0
@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
15
15
  s.license = 'MIT'
16
16
 
17
17
  s.add_dependency 'httparty', '~> 0.14', '>= 0.14.0'
18
- s.add_dependency 'redis', '~> 3.0', '>= 3.0.0'
19
18
 
20
19
  s.add_development_dependency 'rspec', '~> 2.7'
21
20
  s.add_development_dependency 'webmock'
@@ -1,9 +1,7 @@
1
1
  require 'json'
2
2
  require 'httparty'
3
3
  require 'ostruct'
4
- require "redis"
5
4
  require 'logger'
6
- require 'yaml/store'
7
5
 
8
6
  require_relative 'buttercms/version'
9
7
  require_relative 'buttercms/hash_to_object'
@@ -17,9 +15,6 @@ require_relative 'buttercms/post'
17
15
  require_relative 'buttercms/feed'
18
16
  require_relative 'buttercms/content'
19
17
 
20
- require_relative 'buttercms/data_store_adapters/yaml'
21
- require_relative 'buttercms/data_store_adapters/redis'
22
-
23
18
  # See https://github.com/jruby/jruby/issues/3113
24
19
  if RUBY_VERSION < '2.0.0'
25
20
  require_relative 'core_ext/ostruct'
@@ -36,7 +31,7 @@ module ButterCMS
36
31
  end
37
32
 
38
33
  def self.logger
39
- @logger ||= Logger.new($stdout).tap do |log|
34
+ @logger ||= Logger.new($stdout).tap do |log|
40
35
  log.progname = "ButterCMS"
41
36
  end
42
37
  end
@@ -47,14 +42,16 @@ module ButterCMS
47
42
  if args.count < 2
48
43
  raise ArgumentError.new "Wrong number of arguments"
49
44
  end
50
-
45
+
51
46
  strategy = args.first
52
47
  options = args.drop(1)
53
48
 
54
49
  case strategy
55
50
  when :yaml
51
+ require_relative 'buttercms/data_store_adapters/yaml'
56
52
  @data_store = ButterCMS::DataStoreAdapters::Yaml.new(options)
57
53
  when :redis
54
+ require_relative 'buttercms/data_store_adapters/redis'
58
55
  @data_store = ButterCMS::DataStoreAdapters::Redis.new(options)
59
56
  else
60
57
  raise ArgumentError.new "Invalid ButterCMS data store #{strategy}"
@@ -71,7 +68,7 @@ module ButterCMS
71
68
  end
72
69
 
73
70
  response = HTTParty.get(
74
- @api_url + path,
71
+ @api_url + path,
75
72
  headers: {"User-Agent" => "ButterCMS/#{ButterCMS::VERSION}"},
76
73
  query: options.merge(base_options),
77
74
  verify: false
@@ -89,7 +86,7 @@ module ButterCMS
89
86
  result = api_request(path, options)
90
87
 
91
88
  if data_store
92
- data_store.set(key, result)
89
+ data_store.set(key, result)
93
90
  logger.info "Set key #{key}"
94
91
  end
95
92
 
@@ -1,9 +1,16 @@
1
+ begin
2
+ require 'redis'
3
+ rescue LoadError
4
+ puts "WARNING: redis >= 3.0.0 is required to use the redis data store."
5
+ raise
6
+ end
7
+
1
8
  module ButterCMS
2
9
  module DataStoreAdapters
3
10
  class Redis
4
11
  def initialize(options)
5
12
  redis_url = options.first
6
-
13
+
7
14
  @redis = ::Redis.new(url: redis_url)
8
15
  end
9
16
 
@@ -16,4 +23,4 @@ module ButterCMS
16
23
  end
17
24
  end
18
25
  end
19
- end
26
+ end
@@ -1,3 +1,5 @@
1
+ require 'yaml/store'
2
+
1
3
  module ButterCMS
2
4
  module DataStoreAdapters
3
5
  class Yaml
@@ -20,4 +22,4 @@ module ButterCMS
20
22
  end
21
23
  end
22
24
  end
23
- end
25
+ end
@@ -1,3 +1,3 @@
1
1
  module ButterCMS
2
- VERSION = '1.1.3'
2
+ VERSION = '1.2.0'
3
3
  end
metadata CHANGED
@@ -1,81 +1,61 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buttercms-ruby
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - ButterCMS
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-28 00:00:00.000000000 Z
11
+ date: 2017-04-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: httparty
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0.14'
20
- - - ">="
20
+ - - '>='
21
21
  - !ruby/object:Gem::Version
22
22
  version: 0.14.0
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - "~>"
27
+ - - ~>
28
28
  - !ruby/object:Gem::Version
29
29
  version: '0.14'
30
- - - ">="
30
+ - - '>='
31
31
  - !ruby/object:Gem::Version
32
32
  version: 0.14.0
33
- - !ruby/object:Gem::Dependency
34
- name: redis
35
- requirement: !ruby/object:Gem::Requirement
36
- requirements:
37
- - - "~>"
38
- - !ruby/object:Gem::Version
39
- version: '3.0'
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- version: 3.0.0
43
- type: :runtime
44
- prerelease: false
45
- version_requirements: !ruby/object:Gem::Requirement
46
- requirements:
47
- - - "~>"
48
- - !ruby/object:Gem::Version
49
- version: '3.0'
50
- - - ">="
51
- - !ruby/object:Gem::Version
52
- version: 3.0.0
53
33
  - !ruby/object:Gem::Dependency
54
34
  name: rspec
55
35
  requirement: !ruby/object:Gem::Requirement
56
36
  requirements:
57
- - - "~>"
37
+ - - ~>
58
38
  - !ruby/object:Gem::Version
59
39
  version: '2.7'
60
40
  type: :development
61
41
  prerelease: false
62
42
  version_requirements: !ruby/object:Gem::Requirement
63
43
  requirements:
64
- - - "~>"
44
+ - - ~>
65
45
  - !ruby/object:Gem::Version
66
46
  version: '2.7'
67
47
  - !ruby/object:Gem::Dependency
68
48
  name: webmock
69
49
  requirement: !ruby/object:Gem::Requirement
70
50
  requirements:
71
- - - ">="
51
+ - - '>='
72
52
  - !ruby/object:Gem::Version
73
53
  version: '0'
74
54
  type: :development
75
55
  prerelease: false
76
56
  version_requirements: !ruby/object:Gem::Requirement
77
57
  requirements:
78
- - - ">="
58
+ - - '>='
79
59
  - !ruby/object:Gem::Version
80
60
  version: '0'
81
61
  description: Butter is a blogging platform loved by engineers. See https://buttercms.com
@@ -86,8 +66,8 @@ executables: []
86
66
  extensions: []
87
67
  extra_rdoc_files: []
88
68
  files:
89
- - ".gitignore"
90
- - ".rspec"
69
+ - .gitignore
70
+ - .rspec
91
71
  - Gemfile
92
72
  - LICENSE
93
73
  - README.md
@@ -124,17 +104,17 @@ require_paths:
124
104
  - lib
125
105
  required_ruby_version: !ruby/object:Gem::Requirement
126
106
  requirements:
127
- - - ">="
107
+ - - '>='
128
108
  - !ruby/object:Gem::Version
129
109
  version: 1.9.3
130
110
  required_rubygems_version: !ruby/object:Gem::Requirement
131
111
  requirements:
132
- - - ">="
112
+ - - '>='
133
113
  - !ruby/object:Gem::Version
134
114
  version: '0'
135
115
  requirements: []
136
116
  rubyforge_project:
137
- rubygems_version: 2.4.5.1
117
+ rubygems_version: 2.0.14.1
138
118
  signing_key:
139
119
  specification_version: 4
140
120
  summary: A simple Ruby client for the buttercms.com REST API