pilu-terror 0.2.2 → 0.3.0

data/Rakefile

@@ -19,9 +19,12 @@ begin
     gem.executables = ['terror']
     gem.post_install_message = 'Run terror projectname and start aggregating.'
 
-    gem.add_dependency 'sinatra', ['>= 0.9.1.1']
+    gem.add_dependency 'sinatra',         ['>= 0.9.1.1']
     gem.add_dependency 'feed-normalizer', ['>= 1.5.1']
-    gem.add_dependency 'activerecord', ['>= 2.2.2']
+    gem.add_dependency 'dm-core',         ['>= 0.9.10']
+    gem.add_dependency 'dm-validations',  ['>= 0.9.10']
+    gem.add_dependency 'dm-aggregates',   ['>= 0.9.10']
+    gem.add_dependency 'do_sqlite3',      ['>= 0.9.11']
   end
 rescue LoadError
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 0
 :major: 0
-:minor: 2
+:minor: 3

data/config/terror.yml.default

@@ -3,14 +3,14 @@ global:
   subtitle: the micro aggregator
 database:
   development:
-    adapter: sqlite3
-    database: db/terror_dev.sqlite3
+    :adapter: sqlite3
+    :database: db/terror_dev.sqlite3
   test:
-    adapter: sqlite3
-    database: ':memory:'
+    :adapter: sqlite3
+    :database: ':memory:'
   production:
-    adapter: sqlite3
-    database: db/terror.sqlite3
+    :adapter: sqlite3
+    :database: db/terror.sqlite3
 feeds:
   - http://example.com/rss
   - http://example.com/rss2

data/lib/terror.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH << File.dirname(__FILE__) + '/terror'
 require 'rubygems'
-require 'activerecord'
+require 'dm-core'
+require 'dm-validations'
+require 'dm-aggregates'
 require 'sinatra'
 require 'yaml'
 require 'post'
@@ -23,27 +25,11 @@ module Terror
   
   def self.init_database    
     init_database_connection
-    init_database_tables
   end
   
   def self.init_database_connection
-    ActiveRecord::Base.establish_connection(self.config['database'][Sinatra::Application.environment.to_s])
+    DataMapper.setup(:default, self.config['database'][Sinatra::Application.environment.to_s])
+    DataMapper.auto_upgrade!
   end
-  
-  def self.init_database_tables
-    ActiveRecord::Schema.define do
-      create_table :posts do |t|
-        t.string    :title
-        t.string    :source
-        t.string    :url   
-        t.datetime  :date
-        t.datetime  :created_at
-      end
-      add_index :posts, :url
-      add_index :posts, :date
-    end
-  rescue ActiveRecord::StatementInvalid
-    # tables already exist
-  end
-  
+    
 end

data/lib/terror/feed_fetcher.rb

@@ -21,7 +21,7 @@ module Terror
           :url => entry.url, 
           :source => feed.title, 
           :date => entry.date_published
-        ) unless Post.exists?(:url => entry.url)
+        )  unless self.first(:url => entry.url)
       end
     end
     

data/lib/terror/helper.rb

@@ -12,7 +12,7 @@ module Terror
     end
     
     def rfc_3339(time)
-      time.strftime("%Y-%m-%dT%H:%M:%SZ")
+      time.strftime("%Y-%m-%dT%H:%M:%SZ") if time
     end
     
     def newer_page?

data/lib/terror/post.rb

@@ -1,23 +1,31 @@
 require 'feed_fetcher'
 
 module Terror
-  class Post < ActiveRecord::Base
+  class Post
+    include DataMapper::Resource
     include FeedFetcher
     
-    validates_presence_of :title, :url
-    validates_format_of   :url, :with => /^http|https:\/\//
+    property :id,     Integer,  :serial => true
+    property :title,  String,   :nullable => false, :length => 255
+    property :url,    String,   :nullable => false, :length => 255, :index => true, :format => /^http|https:\/\//
+    property :source, String,   :length => 255
+    property :date,   Time,     :nullable => false
     
     def self.paginate(options = {})
       per_page     = options[:per_page]
       page         = options[:page].to_i > 0 ? options[:page].to_i : 1
-      posts        = self.find(:all, :order => 'date DESC', :limit => per_page, :offset => per_page * (page - 1))            
+      posts        = self.all(:order => [:date.desc], :limit => per_page, :offset => per_page * (page - 1))            
       add_pagination_info(posts, per_page, page)
     end
   
     protected  
     
     def self.add_pagination_info(posts, per_page, page)
-      posts.class_eval { attr_accessor :current_page, :total_pages }      
+      posts.instance_eval do 
+        class << self 
+          attr_accessor :current_page, :total_pages
+        end
+      end
       posts.total_pages   = (self.count.to_f / per_page).ceil
       posts.current_page  = page
       posts

data/terror.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{terror}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrea Franz"]
-  s.date = %q{2009-03-16}
+  s.date = %q{2009-03-17}
   s.default_executable = %q{terror}
   s.email = %q{andrea@gravityblast.com}
   s.executables = ["terror"]
@@ -27,15 +27,24 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.1.1"])
       s.add_runtime_dependency(%q<feed-normalizer>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.2.2"])
+      s.add_runtime_dependency(%q<dm-core>, [">= 0.9.10"])
+      s.add_runtime_dependency(%q<dm-validations>, [">= 0.9.10"])
+      s.add_runtime_dependency(%q<dm-aggregates>, [">= 0.9.10"])
+      s.add_runtime_dependency(%q<do_sqlite3>, [">= 0.9.11"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.1.1"])
       s.add_dependency(%q<feed-normalizer>, [">= 1.5.1"])
-      s.add_dependency(%q<activerecord>, [">= 2.2.2"])
+      s.add_dependency(%q<dm-core>, [">= 0.9.10"])
+      s.add_dependency(%q<dm-validations>, [">= 0.9.10"])
+      s.add_dependency(%q<dm-aggregates>, [">= 0.9.10"])
+      s.add_dependency(%q<do_sqlite3>, [">= 0.9.11"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.1.1"])
     s.add_dependency(%q<feed-normalizer>, [">= 1.5.1"])
-    s.add_dependency(%q<activerecord>, [">= 2.2.2"])
+    s.add_dependency(%q<dm-core>, [">= 0.9.10"])
+    s.add_dependency(%q<dm-validations>, [">= 0.9.10"])
+    s.add_dependency(%q<dm-aggregates>, [">= 0.9.10"])
+    s.add_dependency(%q<do_sqlite3>, [">= 0.9.11"])
   end
 end

data/test/feeds/example.xml

@@ -9,6 +9,7 @@
     <id>http://example.com/post-1</id>
     <link type="text/html" rel="alternate" href="http://example.com/post-1"/>
     <updated>2009-03-15T01:11:33Z</updated>
+		<published>2009-03-15T01:11:33Z</published>
     <title>Title 1</title>
     <author>
       <name>author</name>
@@ -19,6 +20,7 @@
     <id>http://example.com/post-2</id>
     <link type="text/html" rel="alternate" href="http://example.com/post-2"/>
     <updated>2009-03-15T01:11:33Z</updated>
+		<published>2009-03-15T01:11:33Z</published>
     <title>Title 2</title>
     <author>
       <name>author</name>

data/test/post_test.rb

@@ -23,11 +23,16 @@ describe 'Creating posts' do
     post = Terror::Post.create(:url => 'example.com')
     post.errors.on(:url).should_not be_nil
   end
+  
+  it 'should validate presence of date' do    
+    @blank_post.errors.on(:date).should_not be_nil
+  end
     
   it 'should create post' do    
-    post = Terror::Post.create(:url => 'http://example.com/', :title => 'Example')
+    post = Terror::Post.create(:url => 'http://example.com/', :title => 'Example', :date => Time.now)
     post.should be_valid
   end
+  
 end
 
 describe 'Fetching feed' do

data/test/spec_helper.rb

@@ -3,4 +3,10 @@ require 'sinatra'
 require 'sinatra/test'
 require 'spec'
 require 'spec/interop/test'
+
+disable           :run
+disable           :reload
+set :environment, :test
+set :root,        File.dirname(__FILE__) + '/../'
+
 require File.dirname(__FILE__) + '/../terror_aggregator'

data/test/terror_test.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe 'Test' do
+describe 'Getting pages' do
   include Sinatra::Test    
   
   it 'should show posts' do
     get '/'
-    response.should be_ok    
+    response.should be_ok
   end
   
   it 'should show feed' do

data/views/feed.builder

@@ -8,14 +8,14 @@ builder do |xml|
               :rel  => 'alternate'
     xml.link  :type => 'application/atom+xml',
               :href => 'http://localhost:4567'    
-    xml.updated(rfc_3339(@posts.first ? @posts.first.created_at : Time.now))
+    xml.updated(rfc_3339(@posts.first ? @posts.first.date : Time.now))
     @posts.each do |post|
       xml.entry do |entry|
         entry.id post.url
         entry.link  :type => 'text/html',
                     :href => post.url,
                     :rel  => 'alternate'
-        entry.updated rfc_3339(post.created_at)
+        entry.updated rfc_3339(post.date)
         entry.title post.title
         entry.author do |author|
           author.name post.source

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pilu-terror
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andrea Franz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: terror
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,14 +33,44 @@ dependencies:
         version: 1.5.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: dm-core
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: 0.9.10
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.10
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-aggregates
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.10
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.11
     version: 
 description: 
 email: andrea@gravityblast.com