feedbuilder 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8627a0a888505dacac4628978b3b4819ebc9c187
+  data.tar.gz: 41386a5d8f0305b43b9832f10c00d5ad58ce8870
+SHA512:
+  metadata.gz: f3d954adcef09e349229d06afaa30a0cc5e86e437d4a8c99d487ae7d9b9d7679ecaa1cc28236b4f190388f648b44a78983ebb7540969e0d86249f71e4d7e3f7c
+  data.tar.gz: 128c545b7f4834620d799bace28bb0cd8b86d3eeb4caed7a52079d0aebe4268e0beb98e085d7d0944e9ca09c0d063260984f0b8e5136c99fca03696a00182dc5

data/.rspec

@@ -1 +1 @@
---color --format progress --require spec/spec_helper.rb
+--color --format progress

data/.ruby-gemset

@@ -0,0 +1 @@
+feedbuilder

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0

data/feedbuilder.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "feedbuilder"
 
-  s.add_dependency 'activesupport', '>= 3.0.0'
-  s.add_dependency 'ratom'
+  s.add_dependency 'activesupport', '~> 3.0', '>= 3.0.0'
+  s.add_dependency 'ratom', '~> 0.8', '>= 0.8.2'
+  s.add_dependency 'addressable', '~> 2.3', '>= 2.3.5'
   s.add_development_dependency 'rspec', '~> 2.0'
 
   s.files         = `git ls-files`.split("\n")

data/lib/feedbuilder/provider.rb

@@ -29,17 +29,18 @@ module FeedBuilder
         if collection.respond_to?(:total_pages) && collection.respond_to?(:current_page) &&
             collection.respond_to?(:per_page)
           if collection.total_pages > 1
-            feed.links << Atom::Link.new(:href => url_builder.first_url(collection.per_page), :rel => :first)
+            feed.links << Atom::Link.new(:href => url_builder.first_url(collection.per_page), :rel => :first,
+                                         :type => 'application/atom+xml')
             if collection.current_page > 1
               feed.links << Atom::Link.new(:href => url_builder.prev_url(collection.current_page, collection.per_page),
-                :rel => :previous)
+                :rel => :previous, :type => 'application/atom+xml')
             end
             if collection.current_page < collection.total_pages
               feed.links << Atom::Link.new(:href => url_builder.next_url(collection.current_page, collection.per_page),
-                :rel => :next)
+                :rel => :next, :type => 'application/atom+xml')
             end
             feed.links << Atom::Link.new(:href => url_builder.last_url(collection.total_pages, collection.per_page),
-              :rel => :last)
+              :rel => :last, :type => 'application/atom+xml')
           end
         end
         collection.each {|model| feed.entries << build_entry(model, &block)}

data/lib/feedbuilder/url_builder.rb

@@ -1,48 +1,53 @@
+require 'addressable/uri'
+
 module FeedBuilder
   class UrlBuilder
     attr_reader :base_url, :html_url, :self_url
 
     def initialize(base_url, html_url, self_url = nil, options = {})
-      @base_url = base_url
-      @html_url = html_url
+      @base_url = Addressable::URI.parse(base_url)
+      @html_url = Addressable::URI.parse(html_url)
       if self_url.present?
-        @self_url = self_url
+        @self_url = Addressable::URI.parse(self_url)
       else
-        @self_url = html_url.dup
-        if @self_url =~ /\?/
-          @self_url.sub!(/\?/, '.atom?')
-        else
-          @self_url << '.atom'
-        end
+        @self_url = @html_url.dup
+        @self_url.path = "#{@self_url.path}.atom"
       end
       @page_param = options[:page_param] || :page
       @per_page_param = options[:per_page_param] || :per_page
     end
 
     def first_url(per_page)
-      add_params(self_url, @page_param => 1, @per_page_param => per_page)
+      self_url.dup.tap do |copy|
+        copy.query_values = hashify_query_values(copy).
+          merge(@page_param.to_s => '1', @per_page_param.to_s => per_page.to_s)
+      end
     end
 
     def next_url(current_page, per_page)
-      add_params(self_url, @page_param => current_page + 1, @per_page_param => per_page)
+      self_url.dup.tap do |copy|
+        copy.query_values = hashify_query_values(copy).
+          merge(@page_param.to_s => (current_page + 1).to_s, @per_page_param.to_s => per_page.to_s)
+      end
     end
 
     def prev_url(current_page, per_page)
-      add_params(self_url, @page_param => current_page - 1, @per_page_param => per_page)
+      self_url.dup.tap do |copy|
+        copy.query_values = hashify_query_values(copy).
+          merge(@page_param.to_s => (current_page - 1).to_s, @per_page_param.to_s => per_page.to_s)
+      end
     end
 
     def last_url(total_pages, per_page)
-      add_params(self_url, @page_param => total_pages, @per_page_param => per_page)
+      self_url.dup.tap do |copy|
+        copy.query_values = hashify_query_values(copy).
+          merge(@page_param.to_s => total_pages.to_s, @per_page_param.to_s => per_page.to_s)
+      end
     end
 
-    def add_params(url, params = {})
-      copy = url.dup
-      unless params.empty?
-        qs = params.inject([]) {|m, kv| m << "#{kv[0]}=#{kv[1]}"}
-        sep = copy =~ /\?/ ? '&amp;' : '?'
-        copy << "#{sep}#{URI.escape(qs.join('&'))}"
-      end
-      copy
+  private
+    def hashify_query_values(uri)
+      (uri.query_values(Array) || []).each_with_object({}) { |(key, val), m| m[key] ||= []; m[key] << val}
     end
   end
 end

data/lib/feedbuilder/version.rb

@@ -1,3 +1,3 @@
 module FeedBuilder
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/provider_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe FeedBuilder::Provider do
   describe "#build_feed" do
     it "builds a feed" do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'lib/feedbuilder'
+require 'feedbuilder'
 require 'nug'

data/spec/url_builder_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe FeedBuilder::UrlBuilder do
+  subject do
+    FeedBuilder::UrlBuilder.new('http://example.com', 'http://example.com/foobar.html?baz=quux',
+                                'http://example.com/foobar.atom?baz=quux')
+  end
+
+  describe '#first_url' do
+    it 'has the correct path' do
+      subject.first_url(10).path.should eq('/foobar.atom')
+    end
+
+    it 'has the correct baz param' do
+      subject.first_url(10).query_values['baz'].should eq('quux')
+    end
+
+    it 'has the correct page param' do
+      subject.first_url(10).query_values['page'].should eq('1')
+    end
+
+    it 'has the correct per_page param' do
+      subject.first_url(10).query_values['per_page'].should eq('10')
+    end
+  end
+
+  describe '#next_url' do
+    it 'has the correct path' do
+      subject.next_url(1, 10).path.should eq('/foobar.atom')
+    end
+
+    it 'has the correct baz param' do
+      subject.next_url(1, 10).query_values['baz'].should eq('quux')
+    end
+
+    it 'has the correct page param' do
+      subject.next_url(1, 10).query_values['page'].should eq('2')
+    end
+
+    it 'has the correct per_page param' do
+      subject.next_url(1, 10).query_values['per_page'].should eq('10')
+    end
+  end
+
+  describe '#prev_url' do
+    it 'has the correct path' do
+      subject.prev_url(2, 10).path.should eq('/foobar.atom')
+    end
+
+    it 'has the correct baz param' do
+      subject.prev_url(2, 10).query_values['baz'].should eq('quux')
+    end
+
+    it 'has the correct page param' do
+      subject.prev_url(2, 10).query_values['page'].should eq('1')
+    end
+
+    it 'has the correct per_page param' do
+      subject.prev_url(2, 10).query_values['per_page'].should eq('10')
+    end
+  end
+
+  describe '#last_url' do
+    it 'has the correct path' do
+      subject.last_url(5, 10).path.should eq('/foobar.atom')
+    end
+
+    it 'has the correct baz param' do
+      subject.last_url(5, 10).query_values['baz'].should eq('quux')
+    end
+
+    it 'has the correct page param' do
+      subject.last_url(5, 10).query_values['page'].should eq('5')
+    end
+
+    it 'has the correct per_page param' do
+      subject.last_url(5, 10).query_values['per_page'].should eq('10')
+    end
+  end
+end

metadata

@@ -1,52 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: feedbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Moseley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: ratom
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +80,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,7 +94,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -82,31 +108,32 @@ files:
 - spec/nug.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb
+- spec/url_builder_spec.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: feedbuilder
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An easier way to build Atom feeds
 test_files:
 - spec/nug.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb
+- spec/url_builder_spec.rb

data/.rvmrc

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-rvm use --create "1.9.3@feedbuilder"