kelredd-resourceful 0.4.9 → 0.5.0

data/README.rdoc

@@ -37,8 +37,9 @@ The supported formats are:
 A suite of cucumber features are available for you to run as an acceptance test.  You should look to the features 
 for additional documentation and usage scenarios.  To run the features:
 
-    # make sure you have the cucumber gem
+    # make sure you have these gems
     $ sudo gem install cucumber
+    $ sudo gem install fakeweb
     # change to the resourceful gem installed location
     $ cd /opt/local/lib/ruby/gems/x.x/gems/kelredd-resourceful-xxx
     $ rake features

data/lib/resourceful/agent/base.rb

@@ -17,13 +17,15 @@ module Resourceful
         @logger.add(Log4r::StdoutOutputter.new('console'))
       end
       
-      def get(path, opts={}, &block)
+      protected
+
+      def call_resource(verb, path, opts={}, &block)
         path, opts = check_config(path, opts)
         format = Resourceful::Resource::Format.get(opts[:format])
         
         full_resource_path = self.class.resource_path(path, format, opts[:params])
-        resource_summary = summary('get', full_resource_path)
-        cache_key = Resourceful::Resource::Cache.key(@host, 'get', full_resource_path)
+        resource_summary = summary(verb.to_s, full_resource_path)
+        cache_key = Resourceful::Resource::Cache.key(@host, verb.to_s, full_resource_path)
         
         if opts[:force] || (resp = cache.read(cache_key)).nil?
           log "Resource call: #{resource_summary}"
@@ -34,8 +36,6 @@ module Resourceful
         format.build(resp)
       end
     
-      protected
-
       def check_config(path, opts) # :nodoc:
         raise Resourceful::Exceptions::ConfigurationError, "invalid agent" unless agent && agent_url && !agent_url.empty?
         opts ||= {}

data/lib/resourceful/agent/mechanize.rb

@@ -18,21 +18,21 @@ module Resourceful
         end
       end
 
-      def get(path, opts={})
-        super(path, opts) do |path|
+      def get(path, opts={}, &block)
+        call_resource(:get, path, opts, block)
+      end
+    
+      protected
+      
+      def call_resource(verb, path, opts, block)
+        super(verb, path, opts) do |path|
           resp = ""
-          @mechanize.get("#{@host}#{path}") do |page|
-            resp = if block_given?
-              yield page
-            else
-              page
-            end
+          @mechanize.send(verb.to_s, "#{@host}#{path}") do |page|
+            resp = block ? block.call(page) : page
           end
           resp.body
         end
       end
-    
-      protected
       
       def agent
         @mechanize

data/lib/resourceful/agent/rest_client.rb

@@ -11,19 +11,41 @@ module Resourceful
         @rest_client = ::RestClient::Resource.new(@host, :user => @user, :password => @password)
       end
 
-      def get(path, opts={})
-        super(path, opts) do |path|
-          result = @rest_client[path].get
-          if block_given?
-            yield result
-          else
-            result
-          end
-        end
+      def get(path, opts={}, &block)
+        call_resource(:get, path, opts, block)
+      end
+      
+      def post(path, opts={}, body=nil, &block)
+        push_resource(:post, path, opts, body, block)
+      end
+      
+      def put(path, opts={}, body=nil, &block)
+        push_resource(:put, path, opts, body, block)
+      end
+      
+      def delete(path, opts={}, body=nil, &block)
+        push_resource(:delete, path, opts, body, block)
       end
       
       protected
       
+      def push_resource(verb, path, opts, body, block)
+        opts[:body] = body
+        call_resource(verb, path, opts, block)
+      end
+      
+      def call_resource(verb, path, opts, block)
+        super(verb, path, opts) do |path|
+          result = case verb.to_sym 
+          when :get
+            @rest_client[path].get
+          when :post, :put, :delete
+            @rest_client[path].send(verb, opts[:body])
+          end
+          block ? block.call(result) : result
+        end
+      end
+      
       def agent
         @rest_client
       end

data/lib/resourceful/model/base.rb

@@ -24,12 +24,42 @@ module Resourceful
         @data
       end
       
-      def attributes
-        @attributes ||= @@attributes[self.class.name].inject({}) { |hsh, key| hsh[key] = self.send(key); hsh }
+      def new_record?
+        @data.nil?
+      end
+      
+      def attributes(force=false)
+        if @attributes.nil? || force
+          @attributes = @@attributes[self.class.name].inject({}) { |hsh, key| hsh[key] = self.send(key); hsh }
+        end
+        @attributes
+      end
+      
+      def update_attributes(attr_hash={})
+        attr_hash.each do |k,v|
+          self.send("#{key}=", v)
+        end
+        attributes(true)
+      end
+      
+      def save
+        @data = yield attributes(true)
+        reset_attributes
+      end
+      
+      def destroy
+        yield attributes(true)
+        @data = nil
       end
       
       protected
       
+      def push_data(verb, path, opts, data)
+        block = opts.delete(:on_response)
+        ['id', :id].each { |a| data.delete(a) } if data.kind_of?(::Hash)
+        self.class.set_agent.send(verb.to_s, path, opts, data, &block)
+      end
+      
       def self.attribute(name, type, config={})
         clean_name = name.to_s.gsub(/\W/,'')
         add_to_attributes(name.to_s)
@@ -63,6 +93,9 @@ module Resourceful
               end
             )
         end
+        define_method("#{name}=") do |value|
+          instance_variable_set("@#{clean_name}", value)
+        end
       end
 
       def self.has_one(name, config={})
@@ -117,6 +150,20 @@ module Resourceful
       
       private
       
+      def reset_attributes
+        clear_attributes
+        attributes(true)
+      end
+      
+      def clear_attributes
+        @@attributes ||= {}
+        klass_name = self.class.name
+        @@attributes[klass_name] ||= []
+        @@attributes[klass_name].each do |a|
+          instance_variable_set("@#{a.to_s.gsub(/\W/,'')}", nil)
+        end
+      end
+      
       def self.add_to_attributes(name)
         @@attributes ||= {}
         klass_name = self.name

data/lib/resourceful/model/json.rb

@@ -26,8 +26,8 @@ module Resourceful
         end
       end
 
-      def initialize(json)
-        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Json model with '#{json.class.name}' data" unless json.kind_of?(::Hash)
+      def initialize(json=nil)
+        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Json model with '#{json.class.name}' data" unless json.nil? || json.kind_of?(::Hash)
         @data = json
       end
       

data/lib/resourceful/model/xml.rb

@@ -26,8 +26,8 @@ module Resourceful
         end
       end
 
-      def initialize(xml)
-        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Xml model with '#{xml.class.name}' data" unless xml.kind_of?(Nokogiri::XML::NodeSet) || xml.kind_of?(Nokogiri::XML::Element)
+      def initialize(xml=nil)
+        raise Resourceful::Exceptions::ModelError, "trying to initialize a Resourceful::Model::Xml model with '#{xml.class.name}' data" unless xml.nil? || xml.kind_of?(Nokogiri::XML::NodeSet) || xml.kind_of?(Nokogiri::XML::Element)
         @data = xml
       end
       

data/lib/resourceful/version.rb

@@ -2,8 +2,8 @@ module Resourceful
   module Version
     
     MAJOR = 0
-    MINOR = 4
-    TINY  = 9
+    MINOR = 5
+    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.4.9
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency