restfully 0.3.1 → 0.3.2

data/README.rdoc

@@ -5,7 +5,7 @@ An attempt at dynamically providing "clever" wrappers on top of RESTful APIs tha
 Alpha work.
 
 == Installation
-  $ gem install restfully
+  $ gem install restfully --source http://gemcutter.org
 
 == Usage
 === Command line

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/restfully

@@ -6,7 +6,6 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'restfully'
 require 'optparse'
 require 'logger'
-require 'pp'
 require 'yaml'
 
 

data/lib/restfully.rb

@@ -12,7 +12,7 @@ require 'restfully/collection'
 
 
 module Restfully
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
   class << self
     attr_accessor :adapter
   end

data/lib/restfully/collection.rb

@@ -27,6 +27,14 @@ module Restfully
       @state = :unloaded
     end
     
+    def [](key)
+      if key.is_a? Symbol
+        by_uid(key.to_s)
+      else
+        super(key)
+      end
+    end
+    
     def method_missing(method, *args)
       load
       if association = @associations[method.to_s]
@@ -99,31 +107,32 @@ module Restfully
       @associations.has_key?(method.to_s) || super(method, *args)
     end
     
-    def inspect(options = {:space => "\t"})
-      output = "#<#{self.class}:0x#{self.object_id.to_s(16)}"
-      if loaded?
-        output += "\n#{options[:space]}------------ META ------------"
-        output += "\n#{options[:space]}@uri: #{uri.inspect}"
-        output += "\n#{options[:space]}@offset: #{offset.inspect}"
-        output += "\n#{options[:space]}@total: #{total.inspect}"
-        @associations.each do |title, assoc|
-          output += "\n#{options[:space]}@#{title}: #{assoc.class.name}"
-        end
-        unless @attributes.empty?
-          output += "\n#{options[:space]}------------ PROPERTIES ------------"
-          @attributes.each do |key, value|
-            output += "\n#{options[:space]}#{key.inspect} => #{value.inspect}"
-          end
-        end
-        unless self.empty?        
-          output += "\n#{options[:space]}------------ ITEMS ------------"
-          self.each do |value|
-            output += "\n#{options[:space]}#{value.class.name}"
-          end
-        end
-      end
-      output += ">"
-    end
+    # Removed: use `y resource` to get pretty output
+    # def inspect(options = {:space => "\t"})
+    #   output = "#<#{self.class}:0x#{self.object_id.to_s(16)}"
+    #   if loaded?
+    #     output += "\n#{options[:space]}------------ META ------------"
+    #     output += "\n#{options[:space]}@uri: #{uri.inspect}"
+    #     output += "\n#{options[:space]}@offset: #{offset.inspect}"
+    #     output += "\n#{options[:space]}@total: #{total.inspect}"
+    #     @associations.each do |title, assoc|
+    #       output += "\n#{options[:space]}@#{title}: #{assoc.class.name}"
+    #     end
+    #     unless @attributes.empty?
+    #       output += "\n#{options[:space]}------------ PROPERTIES ------------"
+    #       @attributes.each do |key, value|
+    #         output += "\n#{options[:space]}#{key.inspect} => #{value.inspect}"
+    #       end
+    #     end
+    #     unless self.empty?        
+    #       output += "\n#{options[:space]}------------ ITEMS ------------"
+    #       self.each do |value|
+    #         output += "\n#{options[:space]}#{value.class.name}"
+    #       end
+    #     end
+    #   end
+    #   output += ">"
+    # end
     
     protected
     def define_link(link)

data/lib/restfully/resource.rb

@@ -7,7 +7,7 @@ module Restfully
   class Resource < DelegateClass(Hash)
     
     undef :type if self.respond_to? :type
-    attr_reader :uri, :session, :state, :raw, :associations, :uid, :type
+    attr_reader :uri, :session, :state, :raw, :associations
 
     def initialize(uri, session, options = {})
       options = options.symbolize_keys
@@ -46,8 +46,8 @@ module Restfully
         (raw['links'] || []).each{|link| define_link(Link.new(link))}
         raw.each do |key, value|
           case key
-          when "uid", "type"
-            instance_variable_set "@#{key}".to_sym, value
+          # when "uid", "type"
+            # instance_variable_set "@#{key}".to_sym, value
           when 'links'  then  next
           else
             case value
@@ -69,25 +69,26 @@ module Restfully
       @associations.has_key?(method.to_s) || super(method, *args)
     end
     
-    def inspect(options = {:space => "\t"})
-      output = "#<#{self.class}:0x#{self.object_id.to_s(16)}"
-      if loaded?
-        output += "\n#{options[:space]}------------ META ------------"
-        output += "\n#{options[:space]}@uri: #{uri.inspect}"
-        output += "\n#{options[:space]}@uid: #{uid.inspect}"
-        output += "\n#{options[:space]}@type: #{type.inspect}"
-        @associations.each do |title, assoc|
-          output += "\n#{options[:space]}@#{title}: #{assoc.class.name}"
-        end
-        unless @attributes.empty?
-          output += "\n#{options[:space]}------------ PROPERTIES ------------"
-          @attributes.each do |key, value|
-            output += "\n#{options[:space]}#{key.inspect} => #{value.inspect}"
-          end
-        end
-      end
-      output += ">"
-    end    
+    # Removed: use `y resource` to get pretty output
+    # def inspect(options = {:space => "\t"})
+    #   output = "#<#{self.class}:0x#{self.object_id.to_s(16)}"
+    #   if loaded?
+    #     output += "\n#{options[:space]}------------ META ------------"
+    #     output += "\n#{options[:space]}@uri: #{uri.inspect}"
+    #     output += "\n#{options[:space]}@uid: #{uid.inspect}"
+    #     output += "\n#{options[:space]}@type: #{type.inspect}"
+    #     @associations.each do |title, assoc|
+    #       output += "\n#{options[:space]}@#{title}: #{assoc.class.name}"
+    #     end
+    #     unless @attributes.empty?
+    #       output += "\n#{options[:space]}------------ PROPERTIES ------------"
+    #       @attributes.each do |key, value|
+    #         output += "\n#{options[:space]}#{key.inspect} => #{value.inspect}"
+    #       end
+    #     end
+    #   end
+    #   output += ">"
+    # end    
     
     protected
     def define_link(link)

data/restfully.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restfully}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-11-02}
   s.default_executable = %q{restfully}
   s.description = %q{Experimental code for auto-generation of wrappers on top of RESTful APIs that follow HATEOAS principles and provide OPTIONS methods and/or Allow headers.}
   s.email = %q{cyril.rohr@gmail.com}

data/spec/collection_spec.rb

@@ -8,7 +8,7 @@ describe Collection do
     end
     it "should be enumerable" do
       @collection.length.should == 9
-      @collection.map{|site| site.uid}.sort.should == ["bordeaux", "grenoble", "lille", "lyon", "nancy", "orsay", "rennes", "sophia", "toulouse"]
+      @collection.map{|site| site["uid"]}.sort.should == ["bordeaux", "grenoble", "lille", "lyon", "nancy", "orsay", "rennes", "sophia", "toulouse"]
     end
   
     it "should have a :total method" do
@@ -89,8 +89,8 @@ describe Collection do
       collection.load
       collection.should be_loaded
       collection.uri.should == "uri"
-      collection.by_uid('rennes').uid.should == 'rennes'
-      collection.by_uid('rennes').type.should == 'site'
+      collection.by_uid('rennes')["uid"].should == 'rennes'
+      collection.by_uid('rennes')["type"].should == 'site'
       collection.by_uid.keys.should =~ ['rennes', 'lille', 'bordeaux', 'nancy', 'sophia', 'toulouse', 'lyon', 'grenoble', 'orsay']
       collection.by_uid('rennes', 'bordeaux').length.should == 2
     end 

data/spec/resource_spec.rb

@@ -122,7 +122,7 @@ describe Resource do
       resource.load
       resource['whatever'].should == 'whatever'
       resource.uri.should == 'uri'
-      resource.uid.should == 'rennes'
+      resource["uid"].should == 'rennes'
       resource['an_array'].should be_a(SpecialArray)
       resource['an_array'].should == [1,2,3]
       lambda{resource.clusters}.should raise_error(NoMethodError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restfully
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 +01:00
+date: 2009-11-02 00:00:00 +01:00
 default_executable: restfully
 dependencies: 
 - !ruby/object:Gem::Dependency