ongaku_ryoho_server 0.3.6 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7de0168f5720bba9e90009b42988c9dbb9d1cc2a
+  data.tar.gz: 1985ef84ad0aa83a0d690961ec0cd41897397ff9
+SHA512:
+  metadata.gz: 1dd31f2434a4d21c01b604bbf988a1f8885e25d515216d3df7426ec8a423c3c32592b2f9fe1cc13619029ababf8b1c12db63e27c3690672d24b447cda52c554b
+  data.tar.gz: a983c63d1281ea398f47cadc4be5f6283dd6e573514f4d0b35c49aa5198db8b0230ca5372d38f65db09b739803e07de2807a6380823b304ef1457fb1f60ea2cd

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p195

data/README.md

@@ -1,12 +1,13 @@
 # Ongaku Ryoho Server
 
-A little Sinatra web server (with Puma) wrapped in a gem specifically for the Ongaku Ryoho client.
+A little web server (with Puma) wrapped in a gem specifically for the Ongaku Ryoho client.
 
 ## How to use
 
 ### Requirements
 
-`Ruby 1.8.7 (or higher)`
+- taglib
+- ruby 1.8.7 (or higher)
 
 ### Installation
 
@@ -34,4 +35,7 @@ or create a [launch agent](https://gist.github.com/4106353) (tested on OSX Mount
 --update     update the cached collection
 
 + all the other puma cli options
+-> https://github.com/puma/puma/blob/v2.0.1/lib/puma/cli.rb#L185
+
+-d           daemonize
 ```

data/Rakefile

@@ -1,2 +1,9 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+end

data/history.txt

@@ -1,3 +1,16 @@
+=== 0.5.0 / 2013-07-02
+
+* tests
+* refactored code
+
+
+=== 0.4.0 / 2013-07-01
+
+* jsonp support
+* replace json gem with oj
+* update other dependencies
+
+
 === 0.3.5 / 2013-03-15
 
 * refactor 'check_files' method

data/lib/ongaku_ryoho_server/application.rb

@@ -1,5 +1,3 @@
-require "sinatra/base"
-
 module OngakuRyohoServer
   #
   # { Application }
@@ -16,24 +14,44 @@ module OngakuRyohoServer
 
     # root
     get "/" do
-      content_type :json
+      callback = params[:callback]
+      json = OngakuRyohoServer::List.get
+
+      if callback and !callback.empty?
+        content_type :js
+        response = "#{callback}(#{json})"
+      else
+        content_type :json
+        response = json
+      end
 
-      OngakuRyohoServer::List.get
+      response
     end
 
 
     # compare filelists
     post "/check" do
-      content_type :json
+      callback = params[:callback]
+      file_list = params[:file_list]
+      other_file_list = params[:other_file_list]
+
+      missing_and_new = OngakuRyohoServer::Process.check_files(file_list, other_file_list)
+      json = Oj.dump(missing_and_new)
+
+      if callback and !callback.empty?
+        content_type :js
+        response = "#{callback}(#{json})"
+      else
+        content_type :json
+        response = json
+      end
 
-      collection = params[:file_list]
-      OngakuRyohoServer::Process.check_files(collection).to_json
+      response
     end
 
 
     # music file
     get %r{.(#{FILE_FORMATS.join("|")})$}i do
-      require "uri"
       requested_item = URI.unescape(request.path_info[1..-1])
       File.exists?(requested_item) ? send_file(requested_item) : 404
     end

data/lib/ongaku_ryoho_server/list.rb

@@ -17,7 +17,6 @@ module OngakuRyohoServer
     # => Creates a digest from the path of the current directory
     #
     def self.get_digest
-      require "digest/sha1"
       digested_path = Digest::SHA1.hexdigest(Dir.pwd)
     end
 
@@ -54,7 +53,7 @@ module OngakuRyohoServer
     def self.save
       path = self.config_file_path
       file_list = OngakuRyohoServer::Process.directory
-      collection = OngakuRyohoServer::Process.files(file_list).to_json
+      collection = Oj.dump(OngakuRyohoServer::Process.files(file_list))
 
       # make path
       FileUtils.mkpath(CONFIG_PATH)

data/lib/ongaku_ryoho_server/process.rb

@@ -1,6 +1,3 @@
-require "taglib"
-require "json"
-
 module OngakuRyohoServer
   #
   # { Process }
@@ -29,27 +26,38 @@ module OngakuRyohoServer
     #
     # Check files
     #
-    # => compares a given file list to the file list from the current directory
+    # => compares a given file list to another file list.
+    #    fallback is file list from the current directory.
     #    show which files are missing and scan the ones that are new
     #
     # [params]
-    #   file_list
+    #   file_list : array of hashes with a :location key
+    #   other_file_list
     #
     # [output]
     #   object containing missing_files and new_tracks array
     #
-    def self.check_files(file_list)
-      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"] }
+    def self.check_files(file_list, other_file_list=nil)
+      file_list = Oj.load(file_list || "[]")
+
+      # other file list
+      if other_file_list
+        other_file_list = Oj.load(other_file_list)
+      else
+        other_file_list = Oj.load(OngakuRyohoServer::List.get)
+        other_file_list.map! { |obj| obj[:location] }
+      end
 
-      missing_files = file_list - file_list_from_current_directory
-      new_files = file_list_from_current_directory - file_list
+      # determine which files are missing and which are new
+      missing_files = file_list - other_file_list
+      new_files = other_file_list - file_list
 
+      # process new files
       new_tracks = OngakuRyohoServer::Process.files(
         new_files, { :last_modified => Time.now }
       )
 
+      # return missing and new tracks
       return {
         :missing_files => missing_files,
         :new_tracks => new_tracks

data/lib/ongaku_ryoho_server.rb

@@ -1,3 +1,11 @@
+require "rubygems"
+require "taglib"
+require "oj"
+require "sinatra/base"
+
+require "uri"
+require "digest/sha1"
+
 require "ongaku_ryoho_server/process"
 require "ongaku_ryoho_server/list"
 require "ongaku_ryoho_server/application"

data/ongaku_ryoho_server.gemspec

@@ -1,26 +1,28 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "ongaku_ryoho_server"
-  s.version = "0.3.6"
+  s.name          = "ongaku_ryoho_server"
+  s.version       = "0.5.0"
 
-  s.authors = ["Steven Vandevelde"]
-  s.email = ["icid.asset@gmail.com"]
-  s.description = "Serves music to Ongaku Ryoho clients"
-  s.summary = "Serves music to Ongaku Ryoho clients"
-  s.homepage = "https://github.com/icidasset/ongaku_ryoho_server"
+  s.authors       = ["Steven Vandevelde"]
+  s.email         = ["icid.asset@gmail.com"]
+  s.description   = "Serves music to Ongaku Ryoho clients"
+  s.summary       = "Serves music to Ongaku Ryoho clients"
+  s.homepage      = "https://github.com/icidasset/ongaku_ryoho_server"
 
-  s.files = `git ls-files`.split($\)
-  s.executables = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.files         = `git ls-files`.split($\)
+  s.test_files    = s.files.grep(%r{^spec/})
+  s.executables   = ["ongaku_ryoho_server"]
 
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
-  s.add_dependency "json", "~> 1.7.7"
-  s.add_dependency "taglib-ruby", "~> 0.5.2"
-  s.add_dependency "sinatra", "~> 1.4.2"
-  s.add_dependency "puma", "~> 1.6.3"
+  s.add_runtime_dependency "oj", "~> 2.0.14"
+  s.add_runtime_dependency "taglib-ruby", "~> 0.6.0"
+  s.add_runtime_dependency "sinatra", "~> 1.4.2"
+  s.add_runtime_dependency "puma", "~> 2.0.1"
 
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "~> 10.0.4"
+  s.add_development_dependency "rack-test", "~> 0.6.2"
+  s.add_development_dependency "minitest", "~> 5.0.3"
 end

data/spec/application_spec.rb

@@ -0,0 +1,121 @@
+require File.expand_path("../spec_helper.rb", __FILE__)
+
+describe "Application" do
+
+  #
+  #  Index (GET)
+  #
+  describe "GET /" do
+    before do
+      OngakuRyohoServer::List.save
+    end
+
+    it "should return json" do
+      get "/"
+      last_response.must_be :ok?
+      last_response.content_type.must_equal "application/json;charset=utf-8"
+    end
+
+    it "should return jsonp" do
+      get "/", :callback => "test"
+      last_response.must_be :ok?
+      last_response.content_type.must_equal "application/javascript;charset=utf-8"
+    end
+
+    it "should have 3 items" do
+      get "/"
+      json = Oj.load(last_response.body)
+      json.length.must_equal 3
+    end
+
+    it "should have an item with the necessary keys" do
+      get "/"
+
+      json = Oj.load(last_response.body)
+      first_item = json.first
+
+      first_item.has_key?(:title).must_equal true
+      first_item.has_key?(:artist).must_equal true
+      first_item.has_key?(:album).must_equal true
+      first_item.has_key?(:year).must_equal true
+      first_item.has_key?(:track).must_equal true
+      first_item.has_key?(:genre).must_equal true
+    end
+  end
+
+
+  #
+  #  Check (POST)
+  #
+  describe "POST /check" do
+    before do
+      OngakuRyohoServer::List.save
+    end
+
+    it "should have 2 parent keys" do
+      post "/check"
+      json = Oj.load(last_response.body)
+      json[:missing_files].must_be_kind_of Array
+      json[:new_tracks].must_be_kind_of Array
+    end
+
+    it "should have 3 new tracks when given empty file list" do
+      post "/check", :file_list => Oj.dump([])
+      json = Oj.load(last_response.body)
+      json[:new_tracks].length.must_equal 3
+    end
+
+    it "should have 0 new tracks when given same file list" do
+      file_list = [
+        { :location => "spec/data/a.mp3" },
+        { :location => "spec/data/b.mp3" },
+        { :location => "spec/data/c.mp3" }
+      ]
+
+      post "/check", :file_list => Oj.dump(file_list)
+      json = Oj.load(last_response.body)
+      json[:new_tracks].length.must_equal 3
+    end
+
+    it "should have 3 missing files" do
+      file_list = [
+        { :location => "spec/data/a.mp3" },
+        { :location => "spec/data/b.mp3" },
+        { :location => "spec/data/c.mp3" }
+      ]
+
+      post "/check",
+        :file_list => Oj.dump(file_list),
+        :other_file_list => Oj.dump([])
+
+      json = Oj.load(last_response.body)
+      json[:missing_files].length.must_equal 3
+    end
+  end
+
+
+  #
+  #  Files (GET)
+  #
+  describe "GET /*.ALLOWED_FILE_FORMAT" do
+    it "should be able to load a.mp3" do
+      get "/spec/data/a.mp3"
+      last_response.status.must_equal 200
+      last_response.content_type.must_equal "audio/mpeg"
+    end
+
+    it "should return a 404 if the file doesn't exist" do
+      get "/spec/data/does_not_exist.mp3"
+      last_response.status.must_equal 404
+    end
+  end
+
+
+  describe "GET /*.DISALLOWED_FILE_FORMAT" do
+    it "should return a 403" do
+      get "/forbidden.tar.gz"
+      last_response.status.must_equal 403
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+ENV["RACK_ENV"] = "test"
+
+require File.expand_path("../../lib/ongaku_ryoho_server", __FILE__)
+require "minitest/autorun"
+require "rack/test"
+
+
+class MiniTest::Spec
+  include Rack::Test::Methods
+
+  def app
+    OngakuRyohoServer::Application
+  end
+end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: ongaku_ryoho_server
 version: !ruby/object:Gem::Version
-  version: 0.3.6
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Steven Vandevelde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 2.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 2.0.14
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,35 +55,59 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.3
 description: Serves music to Ongaku Ryoho clients
 email:
 - icid.asset@gmail.com
@@ -100,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -112,31 +130,37 @@ files:
 - lib/ongaku_ryoho_server/list.rb
 - lib/ongaku_ryoho_server/process.rb
 - ongaku_ryoho_server.gemspec
+- spec/application_spec.rb
+- spec/data/a.mp3
+- spec/data/b.mp3
+- spec/data/c.mp3
+- spec/spec_helper.rb
 homepage: https://github.com/icidasset/ongaku_ryoho_server
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1922673208521641221
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Serves music to Ongaku Ryoho clients
-test_files: []
+test_files:
+- spec/application_spec.rb
+- spec/data/a.mp3
+- spec/data/b.mp3
+- spec/data/c.mp3
+- spec/spec_helper.rb