ongaku_ryoho_server 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f602d4f4c2636375c55d96254285e61b6c6a785a
-  data.tar.gz: e49ac7fd3e6e594ba9e787e43d7c6ecc7f34fe7c
+  metadata.gz: 420c159644d71253d839dc8c45539931e8fcc56f
+  data.tar.gz: 3bef5f4bc768e8f733c40da1e30cbdc3d210eb6c
 SHA512:
-  metadata.gz: 92c0daffb408b9d566a72289e1133d5345fd0d021b255aa887420ee058178272a98474719aa0a6eafc4ec9401efbf1b39b63c83aa635ca20b50e8eb617a09ede
-  data.tar.gz: f2ece7fe3c9ac856ab0ca2e0609fb16df610b593605dd5e69605cd272f58aeafb885f83f6e0ddaa037606360168e3d5b502903dffe65d1e13a0f0962dd480fc3
+  metadata.gz: 1e27cfd66fc816785430541ffbcb7cac4d18f6ac63ae9cee2dd67c3d555a326691913f3b5c05a45499cb60276755e8aa4c5283f623c2fe3fdda5de59e451bce5
+  data.tar.gz: ef5d506ba3b15ca20b0da83d3f6515ac6120cce540a8db432fdb71c00a804ea71d255fa84f8e23b9301bf15ceb4b4a65bcd7f02a5bd94a011da85cbed14d1848

data/history.txt

@@ -1,3 +1,8 @@
+=== 0.5.2 / 2013-07-06
+
+* use strings as keys for json, instead of symbols
+
+
 === 0.5.1 / 2013-07-04
 
 * enable cors

data/lib/ongaku_ryoho_server/process.rb

@@ -45,7 +45,7 @@ module OngakuRyohoServer
         other_file_list = Oj.load(other_file_list)
       else
         other_file_list = Oj.load(OngakuRyohoServer::List.get)
-        other_file_list.map! { |obj| obj[:location] }
+        other_file_list.map! { |obj| obj["location"] }
       end
 
       # determine which files are missing and which are new
@@ -53,14 +53,12 @@ module OngakuRyohoServer
       new_files = other_file_list - file_list
 
       # process new files
-      new_tracks = OngakuRyohoServer::Process.files(
-        new_files, { :last_modified => Time.now }
-      )
+      new_tracks = OngakuRyohoServer::Process.files(new_files)
 
       # return missing and new tracks
       return {
-        :missing_files => missing_files,
-        :new_tracks => new_tracks
+        "missing_files" => missing_files,
+        "new_tracks" => new_tracks
       }
     end
 
@@ -94,19 +92,19 @@ module OngakuRyohoServer
           tag = fileref.tag
 
           tags = {
-            :title => tag.title,
-            :artist => tag.artist,
-            :album => tag.album,
-            :year => tag.year,
-            :track => tag.track,
-            :genre => tag.genre
+            "title" => tag.title,
+            "artist" => tag.artist,
+            "album" => tag.album,
+            "year" => tag.year,
+            "track" => tag.track,
+            "genre" => tag.genre
           }
 
           tags.each do |key, value|
             tags[key] = "Unknown" if value.nil? or (value.respond_to?(:empty) and value.empty?)
           end
 
-          tags.merge!({ :filename => filename, :location => location })
+          tags.merge!({ "filename" => filename, "location" => location })
 
           tags.each do |k, v|
             tags[k] = OngakuRyohoServer::Process.encode_string(v) if v.is_a? String

data/lib/ongaku_ryoho_server.rb

@@ -7,9 +7,9 @@ require "sinatra/cross_origin"
 require "uri"
 require "digest/sha1"
 
-require "ongaku_ryoho_server/process"
-require "ongaku_ryoho_server/list"
-require "ongaku_ryoho_server/application"
+require "#{File.dirname(__FILE__)}/ongaku_ryoho_server/process"
+require "#{File.dirname(__FILE__)}/ongaku_ryoho_server/list"
+require "#{File.dirname(__FILE__)}/ongaku_ryoho_server/application"
 
 
 module OngakuRyohoServer

data/ongaku_ryoho_server.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = "ongaku_ryoho_server"
-  s.version       = "0.5.1"
+  s.version       = "0.5.2"
 
   s.authors       = ["Steven Vandevelde"]
   s.email         = ["icid.asset@gmail.com"]

data/spec/application_spec.rb

@@ -40,12 +40,12 @@ describe "Application" do
       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
+      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
 
@@ -79,33 +79,33 @@ describe "Application" do
     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
+      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
+      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" }
+        { "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
+      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" }
+        { "location" => "spec/data/a.mp3" },
+        { "location" => "spec/data/b.mp3" },
+        { "location" => "spec/data/c.mp3" }
       ]
 
       post "/check",
@@ -113,7 +113,7 @@ describe "Application" do
         :other_file_list => Oj.dump([])
 
       json = Oj.load(last_response.body)
-      json[:missing_files].length.must_equal 3
+      json["missing_files"].length.must_equal 3
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ongaku_ryoho_server
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Steven Vandevelde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj