ongaku_ryoho_server 0.3.4 → 0.3.5

Sign up to get free protection for your applications and to get access to all the features.
data/history.txt CHANGED
@@ -1,3 +1,10 @@
1
+ === 0.3.5 / 2013-03-15
2
+
3
+ * refactor 'check_files' method
4
+ * add gzip compression
5
+ * only force encoding when that method exists
6
+
7
+
1
8
  === 0.3.4 / 2013-02-05
2
9
 
3
10
  * encoding fixes
@@ -1,5 +1,10 @@
1
1
  options = OngakuRyohoServer::OPTIONS
2
2
 
3
+ #
4
+ # Middleware
5
+
6
+ use Rack::Deflater
7
+
3
8
 
4
9
  #
5
10
  # Build file list (only if needed or request)
@@ -39,7 +39,7 @@ module OngakuRyohoServer
39
39
  #
40
40
  def self.get
41
41
  path = self.config_file_path
42
- File.open(path, "r") if File.file?(path)
42
+ File.open(path, "r").read if File.file?(path)
43
43
  end
44
44
 
45
45
 
@@ -39,8 +39,9 @@ module OngakuRyohoServer
39
39
  # object containing missing_files and new_tracks array
40
40
  #
41
41
  def self.check_files(file_list)
42
- file_list = JSON.parse(file_list)
43
- file_list_from_current_directory = OngakuRyohoServer::Process.directory
42
+ file_list = begin JSON.parse(file_list) rescue [] end
43
+ file_list_from_current_directory = JSON.parse(OngakuRyohoServer::List.get)
44
+ file_list_from_current_directory.map! { |obj| obj["location"] }
44
45
 
45
46
  missing_files = file_list - file_list_from_current_directory
46
47
  new_files = file_list_from_current_directory - file_list
@@ -77,6 +78,8 @@ module OngakuRyohoServer
77
78
  rpartition = location.rpartition("/")
78
79
  filename = rpartition[2]
79
80
 
81
+ next unless File.exist?(location)
82
+
80
83
  track = {}
81
84
 
82
85
  TagLib::FileRef.open(location) do |fileref|
@@ -119,6 +122,7 @@ module OngakuRyohoServer
119
122
  # Helpers
120
123
  #
121
124
  def self.encode_string(string)
125
+ return string unless string.respond_to?(:force_encoding)
122
126
  new_string = string.force_encoding("cp1252")
123
127
  new_string.encode("UTF-8", { :invalid => :replace, :undef => :replace, :replace => "?" })
124
128
  end
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "ongaku_ryoho_server"
5
- s.version = "0.3.4"
5
+ s.version = "0.3.5"
6
6
 
7
7
  s.authors = ["Steven Vandevelde"]
8
8
  s.email = ["icid.asset@gmail.com"]
@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
17
17
  s.require_paths = ["lib"]
18
18
  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
19
19
 
20
- s.add_dependency "json", "~> 1.7.5"
20
+ s.add_dependency "json", "~> 1.7.7"
21
21
  s.add_dependency "taglib-ruby", "~> 0.5.2"
22
- s.add_dependency "sinatra", "~> 1.3.3"
22
+ s.add_dependency "sinatra", "~> 1.3.6"
23
23
  s.add_dependency "puma", "~> 1.6.3"
24
24
 
25
25
  s.add_development_dependency "rake"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ongaku_ryoho_server
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,22 +9,27 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-05 00:00:00.000000000Z
12
+ date: 2013-03-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json
16
- requirement: &70239126556780 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 1.7.5
21
+ version: 1.7.7
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70239126556780
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: 1.7.7
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: taglib-ruby
27
- requirement: &70239126556220 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ~>
@@ -32,21 +37,31 @@ dependencies:
32
37
  version: 0.5.2
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70239126556220
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ~>
44
+ - !ruby/object:Gem::Version
45
+ version: 0.5.2
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: sinatra
38
- requirement: &70239126555640 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ~>
42
52
  - !ruby/object:Gem::Version
43
- version: 1.3.3
53
+ version: 1.3.6
44
54
  type: :runtime
45
55
  prerelease: false
46
- version_requirements: *70239126555640
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: 1.3.6
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: puma
49
- requirement: &70239126555060 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ~>
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: 1.6.3
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *70239126555060
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ~>
76
+ - !ruby/object:Gem::Version
77
+ version: 1.6.3
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: rake
60
- requirement: &70239126554680 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
65
85
  version: '0'
66
86
  type: :development
67
87
  prerelease: false
68
- version_requirements: *70239126554680
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: '0'
69
94
  description: Serves music to Ongaku Ryoho clients
70
95
  email:
71
96
  - icid.asset@gmail.com
@@ -107,10 +132,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
107
132
  version: '0'
108
133
  segments:
109
134
  - 0
110
- hash: -2303797705445732798
135
+ hash: 2222766623163788297
111
136
  requirements: []
112
137
  rubyforge_project:
113
- rubygems_version: 1.8.13
138
+ rubygems_version: 1.8.24
114
139
  signing_key:
115
140
  specification_version: 3
116
141
  summary: Serves music to Ongaku Ryoho clients