spotifiery 0.0.2 → 0.0.3

data/lib/spotifiery/search_result/base.rb

@@ -11,7 +11,6 @@ module Spotifiery
       def initialize response, response_class = nil
 
         response_hash = HashWithIndifferentAccess.new response        
-        
         @info = response_hash[:info]
         response_results = response_hash[ ActiveSupport::Inflector.pluralize(@info[:type]) ]
         response_class = ActiveSupport::Inflector.constantize( "Spotifiery::Searchable::" + ActiveSupport::Inflector.titleize(@info[:type])) if response_class.blank?
@@ -23,7 +22,7 @@ module Spotifiery
       end
 
 
-      def method_missing(method, *args, &block)                
+      def method_missing(method, *args, &block)
         if defined?(@info) && @info.has_key?(method)
           @info[method]
         elsif defined?(@info) && method.eql?( ActiveSupport::Inflector.pluralize(@info[:type]).to_sym )

data/lib/spotifiery/searchable/base.rb

@@ -39,7 +39,7 @@ module Spotifiery
       # Can be initialized from a spotify uri or from an search result hash.
       # This way Spotify is not asked when initialized from a search result when name, popularity, etc are called
       def initialize spotify_uri_or_hash
-              
+        @base_attributes = {}
         if spotify_uri_or_hash.is_a? Hash          
           initialize_base_attributes_getters HashWithIndifferentAccess.new spotify_uri_or_hash
           @href = spotify_uri_or_hash['href']
@@ -58,24 +58,28 @@ module Spotifiery
 
       def method_missing(method, *args, &block)
         
+        # Try to find the method in base_attributes
+        res = get_from_base_attrs(method)
         # Looked in spotify before?
-        if !defined?(@lookup_response)
-          lookup_in_spotify
+        lookup_in_spotify if res.blank? && !defined?(@lookup_response)
+        res = get_from_base_attrs(method)
+        if res.blank?
+        # If not try to see if an instance variable is defined          
+          if instance_variable_defined?("@#{method}")            
+            res = instance_variable_get("@#{method}")
+          else
+            super
+          end        
         end
+        res
+      end
 
-        # Try to find the method in base_attributes
-        if @base_attributes.has_key? method
-          # Always try to parse for integers
-          Integer(@base_attributes[method],10) rescue @base_attributes[method]
-        # If not try to see if an instance variable is defined
-        elsif instance_variable_defined?("@#{method}")
-            instance_variable_get("@#{method}")
-        else
-          super
-        end
 
+      def get_from_base_attrs(method)
+        Integer(@base_attributes[method],10) rescue @base_attributes[method]
       end
 
+
       def respond_to_missing?(method, include_private = false)
         if !defined? @lookup_response
           lookup_in_spotify
@@ -137,7 +141,7 @@ module Spotifiery
       def define_base_method method
         send(:define_singleton_method, method) do
           # Always try to parse for integers
-          Integer(@base_attributes[attribute],10) rescue @base_attributes[attribute]
+          get_from_base_attrs(method)          
         end
       end
 

data/lib/spotifiery/version.rb

@@ -1,3 +1,3 @@
 module Spotifiery
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotifiery
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty