feedcellar 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c68cc360529496d84b72f86f7bde1c3da53a54fa
-  data.tar.gz: 35ac9e19d288b2454cf8442077d1b41f7e3eae44
+  metadata.gz: 90de9f0e20628fe9c0296ceb73a55e068124996b
+  data.tar.gz: 35318c5da10ecd18d85c37f0e00c2dcf10c907ad
 SHA512:
-  metadata.gz: b77c019cd534abc6b58cdee970c8cf69223947770c58ecbc65ab66766672ab91df965edff6495e9a4da2ac86a004da0e9909c4dc99dd577f627999ce5be47b54
-  data.tar.gz: 0d29006fbcf81628d0dcf7b746b721b1c79edfb49b9344dc4a3402b146b6219b36f02a8101a338a963bc450608dbb206c73a96ad68d36120c36f88b99daa1917
+  metadata.gz: dc398b74be7d927be4cdb120878ce6b556099d01ca675c18fd1e39c08ee61fe7ff7a278870b1af7a57db6210beda04e3c7265b94305d9e5df472e080847ce426
+  data.tar.gz: 3d92d30d502af29ccb90a1347ea7bf1463d26ad9635683cd8d0eb655733302c77dbc256862f03dcdc67bed8c7e2ef44f261935d9f053d3de7dcab9bd6d50ce33

data/NEWS.md

@@ -1,5 +1,21 @@
 # NEWS
 
+## 0.3.0: 2013-06-23
+
+Database schema improved release!
+
+### Changes
+
+  * Improvements
+    * Added latest command
+    * Added "-v" option as version command
+    * Improved word search that select to groonga at a time
+    * Added a dump method as grndump
+    * Stopped empty word unless resource option for search command
+    * Changed Resources key to "xmlUrl"
+    * Supported for migration to 0.3.0 for existing database
+    * Use "reference" type for resource column of Feeds table
+
 ## 0.2.2: 2013-06-16
 
 Improve search command release!

data/lib/feedcellar/command.rb

@@ -4,9 +4,12 @@ require "feedcellar/groonga_database"
 require "feedcellar/opml"
 require "feedcellar/feed"
 require "feedcellar/resource"
+require "feedcellar/gui"
 
 module Feedcellar
   class Command < Thor
+    map "-v" => :version
+
     def initialize(*args)
       super
       @base_dir = File.join(File.expand_path("~"), ".feedcellar")
@@ -22,9 +25,10 @@ module Feedcellar
     def register(url)
       resource = Resource.parse(url)
       return 1 unless resource
+      return 1 if resource["xmlUrl"].empty?
 
       GroongaDatabase.new.open(@database_dir) do |database|
-        database.register(resource["title"], resource)
+        database.register(resource["xmlUrl"], resource)
       end
     end
 
@@ -39,7 +43,9 @@ module Feedcellar
     def import(opml_xml)
       GroongaDatabase.new.open(@database_dir) do |database|
         Opml.parse(opml_xml).each do |resource|
-          database.register(resource["title"], resource)
+          next unless resource["xmlUrl"] # FIXME: better way
+          next if resource["xmlUrl"].empty?
+          database.register(resource["xmlUrl"], resource)
         end
       end
     end
@@ -64,14 +70,14 @@ module Feedcellar
     def collect
       GroongaDatabase.new.open(@database_dir) do |database|
         database.resources.each do |record|
-          feed_url = record["xmlUrl"]
+          feed_url = record.xmlUrl
           next unless feed_url
 
           items = Feed.parse(feed_url)
           next unless items
 
           items.each do |item|
-            database.add(feed_url,
+            database.add(record.xmlUrl,
                          item.title,
                          item.link,
                          item.description,
@@ -81,6 +87,23 @@ module Feedcellar
       end
     end
 
+    desc "latest", "Show latest feeds by resources."
+    def latest
+      GroongaDatabase.new.open(@database_dir) do |database|
+        feeds = database.feeds
+        # TODO: I want to use the groonga method for grouping.
+        feeds.group_by {|feed| feed.resource.xmlUrl }.each do |url, group|
+          latest_feed = group.sort_by {|feed| feed.date }.last
+          next unless latest_feed
+
+          title = latest_feed.title.gsub(/\n/, " ")
+          next unless title
+          date = latest_feed.date.strftime("%Y/%m/%d")
+          puts "#{date} #{title} - #{latest_feed.resource.title}"
+        end
+      end
+    end
+
     desc "search WORD", "Search feeds from local database."
     option :browser, :type => :boolean, :desc => "open *ALL* links in browser"
     option :long, :type => :boolean, :aliases => "-l", :desc => "use a long listing format"
@@ -88,40 +111,62 @@ module Feedcellar
     option :mtime, :type => :numeric, :desc => "feed's data was last modified n*24 hours ago."
     option :resource, :type => :string, :desc => "search of partial match by feed's resource url"
     def search(*words)
+      if words.empty? &&
+         (options["resource"].nil? || options["resource"].empty?)
+        $stderr.puts "WARNING: required one of word or resource option."
+        return 1
+      end
+
+      if options[:browser]
+        unless GUI.available?
+          $stderr.puts "WARNING: browser option required \"gtk2\"."
+        end
+      end
+
       GroongaDatabase.new.open(@database_dir) do |database|
         feeds = database.feeds
-        words.each do |word|
         feeds = feeds.select do |feed|
-          (feed.title =~ word) | (feed.description =~ word)
-        end
-        end
+          expression = nil
+          words.each do |word|
+            sub_expression = (feed.title =~ word) |
+                             (feed.description =~ word)
+            if expression.nil?
+              expression = sub_expression
+            else
+              expression &= sub_expression
+            end
+          end
 
-        if options[:mtime]
-          feeds = feeds.select do |feed|
-            feed.date > (Time.now - (options[:mtime] * 60 * 60 * 24))
+          if options[:mtime]
+            base_date = (Time.now - (options[:mtime] * 60 * 60 * 24))
+            mtime_expression = feed.date > base_date
+            if expression.nil?
+              expression = mtime_expression
+            else
+              expression &= mtime_expression
+            end
           end
-        end
 
-        if options[:resource]
-          feeds = feeds.select do |feed|
-            feed.resource =~ options[:resource]
+          if options[:resource]
+            resource_expression = feed.resource =~ options[:resource]
+            if expression.nil?
+              expression = resource_expression
+            else
+              expression &= resource_expression
+            end
           end
+
+          expression
         end
 
         order = options[:reverse] ? "descending" : "ascending"
         sorted_feeds = feeds.sort([{:key => "date", :order => order}])
 
         sorted_feeds.each do |feed|
-          resources = database.resources.select do |resource|
-            resource.xmlUrl == feed.resource
-          end
-          next unless resources
-          next unless resources.first # FIXME
-
           title = feed.title.gsub(/\n/, " ")
           if options[:long]
             date = feed.date.strftime("%Y/%m/%d %H:%M")
-            resource = resources.first.title
+            resource = feed.resource.title
             puts "#{date} #{title} - #{resource} / #{feed.link}"
           else
             date = feed.date.strftime("%Y/%m/%d")
@@ -129,25 +174,10 @@ module Feedcellar
           end
 
           if options[:browser]
-            Gtk.show_uri(feed.link) if browser_available?
+            GUI.show_uri(feed.link)
           end
         end
       end
     end
-
-    private
-    def browser_available?
-      if @browser.nil?
-        begin
-          require "gtk2"
-        rescue LoadError
-          $stderr.puts "WARNING: Sorry, browser option required \"gtk2\"."
-          @browser = false
-        else
-          @browser = true
-        end
-      end
-      @browser
-    end
   end
 end

data/lib/feedcellar/groonga_database.rb

@@ -11,7 +11,13 @@ module Feedcellar
       path = File.join(base_path, "feedcellar.db")
       if File.exist?(path)
         @database = Groonga::Database.open(path)
-        populate_schema
+        begin
+          populate_schema
+        rescue Groonga::Schema::ColumnCreationWithDifferentOptions
+          # NOTE: migrate to feedcellar-0.3.0 from 0.2.2 or earlier.
+          populate_new_schema
+          transform_resources_key
+        end
       else
         FileUtils.mkdir_p(base_path)
         populate(path)
@@ -26,13 +32,11 @@ module Feedcellar
     end
 
     def register(key, attributes)
-      feeds = Groonga["Resources"]
-      feeds.add(key, attributes)
+      resources.add(key, attributes)
     end
 
-    def add(resource, title, link, description, date)
-      feeds = Groonga["Feeds"]
-      feeds.add(link, :resource    => resource,
+    def add(resource_key, title, link, description, date)
+      feeds.add(link, :resource    => resources[resource_key],
                       :title       => title,
                       :link        => link,
                       :description => description,
@@ -40,8 +44,7 @@ module Feedcellar
     end
 
     def unregister(title_or_url)
-      feeds = Groonga["Resources"]
-      feeds.delete do |record|
+      resources.delete do |record|
         (record.title == title_or_url) |
         (record.xmlUrl == title_or_url)
       end
@@ -64,6 +67,10 @@ module Feedcellar
       @feeds ||= Groonga["Feeds"]
     end
 
+    def dump
+      Groonga::DatabaseDumper.dump
+    end
+
     private
     def reset_context(encoding)
       Groonga::Context.default_options = {:encoding => encoding}
@@ -76,6 +83,59 @@ module Feedcellar
     end
 
     def populate_schema
+      Groonga::Schema.define do |schema|
+        schema.create_table("Resources", :type => :hash) do |table|
+          table.text("text")
+          table.short_text("isComment")
+          table.short_text("isBreakpoint")
+          table.short_text("created")
+          table.short_text("category")
+          table.text("description")
+          table.short_text("url")
+          table.short_text("htmlUrl")
+          table.short_text("xmlUrl")
+          table.short_text("title")
+          table.short_text("version")
+          table.short_text("language")
+        end
+
+        schema.create_table("Feeds", :type => :hash) do |table|
+          table.reference("resource", "Resources")
+          table.short_text("title")
+          table.short_text("link")
+          table.text("description")
+          table.time("date")
+        end
+
+        schema.create_table("Terms",
+                            :type => :patricia_trie,
+                            :key_normalize => true,
+                            :default_tokenizer => "TokenBigram") do |table|
+          table.index("Feeds.title")
+          table.index("Feeds.description")
+        end
+      end
+    end
+
+    def populate_new_schema
+      populate_old_schema
+      add_new_column
+      migrate_value
+      delete_old_column
+    end
+
+    def transform_resources_key
+      resources.each do |resource|
+        next unless resource.xmlUrl
+        values = resource.attributes.reject do |key, value|
+          /^_/ =~ key
+        end
+        resources.add(resource.xmlUrl, values)
+        resources.delete(resource.id)
+      end
+    end
+
+    def populate_old_schema
       Groonga::Schema.define do |schema|
         schema.create_table("Resources", :type => :hash) do |table|
           table.text("text")
@@ -109,5 +169,39 @@ module Feedcellar
         end
       end
     end
+
+    def add_new_column
+      Groonga::Schema.define do |schema|
+        schema.change_table("Feeds") do |table|
+          table.reference("new_resource", "Resources")
+        end
+      end
+    end
+
+    def migrate_value
+      feeds = Groonga["Feeds"]
+      resources = Groonga["Resources"]
+      tmp_resources = {}
+      resources.each do |resource|
+        tmp_resources[resource.xmlUrl] = resource.title
+      end
+
+      feeds.each do |feed|
+        feed["new_resource"] = resources[tmp_resources[feed.resource]]
+        feed["resource"] = nil
+      end
+    end
+
+    def delete_old_column
+      Groonga::Schema.define do |schema|
+        schema.change_table("Feeds") do |table|
+          table.remove_column("resource")
+        end
+
+        schema.change_table("Feeds") do |table|
+          table.rename_column("new_resource", "resource")
+        end
+      end
+    end
   end
 end

data/lib/feedcellar/gui.rb

@@ -0,0 +1,27 @@
+module Feedcellar
+  class GUI
+    class << self
+      def available?
+        gtk_available?
+      end
+
+      def show_uri(uri)
+        Gtk.show_uri(uri) if gtk_available?
+      end
+
+      private
+      def gtk_available?
+        if @gtk_available.nil?
+          begin
+            require "gtk2"
+          rescue LoadError
+            @gtk_available = false
+          else
+            @gtk_available = true
+          end
+        end
+        @gtk_available
+      end
+    end
+  end
+end

data/lib/feedcellar/version.rb

@@ -1,3 +1,3 @@
 module Feedcellar
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/feedcellar.rb

@@ -4,6 +4,7 @@ require "feedcellar/opml"
 require "feedcellar/command"
 require "feedcellar/resource"
 require "feedcellar/feed"
+require "feedcellar/gui"
 
 module Feedcellar
 end

data/test/fixtures/subscriptions.xml

@@ -5,7 +5,7 @@
     </head>
     <body>
         <outline text="my_letter" title="my_letter" type="rss"
-            xmlUrl="http://myokoym.github.com/entries.rss" htmlUrl="http://myokoym.github.com/"/>
+            xmlUrl="http://myokoym.github.io/entries.rss" htmlUrl="http://myokoym.github.com/"/>
         <outline text="Rubygems | Latest Versions for mister_fairy"
             title="Rubygems | Latest Versions for mister_fairy" type="rss"
             xmlUrl="https://rubygems.org/gems/mister_fairy/versions.atom" htmlUrl="https://rubygems.org/gems"/>

data/test/test-command.rb

@@ -41,7 +41,8 @@ class CommandTest < Test::Unit::TestCase
     @command.import(file)
     @command.collect
     Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
-      assert_equal(4, database.resources.size)
+      # NOTE: a tag of outline is not register.
+      assert_equal(3, database.resources.size)
       assert_true(database.feeds.count > 0)
     end
 
@@ -51,7 +52,7 @@ class CommandTest < Test::Unit::TestCase
     $stdout = io
     @command.export
     assert_equal(1, s.scan(/<opml/).size)
-    assert_equal(4, s.scan(/<outline/).size)
+    assert_equal(3, s.scan(/<outline/).size)
     $stdout = STDOUT
 
     # confirm search command
@@ -65,12 +66,20 @@ class CommandTest < Test::Unit::TestCase
     # confirm unregister command
     @command.unregister("my_letter")
     Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
-      assert_equal(3, database.resources.size)
+      assert_equal(2, database.resources.size)
     end
     @command.unregister("https://rubygems.org/gems/mister_fairy/versions.atom")
     Feedcellar::GroongaDatabase.new.open(@tmpdir) do |database|
-      assert_equal(2, database.resources.size)
+      assert_equal(1, database.resources.size)
     end
+
+    # confirm latest command
+    s = ""
+    io = StringIO.new(s)
+    $stdout = io
+    @command.latest
+    assert_true(s.size > 0)
+    $stdout = STDOUT
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedcellar
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -129,6 +129,7 @@ files:
 - lib/feedcellar/command.rb
 - lib/feedcellar/feed.rb
 - lib/feedcellar/groonga_database.rb
+- lib/feedcellar/gui.rb
 - lib/feedcellar/opml.rb
 - lib/feedcellar/resource.rb
 - lib/feedcellar/version.rb