marquetapage 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83186079a129d656cf05238db63b8d3b39fb9ce7
-  data.tar.gz: ecfb6c7775de3408543d1d95074490a8ad2fdb9c
+  metadata.gz: c5fe7f2769b658ae8c8d0910bfd8577d0bb26064
+  data.tar.gz: 0997d1f4f1b8b1a1985a63848234e863c787228d
 SHA512:
-  metadata.gz: 5635907059b633c5b0cadb964c1be2d378ffd735f971884882dab4f421dcf06e024657914e75596b46e3605b45b0622240e3c8e12533bf508d68a3a4b0fed8c4
-  data.tar.gz: 23e1b4f7400e5631173c589111ab1ed5d087c1777bebb6704ec84bf1f42a97f3e5016a0b16600e8ca11209ab4dc26fab9473ec290f16464d2fea854cad2022a3
+  metadata.gz: 47f8e7e31902e3fdf18b55c2e5f8ee33343d0bb36ba815fde08d24c8a71561200391429d68676150f7db8f6a3e162e503eea55214cc4243d5eda1cc3a0e865d9
+  data.tar.gz: 817fe635d31d60a8ae8d2cd3feb89dad00f704f5dedbcab3011392257b8fd97cd945b24c5fda0d295bb445693b4890d866afe9cc6997da87569b9b6b4c8abfa5

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2015-2016 Laurent Arnoud <laurent@spkdev.net>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, 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.

data/README.md

@@ -2,6 +2,9 @@
 
 Extract from `places.sqlite` firefox bookmarks with specific tag to JSON format.
 
