ongaku_ryoho_server 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de0168f5720bba9e90009b42988c9dbb9d1cc2a
-  data.tar.gz: 1985ef84ad0aa83a0d690961ec0cd41897397ff9
+  metadata.gz: f602d4f4c2636375c55d96254285e61b6c6a785a
+  data.tar.gz: e49ac7fd3e6e594ba9e787e43d7c6ecc7f34fe7c
 SHA512:
-  metadata.gz: 1dd31f2434a4d21c01b604bbf988a1f8885e25d515216d3df7426ec8a423c3c32592b2f9fe1cc13619029ababf8b1c12db63e27c3690672d24b447cda52c554b
-  data.tar.gz: a983c63d1281ea398f47cadc4be5f6283dd6e573514f4d0b35c49aa5198db8b0230ca5372d38f65db09b739803e07de2807a6380823b304ef1457fb1f60ea2cd
+  metadata.gz: 92c0daffb408b9d566a72289e1133d5345fd0d021b255aa887420ee058178272a98474719aa0a6eafc4ec9401efbf1b39b63c83aa635ca20b50e8eb617a09ede
+  data.tar.gz: f2ece7fe3c9ac856ab0ca2e0609fb16df610b593605dd5e69605cd272f58aeafb885f83f6e0ddaa037606360168e3d5b502903dffe65d1e13a0f0962dd480fc3

data/history.txt

@@ -1,3 +1,9 @@
+=== 0.5.1 / 2013-07-04
+
+* enable cors
+* fixed utf-8 encoding issue
+
+
 === 0.5.0 / 2013-07-02
 
 * tests

data/lib/ongaku_ryoho_server/application.rb

@@ -10,6 +10,14 @@ module OngakuRyohoServer
   class Application < Sinatra::Base
     set :environment, :production
 
+    # CORS
+    register Sinatra::CrossOrigin
+
+    configure do
+      enable :cross_origin
+    end
+
+    # allowed file formats
     FILE_FORMATS = %w{ mp3 mp4 m4a ogg flac wav wma }
 
     # root

data/lib/ongaku_ryoho_server/process.rb

@@ -131,7 +131,7 @@ module OngakuRyohoServer
     #
     def self.encode_string(string, replace_value="?")
       return string unless string.respond_to?(:force_encoding)
-      new_string = string.force_encoding("cp1252")
+      new_string = string.force_encoding(::Encoding::UTF_8)
       new_string.encode("UTF-8", { :invalid => :replace, :undef => :replace, :replace => replace_value })
     end
 

data/lib/ongaku_ryoho_server.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "taglib"
 require "oj"
 require "sinatra/base"
+require "sinatra/cross_origin"
 
 require "uri"
 require "digest/sha1"
@@ -10,4 +11,6 @@ require "ongaku_ryoho_server/process"
 require "ongaku_ryoho_server/list"
 require "ongaku_ryoho_server/application"
 
-module OngakuRyohoServer; end
+
+module OngakuRyohoServer
+end

data/ongaku_ryoho_server.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = "ongaku_ryoho_server"
-  s.version       = "0.5.0"
+  s.version       = "0.5.1"
 
   s.authors       = ["Steven Vandevelde"]
   s.email         = ["icid.asset@gmail.com"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   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 "sinatra-cross_origin", "~> 0.2.0"
   s.add_runtime_dependency "puma", "~> 2.0.1"
 
   s.add_development_dependency "rake", "~> 10.0.4"

data/spec/application_spec.rb

@@ -22,6 +22,12 @@ describe "Application" do
       last_response.content_type.must_equal "application/javascript;charset=utf-8"
     end
 
+    it "should work cross domain" do
+      get "/", {}, { "HTTP_ORIGIN" => "http://localhost" }
+      last_response.must_be :ok?
+      last_response.headers["Access-Control-Allow-Origin"].must_equal "http://localhost"
+    end
+
     it "should have 3 items" do
       get "/"
       json = Oj.load(last_response.body)
@@ -52,6 +58,24 @@ describe "Application" do
       OngakuRyohoServer::List.save
     end
 
+    it "should return json" do
+      post "/check"
+      last_response.must_be :ok?
+      last_response.content_type.must_equal "application/json;charset=utf-8"
+    end
+
+    it "should return jsonp" do
+      post "/check", :callback => "test"
+      last_response.must_be :ok?
+      last_response.content_type.must_equal "application/javascript;charset=utf-8"
+    end
+
+    it "should work cross domain" do
+      post "/check", {}, { "HTTP_ORIGIN" => "http://localhost" }
+      last_response.must_be :ok?
+      last_response.headers["Access-Control-Allow-Origin"].must_equal "http://localhost"
+    end
+
     it "should have 2 parent keys" do
       post "/check"
       json = Oj.load(last_response.body)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ongaku_ryoho_server
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Steven Vandevelde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: sinatra-cross_origin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement