kelredd-resourceful 0.7.26 → 0.8.0

data/README.rdoc

@@ -16,7 +16,7 @@ Resourceful uses agents to fetch and push data to and from web resources.  Suppo
 
 == Installation
 
-    sudo gem install kelredd-resourceful --source http://gemcutter.org
+    gem install kelredd-resourceful
     
 == Dependencies
 
@@ -90,7 +90,7 @@ A suite of cucumber features are available for you to run as acceptance tests.
 
 == License
 
-Copyright (c) 2009 Kelly Redding
+Copyright (c) 2010 Kelly Redding (mailto:kelly@kelredd.com)
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -24,7 +24,9 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('rest-client')
   s.add_dependency('mechanize')
   s.add_dependency('log4r')
-  s.add_dependency('kelredd-useful', '>= 0.2.5')
+  s.add_dependency('kelredd-useful', [">= 0.2.5"])
+
+  s.add_development_dependency("shoulda", [">= 2.10.2"])
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -43,10 +45,3 @@ task :gemspec do
   File.open(file, 'w') {|f| f << spec.to_ruby }
   puts "Created gemspec: #{file}"
 end
-
-require 'cucumber'
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "test/features --format pretty" 
-end

data/lib/resourceful/model/activerecord_associations.rb

@@ -42,23 +42,32 @@ module Resourceful::Model::ActiverecordAssociations
     def belongs_to_resourceful(name, config={})
       clean_name = Resourceful::Model::Base.cleanup_name(name)
       config ||= {}
-      raise ArgumentError, "belongs_to_resourceful requires a :class_name option to be specified" unless config[:class_name]
-      class_name = config.delete(:class_name).to_s
+
       find_method_name = (config.delete(:method) || 'find').to_s
       force = config.delete(:force) || false
       foreign_key_name = config.delete(:foreign_key_name) || 'id'
       foreign_key_method = config.delete(:foreign_key) || "#{clean_name}_id"
-      Resourceful.add_to_associations(self.name, clean_name, {
-        :type => :belongs_to,
-        :class_name => class_name,
-        :foreign_key_name => foreign_key_name,
-        :foreign_key_method => foreign_key_method,
-        :find_method_name => find_method_name
-      })
+      
+      if !(polymorphic = !!config.delete(:polymorphic))
+        raise ArgumentError, "belongs_to_resourceful requires a :class_name option to be specified" unless config[:class_name]
+        class_name = config.delete(:class_name).to_s
+        Resourceful.add_to_associations(self.name, clean_name, {
+          :type => :belongs_to,
+          :class_name => class_name,
+          :foreign_key_name => foreign_key_name,
+          :foreign_key_method => foreign_key_method,
+          :find_method_name => find_method_name
+        })
+      end
+      
       define_method(name) do |*args|
         reload = args.first || false
         if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
-          klass = class_name.resourceful_constantize
+          klass = if polymorphic
+            self.send("#{clean_name}_type")
+          else
+            class_name
+          end.resourceful_constantize
           raise ArgumentError, "belongs_to_resourceful :class_name '#{class_name}' is not defined" if klass.nil?
           unless self.respond_to?(foreign_key_method)
             raise ArgumentError, "belongs_to_resourceful requires a '#{foreign_key_method}' method defined to return the foreign_key"

data/lib/resourceful/model/base.rb

@@ -74,8 +74,14 @@ module Resourceful::Model
     end
     
     def save
-      @data = yield attributes(true)
-      reset_attributes
+      # TODO: I think this is where it is failing if response does not return any data
+      # => test it!
+      if response_data = yield(attributes(true))
+        @data = response_data
+        reset_attributes
+      else
+        @attributes
+      end
     end
     
     def destroy

data/lib/resourceful/model/external_associations.rb

@@ -42,23 +42,32 @@ module Resourceful::Model::ExternalAssociations
     def belongs_to(name, config={})
       clean_name = cleanup_name(name)
       config ||= {}
-      raise ArgumentError, "belongs_to requires a :class option to be specified" unless config[:class]
-      class_name = config.delete(:class).to_s
+
       find_method_name = (config.delete(:method) || 'find').to_s
       force = config.delete(:force) || false
       foreign_key_name = config.delete(:foreign_key_name) || 'id'
       foreign_key_method = config.delete(:foreign_key) || "#{clean_name}_id"
-      Resourceful.add_to_associations(self.name, clean_name, {
-        :type => :belongs_to,
-        :class_name => class_name,
-        :foreign_key_name => foreign_key_name,
-        :foreign_key_method => foreign_key_method,
-        :find_method_name => find_method_name
-      })
+      
+      if !(polymorphic = !!config.delete(:polymorphic))
+        raise ArgumentError, "belongs_to requires a :class option to be specified" unless config[:class]
+        class_name = config.delete(:class).to_s
+        Resourceful.add_to_associations(self.name, clean_name, {
+          :type => :belongs_to,
+          :class_name => class_name,
+          :foreign_key_name => foreign_key_name,
+          :foreign_key_method => foreign_key_method,
+          :find_method_name => find_method_name
+        })
+      end
+      
       define_method(name) do |*args|
         reload = args.first || false
         if reload || (assoc_val = instance_variable_get("@#{clean_name}")).nil?
-          klass = self.class.get_namespaced_klass(class_name)
+          klass = self.class.get_namespaced_klass(if polymorphic
+            self.send("#{clean_name}_type")
+          else
+            class_name
+          end)
           raise ArgumentError, "belongs_to :class '#{class_name}' is not defined in any given namespaces" if klass.nil?
           unless self.respond_to?(foreign_key_method)
             raise ArgumentError, "belongs_to requires a '#{foreign_key_method}' method defined to return the foreign_key"

