freckly 0.0.2 → 0.0.3

data/Gemfile

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

data/Gemfile.lock

@@ -1,9 +1,18 @@
+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)
-      faraday (~> 0.5.3)
-      faraday_middleware (~> 0.2.1)
+      faraday_middleware (~> 0.3.0)
       hashie (~> 0.4.0)
       multi_xml (~> 0.2.0)
 
@@ -13,12 +22,8 @@ GEM
     addressable (2.2.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    faraday (0.5.3)
-      addressable (~> 2.2.2)
-      multipart-post (~> 1.0.1)
-      rack (>= 1.1.0, < 2)
-    faraday_middleware (0.2.1)
-      faraday (~> 0.5.1)
+    faraday_middleware (0.3.0)
+      faraday (~> 0.5.3)
     hashie (0.4.0)
     multi_xml (0.2.0)
     multipart-post (1.0.1)
@@ -40,8 +45,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  faraday (~> 0.5.3)
-  faraday_middleware (~> 0.2.1)
+  faraday!
+  faraday_middleware (~> 0.3.0)
   freckly!
   hashie (~> 0.4.0)
   multi_xml (~> 0.2.0)

data/freckly.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "freckly"
 
-  s.add_dependency "faraday", "~> 0.5.3"
-  s.add_dependency "faraday_middleware", "~> 0.2.1"
+  #s.add_dependency "faraday", "~> 0.5.3"
+  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

@@ -15,7 +15,7 @@ module Freckly
     attr_accessor :token, :subdomain
 
     def authed_get(path, options={})
-      results = authed_connection.get do |request|
+      authed_connection.get do |request|
         request.url(path, options)
       end.body
     end
@@ -25,7 +25,9 @@ module Freckly
         :user_agent => "Freckly",
         "X-FreckleToken" => token
       }
-      @connection ||= Faraday::Connection.new(:url => "http://#{subdomain}.letsfreckle.com", :headers => headers) do |builder|
+      @connection ||= Faraday::Connection.new(:url => "https://#{subdomain}.letsfreckle.com",
+                                              :headers => headers,
+                                              :ssl => {:verify => false}) do |builder|
         builder.adapter Faraday.default_adapter
         builder.use Faraday::Response::ParseXml
         builder.use Faraday::Response::Mashify

data/lib/freckly/entry.rb

@@ -2,20 +2,13 @@ module Freckly
   class Entry
     class << self
       def all(options={})
-        options = commatorize_params(options)
-        Freckly.authed_get("/api/entries.xml", options)[:entries].map {|entry| new(entry) }
-      end
-
-      private
+        results = Freckly.authed_get("/api/entries.xml", :search => options)
 
-      def commatorize_params(params)
-        params.each_pair do |key, value|
-          next unless value.is_a?(Array)
-
-          params[key] = value.join(",")
+        if entries = results[:entries]
+          entries.map {|entry| new(entry) }
+        else
+          []
         end
-
-        params
       end
     end
 

data/lib/freckly/project.rb

@@ -11,7 +11,7 @@ module Freckly
     end
 
     def entries(options={})
-      Entry.find_all_for_project(id, options)
+      Entry.all(options.merge(:projects => id))
     end
 
     %w{ name id }.each do |method_name|

data/lib/freckly/version.rb

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

data/spec/freckly/entry_spec.rb

@@ -16,21 +16,35 @@ describe Freckly::Entry do
       describe "the request" do
         subject { WebMock::API }
 
-        it { should have_requested(:get, "http://test.letsfreckle.com/api/entries.xml").with(:headers => {"X-FreckleToken" => "aaa"}, :query => {:projects => "123,192"}) }
+        it { should have_requested(:get, "https://test.letsfreckle.com/api/entries.xml").with(:headers => {"X-FreckleToken" => "aaa"},
+                                                                                              :query => {:search => {
+                                                                                              :projects => "123,192"}
+                                                                                             }) }
       end
 
-      describe "the response" do
-        subject { @response }
+      context "when returning something" do
+        describe "the response" do
+          subject { @response }
 
-        it { should be_a(Array) }
+          it { should be_a(Array) }
+
+          its(:first) { should be_a(Freckly::Entry) }
+        end
+      end
 
-        its(:first) { should be_a(Freckly::Entry) }
+      context "when returning nothing" do
+        before { stub_request(:any, /entries/) }
+
+        subject { Freckly::Entry.all(:projects => %w{123 192}) }
+
+        it { should be_a(Array) }
+        it { should be_empty }
       end
     end
   end
 
   describe "Initialization" do
-    let(:entry) { Freckly::Entry.find_all_for_project(123).first }
+    let(:entry) { Freckly::Entry.all(:projects => 123).first }
     subject { entry }
 
     its(:billable) { should be_true }

data/spec/freckly/project_spec.rb

@@ -13,7 +13,7 @@ describe Freckly::Project do
         before { Freckly::Project.all }
         subject { WebMock }
 
-        it { should have_requested(:get, "http://test.letsfreckle.com/api/projects.xml").with(:headers => {"X-FreckleToken" => "aaa"}) }
+        it { should have_requested(:get, "https://test.letsfreckle.com/api/projects.xml").with(:headers => {"X-FreckleToken" => "aaa"}) }
       end
 
       describe "the response" do
@@ -36,7 +36,11 @@ describe Freckly::Project do
   end
 
   describe "#entries" do
-    before { Freckly::Entry.stub!(:find_all_for_project).and_return([mock]) }
+    before do
+      stub_request(:any, /entries/).to_return(:body => fixture("entries.xml"))
+      Freckly::Entry.stub!(:find_all_for_project).and_return([mock])
+    end
+
     let(:project) { Freckly::Project.all.first }
 
     subject { project.entries }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freckly
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Red Davis
@@ -15,45 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +00:00
+date: 2010-11-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: faraday
+  name: faraday_middleware
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 19
         segments: 
         - 0
-        - 5
         - 3
-        version: 0.5.3
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
         - 0
-        - 2
-        - 1
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: multi_xml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +49,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +65,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,11 +81,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,11 +97,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,7 +113,7 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 description: Wrapper for Freckle
 email: 
 - red@railslove.com