spruce 0.0.1 → 0.0.2

data/README.rdoc

@@ -24,7 +24,7 @@ gem until the Forrst API returns the correct MIME type and status codes.
     
     # Retrieve a user by username
     kyle = Forrst::User.find 'kyle'
-      
+    
     # Kyles latest PUBLIC posts
     kyle.public_posts
     
@@ -66,4 +66,4 @@ 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.
+THE SOFTWARE.

data/Rakefile

@@ -1,6 +1,16 @@
 require 'rubygems'
 gem 'rdoc' # Required on Mac OS X to get a “working” rdoc version
 require 'rake/rdoctask'
+require 'rake/testtask'
+
+task :default => :test
+
+desc "Test spruce"
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['spec/*_spec.rb']
+  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.ruby_opts << '-I.'
+end
 
 desc 'Generate RDoc documentation for the spruce gem.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -10,10 +20,10 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
     exclude('lib/leaf/view_helpers/sinatra.rb').
     exclude('lib/leaf/core_ext.rb').
     exclude('lib/leaf/version.rb')
-  
+
   rdoc.main = "README.rdoc" # page to start on
   rdoc.title = "leaf documentation"
-  
+
   rdoc.rdoc_dir = 'doc' # rdoc output folder
   rdoc.options << '--inline-source' << '--charset=UTF-8' << '--format=darkfish'
   rdoc.options << '--main=README.rdoc'

data/lib/forrst.rb

@@ -1,12 +1,13 @@
+# encoding: utf-8
 require 'spruce'
 
 module Forrst
   API_URI     = "http://api.forrst.com/api/"
-  API_VERSION = 'v1'
-  
+  API_VERSION = 'v2'
+
   ## Sections of the Forrst API
   require 'forrst/user'
-  
+
   ## Exceptions
   module Exceptions
     class InvalidUserId < ArgumentError
@@ -14,23 +15,23 @@ module Forrst
         'Invalid User ID, must be an Integer'
       end
     end
-    
+
     class InvalidPostId < ArgumentError
       def to_s
         'Invalid Post ID, must be an Integer'
       end
     end
-    
+
     class InvalidUsername < ArgumentError
       def to_s
         'Invalid username, must be a String'
       end
     end
-    
+
     class UserNotFound < ArgumentError
       def to_s
         'User not found on Forrst'
       end
     end
   end
-end
+end

data/lib/forrst/list_of_posts.rb

@@ -1,11 +1,21 @@
+# encoding: utf-8
 require 'forrst/post'
 
 module Forrst
   class ListOfPosts < Array
-    attr_accessor :status, :raw_data
-    
+    attr_reader :status, :in, :authenticated, :authenticated_as, :environment, :raw_data
+
+    def initialize(data)
+        @status           = data['stat']
+        @in               = data['in']
+        @authenticated    = data['authed']
+        @authenticated_as = data['authed_as']
+        @environment      = data['env']
+        @raw_data         = data
+    end
+
     def add_post(post)
       self << post
     end
   end
-end
+end

data/lib/forrst/post.rb

@@ -1,41 +1,42 @@
+# encoding: utf-8
 require 'time'
 
 module Forrst
   class Post
     attr_accessor :raw_data
-    
+
     def initialize(data)
       populate(data)
     end
-    
+
     def populate(data)
       # Save the raw data hash
       @raw_data = data
-      
+
       # Standard fields
       standard_fields = [
         'slug', 'tag_string', 'tiny_id', 'faved_by_current_user', 'title',
-        'markdown_description', 'markdown_content', 'reply_key', 'reply_url', 
-        'current_user_likes_this', 'url', 'url_with_wbr', 'post_type', 
+        'markdown_description', 'markdown_content', 'reply_key', 'reply_url',
+        'current_user_likes_this', 'url', 'url_with_wbr', 'post_type',
         'in_reply_to_post_id', 'post_url', 'phrase', 'formatted_description',
         'tag_objs', 'tags', 'images', 'snap_content_type',
       ]
-      
+
       # Numeric fields such as like count and number of views
       numeric_fields = [
-        'like_count', 'views', 'is_public', 'id', 'comment_count', 
+        'like_count', 'views', 'is_public', 'id', 'comment_count',
         'short_url_redirects', 'user_id', 'snap_file_size'
       ]
-      
+
       # Date fields
       date_fields = [
         'created_at', 'updated_at', 'snap_updated_at'
       ]
-      
+
       standard_fields.map { |f| instance_variable_set("@#{f}", data[f]) }
       numeric_fields.map  { |f| instance_variable_set("@#{f}", data[f].to_i) }
       date_fields.map     { |f| instance_variable_set("@#{f}", f.match(/\d\d\d\d/) ? Time.parse(data[f]) : nil) }
-      
+
       # Define accessor methods
       (class << self; self; end).class_eval do
         # Handle the standard fields
@@ -47,4 +48,4 @@ module Forrst
       end
     end
   end
-end
+end

data/lib/forrst/user.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'uri'
 require 'yajl'
 require 'rest_client'
@@ -7,47 +8,41 @@ require 'forrst/user/public_posts'
 module Forrst
   class User
     INFO_RESOURCE = "#{API_URI}#{API_VERSION}/users/info"
-    
+
     attr_reader :username, :id, :raw_data
-    
+
     def self.find(id)
       (id.is_a? Fixnum) ? self.find_by_user_id(id) : self.find_by_username(id)
     end
-    
+
     def initialize(uri)
       begin
         response = RestClient.get uri
-        
+
         if response.code == 200
-          @raw_data = Yajl::Parser.parse(response.body)['resp']['user']
+          @raw_data = Yajl::Parser.parse(response.body)['resp']
           @username = @raw_data['username']
-          @id = @raw_data['id'].to_i # Should be a Fixnum from the start
+          @id       = @raw_data['id'].to_i # Should be a Fixnum from the start
         end
-        
       rescue RestClient::ResourceNotFound
         raise Exceptions::UserNotFound
       end
     end
-    
+
     def public_posts
       @posts ||= PublicPosts.new(username)
-      @posts.latest
+      @posts.retrieve
     end
-    
-    def public_posts_before(post_id)
-      @posts ||= PublicPosts.new(username)
-      @posts.before(post_id)
-    end
-    
+
   private
     def self.find_by_user_id(user_id)
       raise Exceptions::InvalidId unless user_id.is_a? Fixnum
       self.new("#{INFO_RESOURCE}?id=#{user_id}")
     end
-    
+
     def self.find_by_username(username)
       raise Exceptions::InvalidUsername unless username.is_a? String
       self.new("#{INFO_RESOURCE}?username=#{username}")
     end
   end
-end
+end

data/lib/forrst/user/public_posts.rb

@@ -1,38 +1,24 @@
+# encoding: utf-8
 require 'forrst/list_of_posts'
 
 module Forrst
   class User
     class PublicPosts
+      attr_reader :posts, :username
       RESOURCE = "#{API_URI}#{API_VERSION}/users/posts"
-      
-      def latest
-        return @posts unless @posts.nil?
+
+      def retrieve
+        return posts unless posts.nil?
         response = get("#{RESOURCE}?username=#{@username}")
-        
-        @posts = ListOfPosts.new
-        response['resp']['posts'].map { |p| 
-          @posts.add_post(Forrst::Post.new(p)) 
+
+        @posts = ListOfPosts.new(response)
+
+        response['resp'].map { |p|
+          @posts.add_post(Forrst::Post.new(p))
         }
-        @posts.status = response['resp']['stat']
-        @posts.raw_data = response
-        
         @posts
       end
-      
-      def before(post_id)
-        raise Exceptions::InvalidPostId unless post_id.is_a? Fixnum
-        response = get("#{RESOURCE}?username=#{@username}&last_id=#{post_id}")
-        
-        posts = ListOfPosts.new
-        response['resp']['posts'].map { |p| 
-          posts.add_post(Forrst::Post.new(p))
-        }
-        posts.status = response['resp']['stat']
-        posts.raw_data = response
-        
-        posts
-      end
-      
+
       def initialize(username)
         raise Exceptions::InvalidUsername unless username.is_a? String
         @username = username
@@ -48,4 +34,4 @@ module Forrst
       end
     end
   end
-end
+end

data/lib/spruce.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # = Spruce - a Ruby wrapper around the Forrst API
 #
 # Happy Forrsting!
@@ -6,4 +8,4 @@ require 'forrst'
 
 module Spruce
   require 'spruce/version'
-end
+end

data/lib/spruce/version.rb

@@ -1,9 +1,11 @@
+# encoding: utf-8
+
 module Spruce
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
-    
+    TINY  = 2
+
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
-end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+require 'rubygems'
+gem 'minitest'
+
+require 'minitest/pride'
+require 'minitest/autorun'
+require 'minitest/spec'
+
+require File.expand_path('../../lib/spruce.rb', __FILE__)
+

data/spec/spruce_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require File.expand_path('../spec_helper.rb', __FILE__)
+
+describe "spruce" do
+  it "should find a user by username" do
+    user = Forrst::User.find('peterhellberg')
+    user.id.must_equal 5079
+  end
+
+  it "should find a user by id" do
+    user = Forrst::User.find(1)
+    user.username.must_equal 'kyle'
+  end
+
+  it "should find a users public posts" do
+    user = Forrst::User.find('peterhellberg')
+
+    user.public_posts.status.must_equal 'ok'
+    user.public_posts.environment.must_equal 'prod'
+    user.public_posts.authenticated.must_equal false
+
+    user.public_posts.each do |post|
+      if post.tiny_id == 'yNS'
+        post.post_type.must_equal 'code'
+        break
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spruce
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - Peter Hellberg
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +02:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 7
-        - 7
         version: 0.7.7
   type: :runtime
   version_requirements: *id001
@@ -42,14 +32,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
         version: 1.6.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Spruce is a Ruby wrapper around the Forrst API. The Forrst API is currently a _moving target_ and the plan is to develop Spruce alongside it, as close as possible.
 email: peter@c7.se
 executables: []
@@ -67,6 +63,8 @@ files:
 - lib/forrst.rb
 - lib/spruce/version.rb
 - lib/spruce.rb
+- spec/spec_helper.rb
+- spec/spruce_spec.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -86,23 +84,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: spruce
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Spruce is a Ruby wrapper around the Forrst API