data/lib/resourceful/model/json.rb

@@ -42,7 +42,11 @@ module Resourceful::Model
     
     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
+      if !hsh_keys.nil? && !hsh_keys.empty? && result.respond_to?(:get_value)
+        result.get_value(hsh_keys) || result
+      else
+        result
+      end
     end
     
     def self.format

data/lib/resourceful/model/xml.rb

@@ -39,7 +39,11 @@ module Resourceful::Model
     
     def push_data(verb, path, opts, data, search=nil)
       result = super(verb, path, opts, data)
-      search.nil? ? result : (result.search(search) || result)
+      if search.nil?
+        result
+      else
+        result.search(search) || result
+      end
     end
     
     def self.format

data/lib/resourceful/resource/format.rb

@@ -8,40 +8,60 @@ module Resourceful::Resource
     
     SUPPORTED = ['json', 'xml']
     
-    def self.get(format)
-      raise Resourceful::Exceptions::FormatError, "the format '#{format}' is not supported" unless SUPPORTED.include?(format.to_s)
-      self.send(format)
-    end
-    
-    def self.json
-      Resourceful::Resource::Json
-    end
+    class << self
       
-    def self.xml
-      Resourceful::Resource::Xml
-    end
-    
-    def self.to_s
-      raise 'method not implemented by this format'
-    end
+      def get(format)
+        raise Resourceful::Exceptions::FormatError, "the format '#{format}' is not supported" unless SUPPORTED.include?(format.to_s)
+        self.send(format)
+      end
+
+      def json
+        Resourceful::Resource::Json
+      end
+
+      def xml
+        Resourceful::Resource::Xml
+      end
+
+      def to_s
+        raise 'method not implemented by this format'
+      end
+
+      def build(str)
+        raise 'method not implemented by this format'
+      end
       
-    def self.build(str)
-      raise 'method not implemented by this format'
-    end
+      protected
       
+      def parsable?(data)
+        if !data.nil? && !data.to_s.strip.empty? && data.to_s.strip != 'null'
+          yield if block_given?
+        else
+          nil
+        end
+      end
+
+    end
+    
   end
 end
 
 module Resourceful::Resource
   class Json < Resourceful::Resource::Format
     
-    def self.to_s
-      "json"
-    end
-      
-    def self.build(json_str)
-      !json_str.nil? && !json_str.to_s.empty? && (json_str.to_s != 'null') ? JSON.parse(json_str.to_s) : nil
-    end
+    class << self
+
+      def to_s
+        "json"
+      end
+
+      def build(json_str)
+        parsable?(json_str) do
+          JSON.parse(json_str.to_s.strip)
+        end
+      end
+
+    end    
       
   end
 end
@@ -49,13 +69,19 @@ end
 module Resourceful::Resource
   class Xml < Resourceful::Resource::Format
     
-    def self.to_s
-      "xml"
-    end
-      
-    def self.build(xml_str)
-      Nokogiri::XML(xml_str.to_s)
+    class << self
+    
+      def to_s
+        "xml"
+      end
+
+      def build(xml_str)
+        parsable?(xml_str) do
+          Nokogiri::XML(xml_str.to_s)
+        end
+      end
+
     end
-      
+    
   end
 end

data/lib/resourceful/shoulda/test_unit.rb

@@ -72,17 +72,22 @@ module Resourceful::Shoulda::TestUnit
   
   def should_have_resourceful_association_item(name, opts)
     klass = described_type
-    should_have_resourceful_association_class(opts)
-    should "return an item that is a kind of #{opts[:class]}" do
+    should_have_resourceful_association_class(name, opts)
+    should "return an item that is of the correct class" do
       if subject && (val = subject.send(name))
-        assert_kind_of klass.get_namespaced_klass(opts[:class]), val, "#{name} should be a kind of #{opts[:class]}"
+        class_name = if !!opts[:polymorphic]
+          val.send("#{name}_type")
+        else
+          opts[:class]
+        end
+        assert_kind_of klass.get_namespaced_klass(class_name), val, "#{name} should be a kind of #{class_name}"
       end
     end
   end
   
   def should_have_resourceful_association_collection(name, opts)
     klass = described_type
-    should_have_resourceful_association_class(opts)
+    should_have_resourceful_association_class(name, opts)
     should "return a collection of items that are a kind of #{opts[:class]}" do
       if subject && (val = subject.send(name))
         assert_kind_of ::Array, val, "#{name} should be a kind of Array"
@@ -93,11 +98,17 @@ module Resourceful::Shoulda::TestUnit
     end
   end
   
-  def should_have_resourceful_association_class(opts)
+  def should_have_resourceful_association_class(name, opts)
+    # TODO: update this for polymorphic
     klass = described_type
     should "have a #{opts[:class]} class specified that is defined" do
-      assert opts[:class], "resourceful associations require a :class option"
-      assert klass.get_namespaced_klass(opts[:class]), "a namespaced #{opts[:class]} is not defined"
+      class_name = if !!opts[:polymorphic]
+        subject.send("#{name}_type")
+      else
+        opts[:class]
+      end
+      assert class_name, "resourceful can't determine the class name from either the :class option or a :polymorphic setting"
+      assert klass.get_namespaced_klass(class_name), "a namespaced #{class_name} is not defined"
     end
   end
   

data/lib/resourceful/version.rb

@@ -2,8 +2,8 @@ module Resourceful
   module Version
     
     MAJOR = 0
-    MINOR = 7
-    TINY  = 26
+    MINOR = 8
+    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.7.26
+  version: 0.8.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 -06:00
+date: 2010-02-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.5
     version: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.10.2
+    version: 
 description: 
 email: kelly@kelredd.com
 executables: []