fundler 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d126ab4a0ce34305604459b4607513f1d00aa1b
-  data.tar.gz: ce7f216f98126c8965f12ffd6ec9c288bb8a8915
+  metadata.gz: c9e5cc9979b9b7356a8341a8bd13674dece28c55
+  data.tar.gz: 0251f3debe730d261e4f47dcf035e3f2f8be4129
 SHA512:
-  metadata.gz: 0650721de13bce3bb8dca720a75a3f5d163a615e4743f9b9732cd7269b1ab1a39da17ddf5d9b594a2d3b5adb5f6ad45843c8fb1ed544b7502fb45c6c48b83908
-  data.tar.gz: e7d6e9708b44704e3b6d2908008962d8094470efa3a4eea02c90a9e287a1ead46b03b7a39da5b4e1c48a2718884437051f5e86c007f673d089429d631c7ba2ff
+  metadata.gz: d9f874b856944b3f6d20a16a0d91abc0e49cfec0363f941b5e4cf135c96f9dbb16acde8e693ce403e45c9e05fb2c96544f22d0983b493207e151b1f2d69c5b79
+  data.tar.gz: cbbf396c02cc8b21d71ebd26914dcc63e5c6805e60fe3c021a22663428ad478508081efbcda8ebdaca549a6e41d579fb772eaee0ab143b63094bc28a18f9c2d2

data/lib/fundler/bookmarks_reader.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
-
-module BookmarksReader
+require 'sqlite3'
 
 =begin rdoc
 
@@ -31,51 +30,134 @@ where moz_historyvisits.place_id = moz_places.id
 order by moz_historyvisits.visit_date desc;
 =end
 
+module BookmarksReader
+
+  attr_reader :db
+
   MOZILLA_FIREFOX_CONF_DIR = File.expand_path('~') + '/.mozilla/firefox/'
-  # BOOKMARKS_QUERY = %q{select moz_places.url, moz_bookmarks.title from moz_places, moz_bookmarks where moz_places.id = moz_bookmarks.fk and moz_bookmarks.title != '';}
+   
+  # all bookmarks
   BOOKMARKS_QUERY = <<-SQL
-SELECT DISTINCT
-    moz_places.url AS url,
-    moz_bookmarks.title AS title,
-    moz_items_annos.content AS description
-
-FROM
-    moz_places,
-    moz_bookmarks,
-    moz_items_annos,
-    moz_anno_attributes
-
-WHERE
-    moz_anno_attributes.name = 'bookmarkProperties/description' AND
-    moz_items_annos.anno_attribute_id = moz_anno_attributes.id AND
-    moz_items_annos.item_id = moz_bookmarks.id AND
-    moz_places.id = moz_bookmarks.fk AND
-    moz_places.id IN (
-            SELECT DISTINCT fk 
-            FROM moz_bookmarks
-            WHERE parent IN (
-                SELECT moz_bookmarks.id
-                FROM moz_bookmarks, moz_bookmarks_roots
-                WHERE moz_bookmarks_roots.root_name = 'tags'
-                AND moz_bookmarks.parent = moz_bookmarks_roots.folder_id
+    SELECT DISTINCT
+        moz_places.url AS url,
+        moz_bookmarks.title AS title,
+        moz_items_annos.content AS description
+    FROM
+        moz_places,
+        moz_bookmarks,
+        moz_items_annos,
+        moz_anno_attributes
+    WHERE
+        moz_anno_attributes.name = 'bookmarkProperties/description' AND
+        moz_items_annos.anno_attribute_id = moz_anno_attributes.id AND
+        moz_items_annos.item_id = moz_bookmarks.id AND
+        moz_places.id = moz_bookmarks.fk AND
+        moz_places.id IN (
+                SELECT DISTINCT fk 
+                FROM moz_bookmarks
+                WHERE parent IN (
+                    SELECT moz_bookmarks.id
+                    FROM moz_bookmarks, moz_bookmarks_roots
+                    WHERE moz_bookmarks_roots.root_name = 'tags'
+                    AND moz_bookmarks.parent = moz_bookmarks_roots.folder_id
+                )
             )
-        )
-        
-ORDER BY UPPER(moz_bookmarks.title) ASC
+    ORDER BY UPPER(moz_bookmarks.title) ASC
   SQL
   
+  # tag.id|tag.title
+  QUERY_FOR_TAGS = <<-SQL
+    SELECT id, title FROM moz_bookmarks WHERE parent = 4;
+  SQL
+  
+  # all bookmarks with the "given" tag.id
+  QUERY_BY_TAG = <<-SQL
+    SELECT moz_places.id, moz_places.url, moz_places.title, moz_bookmarks.parent    
+    FROM moz_places    
+    LEFT OUTER JOIN moz_bookmarks    
+    ON moz_places.id = moz_bookmarks.fk    
+    WHERE moz_bookmarks.parent = @tag_id;
+  SQL
+
+  # bookmark.id|bookmark.fk|bookmark.title
+  # ...
+  #=> 1933|1387|SQLite Home Page
+  # ...
+  QUERY_FOR_SIMPLE_BOOKMARKS = <<-SQL
+    SELECT id,fk,title FROM moz_bookmarks WHERE parent = 2;
+  SQL
+
+  # select the link between bookmars and tags
+  # fk_id = 1387
+  #=> 1934|1387|1144
+  QUERY_FOR_LINK = <<-SQL
+    SELECT id,fk,parent FROM moz_bookmarks WHERE title is null AND fk = @fk_id;
+  SQL
+
+  # tag.id|tag.title
+  # parent = 1144
+  #=> 1144|coding
+  QUERY_FOR_TAG_BY_ID = <<-SQL
+    SELECT id, title FROM moz_bookmarks WHERE parent = 4 AND id = @parent;
+  SQL
+
+  def find_bookmarks_by_tag(tag_id)
+    query = QUERY_BY_TAG
+    query.gsub(/@tag_id/,tag_id)
+    db.execute(query) do |row|
+      (result ||= []) << row
+    end
+  end
+
+  def get_tags
+    tags = {}
+    db.execute(QUERY_FOR_TAGS).each do |row|
+      tag = row.split('|')
+      tags[tag[0]] = tag[1]
+    end
+    tags
+  end
+  
+  def get_tag_by_id(id)
+    query = QUERY_FOR_TAG_BY_ID
+    query.gsub(/@tag_id/,id)
+    db.get_first_row(query)
+  end
+
+  def get_bookmarks_with_tags
+    bookmarks = []
+    result = {}
+    db.execute(QUERY_FOR_SIMPLE_BOOKMARKS) do |bookmark|
+      bookmarks << bookmark
+    end
+    bookmarks.each do |bookmark|
+      bookmark_id, bookmark_fk, bookmark_title = bookmark
+      if bookmark_fk
+        link_query = QUERY_FOR_LINK.sub(/@fk_id/, bookmark_fk.to_s)
+        links = db.execute(link_query) 
+        links.each do |link|
+          link_id, link_fk, link_parent = link
+          tag_query = QUERY_FOR_TAG_BY_ID.gsub(/@parent/, link_parent.to_s)
+          db.execute(tag_query) do |tag|
+            tag_id, tag_title = tag
+            result[bookmark_id] =  "[#{tag_title}] #{bookmark_title}"
+          end
+        end
+      end
+    end
+    result
+  end
+
   # +drop_bookmarks+ browse the home directory of the current user,
   # locate the +places.sqlite+ db_file generated by Firefox and
   # retrieve all the bookmarks stored.
-  def drop_bookmarks(format = :plain)
-    require 'sqlite3'
+  def drop_bookmarks(format = :txt)
     output = []
-    if locate_places
-      db = SQLite3::Database.new(locate_places)
+    if db
       rows = db.execute(BOOKMARKS_QUERY)
       rows.each_with_index do |row, index|
         case format
-        when :plain
+        when :txt
           output << "#{index}: #{row.join(' | ')}"
           output << '---'
         when :html
@@ -84,10 +166,12 @@ ORDER BY UPPER(moz_bookmarks.title) ASC
           puts "TODO"
         when :json
           puts "TODO"
+        else
+          # exit 1
         end
       end
     end
-    File.open('./bookmarks_dump.txt', 'w') do |file|
+    File.open("./bookmarks_dump.#{format.to_s}", 'w') do |file|
       file.puts output
     end
   end
@@ -104,9 +188,32 @@ ORDER BY UPPER(moz_bookmarks.title) ASC
     end
   end
   
+  def db
+    @db ||= SQLite3::Database.new(locate_places) if locate_places
+  end
+  
   def dump_places
     FileUtils.cp(locate_places, pwd)
   end
-  
+
 end # BookmarksReader
 
+__END__
+
+select id,fk,title,parent from moz_bookmarks;
+...
+1983|2509|The Places database | MDN|2
+1984|2509||1144
+1933|1387|SQLite Home Page|2
+1934|1387||1144
+...
+
+select id,fk,title from moz_bookmarks where parent = 2;
+=> 1933|1387|SQLite Home Page
+
+select id,fk,parent from moz_bookmarks where title is null and fk = 1387;
+1934|1387|1144
+
+select title from moz_bookmarks where parent = 4 AND id = 1144;
+=> coding
+

data/lib/fundler/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 class Fundler
   # The version of the Fundler Utility.
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/fundler_bookmarks_spec.rb

@@ -1,34 +1,28 @@
-require 'fundler'
-require 'fundler/fundler_utils'
-
-RSpec.configure do |config|
-  config.filter_run_excluding ruby: ->(v) { !RUBY_VERSION.start_with?(v.to_s) }
-  config.color_enabled = true
-  config.formatter = 'documentation'
-  # https://github.com/rspec/rspec-expectations
-  config.expect_with :rspec do |c|
-    c.syntax = :expect # disables `should`
-  end
-
-  config.include(ExitCodeMatchers)
-end
+require 'fundler_spec_helper'
 
 class TestBookmarksFundler
   describe Fundler do
-    let(:fundler) { Fundler.new }
-    before(:each) do
-      FileUtils::mkdir 'test'
-    end
+    context 'bookmarks functions' do
+      let(:fundler) { Fundler.new }
+      before(:each) do
+        FileUtils::mkdir 'test'
+      end
 
-    after(:each) do
-      FileUtils::rm_rf 'test'
-    end
-  
-    it 'finds bookmarks file' do
-      FileUtils::cd './test' do
-        fundler.drop_bookmarks_file(:plain)
-        expect(fundler.all_files).to include('bookmarks_dump.txt')
+      after(:each) do
+        FileUtils::rm_rf 'test'
+      end
+      
+      it 'finds bookmarks file' do
+        FileUtils::cd './test' do
+          fundler.drop_bookmarks_file(:txt)
+          expect(fundler.all_files).to include('bookmarks_dump.txt')
+        end
       end
-    end
-  end #describe
+
+      it 'get_bookmarks_with_tags' do
+        expect { fundler.get_bookmarks_with_tags }.to_not raise_error
+      end
+
+    end # context
+  end # describe
 end # TestBookmarksFundler

data/spec/fundler_spec.rb

@@ -1,70 +1,56 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'fundler'
-require 'fundler/fundler_utils'
-
-RSpec.configure do |config|
-  config.filter_run_excluding ruby: ->(v) { !RUBY_VERSION.start_with?(v.to_s) }
-  config.color_enabled = true
-  config.formatter = 'documentation'
-  # https://github.com/rspec/rspec-expectations
-  config.expect_with :rspec do |c|
-    c.syntax = :expect # disables `should`
-  end
-
-  config.include(ExitCodeMatchers)
-end
+require 'fundler_spec_helper'
 
 class TestFundler
   describe Fundler do
-    let(:finder) { Fundler.new }
-    before(:each) do
-      FileUtils::mkdir 'test'
-      File.open('test/example', 'w') do |f|
-        f.puts '#!/usr/bin/env ruby'
-        f.puts '# encoding: utf-8'
-        f.puts 'x = 0'
-        f.puts 'puts x'
-      end
-      File.open('test/example_rb.rb', 'w') do |f|
-        f.puts 'x = :foo'
-        f.puts 'puts x'
-      end
-      File.open('test/list.txt', 'w') do |f|
-        f.puts 'grocery list'
-        f.puts '- chunky bacon'
-      end
-      File.open('test/SpAcE  cAmEl.txt', 'w') do |f|
-        f.puts 'foo!'
-      end
-    end
-    after(:each) do
-      FileUtils::rm_rf 'test'
-    end
-  
-    it 'finds all files' do
-      FileUtils::cd './test' do
-        expect(finder.all_files()).to eq(['example', 'example_rb.rb', 'list.txt', 'SpAcE  cAmEl.txt'].sort)
-      end
-    end
-    it 'finds a file with no .rb extension but has a shebang line' do
-      FileUtils::cd './test' do
-        expect(finder.ruby_files()).to eq(['example', 'example_rb.rb'])
-      end
-    end
-    it 'clean all filenames' do
-      FileUtils::cd './test' do
-        expect(finder.clean_all_filenames()).to eq(4)
-        expect(finder.all_files()).to eq(['example', 'example_rb.rb', 'list.txt', 'space_camel.txt'].sort)
-      end
-    end
-    it 'show the pwd (last dir in this spec)' do
-      FileUtils::cd './test' do
-        expect(finder.get_pwd.split('/').last).to eq('test')
+    context 'file utils' do
+      let(:finder) { Fundler.new }
+      before(:each) do
+        FileUtils::mkdir 'test'
+        File.open('test/example', 'w') do |f|
+          f.puts '#!/usr/bin/env ruby'
+          f.puts '# encoding: utf-8'
+          f.puts 'x = 0'
+          f.puts 'puts x'
+        end
+        File.open('test/example_rb.rb', 'w') do |f|
+          f.puts 'x = :foo'
+          f.puts 'puts x'
+        end
+        File.open('test/list.txt', 'w') do |f|
+          f.puts 'grocery list'
+          f.puts '- chunky bacon'
+        end
+        File.open('test/SpAcE  cAmEl.txt', 'w') do |f|
+          f.puts 'foo!'
+        end
+      end
+      after(:each) do
+        FileUtils::rm_rf 'test'
+      end
+      
+      it 'finds all files' do
+        FileUtils::cd './test' do
+          expect(finder.all_files()).to eq(['example', 'example_rb.rb', 'list.txt', 'SpAcE  cAmEl.txt'].sort)
+        end
+      end
+      it 'finds a file with no .rb extension but has a shebang line' do
+        FileUtils::cd './test' do
+          expect(finder.ruby_files()).to eq(['example', 'example_rb.rb'])
+        end
+      end
+      it 'clean all filenames' do
+        FileUtils::cd './test' do
+          expect(finder.clean_all_filenames()).to eq(4)
+          expect(finder.all_files()).to eq(['example', 'example_rb.rb', 'list.txt', 'space_camel.txt'].sort)
+        end
+      end
+      it 'show the pwd (last dir in this spec)' do
+        FileUtils::cd './test' do
+          expect(finder.get_pwd.split('/').last).to eq('test')
+        end
       end
-    end
 
+    end # context
   end # describe
   
 end #TestFundler

data/spec/fundler_spec_helper.rb

@@ -0,0 +1,20 @@
+# fundler_spec_helper.rb
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'fundler'
+require 'fundler/fundler_utils'
+
+RSpec.configure do |config|
+  config.filter_run_excluding ruby: ->(v) { !RUBY_VERSION.start_with?(v.to_s) }
+  config.color_enabled = true
+  config.formatter = 'documentation'
+
+  # https://github.com/rspec/rspec-expectations
+  config.expect_with :rspec do |c|
+    c.syntax = :expect # disables `should`
+  end
+
+  config.include(ExitCodeMatchers)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fundler
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - zeroed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -88,6 +88,7 @@ files:
 - lib/fundler/version.rb
 - spec/fundler_bookmarks_spec.rb
 - spec/fundler_spec.rb
+- spec/fundler_spec_helper.rb
 homepage: https://github.com/zeroed/fundler
 licenses:
 - GPL3
@@ -115,4 +116,5 @@ summary: find rename utility
 test_files:
 - spec/fundler_bookmarks_spec.rb
 - spec/fundler_spec.rb
+- spec/fundler_spec_helper.rb
 has_rdoc: