freckly 0.0.0 → 0.0.2

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+demo/**

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--profile

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    freckly (0.0.2)
+      faraday (~> 0.5.3)
+      faraday_middleware (~> 0.2.1)
+      hashie (~> 0.4.0)
+      multi_xml (~> 0.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    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)
+    hashie (0.4.0)
+    multi_xml (0.2.0)
+    multipart-post (1.0.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    webmock (1.6.1)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  faraday (~> 0.5.3)
+  faraday_middleware (~> 0.2.1)
+  freckly!
+  hashie (~> 0.4.0)
+  multi_xml (~> 0.2.0)
+  rake (~> 0.8.7)
+  rspec (~> 2.1.0)
+  webmock (~> 1.6.1)

data/README.md

@@ -0,0 +1,67 @@
+# Freckly
+
+We built this gem for http://github.com/railslove/Freckly-App
+
+NOTE: It is currently missing quite a few API calls
+
+## How To Install
+
+    sudo gem install freckly
+
+## Example
+
+    require 'rubygems'
+    require 'freckly'
+
+    Freckly.token = "token_from_freckly"
+    Freckly.subdomain = "my_subdomain"
+
+    # Get all projects
+    projects = Freckly::Project.all
+
+    # Get all time entries for a project
+    projects.first.entries
+
+    # If you know the ID of a project
+    Freckly::Entry.all(:projects => 123)
+
+    # Want the entries of a list of projects
+    Freckly::Entry.all(:projects => %w{123 456 789})
+
+    # You can pass any of the options from http://github.com/madrobby/freckle-apidocs/blob/master/entries.mkdn
+    Freckly::Entry.find_all_for_project(123, :billable => true, :tags => "fun")
+
+## Note on Patches/Pull Requests
+
+* Fork the project.
+* Create a feature branch
+* Make your feature addition or bug fix.
+* Add tests.
+* Commit, do not mess with RakeFile, version, or history.
+* Send me a pull request.
+
+## Copyright
+
+Copyright (c) 2010 Red Davis.
+
+## License
+
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -1,31 +1,9 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+require 'rspec/core/rake_task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "freckly"
-    gem.summary = %Q{Freckle Gem}
-    gem.description = %Q{Freckle Gem}
-    gem.email = "reddavis@gmail.com"
-    gem.homepage = "http://github.com/reddavis/freckly"
-    gem.authors = ["reddavis"]
-    gem.add_development_dependency("rspec", "~> 1.3.0")
-    gem.add_runtime_dependency("faraday", "~> 0.4.6")
-    gem.add_runtime_dependency("faraday_middleware", "~> 0.1.0")
-    gem.add_runtime_dependency("multi_xml", "~> 0.0.1")
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+Bundler::GemHelper.install_tasks
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new do |t|
-  t.ruby_opts = ["-I spec/", "-rubygems"]
-  puts FileList['spec/**/*_spec.rb'].inspect
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+desc "Run specs"
+RSpec::Core::RakeTask.new
 
 task :default => :spec

data/freckly.gemspec

@@ -1,73 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "freckly/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{freckly}
-  s.version = "0.0.0"
+  s.name        = "freckly"
+  s.version     = Freckly::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Red Davis"]
+  s.email       = ["red@railslove.com"]
+  s.homepage    = "http://rubygems.org/gems/freckly"
+  s.summary     = %q{Wrapper for Freckle}
+  s.description = %q{Wrapper for Freckle}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["reddavis"]
-  s.date = %q{2010-10-04}
-  s.description = %q{Freckle Gem}
-  s.email = %q{reddavis@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "freckly.gemspec",
-     "lib/freckly.rb",
-     "lib/freckly/entry.rb",
-     "lib/freckly/faraday/parse_xml.rb",
-     "lib/freckly/project.rb",
-     "spec/fixtures/entries.xml",
-     "spec/fixtures/projects.xml",
-     "spec/freckly/entry_spec.rb",
-     "spec/freckly/project_spec.rb",
-     "spec/freckly_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/reddavis/freckly}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Freckle Gem}
-  s.test_files = [
-    "spec/freckly/entry_spec.rb",
-     "spec/freckly/project_spec.rb",
-     "spec/freckly_spec.rb",
-     "spec/spec_helper.rb"
-  ]
+  s.rubyforge_project = "freckly"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "faraday", "~> 0.5.3"
+  s.add_dependency "faraday_middleware", "~> 0.2.1"
+  s.add_dependency "multi_xml", "~> 0.2.0"
+  s.add_dependency "hashie", "~> 0.4.0"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_runtime_dependency(%q<faraday>, ["~> 0.4.6"])
-      s.add_runtime_dependency(%q<faraday_middleware>, ["~> 0.1.0"])
-      s.add_runtime_dependency(%q<multi_xml>, ["~> 0.0.1"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_dependency(%q<faraday>, ["~> 0.4.6"])
-      s.add_dependency(%q<faraday_middleware>, ["~> 0.1.0"])
-      s.add_dependency(%q<multi_xml>, ["~> 0.0.1"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    s.add_dependency(%q<faraday>, ["~> 0.4.6"])
-    s.add_dependency(%q<faraday_middleware>, ["~> 0.1.0"])
-    s.add_dependency(%q<multi_xml>, ["~> 0.0.1"])
-  end
-end
+  s.add_development_dependency "rspec", "~> 2.1.0"
+  s.add_development_dependency "webmock", "~> 1.6.1"
+  s.add_development_dependency "rake", "~> 0.8.7"
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/freckly.rb

@@ -1,6 +1,5 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__)))
 
-# TODO: use bundler
 # Gems
 require "faraday"
 require "faraday_middleware"

data/lib/freckly/entry.rb

@@ -1,8 +1,21 @@
 module Freckly
   class Entry
     class << self
-      def find_all_for_project(project_ids, options={})
-        Freckly.authed_get("/api/entries.xml", options.merge(:projects => project_ids))[:entries].map {|entry| new(entry) }
+      def all(options={})
+        options = commatorize_params(options)
+        Freckly.authed_get("/api/entries.xml", options)[:entries].map {|entry| new(entry) }
+      end
+
+      private
+
+      def commatorize_params(params)
+        params.each_pair do |key, value|
+          next unless value.is_a?(Array)
+
+          params[key] = value.join(",")
+        end
+
+        params
       end
     end
 

data/lib/freckly/faraday/parse_xml.rb

@@ -2,7 +2,7 @@
 
 module Faraday
   class Response::ParseXml < Response::Middleware
-    MultiXml.engine = :rexml
+    MultiXml.parser = :rexml
 
     def self.register_on_complete(env)
       env[:response].on_complete do |response|

data/lib/freckly/version.rb

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

data/spec/freckly/entry_spec.rb

@@ -4,37 +4,39 @@ describe Freckly::Entry do
   before do
     Freckly.token = "aaa"
     Freckly.subdomain = "test"
-    stub_request(:any, /entries.xml/).to_return(:body => fixture("entries.xml"))
+    stub_request(:any, /entries/).to_return(:body => fixture("entries.xml"))
   end
 
   describe "Class methods" do
-    describe "#find" do
+    describe "#all" do
+      before do
+        @response = Freckly::Entry.all(:projects => %w{123 192})
+      end
+
       describe "the request" do
-        before { Freckly::Entry.find_all_for_project(123) }
-        subject { WebMock }
+        subject { WebMock::API }
 
-        it { should have_requested(:get, "http://test.letsfreckle.com/api/entries.xml").with(:headers => {"X-FreckleToken" => "aaa"}, :query => {:projects => "123"}) }
+        it { should have_requested(:get, "http://test.letsfreckle.com/api/entries.xml").with(:headers => {"X-FreckleToken" => "aaa"}, :query => {:projects => "123,192"}) }
       end
 
       describe "the response" do
-        before { @response = Freckly::Entry.find_all_for_project(123) }
         subject { @response }
 
         it { should be_a(Array) }
 
-        specify { subject.first.should be_a(Freckly::Entry) }
+        its(:first) { should be_a(Freckly::Entry) }
       end
     end
   end
 
   describe "Initialization" do
-    before(:all) { @entry = Freckly::Entry.find_all_for_project(123).first }
-    subject { @entry }
-
-    specify { subject.billable.should be_true }
-    specify { subject.date.should_not be_nil }
-    specify { subject.description.should == "freckle restful api test, bulk import" }
-    specify { subject.id.should == 83601 }
-    specify { subject.minutes.should == 120 }
+    let(:entry) { Freckly::Entry.find_all_for_project(123).first }
+    subject { entry }
+
+    its(:billable) { should be_true }
+    its(:date) { should_not be_nil }
+    its(:description) { should == "freckle restful api test, bulk import" }
+    its(:id) { should == 83601 }
+    its(:minutes) { should == 120 }
   end
 end

data/spec/freckly/project_spec.rb

@@ -4,7 +4,7 @@ describe Freckly::Project do
   before do
     Freckly.token = "aaa"
     Freckly.subdomain = "test"
-    stub_request(:any, /projects.xml$/).to_return(:body => fixture("projects.xml"))
+    stub_request(:any, /projects.xml/).to_return(:body => fixture("projects.xml"))
   end
 
   describe "Class methods" do
@@ -28,8 +28,8 @@ describe Freckly::Project do
   end
 
   describe "Initialization" do
-    before(:all) { @project = Freckly::Project.all.first }
-    subject { @project }
+    let(:project) { Freckly::Project.all.first }
+    subject { project }
 
     specify { subject.name.should == "TestProject1" }
     specify { subject.id.should == 1343 }
@@ -37,9 +37,9 @@ describe Freckly::Project do
 
   describe "#entries" do
     before { Freckly::Entry.stub!(:find_all_for_project).and_return([mock]) }
-    before(:all) { @project = Freckly::Project.all.first }
+    let(:project) { Freckly::Project.all.first }
 
-    subject { @project.entries }
+    subject { project.entries }
 
     it { should be_a(Array) }
   end

data/spec/spec_helper.rb

@@ -1,17 +1,18 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift(File.dirname(__FILE__))
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'freckly'
-
-gem "rspec", "1.3.0"
-require 'spec'
-require 'spec/autorun'
+require "freckly"
+require "rspec"
 require 'webmock/rspec'
 
 def fixture(file_name)
-  File.read(File.expand_path(File.dirname(__FILE__) + "/fixtures/#{file_name}"))
+  File.read(fixture_path(file_name))
+end
+
+def fixture_path(file_name)
+  File.expand_path(File.dirname(__FILE__)) + "/fixtures/#{file_name}"
 end
 
-Spec::Runner.configure do |config|
-  config.include WebMock
+RSpec.configure do |config|
+  config.include WebMock::API
 end

metadata

@@ -1,137 +1,202 @@
 --- !ruby/object:Gem::Specification 
 name: freckly
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 0
-  version: 0.0.0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-- reddavis
+- Red Davis
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2010-11-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: faraday
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
-  type: :development
+        - 5
+        - 3
+        version: 0.5.3
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: faraday
+  name: faraday_middleware
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
-        - 4
-        - 6
-        version: 0.4.6
+        - 2
+        - 1
+        version: 0.2.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: faraday_middleware
+  name: multi_xml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: multi_xml
+  name: hashie
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
+        - 4
         - 0
-        - 1
-        version: 0.0.1
+        version: 0.4.0
   type: :runtime
   version_requirements: *id004
-description: Freckle Gem
-email: reddavis@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  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: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  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: *id007
+description: Wrapper for Freckle
+email: 
+- red@railslove.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .bundle/config
 - .document
 - .gitignore
-- LICENSE
-- README.rdoc
+- .rspec
+- Gemfile
+- Gemfile.lock
+- README.md
 - Rakefile
-- VERSION
 - freckly.gemspec
 - lib/freckly.rb
 - lib/freckly/entry.rb
 - lib/freckly/faraday/parse_xml.rb
 - lib/freckly/project.rb
+- lib/freckly/version.rb
 - spec/fixtures/entries.xml
 - spec/fixtures/projects.xml
 - spec/freckly/entry_spec.rb
 - spec/freckly/project_spec.rb
 - spec/freckly_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/reddavis/freckly
+homepage: http://rubygems.org/gems/freckly
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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: 
-rubygems_version: 1.3.6
+rubyforge_project: freckly
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Freckle Gem
+summary: Wrapper for Freckle
 test_files: 
+- spec/fixtures/entries.xml
+- spec/fixtures/projects.xml
 - spec/freckly/entry_spec.rb
 - spec/freckly/project_spec.rb
 - spec/freckly_spec.rb

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 reddavis
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,17 +0,0 @@
-= Freckly
-
-Description goes here.
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Red Davis. See LICENSE for details.

data/VERSION

@@ -1 +0,0 @@
-0.0.0

data/spec/spec.opts

@@ -1 +0,0 @@
---color