kelredd-resourceful 0.7.3 → 0.7.4

data/lib/resourceful/extensions.rb

@@ -81,6 +81,36 @@ module Resourceful
           end
         end
       end
+
+      unless "".respond_to?(:camelize)
+        #   "active_record/errors".camelize         # => "ActiveRecord::Errors"
+        def camelize(first_letter_in_uppercase = true)
+          if first_letter_in_uppercase
+            self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+          else
+            self[0..0].downcase + camelize(self)[1..-1]
+          end
+        end
+        
+      end
+      
+      unless "".respond_to?(:underscore)
+        #   "ActiveRecord::Errors".underscore # => active_record/errors
+        def underscore
+          self.to_s.gsub(/::/, '/').
+            gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+            gsub(/([a-z\d])([A-Z])/,'\1_\2').
+            tr("-", "_").
+            downcase
+        end
+      end
+      
+      unless "".respond_to?(:demodulize)
+        #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
+        def demodulize
+          self.to_s.gsub(/^.*::/, '')
+        end
+      end
       
     end
   end

data/lib/resourceful/model/external_associations.rb

@@ -22,7 +22,7 @@ module Resourceful
             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"
+            fk = config.delete(:foreign_key) || "#{self.class.name.demodulize.underscore}_id"
             fk_method = config.delete(:foreign_key_method) || 'id'
             config[fk] = self.send(fk_method)
             instance_variable_get("@#{clean_name}") || \

data/lib/resourceful/model/findable.rb

@@ -30,7 +30,7 @@ module Resourceful
         
         def findable_search
           # defaults to non namespaced downcased name of the class
-          self.name.downcase.to_s.gsub(/^.*::/, '')
+          self.name.demodulize.underscore.to_s.gsub(/^.*::/, '')
         end
         
       end

data/lib/resourceful/model/json.rb

@@ -14,9 +14,7 @@ module Resourceful
           :force => force,
           :on_response => block
         }
-        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)
+        new(get_result_data(super(path, opts), search))
       end
       def self.get_collection(path, params, search=nil, force=false, &block)
         opts = {
@@ -25,9 +23,8 @@ module Resourceful
           :force => force,
           :on_response => block
         }
-        hsh_keys = search.kind_of?(String) ? search.split(/\s+/) : nil
         super(path, opts) do |data|
-          data.collect{|item| !hsh_keys.nil? && !hsh_keys.empty? && item.respond_to?(:get_value) ? item.get_value(hsh_keys) : item}
+          data.collect {|item| get_result_data(item, search) }
         end
       end
 
@@ -38,6 +35,11 @@ module Resourceful
       
       protected
       
+      def self.get_result_data(result, search)
+        hsh_keys = search.kind_of?(String) ? search.split(/\s+/) : nil
+        result_data = !hsh_keys.nil? && !hsh_keys.empty? && result.respond_to?(:get_value) ? result.get_value(hsh_keys) || result : result
+      end
+      
       def self.format
         Resourceful::Resource::Json.to_s
       end

data/lib/resourceful/model/xml.rb

@@ -14,7 +14,8 @@ module Resourceful
           :force => force,
           :on_response => block
         }
-        new(super(path, opts).search(search))
+        data = super(path, opts)
+        new(data.search(search) || data)
       end
       def self.get_collection(path, params, search, force=false, &block)
         opts = {
@@ -24,7 +25,7 @@ module Resourceful
           :on_response => block
         }
         super(path, opts) do |data|
-          data.search(search)
+          data.search(search) || data
         end
       end
 

data/lib/resourceful/version.rb

@@ -3,7 +3,7 @@ module Resourceful
     
     MAJOR = 0
     MINOR = 7
-    TINY  = 3
+    TINY  = 4
     
     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.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 -07:00
+date: 2009-09-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,6 @@ files:
 - lib/resourceful.rb
 has_rdoc: false
 homepage: ""
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -133,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A ruby gem to abstract web resource handling.