cline 0.1.2 → 0.2.0

data/README.md

@@ -6,10 +6,10 @@
   gem install cline
   cline init
   echo "Cline.out_stream = Cline::OutStreams::WithGrowl.new($stdout)" > ~/.cline/config # growlnotify required
-  echo "Cline.fetchers  << Cline::Fetchers::Feed" >> ~/.cline/config
+  echo "Cline.collectors  << Cline::Collector::Feed" >> ~/.cline/config
   curl http://foo.examle.com/url/to/opml.xml > ~/.cline/feeds.xml
 
-  cline fetch
+  cline collect
   cline tick --offset 0 --interval 5
 ~~~~
 
@@ -31,21 +31,21 @@ in ~/.screenrc
 
 ## Reload
 
-`fetch`command fetch new notifications from `Cline.fetchers`.
+`collect`command collect new notifications from `Cline.collectors`.
 
 ~~~~
-  cline fetch
+  cline collect
 ~~~~
 
-### Custom Fetcher
+### Custom Collector
 
-*fetcher* required `fetch` method.
+*collector* required `collect` method.
 
 example:
 
 ~~~~ruby
-  class MyFetcher
-    def self.fetch
+  class MyCollector
+    def self.collect
       new.sources.each do |source|
         Cline::Notification.find_by_message(source.body) || Cline::Notification.create!(message: source.body, time: source.created_at)
       end
@@ -62,8 +62,8 @@ example:
 in ~/.cline/config
 
 ~~~~ruby
-  require 'path/to/my_fetcher'
-  Cline.fetchers << MyFetcher
+  require 'path/to/my_collector'
+  Cline.collectors << MyCollector
 ~~~~
 
 ## Notifier

data/cline.gemspec

@@ -11,6 +11,21 @@ Gem::Specification.new do |s|
   s.summary     = %q{CLI Line Notifier}
   s.description = %q{Cline - CLI Line Notifier}
 
+  s.post_install_message = <<-EOM
+    **Important** Some APIs name have changed.
+
+      s/fetch/collect/g
+
+      * Command
+        $ cline fetch
+          => $ cline collect
+
+      * Classes And Modules
+        Cline.fechers   => Cline.collectors
+        Cline::Fetchers => Cline::Collectors
+        Cline::Fetchers::Feed.fetch => Cline::Fetchers::Feed.collect
+  EOM
+
   #s.rubyforge_project = "cline"
 
   s.files         = `git ls-files`.split("\n")

data/lib/cline/collectors.rb

@@ -0,0 +1,72 @@
+# coding: utf-8
+
+module Cline::Collectors
+  class Feed
+    class << self
+      def collect
+        entries = new(opml_path.read).collect
+
+        entries.each do |entry|
+          begin
+            Cline::Notification.instance_exec entry do |entry|
+              message = normalize_message("#{entry.title} #{entry.url}").encode(Encoding::UTF_8)
+
+              find_by_message(message) || create(message: message, time: entry.published)
+            end
+          rescue ActiveRecord::StatementInvalid => e
+            puts e.class, e.message
+          end
+        end
+      end
+
+      def opml_path
+        opml = Pathname.new("#{Cline.cline_dir}/feeds.xml")
+      end
+    end
+
+    def initialize(opml_str)
+      require 'rexml/document'
+      require 'feedzirra'
+
+      @opml = REXML::Document.new(opml_str)
+      @feeds = parse_opml(@opml.elements['opml/body'])
+    end
+
+    def collect
+      entries = []
+
+      @feeds.map { |feed_url|
+        Thread.fork {
+          begin
+            feed = Feedzirra::Feed.fetch_and_parse(feed_url)
+
+            if feed.is_a?(Feedzirra::FeedUtilities)
+              feed.entries.each { |entry| entries << entry }
+            end
+          rescue
+            puts $!.class, $!.message
+          ensure
+            Thread.pass
+          end
+        }
+      }.map(&:join)
+
+      entries
+    end
+
+    def parse_opml(opml_node)
+      feeds = []
+
+      opml_node.elements.each('outline') do |el|
+        unless el.elements.size.zero?
+          feeds += parse_opml(el) 
+        else
+          url = el.attributes['xmlUrl']
+          feeds << url if url
+        end
+      end
+
+      feeds
+    end
+  end
+end

data/lib/cline/command.rb

@@ -10,7 +10,7 @@ module Cline
     map '-s' => :show,
         '-t' => :tick,
         '-s' => :status,
-        '-f' => :fetch,
+        '-c' => :collect,
         '-i' => :init,
         '-v' => :version
 
@@ -35,9 +35,9 @@ module Cline
       say "total     : #{Notification.count}", :cyan
     end
 
-    desc 'fetch', 'Fetch sources'
-    def fetch
-      Cline.fetchers.each &:fetch
+    desc 'collect', 'Collect sources'
+    def collect
+      Cline.collectors.each &:collect
     end
 
     desc 'init', 'Init database'

data/lib/cline/notification.rb

@@ -12,10 +12,18 @@ module Cline
 
     scope :displayed, where('display_count > 0')
 
+    def message=(m)
+      super Notification.normalize_message(m)
+    end
+
     class << self
       def display(offset)
         earliest(1, offset).first.display
       end
+
+      def normalize_message(m)
+        m.gsub(/[\r\n]/, '')
+      end
     end
 
     def display

data/lib/cline/version.rb

@@ -1,3 +1,3 @@
 module Cline
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/cline.rb

@@ -43,8 +43,8 @@ module Cline
       @out_stream = stream
     end
 
-    fetchers = []
-    define_method(:fetchers) { fetchers }
+    collectors = []
+    define_method(:collectors) { collectors }
   end
 end
 
@@ -57,5 +57,5 @@ require 'active_record'
 require "cline/version"
 require "cline/notification"
 require "cline/command"
-require "cline/fetchers"
+require "cline/collectors"
 require "cline/out_streams"

data/spec/lib/cline_spec.rb

@@ -7,13 +7,13 @@ describe Cline do
     let(:config) { Pathname.new(Cline.cline_dir).join('config') }
 
     before do
-      config.open('w') {|f| f.puts "Cline.fetchers  << Cline::Fetchers::Feed" }
+      config.open('w') {|f| f.puts "Cline.collectors  << Cline::Collectors::Feed" }
 
       Cline.boot
     end
 
     specify "config file should loaded" do
-      Cline.fetchers.should include Cline::Fetchers::Feed
+      Cline.collectors.should include Cline::Collectors::Feed
     end
 
     after do

data/spec/lib/notification_spec.rb

@@ -30,6 +30,21 @@ describe Cline::Notification do
     it { should == [notification2] }
   end
 
+  describe '#message=' do
+    let(:notification) { Fabricate(:notification, display_count: 0) }
+
+    before do
+      notification.message = <<-EOM
+        line feed
+        spoooooky
+      EOM
+    end
+
+    subject { notification }
+
+    its(:message) { should_not match /\n/ }
+  end
+
   describe '#display' do
     let!(:notification) { Fabricate(:notification, display_count: 0) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cline
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2011-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70162540537320 !ruby/object:Gem::Requirement
+  requirement: &70186568998880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70162540537320
+  version_requirements: *70186568998880
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70162540536780 !ruby/object:Gem::Requirement
+  requirement: &70186568997980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70162540536780
+  version_requirements: *70186568997980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70162540536240 !ruby/object:Gem::Requirement
+  requirement: &70186568997040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70162540536240
+  version_requirements: *70186568997040
 - !ruby/object:Gem::Dependency
   name: feedzirra
-  requirement: &70162540535740 !ruby/object:Gem::Requirement
+  requirement: &70186568996160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.31
   type: :runtime
   prerelease: false
-  version_requirements: *70162540535740
+  version_requirements: *70186568996160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70162540535160 !ruby/object:Gem::Requirement
+  requirement: &70186568995020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70162540535160
+  version_requirements: *70186568995020
 - !ruby/object:Gem::Dependency
   name: ir_b
-  requirement: &70162540534560 !ruby/object:Gem::Requirement
+  requirement: &70186568993800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70162540534560
+  version_requirements: *70186568993800
 - !ruby/object:Gem::Dependency
   name: tapp
-  requirement: &70162540533880 !ruby/object:Gem::Requirement
+  requirement: &70186568979320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70162540533880
+  version_requirements: *70186568979320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70162540532500 !ruby/object:Gem::Requirement
+  requirement: &70186568974480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70162540532500
+  version_requirements: *70186568974480
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70162540532020 !ruby/object:Gem::Requirement
+  requirement: &70186568948220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70162540532020
+  version_requirements: *70186568948220
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &70162540531480 !ruby/object:Gem::Requirement
+  requirement: &70186568942920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70162540531480
+  version_requirements: *70186568942920
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70162540530720 !ruby/object:Gem::Requirement
+  requirement: &70186568942200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70162540530720
+  version_requirements: *70186568942200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70162540529960 !ruby/object:Gem::Requirement
+  requirement: &70186568876900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70162540529960
+  version_requirements: *70186568876900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70162540529440 !ruby/object:Gem::Requirement
+  requirement: &70186568874780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: 3.1.1
   type: :development
   prerelease: false
-  version_requirements: *70162540529440
+  version_requirements: *70186568874780
 description: Cline - CLI Line Notifier
 email:
 - celluloid.key@gmail.com
@@ -171,8 +171,8 @@ files:
 - bin/cline
 - cline.gemspec
 - lib/cline.rb
+- lib/cline/collectors.rb
 - lib/cline/command.rb
-- lib/cline/fetchers.rb
 - lib/cline/notification.rb
 - lib/cline/out_streams.rb
 - lib/cline/version.rb
@@ -184,7 +184,10 @@ files:
 - spec/tmp/.gitkeep
 homepage: https://github.com/hibariya/cline
 licenses: []
-post_install_message: 
+post_install_message: ! "    **Important** Some APIs name have changed.\n\n      s/fetch/collect/g\n\n
+  \     * Command\n        $ cline fetch\n          => $ cline collect\n\n      *
+  Classes And Modules\n        Cline.fechers   => Cline.collectors\n        Cline::Fetchers
+  => Cline::Collectors\n        Cline::Fetchers::Feed.fetch => Cline::Fetchers::Feed.collect\n"
 rdoc_options: []
 require_paths:
 - lib

data/lib/cline/fetchers.rb

@@ -1,60 +0,0 @@
-# coding: utf-8
-
-module Cline::Fetchers
-  class Feed
-    def self.fetch
-      opml = Pathname.new("#{Cline.cline_dir}/feeds.xml")
-      entries = new(opml.read).fetch
-
-      entries.each do |entry|
-        message = "#{entry.title} #{entry.url}"
-
-        begin
-          Cline::Notification.tap {|n| n.find_by_message(message) || n.create(message: message, time: entry.published) }
-        rescue ActiveRecord::StatementInvalid => e
-          puts e.class, e.message
-        end
-      end
-    end
-
-    def initialize(opml_str)
-      require 'rexml/document'
-      require 'feedzirra'
-
-      @opml = REXML::Document.new(opml_str)
-      @feeds = parse_opml(@opml.elements['opml/body'])
-    end
-
-    def fetch
-      entries = []
-
-      @feeds.map { |feed_url|
-        Thread.fork do
-          begin
-            feed = Feedzirra::Feed.fetch_and_parse(feed_url)
-            entries += feed.entries if feed.is_a? Feedzirra::FeedUtilities
-          rescue
-            puts $!.class, $!.message
-          end
-        end
-      }.map(&:join)
-
-      entries
-    end
-
-    def parse_opml(opml_node)
-      feeds = []
-
-      opml_node.elements.each('outline') do |el|
-        unless el.elements.size.zero?
-          feeds += parse_opml(el) 
-        else
-          url = el.attributes['xmlUrl']
-          feeds << url if url
-        end
-      end
-
-      feeds
-    end
-  end
-end