rdio 0.0.8 → 0.0.9

data/lib/rdio.rb

@@ -7,14 +7,6 @@ require 'logger'
 
 # third party
 
-# internal requires
-require 'rdio/base'
-require 'rdio/api'
-require 'rdio/oauth'
-require 'rdio/datatypes'
-require 'rdio/types'
-require 'rdio/call' #TODO
-
 module Rdio
   VERSION = '0.0.1'
 
@@ -77,6 +69,14 @@ HERE
   end
 end
 
+# internal requires
+require 'rdio/base'
+require 'rdio/api'
+require 'rdio/oauth'
+require 'rdio/datatypes'
+require 'rdio/types'
+require 'rdio/call'
+
 # Silly syntax so you can say Rd::io...blah...blah...blah
 module Rd
   

data/lib/rdio/base.rb

@@ -19,21 +19,6 @@ class Class
 end
 
 module Rdio
-
-  # Adds 'str' to the array or string 'arr'
-  def add_to_array(arr,str)
-    if arr == nil
-      return [str.to_s]
-    end
-    if arr == ''
-      return [str.to_s]
-    end
-    if arr.is_a? Array
-      return arr + [str.to_s]
-    end
-    return arr.to_s + ',' + str.to_s
-  end
-
   # string -> string
   #
   # Converts camel-case string to underscore-delimited one.
@@ -50,6 +35,20 @@ module Rdio
     end
     s
   end
+
+  # Adds 'str' to the array or string 'arr'
+  def add_to_array(arr,str)
+    if arr == nil
+      return [str.to_s]
+    end
+    if arr == ''
+      return [str.to_s]
+    end
+    if arr.is_a? Array
+      return arr + [str.to_s]
+    end
+    return arr.to_s + ',' + str.to_s
+  end
   
   # array -> string
   #
@@ -102,6 +101,7 @@ module Rdio
     # This is done at the end of types.rb.
     #
     attr_accessor :symbols_to_types
+
   end
   self.symbols_to_types = {}
 
@@ -120,7 +120,7 @@ module Rdio
     def fill(x)
       syms_to_types = Rdio::symbols_to_types || {}
       x.each do |k,v|
-        sym = camel2underscores(k).to_sym
+        sym = Rdio::camel2underscores(k).to_sym
         #
         # If we have an actual type for this symbol, then use that
         # type to construct this value.  Otherwise, it's just a
@@ -144,7 +144,7 @@ module Rdio
           o = to_o v
         end
         begin
-          sym_eq = (camel2underscores(k)+'=').to_sym
+          sym_eq = (Rdio::camel2underscores(k)+'=').to_sym
           self.send sym_eq,o
         rescue Exception => e
           Rdio::logger.warn "Couldn't find symbol: " +
@@ -229,7 +229,7 @@ module Rdio
     # url for the contained RdioOAuth instance
     #
     def get_pin=(get_pin)
-        @oauth.get_pin = get_pin
+      @oauth.get_pin = get_pin
     end
 
     def get_pin

data/lib/rdio/types.rb

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+
+include Rdio
+
 module Rdio
 
   # ----------------------------------------------------------------------

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdio
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jeffrey Palm
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -04:00
+date: 2011-04-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency