kelredd-resourceful 0.6.7 → 0.7.0

data/lib/resourceful/extensions.rb

@@ -113,6 +113,23 @@ module Resourceful
         end
       end
       
+      # Returns the value for the provided key(s).  Allows searching in nested hashes
+      unless {}.respond_to?(:get_value) 
+        def get_value(*keys)
+          val = self[keys.first] || self[keys.first.to_s]
+          val = self[keys.first.to_s.intern] unless val || keys.first.to_s.empty? || keys.first.kind_of?(Symbol) 
+          val.kind_of?(Hash) && keys.length > 1 ? val.get_value?(keys[1..-1]) : val
+        end
+      end
+
+      # Determines if a value exists for the provided key(s).  Allows searching in nested hashes
+      unless {}.respond_to?('check_value?') 
+        def check_value?(*keys)
+          val = self.get_value(keys)
+          val && !val.empty? ? true : false
+        end
+      end
+
     end
   end
 end

data/lib/resourceful/model/base.rb

@@ -8,6 +8,22 @@ module Resourceful
         @@agent[self.name.to_s] = block;
       end
       
+      @@namespaces = [""]
+      def self.add_namespace(ns)
+        @@namespaces.unshift(ns)
+      end
+      def self.get_namespaced_klass(class_name)
+        klass = nil
+        @@namespaces.each do |ns|
+          begin
+            klass = "#{ns}::#{class_name}".constantize
+            break;
+          rescue Exception => err
+          end
+        end
+        klass
+      end
+      
       def self.get(path, opts={})
         block = opts.delete(:on_response)
         set_agent.get(path, opts, &block)
@@ -45,7 +61,7 @@ module Resourceful
       
       def update_attributes(attr_hash={})
         attr_hash.each do |k,v|
-          self.send("#{key}=", v)
+          self.send("#{k}=", v)
         end
         attributes(true)
       end
@@ -170,6 +186,10 @@ module Resourceful
         @@agent[klass_name]
       end
 
+      def self.add_namespace(ns)
+        @@namespaces.unshift(ns)
+      end
+      
     end
 
   end

data/lib/resourceful/model/embedded_associations.rb

@@ -10,11 +10,15 @@ module Resourceful
           clean_name = cleanup_name(name)
           config ||= {}
           config[:path] ||= clean_name
+          raise ArgumentError, "contains_one requires a :class option to be specified" unless config[:class]
+          class_name = config.delete(:class).to_s
           define_method(name) do
+            klass = self.class.get_namespaced_klass(class_name)
+            raise ArgumentError, "contains_one :class '#{class_name}' is not defined in any given namespaces" if klass.nil?
             instance_variable_get("@#{clean_name}") || \
               instance_variable_set("@#{clean_name}", \
                 if (c = child(config))
-                  config[:class].constantize.new(c) rescue c
+                  klass.new(c) rescue c
                 else
                   c
                 end
@@ -26,12 +30,16 @@ module Resourceful
           clean_name = cleanup_name(name)
           config ||= {}
           config[:path] ||= clean_name
+          raise ArgumentError, "contains_many requires a :class option to be specified" unless config[:class]
+          class_name = config.delete(:class).to_s
           define_method(name) do
+            klass = self.class.get_namespaced_klass(class_name)
+            raise ArgumentError, "contains_many :class '#{class_name}' is not defined in any given namespaces" if klass.nil?
             instance_variable_get("@#{clean_name}") || \
               instance_variable_set("@#{clean_name}", \
                 if ((c = child(config)) && c.respond_to?(:collect))
                   c.collect do |item|
-                    config[:class].constantize.new(item) rescue item
+                    klass.new(item) rescue item
                   end
                 else
                   c

data/lib/resourceful/model/external_associations.rb

@@ -14,10 +14,12 @@ module Resourceful
           clean_name = cleanup_name(name)
           config ||= {}
           raise ArgumentError, "has_many requires a :class option to be specified" unless config[:class]
-          klass = config.delete(:class)
+          class_name = config.delete(:class).to_s
           force = config.delete(:force) || true
           define_method(name) do
-            unless klass.to_s.constantize.respond_to?(:find)
+            klass = self.class.get_namespaced_klass(class_name)
+            raise ArgumentError, "has_many :class '#{class_name}' is not defined in any given namespaces" if klass.nil?
+            unless klass.respond_to?(:find)
               raise NotImplementedError, "has_many expects #{klass} to be findable (ie mixin the Findable helper)"
             end
             fk = config.delete(:foreign_key) || "#{self.class.name.downcase.to_s.gsub(/^.*::/, '')}_id"
@@ -25,7 +27,7 @@ module Resourceful
             config[fk] = self.send(fk_method)
             instance_variable_get("@#{clean_name}") || \
               instance_variable_set("@#{clean_name}", \
-                klass.to_s.constantize.find(:all, config, force)
+                klass.find(:all, config, force)
               )
           end
         end
@@ -33,15 +35,17 @@ module Resourceful
         def belongs_to(name, config={})
           clean_name = cleanup_name(name)
           config ||= {}
-          raise ArgumentError, "has_many requires a :class option to be specified" unless config[:class]
-          klass = config.delete(:class)
+          raise ArgumentError, "belongs_to requires a :class option to be specified" unless config[:class]
+          class_name = config.delete(:class).to_s
           foreign_key = config.delete(:foreign_key) || "#{clean_name}_id"
           force = config.delete(:force) || true
           define_method(name) do
+            klass = self.class.get_namespaced_klass(class_name)
+            raise ArgumentError, "belongs_to :class '#{class_name}' is not defined in any given namespaces" if klass.nil?
             unless self.respond_to?(foreign_key)
               raise ArgumentError, "belongs_to requires a '#{foreign_key}' method defined to return the foreign_key"
             end
-            unless klass.to_s.constantize.respond_to?(:find)
+            unless klass.respond_to?(:find)
               raise NotImplementedError, "has_many expects #{klass} to be findable (ie mixin the Findable helper)"
             end
             fk = self.send(foreign_key)
@@ -50,7 +54,7 @@ module Resourceful
             else
               instance_variable_get("@#{clean_name}") || \
                 instance_variable_set("@#{clean_name}", \
-                  klass.to_s.constantize.find(fk, config, force)
+                  klass.find(fk, config, force)
                 )
             end
           end

data/lib/resourceful/model/findable.rb

@@ -9,11 +9,11 @@ module Resourceful
           opts = findable_default_opts.merge(opts) if respond_to?(:findable_default_opts)
           case id
           when :all
-            self.get_collection("#{findable_index}.#{format}", opts, force)
+            self.get_collection("#{findable_index}.#{format}", opts, findable_search, force)
           when :first
-            self.get_collection("#{findable_index}.#{format}", opts, force).first
+            self.get_collection("#{findable_index}.#{format}", opts, findable_search, force).first
           else
-            self.get("#{findable_index}/#{id}.#{format}", opts, force)
+            self.get("#{findable_index}/#{id}.#{format}", opts, findable_search, force)
           end
         end
         
@@ -28,6 +28,11 @@ module Resourceful
           raise NotImplementedError, "Findable expects a public class method 'findable_index'"
         end
         
+        def findable_search
+          # defaults to non namespaced downcased name of the class
+          self.name.downcase.to_s.gsub(/^.*::/, '')
+        end
+        
       end
       
       module InstanceMethods

data/lib/resourceful/model/json.rb

@@ -7,24 +7,27 @@ module Resourceful
       
       attr_reader :json
 
-      def self.get(path, params, force=false, &block)
+      def self.get(path, params, search=nil, force=false, &block)
         opts = {
           :format => 'json',
           :params => params || {},
           :force => force,
           :on_response => block
         }
-        new(super(path, opts))
+        result = super(path, opts)
+        hsh_keys = search.kind_of?(String) ? search.split(/\s+/) : nil
+        new(!hsh_keys.nil? && !hsh_keys.empty? && result.respond_to?(:get_value) ? result.get_value(hsh_keys) : result)
       end
-      def self.get_collection(path, params, force=false, &block)
+      def self.get_collection(path, params, search=nil, force=false, &block)
         opts = {
           :format => 'json',
           :params => params || {},
           :force => force,
           :on_response => block
         }
+        hsh_keys = search.kind_of?(String) ? search.split(/\s+/) : nil
         super(path, opts) do |data|
-          data
+          data.collect{|item| !hsh_keys.nil? && !hsh_keys.empty? && item.respond_to?(:get_value) ? item.get_value(hsh_keys) : item}
         end
       end
 

data/lib/resourceful/version.rb

@@ -2,8 +2,8 @@ module Resourceful
   module Version
     
     MAJOR = 0
-    MINOR = 6
-    TINY  = 7
+    MINOR = 7
+    TINY  = 0
     
     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.6.7
+  version: 0.7.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency