kelredd-resourceful 0.4.6 → 0.4.8

data/lib/resourceful/model/base.rb

@@ -34,7 +34,7 @@ module Resourceful
         clean_name = name.to_s.gsub(/\W/,'')
         add_to_attributes(name.to_s)
         config ||= {}
-        config[:path] ||= name
+        config[:path] ||= clean_name
         content_method = case type.to_sym
         when :string
           'to_s'
@@ -66,11 +66,12 @@ module Resourceful
       end
 
       def self.has_one(name, config={})
+        clean_name = name.to_s.gsub(/\W/,'')
         config ||= {}
-        config[:path] ||= name
+        config[:path] ||= clean_name
         define_method(name) do
-          instance_variable_get("@#{name}") || \
-            instance_variable_set("@#{name}", \
+          instance_variable_get("@#{clean_name}") || \
+            instance_variable_set("@#{clean_name}", \
               if (c = child(config))
                 config[:klass].constantize.new(c) rescue c
               else
@@ -81,11 +82,12 @@ module Resourceful
       end
 
       def self.has_many(name, config={})
+        clean_name = name.to_s.gsub(/\W/,'')
         config ||= {}
-        config[:path] ||= name
+        config[:path] ||= clean_name
         define_method(name) do
-          instance_variable_get("@#{name}") || \
-            instance_variable_set("@#{name}", \
+          instance_variable_get("@#{clean_name}") || \
+            instance_variable_set("@#{clean_name}", \
               if ((c = child(config)) && c.respond_to?(:collect))
                 c.collect do |item|
                   config[:klass].constantize.new(item) rescue item
@@ -98,11 +100,12 @@ module Resourceful
       end
 
       def self.belongs_to(name, config={})
+        clean_name = name.to_s.gsub(/\W/,'')
         config ||= {}
-        config[:id] ||= "#{name}_id"
+        config[:id] ||= "#{clean_name}_id"
         define_method(name) do
-          instance_variable_get("@#{name}") || \
-            instance_variable_set("@#{name}", \
+          instance_variable_get("@#{clean_name}") || \
+            instance_variable_set("@#{clean_name}", \
               if ((k = config[:klass].constantize) && k.respond_to?(:find))
                 self.respond_to?(config[:id]) ? k.find(self.send(config[:id])) : nil
               else

data/lib/resourceful/model/json.rb

@@ -31,10 +31,6 @@ module Resourceful
         @data = json
       end
       
-      #def attributes
-      #  @data
-      #end
-      
       protected
       
       def attribute(config)

data/lib/resourceful/model/xml.rb

@@ -35,7 +35,7 @@ module Resourceful
       
       def attribute(config)
         begin
-          get_node("#{config[:path]}").send((config[:content] || 'content').to_s)
+          get_node(config[:path]).first.send((config[:content] || 'content').to_s)
         rescue Exception => err
           nil
         end          
@@ -43,14 +43,14 @@ module Resourceful
         
       def child(config)
         begin
-          get_node("#{config[:path]}")
+          get_node(config[:path])
         rescue Exception => err
           nil
         end
       end
         
       def self.get_node(xml, path)
-        xml.search(path.to_s).first
+        xml.search(path.to_s)
       end
       def get_node(path)
         self.class.get_node(@data, path)

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 4
-    TINY  = 6
+    TINY  = 8
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors: 
 - Kelly Redding