mockspotify 0.1.2 → 0.1.3

data/lib/mockspotify/version.rb

@@ -1,5 +1,5 @@
 module Spotify
   module Mock
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/lib/mockspotify.rb

@@ -1,5 +1,6 @@
 require 'ffi'
 require 'rbconfig'
+require 'mockspotify/version'
 
 module Spotify
   module Mock

data/src/image.c

@@ -19,10 +19,8 @@ mocksp_image_create(const byte image_id[20], sp_imageformat format, size_t data_
 sp_image*
 sp_image_create_from_link(sp_session *session, sp_link *l)
 {
-  byte *real_id  = l->data + strlen("spotify:image:");
-  byte *image_id = ALLOC_N(byte, 20);
-  memcpy(image_id, real_id, 20); // TODO: convert "deadbeef" to array of: [0xDE, 0xAD, 0xBE, 0xEF]
-  return mocksp_image_create(image_id, SP_IMAGE_FORMAT_JPEG, 0, NULL, SP_ERROR_OK);
+  byte *real_id = l->data + strlen("spotify:image:");
+  return mocksp_image_create(hextoa(real_id, 40), SP_IMAGE_FORMAT_JPEG, 0, NULL, SP_ERROR_OK);
 }
 
 void

data/src/link.c

@@ -29,9 +29,18 @@ sp_link_create_from_string(const char *link)
 sp_link *
 sp_link_create_from_user(sp_user *user)
 {
-  char *link = ALLOC_N(char, 1024);
-  sprintf(link, "spotify:user:%s", user->canonical_name);
-  return sp_link_create_from_string(link);
+  sp_link *link = ALLOC(sp_link);
+  sprintf(link->data, "spotify:user:%s", user->canonical_name);
+  return link;
+}
+
+sp_link *
+sp_link_create_from_image(sp_image *image)
+{
+  sp_link *link = ALLOC(sp_link);
+  sprintf(link->data, "spotify:image:");
+  atohex(link->data + strlen("spotify:image:"), image->image_id, 40);
+  return link;
 }
 
 int

data/src/util.c

@@ -1,6 +1,4 @@
-#include <stdlib.h>
-#include <string.h>
-#include "util.h"
+#include "libmockspotify.h"
 
 void*
 xmalloc(size_t size)
@@ -9,3 +7,47 @@ xmalloc(size_t size)
   memset(ptr, 0, size);
   return ptr;
 }
+
+int
+htoi(char n)
+{
+  if (n >= '0' && n <= '9') return n - '0';
+  else if (n >= 'a' && n <= 'f') return n - 'a' + 10;
+  else if (n >= 'A' && n <= 'F') return n - 'A' + 10;
+  else return 0;
+}
+
+char
+itoh(int n)
+{
+  char hex[] = { "0123456789abcdef" };
+  return hex[n];
+}
+
+char*
+hextoa(const char *str, int size)
+{
+  if (size % 2) return NULL;
+
+  char *result = ALLOC_N(char, size / 2);
+
+  int i;
+  for (i = 0; i < size; i += 2)
+  {
+    result[i/2] = (htoi(str[i]) << 4) + htoi(str[i+1]);
+  }
+
+  return result;
+}
+
+void
+atohex(char *dst, const char *src, int size)
+{
+  int i;
+  int p;
+  for (i = p = 0; i < size; i += 2, p = i/2)
+  {
+    dst[i]   = itoh((src[p] >> 4) & 0x0F);
+    dst[i+1] = itoh(src[p] & 0xF);
+  }
+}

data/src/util.h

@@ -6,6 +6,7 @@
 #define ALLOC(type) ALLOC_N(type, 1)
 #define ALLOC_N(type, n) ((type*) xmalloc(sizeof(type) * (n)))
 void *xmalloc(size_t);
+char *hextoa(const char *, int);
 
 #define STARTS_WITH(x, y) (strncmp((x), (y), strlen(y)) == 0)
 

data/test/mockspotify_spec.rb

@@ -28,4 +28,22 @@ describe Spotify::Mock do
       Spotify.artist_is_loaded(@artist).must_equal true
     end
   end
+
+  describe "hextoa" do
+    it "should convert a hexidecimal string properly" do
+      Spotify.attach_function :hextoa, [:string, :int], :string
+      Spotify.hextoa("3A3A", 4).must_equal "::"
+    end
+  end
+
+  describe "atohex" do
+    it "should convert a byte string to a hexadecimal string" do
+      Spotify.attach_function :atohex, [:buffer_out, :buffer_in, :int], :void
+
+      FFI::Buffer.alloc_out(8) do |b|
+        Spotify.atohex(b, "\x3A\x3A\x0F\xF1", b.size)
+        b.get_string(0, b.size).must_equal "3a3a0ff1"
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mockspotify
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &2152836420 !ruby/object:Gem::Requirement
+  requirement: &2152713800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152836420
+  version_requirements: *2152713800
 description: 
 email: kim@burgestrand.se
 executables: []