nestful 1.0.0.rc2 → 1.0.1

data/examples/oembed.rb

@@ -0,0 +1,85 @@
+require 'nestful'
+require 'nokogiri'
+
+module OEmbed
+  def self.parse(html)
+    base = Nokogiri::HTML(html)
+    link = base.css('link[type="application/json+oembed"]').first
+    return unless link
+    Response.new(Nestful.get(link['href']).decoded)
+  end
+
+  class Response
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+
+    def type
+      @attributes['type']
+    end
+
+    def html
+      @attributes['html']
+    end
+
+    def title
+      @attributes['title']
+    end
+
+    def provider_name
+      @attributes['provider_name']
+    end
+
+    def provider_url
+      @attributes['provider_url']
+    end
+
+    def width
+      @attributes['width']
+    end
+
+    def height
+      @attributes['height']
+    end
+
+    def thumbnail_url
+      @attributes['thumbnail_url']
+    end
+
+    def thumbnail_width
+      @attributes['thumbnail_width']
+    end
+
+    def thumbnail_height
+      @attributes['thumbnail_height']
+    end
+
+    def author_name
+      @attributes['author_name']
+    end
+
+    def author_url
+      @attributes['author_url']
+    end
+
+    def version
+      @attributes['version']
+    end
+
+    def video?
+      type == 'video'
+    end
+
+    def photo?
+      type == 'photo'
+    end
+
+    def link?
+      type == 'link'
+    end
+
+    def rich?
+      type == 'rich'
+    end
+  end
+end

data/lib/nestful/helpers.rb

@@ -1,4 +1,4 @@
-require 'cgi'
+require 'uri'
 
 module Nestful
   module Helpers extend self
@@ -6,24 +6,97 @@ module Nestful
       params.map(&:to_s).reject(&:empty?) * '/'
     end
 
-    def to_param(value, key = nil)
+    def camelize(value)
+      value.to_s.split('_').map {|w| w.capitalize }.join
+    end
+
+    # Stolen from Rack:
+
+    DEFAULT_SEP = /[&;] */n
+
+    def to_param(value, prefix = nil)
       case value
-      when Hash  then value.map { |k,v| to_param(v, append_key(key,k)) }.join('&')
-      when Array then value.map { |v| to_param(v, "#{key}[]") }.join('&')
-      when nil   then ''
+      when Array
+        value.map { |v|
+          to_param(v, "#{prefix}[]")
+        }.join("&")
+      when Hash
+        value.map { |k, v|
+          to_param(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
+        }.join("&")
+      when String
+        raise ArgumentError, "value must be a Hash" if prefix.nil?
+        "#{prefix}=#{escape(value)}"
       else
-        "#{key}=#{CGI.escape(value.to_s)}"
+        prefix
       end
     end
 
-    def camelize(value)
-      value.to_s.split('_').map {|w| w.capitalize }.join
+    def from_param(param)
+      Rack::Utils.parse_nested_query(param)
+      (value || '').split('&').each do |res|
+        key, value = res.split('=')
+        @params[key] = value
+      end
+    end
+
+    def from_param(qs, d = nil)
+      params = {}
+
+      (qs || '').split(d ? /[#{d}] */n : DEFAULT_SEP).each do |p|
+        k, v = p.split('=', 2).map { |s| unescape(s) }
+
+        normalize_params(params, k, v)
+      end
+
+      params
+    end
+
+    def escape(s)
+      URI.encode_www_form_component(s)
+    end
+
+    if defined?(::Encoding)
+      def unescape(s, encoding = Encoding::UTF_8)
+        URI.decode_www_form_component(s, encoding)
+      end
+    else
+      def unescape(s, encoding = nil)
+        URI.decode_www_form_component(s, encoding)
+      end
     end
 
     protected
 
-    def append_key(root_key, key)
-      root_key.nil? ? key : "#{root_key}[#{key.to_s}]"
+    def normalize_params(params, name, v = nil)
+      name =~ %r(\A[\[\]]*([^\[\]]+)\]*)
+      k = $1 || ''
+      after = $' || ''
+
+      return if k.empty?
+
+      if after == ""
+        params[k] = v
+      elsif after == "[]"
+        params[k] ||= []
+        raise TypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        params[k] << v
+      elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
+        child_key = $1
+        params[k] ||= []
+        raise TypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        if params[k].last.kind_of?(Hash) && !params[k].last.key?(child_key)
+          normalize_params(params[k].last, child_key, v)
+        else
+          params[k] << normalize_params(params.class.new, child_key, v)
+        end
+      else
+        params[k] ||= params.class.new
+        raise TypeError, "expected Hash (got #{params[k].class.name}) for param `#{k}'" unless params[k].kind_of?(Hash)
+        params[k] = normalize_params(params[k], after, v)
+      end
+
+      return params
     end
   end
 end

data/lib/nestful/request.rb

@@ -40,10 +40,10 @@ module Nestful
       @uri = URI.parse(url)
       @uri.path = '/' if @uri.path.empty?
 
-      @uri.query.split('&').each do |res|
-        key, value = res.split('=')
-        @params[key] = value
-      end if @uri.query
+      if @uri.query
+        @params.merge!(Helpers.from_param(@uri.query))
+        @uri.query = nil
+      end
 
       @uri
     end

data/lib/nestful/version.rb

@@ -1,3 +1,3 @@
 module Nestful
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nestful
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
-  prerelease: 6
+  version: 1.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -23,6 +23,7 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
+- examples/oembed.rb
 - examples/resource.rb
 - lib/nestful.rb
 - lib/nestful/.DS_Store
@@ -58,12 +59,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple Ruby HTTP/REST client with a sane API