ongaku_ryoho_server 0.3.4 → 0.3.5

data/history.txt

@@ -1,3 +1,10 @@
+=== 0.3.5 / 2013-03-15
+
+* refactor 'check_files' method
+* add gzip compression
+* only force encoding when that method exists
+
+
 === 0.3.4 / 2013-02-05
 
 * encoding fixes

data/lib/ongaku_ryoho_server/config.ru

@@ -1,5 +1,10 @@
 options = OngakuRyohoServer::OPTIONS
 
+#
+# Middleware
+
+use Rack::Deflater
+
 
 #
 # Build file list (only if needed or request)

data/lib/ongaku_ryoho_server/list.rb

@@ -39,7 +39,7 @@ module OngakuRyohoServer
     #
     def self.get
       path = self.config_file_path
-      File.open(path, "r") if File.file?(path)
+      File.open(path, "r").read if File.file?(path)
     end
 
 

data/lib/ongaku_ryoho_server/process.rb

@@ -39,8 +39,9 @@ module OngakuRyohoServer
     #   object containing missing_files and new_tracks array
     #
     def self.check_files(file_list)
-      file_list = JSON.parse(file_list)
-      file_list_from_current_directory = OngakuRyohoServer::Process.directory
+      file_list = begin JSON.parse(file_list) rescue [] end
+      file_list_from_current_directory = JSON.parse(OngakuRyohoServer::List.get)
+      file_list_from_current_directory.map! { |obj| obj["location"] }
 
       missing_files = file_list - file_list_from_current_directory
       new_files = file_list_from_current_directory - file_list
@@ -77,6 +78,8 @@ module OngakuRyohoServer
         rpartition = location.rpartition("/")
         filename = rpartition[2]
 
+        next unless File.exist?(location)
+
         track = {}
 
         TagLib::FileRef.open(location) do |fileref|
@@ -119,6 +122,7 @@ module OngakuRyohoServer
     # Helpers
     #
     def self.encode_string(string)
+      return string unless string.respond_to?(:force_encoding)
       new_string = string.force_encoding("cp1252")
       new_string.encode("UTF-8", { :invalid => :replace, :undef => :replace, :replace => "?" })
     end

data/ongaku_ryoho_server.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ongaku_ryoho_server"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.authors = ["Steven Vandevelde"]
   s.email = ["icid.asset@gmail.com"]
@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
-  s.add_dependency "json", "~> 1.7.5"
+  s.add_dependency "json", "~> 1.7.7"
   s.add_dependency "taglib-ruby", "~> 0.5.2"
-  s.add_dependency "sinatra", "~> 1.3.3"
+  s.add_dependency "sinatra", "~> 1.3.6"
   s.add_dependency "puma", "~> 1.6.3"
 
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ongaku_ryoho_server
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70239126556780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70239126556780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
-  requirement: &70239126556220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +37,31 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70239126556220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70239126555640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70239126555640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: puma
-  requirement: &70239126555060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70239126555060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70239126554680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239126554680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serves music to Ongaku Ryoho clients
 email:
 - icid.asset@gmail.com
@@ -107,10 +132,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2303797705445732798
+      hash: 2222766623163788297
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Serves music to Ongaku Ryoho clients