rcarvalho-happening 0.2.5.4 → 0.2.5.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/happening.gemspec +1 -1
  2. data/lib/happening/s3/bucket.rb +3 -1
  3. metadata +11 -11
data/happening.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{rcarvalho-happening}
8
- s.version = "0.2.5.4"
8
+ s.version = "0.2.5.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = [%q{Jonathan Weiss}]
data/lib/happening/s3/bucket.rb CHANGED
@@ -12,6 +12,7 @@ module Happening
12
12
  attr_accessor :bucket, :options
13
13
 
14
14
  def initialize(bucket, options = {})
15
+ @marker = options.delete(:marker)
15
16
  @options = {
16
17
  :timeout => 10,
17
18
  :server => 's3.amazonaws.com',
@@ -36,7 +37,8 @@ module Happening
36
37
  end
37
38
 
38
39
  def url
39
- URI::Generic.new(options[:protocol], nil, server, port, nil, path(!dns_bucket?), nil, nil, nil).to_s
40
+ marker = @marker.nil? ? nil : "marker=#{CGI.escape(@marker)}"
41
+ URI::Generic.new(options[:protocol], nil, server, port, nil, path(!dns_bucket?), nil, marker, nil).to_s
40
42
  end
41
43
 
42
44
  def server
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rcarvalho-happening
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5.4
4
+ version: 0.2.5.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-07-26 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: em-http-request
16
- requirement: &2153757760 !ruby/object:Gem::Requirement
16
+ requirement: &2153728520 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2153757760
24
+ version_requirements: *2153728520
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &2153757280 !ruby/object:Gem::Requirement
27
+ requirement: &2153728040 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *2153757280
35
+ version_requirements: *2153728040
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &2153756800 !ruby/object:Gem::Requirement
38
+ requirement: &2153727560 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.0.0
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2153756800
46
+ version_requirements: *2153727560
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: jeweler
49
- requirement: &2153756320 !ruby/object:Gem::Requirement
49
+ requirement: &2153727080 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.6.4
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2153756320
57
+ version_requirements: *2153727080
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mocha
60
- requirement: &2153772220 !ruby/object:Gem::Requirement
60
+ requirement: &2153742980 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2153772220
68
+ version_requirements: *2153742980
69
69
  description: ! 'An EventMachine based S3 client '
70
70
  email: jw@innerewut.de
71
71
  executables: []