+Note: supporting now firefox >= 48, due to [moz_bookmarks_roots
+removal](https://bugzilla.mozilla.org/show_bug.cgi?id=1143712)
+
 ## Usage
 
 ~~~
@@ -31,3 +34,17 @@ bundle exec rake
 * https://github.com/websafe/ffbx
 * https://wiki.mozilla.org/images/d/d5/Places.sqlite.schema3.pdf
 * https://developer.mozilla.org/en-US/docs/Mozilla/Tech/Places/Database
+
+## License
+
+The MIT License
+
+Copyright © 2015-2016 Laurent Arnoud <laurent@spkdev.net>
+
+---
+[![Build](https://img.shields.io/travis-ci/spk/marquetapage.svg)](https://travis-ci.org/spk/marquetapage)
+[![Version](https://img.shields.io/gem/v/marquetapage.svg)](https://rubygems.org/gems/marquetapage)
+[![Documentation](https://img.shields.io/badge/doc-rubydoc-blue.svg)](http://www.rubydoc.info/gems/marquetapage)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT "MIT")
+[![Code Climate](http://img.shields.io/codeclimate/github/spk/marquetapage.svg)](https://codeclimate.com/github/spk/marquetapage)
+[![Inline docs](http://inch-ci.org/github/spk/marquetapage.svg?branch=master)](http://inch-ci.org/github/spk/marquetapage)

data/lib/marquetapage.rb

@@ -3,7 +3,7 @@ require 'sequel'
 # Marquetapage module handle env, db, and db connection
 module Marquetapage
   # Get current environment from MARQUETAPAGE_ENV
-  # Default: development
+  # Default: production
   # @return String
   def self.env
     ENV['MARQUETAPAGE_ENV'] || 'production'

data/lib/marquetapage/models.rb

@@ -25,10 +25,6 @@ class Place < Sequel::Model(:moz_places)
   end
 end
 
-# moz_bookmarks_roots Sequel class
-class BookmarkRoot < Sequel::Model(:moz_bookmarks_roots)
-end
-
 # moz_bookmarks Sequel class
 class Bookmark < Sequel::Model(:moz_bookmarks)
 end

data/lib/marquetapage/runner.rb

@@ -17,7 +17,7 @@ module Marquetapage
     # @param [ARGV] args must include a tag
     # @return [Integer] Exit status
     def run(args)
-      fail ArgumentError unless args
+      raise ArgumentError unless args
       usage if args.empty?
       trap_interrupt
       @tag_name = args.first
@@ -28,7 +28,7 @@ module Marquetapage
 
     # Print usage
     def usage
-      puts 'Usage: firefox-bookmarks-extract TAG'
+      puts 'Usage: marquetapage TAG'
       exit!(1)
     end
 
@@ -71,16 +71,11 @@ module Marquetapage
     end
 
     def bookmark_place_ids
-      Bookmark.distinct.select(:fk).where(parent: tag)
+      Bookmark.distinct.select(:fk).where(parent: tag_id)
     end
 
-    def tag
-      Bookmark.join(
-        :moz_bookmarks_roots,
-        root_name: 'tags',
-        moz_bookmarks__parent: :moz_bookmarks_roots__folder_id,
-        moz_bookmarks__title: @tag_name
-      ).select(:id)
+    def tag_id
+      Bookmark.where(moz_bookmarks__title: @tag_name).select(:id)
     end
   end
 end

data/lib/marquetapage/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Version file
 module Marquetapage
   # Version constant
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'.freeze
 end

data/test/moz_places.schema

@@ -1,6 +1,5 @@
 
 CREATE TABLE moz_bookmarks (id INTEGER PRIMARY KEY,type INTEGER, fk INTEGER DEFAULT NULL, parent INTEGER, position INTEGER, title LONGVARCHAR, keyword_id INTEGER, folder_type TEXT, dateAdded INTEGER, lastModified INTEGER, guid TEXT);
-CREATE TABLE moz_bookmarks_roots (root_name VARCHAR(16) UNIQUE, folder_id INTEGER);
 CREATE TABLE moz_keywords (id INTEGER PRIMARY KEY AUTOINCREMENT, keyword TEXT UNIQUE, place_id INTEGER, post_data TEXT);
 CREATE TABLE moz_favicons (id INTEGER PRIMARY KEY, url LONGVARCHAR UNIQUE, data BLOB, mime_type VARCHAR(32), expiration LONG, guid TEXT);
 CREATE TABLE moz_annos (id INTEGER PRIMARY KEY,place_id INTEGER NOT NULL,anno_attribute_id INTEGER,mime_type VARCHAR(32) DEFAULT NULL,content LONGVARCHAR, flags INTEGER DEFAULT 0,expiration INTEGER DEFAULT 0,type INTEGER DEFAULT 0,dateAdded INTEGER DEFAULT 0,lastModified INTEGER DEFAULT 0);

data/test/runner_test.rb

@@ -16,8 +16,6 @@ describe Marquetapage::Runner do
         @url = 'https://www.mozilla.org/en-US/firefox/central/'
         place_id = Place.insert url: @url
         bookmark_root_folder_id = 4
-        BookmarkRoot.insert root_name: 'tags',
-                            folder_id: bookmark_root_folder_id
         tag_id = Bookmark.insert type: 2, fk: nil,
                                  parent: bookmark_root_folder_id,
                                  title: @tag_name,
@@ -34,12 +32,11 @@ describe Marquetapage::Runner do
       end
 
       it 'with good arg' do
-        out, err = capture_io do
+        out, = capture_io do
           Marquetapage::Runner.run([@tag_name])
         end
         out.chomp.must_match @url
         out.chomp.must_match @content
-        err.chomp.must_equal ''
       end
     end
   end

data/test/test_helper.rb

@@ -1,11 +1,13 @@
-ENV['MARQUETAPAGE_ENV'] = 'test'
+# frozen_string_literal: true
+
+ENV['MARQUETAPAGE_ENV'] = 'test'.freeze
 require 'minitest/autorun'
 require 'marquetapage'
 require 'marquetapage/runner'
 
 DB = Marquetapage.sequel_connect
-%i(places anno_attributes items_annos bookmarks bookmarks_roots
-   keywords favicons annos historyvisits inputhistory hosts).each do |t|
+%i(places anno_attributes items_annos bookmarks keywords favicons annos
+   historyvisits inputhistory hosts).each do |t|
   DB.drop_table(:"moz_#{t}") if DB.table_exists?(:"moz_#{t}")
 end
 DB.run(File.read(File.expand_path('../moz_places.schema', __FILE__)))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marquetapage
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.27'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.27'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -53,75 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.6'
-- !ruby/object:Gem::Dependency
-  name: minitest-line
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: inch
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: 0.42.0
 description: marquetapage
 email: laurent@spkdev.net
 executables:
@@ -131,6 +103,7 @@ extra_rdoc_files:
 - README.md
 files:
 - Gemfile
+- LICENSE
 - README.md
 - bin/marquetapage
 - lib/marquetapage.rb
@@ -152,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -160,10 +133,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Extract to JSON bookmarks from `places.sqlite` with specific tag
 test_files:
 - test/runner_test.rb
-has_rdoc: