freckly 0.0.3 → 0.0.5

data/Gemfile

@@ -1,5 +1,2 @@
 source "http://rubygems.org"
-
-gem "faraday", :git => "git://github.com/railslove/faraday.git", :branch => "hacking"
-
 gemspec

data/Gemfile.lock

@@ -1,17 +1,8 @@
-GIT
-  remote: git://github.com/railslove/faraday.git
-  revision: 1c4337bfd46a0a524ec510daf8d9ab21df645767
-  branch: hacking
-  specs:
-    faraday (0.5.3)
-      addressable (~> 2.2.2)
-      multipart-post (~> 1.0.1)
-      rack (>= 1.1.0, < 2)
-
 PATH
   remote: .
   specs:
-    freckly (0.0.2)
+    freckly (0.0.3)
+      faraday (~> 0.5.7)
       faraday_middleware (~> 0.3.0)
       hashie (~> 0.4.0)
       multi_xml (~> 0.2.0)
@@ -19,15 +10,19 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.2)
+    addressable (2.2.4)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    faraday_middleware (0.3.0)
-      faraday (~> 0.5.3)
+    faraday (0.5.7)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (>= 1.1.0, < 2)
+    faraday_middleware (0.3.2)
+      faraday (~> 0.5.4)
     hashie (0.4.0)
-    multi_xml (0.2.0)
-    multipart-post (1.0.1)
-    rack (1.2.1)
+    multi_xml (0.2.2)
+    multipart-post (1.1.0)
+    rack (1.2.2)
     rake (0.8.7)
     rspec (2.1.0)
       rspec-core (~> 2.1.0)
@@ -37,7 +32,7 @@ GEM
     rspec-expectations (2.1.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.1.0)
-    webmock (1.6.1)
+    webmock (1.6.2)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
 
@@ -45,11 +40,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  faraday!
-  faraday_middleware (~> 0.3.0)
   freckly!
-  hashie (~> 0.4.0)
-  multi_xml (~> 0.2.0)
   rake (~> 0.8.7)
   rspec (~> 2.1.0)
   webmock (~> 1.6.1)

data/freckly.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "freckly"
 
-  #s.add_dependency "faraday", "~> 0.5.3"
+  s.add_dependency "faraday", "~> 0.5.7"
   s.add_dependency "faraday_middleware", "~> 0.3.0"
   s.add_dependency "multi_xml", "~> 0.2.0"
   s.add_dependency "hashie", "~> 0.4.0"

data/lib/freckly.rb

@@ -9,6 +9,8 @@ require "multi_xml"
 require "freckly/project"
 require "freckly/entry"
 require "freckly/faraday/parse_xml"
+require "freckly/ext/enumerable"
+require "freckly/faraday/utils"
 
 module Freckly
   class << self

data/lib/freckly/ext/enumerable.rb

@@ -0,0 +1,47 @@
+module Enumerable
+  def to_param(options={})
+    escape = options[:escape]
+    previous_base = options[:base]
+    parts = []
+
+    self.to_a.each do |key, value|
+      base = build_base(key, previous_base)
+
+      case value
+      when Array
+        values = value.map(&:strip).join(",")
+        parts << build_param(base, values)
+      when Hash
+        parts << value.to_param(:escape => false, :base => base)
+      else
+        parts << (escape ? build_escaped_param(base, value) : build_param(base, value))
+      end
+    end
+
+    parts.join("&")
+  end
+
+  private
+
+  def escape(s)
+    s.to_s.gsub(/([^a-zA-Z0-9_.-]+)/n) do
+      '%' << $1.unpack('H2'* $1.bytesize).join('%').tap { |c| c.upcase! }
+    end
+  end
+
+  # {:a => {:b => {:c => "d"}}} => a[b][c]...
+  # {:a => {:b => "d"}} => a[b]...
+  def build_base(key, previous_base)
+    return key unless previous_base
+
+    "#{previous_base}[#{key}]"
+  end
+
+  def build_param(base, value)
+    "#{base}=#{value}"
+  end
+
+  def build_escaped_param(base, value)
+    "#{escape(base)}=#{escape(value)}"
+  end
+end

data/lib/freckly/faraday/utils.rb

@@ -0,0 +1,7 @@
+module Faraday
+  module Utils
+    def build_query(params)
+      params.to_param(:escape => true)
+    end
+  end
+end

data/lib/freckly/version.rb

@@ -1,3 +1,3 @@
 module Freckly
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: freckly
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Red Davis
@@ -15,105 +10,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +00:00
+date: 2011-03-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: faraday_middleware
+  name: faraday
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+        version: 0.5.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: multi_xml
+  name: faraday_middleware
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hashie
+  name: multi_xml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: hashie
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+        version: 0.4.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 2.1.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Wrapper for Freckle
 email: 
 - red@railslove.com
@@ -135,7 +111,9 @@ files:
 - freckly.gemspec
 - lib/freckly.rb
 - lib/freckly/entry.rb
+- lib/freckly/ext/enumerable.rb
 - lib/freckly/faraday/parse_xml.rb
+- lib/freckly/faraday/utils.rb
 - lib/freckly/project.rb
 - lib/freckly/version.rb
 - spec/fixtures/entries.xml
@@ -158,23 +136,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: freckly
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Wrapper for Freckle