taggata 0.0.2 → 0.1.0

data/lib/taggata/persistent/with_parent.rb

@@ -0,0 +1,11 @@
+module Taggata
+  module Persistent
+    module WithParent
+
+      def parent
+        Directory.find_one db, :id => parent_id
+      end
+
+    end
+  end
+end

data/lib/taggata/scanner.rb

@@ -0,0 +1,70 @@
+module Taggata
+  class Scanner
+
+    attr_reader :db, :jobs, :progress
+
+    def initialize(db)
+      @db = db
+      @jobs = []
+      @progress = { :files => 0, :directories => 0 }
+    end
+
+    def report_header
+      puts "Files\tDirectories\tQueued"
+    end
+
+    def report
+      puts "#{progress[:files]}\t#{progress[:directories]}\t\t#{jobs.length}"
+    end
+
+    def process(dir)
+      report_header
+      db.transaction do
+        jobs << [dir.id, dir.name]
+        until jobs.empty?
+          do_job *jobs.shift
+          report
+        end
+      end
+    end
+
+    def do_job(parent_id, path)
+      files, directories = Dir.glob(File.join(path, '*'))
+                              .sort
+                              .partition { |entry| ::File.file? entry }
+      save_missing files.map { |f| ::File.basename f },
+                   parent_id,
+                   Persistent::File unless files.empty?
+      save_missing directories.map { |f| ::File.basename f },
+                   parent_id,
+                   Persistent::Directory unless directories.empty?
+      progress[:files] += files.length
+      add_directory_jobs directories,
+                         parent_id unless directories.empty?
+      progress[:directories] += 1
+    end
+
+    def save_missing(files, parent_id, klass)
+      in_db = find_in_db(klass, parent_id, files, :name)
+      to_save = (files - in_db).map do |basename|
+        { :name => basename, :parent_id => parent_id }
+      end
+      db.adapter.db[klass.table].multi_insert(to_save)
+    end
+
+    def find_in_db(klass, parent_id, names, param)
+      db.adapter.db[klass.table]
+        .where(:parent_id => parent_id)
+        .where(:name => names)
+        .map(param)
+    end
+
+    def add_directory_jobs(dirs, parent_id)
+      ids = find_in_db Persistent::Directory,
+                       parent_id,
+                       dirs.map { |d| ::File.basename d },
+                       :id
+      ids.zip(dirs).each { |job| jobs << [job.first, job.last] }
+    end
+  end
+end

data/lib/taggata/version.rb

@@ -1,3 +1,3 @@
 module Taggata
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/taggata.gemspec

@@ -21,10 +21,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'sequel', '~> 4.22.0', '>= 4.22.0'
   spec.add_dependency 'sqlite3', '~> 1.3.10', '>= 1.3.10'
+  spec.add_dependency 'clamp', '~>1.0.0', '>= 1.0.0'
 
+spec.add_development_dependency 'thor', '~> 0.0', '>= 0.0.0'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.6.1', '>= 5.6.1'
   spec.add_development_dependency 'minitest-reporters', '~> 1.0.16', '>= 1.0.16'
+  spec.add_development_dependency 'pry', '~> 0.0', '>= 0.0.0'
   spec.add_development_dependency 'mocha', '~> 1.1', '>= 1.1.0'
 end

data/test/parser/query_parser_test.rb

@@ -3,7 +3,8 @@ require 'taggata_test_helper'
 module Taggata
   module Parser
     describe Query do
-      let(:parser) { ::Taggata::Parser::Query }
+      let(:db) { Db.new 'sqlite:/', DbAdapters::Sequel }
+      let(:parser) { ::Taggata::Parser::Query.new db }
 
       it 'translates' do
         parser.send(:translate, '&').must_equal :and
@@ -16,9 +17,9 @@ module Taggata
       end
 
       it 'applies' do
-        parser.apply(:and, [1, 2], [2, 3]).must_equal [2]
-        parser.apply(:or, [1, 2], [2, 3]).must_equal [1, 2, 3]
-        proc { parser.apply('q', [], []) }.must_raise RuntimeError
+        parser.send(:apply, :and, [1, 2], [2, 3]).must_equal [2]
+        parser.send(:apply, :or, [1, 2], [2, 3]).must_equal [1, 2, 3]
+        proc { parser.send(:apply, 'q', [], []) }.must_raise RuntimeError
       end
 
       it 'converts to postfix' do
@@ -43,7 +44,7 @@ module Taggata
 
       it 'tries to resolve the token' do
         tag = mock.tap { |t| t.expects(:files).returns([1]) }
-        ::Taggata::Tag.expects(:find).with(:name => '2014').returns(tag)
+        ::Taggata::Persistent::Tag.expects(:find_one).with(db, :name => '2014').returns(tag)
         parser.send(:resolve, 'is:2014').must_equal([1])
       end
     end

data/test/parser/tag_parser_test.rb

@@ -3,10 +3,11 @@ require 'taggata_test_helper'
 module Taggata
   module Parser
     describe Tag do
-      let(:parser) { ::Taggata::Parser::Tag }
+      let(:db) { Db.new 'sqlite:/', DbAdapters::Sequel }
+      let(:parser) { ::Taggata::Parser::Tag.new db }
 
       after do
-        ::Taggata::Tag.each(&:destroy)
+        ::Taggata::Persistent::Tag.destroy(db, {})
       end
 
       it 'parses' do

data/test/{filesystem_scanner_test.rb → scanner_test.rb}

@@ -1,10 +1,11 @@
 require 'taggata_test_helper'
 
 module Taggata
-  describe FilesystemScanner do
+  describe Scanner do
     let(:workdir) { ::Dir.mktmpdir }
-    let(:scanner) { FilesystemScanner.new }
-    let(:root) { Directory.find_or_create(:name => workdir) }
+    let(:db) { Db.new 'sqlite:/', DbAdapters::Sequel }
+    let(:scanner) { Scanner.new db }
+    let(:root) { Persistent::Directory.find_or_create(db, :name => workdir) }
     let(:file) { mock }
 
     before do
@@ -17,31 +18,35 @@ module Taggata
 
     it 'process creates initial job' do
       root
+      scanner.expects(:report_header)
       scanner.expects(:do_job).with(root.id, root.name)
       scanner.process(root)
     end
 
     it 'scans empty directory' do
+      scanner.expects(:report_header)
       scanner.expects(:save_missing).never
       scanner.expects(:add_directory_jobs).never
       scanner.process(root)
     end
 
     it 'scans directory with files' do
+      scanner.expects(:report_header)
       basenames = (1..5).map { |i| "file-#{i}" }
       basenames.each do |name|
         FileUtils.touch(::File.join(workdir, name))
       end
-      scanner.expects(:save_missing).with(basenames, root.id, ::Taggata::File)
+      scanner.expects(:save_missing).with(basenames, root.id, Persistent::File)
       scanner.expects(:add_directory_jobs).never
       scanner.process(root)
     end
 
     it 'scans subdirectories' do
+      scanner.expects(:report_header)
       basenames = (1..5).map { |i| "file-#{i}" }
       subdir_path = ::File.join(workdir, 'subdir')
       FileUtils.mkdir_p(subdir_path)
-      Directory.find_or_create(:name => 'subdir',
+      Persistent::Directory.find_or_create(db, :name => 'subdir',
                                :parent_id => root.id)
       basenames.each do |name|
         FileUtils.touch(::File.join(subdir_path, name))

data/test/taggata_test_helper.rb

@@ -1,10 +1,5 @@
 require 'sequel'
-DB = Sequel.sqlite
-DB.create_table :file_tags do
-  foreign_key :tag_id, :tags
-  foreign_key :file_id, :files
-end unless DB.table_exists? :file_tags
-Sequel::Model.plugin(:schema)
+
 require 'taggata'
 require 'minitest/autorun'
 require 'minitest/reporters'

data/test/tagging_test.rb

@@ -0,0 +1,58 @@
+require 'taggata_test_helper'
+
+module Taggata
+  module Persistent
+    describe Directory do
+      let(:db) { Db.new 'sqlite:/', DbAdapters::Sequel }
+
+      it 'can be created as root' do
+        root = Directory.find_or_create db, :name => 'root'
+        root.id.must_equal 1
+        root.parent.must_be_nil
+      end
+
+      it 'can have children' do
+        root = Directory.find_or_create db, :name => 'root'
+        subdir = Directory.find_or_create db, :name => 'subdir', :parent_id => root.id
+        subdir.parent_id.must_equal root.id
+        file = File.find_or_create db, :name => 'file', :parent_id => subdir.id
+        file.path.must_equal "root/subdir/file"
+        subdir.files.length.must_equal 1
+        subdir.directories.length.must_equal 0
+        root.entries.length.must_equal 1
+      end
+
+    end
+
+    describe File do
+      let(:db) { Db.new 'sqlite:/', DbAdapters::Sequel }
+      let(:root) { Directory.find_or_create db, :name => 'root' }
+
+      it 'cannot be created without parent' do
+        Proc.new { File.find_or_create(db, :name => 'myfile') }.must_raise Sequel::NotNullConstraintViolation
+        File.find_or_create db, :name => 'myfile', :parent_id => root.id
+      end
+
+      it 'can be tagged' do
+        file = File.find_or_create db, :name => 'myfile', :parent_id => root.id
+        tag = Tag.find_or_create db, :name => 'mytag'
+        file.add_tags(tag)
+        file.tags.map(&:name).must_equal ['mytag']
+        file.add_tags_by_name('tag1', 'tag2', 'tag3')
+        file.tags.map(&:name).must_equal ['mytag', 'tag1', 'tag2', 'tag3']
+      end
+
+      it 'can have tags removed' do
+        file = File.find_or_create db, :name => 'myfile', :parent_id => root.id
+        tag = Tag.find_or_create db, :name => 'mytag'
+        file.add_tags tag
+        file.add_tags_by_name 'mytag2'
+        file.tags.length.must_equal 2
+        file.remove_tags tag
+        file.remove_tags_by_name 'mytag2'
+        file.tags.length.must_equal 0
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taggata
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Adam Ruzicka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -50,6 +50,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +158,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.16
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -155,20 +215,31 @@ files:
 - Rakefile
 - bin/taggata
 - lib/taggata.rb
+- lib/taggata/cli.rb
 - lib/taggata/constants.rb
-- lib/taggata/directory.rb
-- lib/taggata/file.rb
-- lib/taggata/filesystem_scanner.rb
+- lib/taggata/db.rb
+- lib/taggata/db_adapters.rb
+- lib/taggata/db_adapters/abstract.rb
+- lib/taggata/db_adapters/sequel.rb
+- lib/taggata/db_adapters/sequel_migrations/001_initial.rb
 - lib/taggata/parser.rb
 - lib/taggata/parser/query.rb
 - lib/taggata/parser/tag.rb
-- lib/taggata/tag.rb
+- lib/taggata/persistent.rb
+- lib/taggata/persistent/abstract.rb
+- lib/taggata/persistent/directory.rb
+- lib/taggata/persistent/file.rb
+- lib/taggata/persistent/file_tag.rb
+- lib/taggata/persistent/tag.rb
+- lib/taggata/persistent/with_parent.rb
+- lib/taggata/scanner.rb
 - lib/taggata/version.rb
 - taggata.gemspec
-- test/filesystem_scanner_test.rb
 - test/parser/query_parser_test.rb
 - test/parser/tag_parser_test.rb
+- test/scanner_test.rb
 - test/taggata_test_helper.rb
+- test/tagging_test.rb
 homepage: https://github.com/adamruzicka/taggata
 licenses:
 - BSD-2-Clause
@@ -189,12 +260,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Gem for scanning the filesystem and storing it in sqlite database with tagging
 test_files:
-- test/filesystem_scanner_test.rb
 - test/parser/query_parser_test.rb
 - test/parser/tag_parser_test.rb
+- test/scanner_test.rb
 - test/taggata_test_helper.rb
+- test/tagging_test.rb

data/lib/taggata/directory.rb

@@ -1,49 +0,0 @@
-module Taggata
-  class Directory < Sequel::Model(:directories)
-    set_schema do
-      primary_key :id
-      String :name
-      foreign_key :parent_id, :directories
-    end
-
-    create_table unless table_exists?
-
-    one_to_many :directories,
-                :key => :parent_id,
-                :class => self
-
-    one_to_many :files,
-                :key => :parent_id,
-                :class => ::Taggata::File
-
-    many_to_one :parent,
-                :key => :parent_id,
-                :class => self
-
-    def entries
-      directories + files
-    end
-
-    # Scan children of this directory
-    def scan
-      scanner = ::Taggata::FilesystemScanner.new
-      scanner.process(self)
-      validate
-    end
-
-    def validate
-      missing = ::Taggata::Tag.find_or_create(:name => MISSING_TAG_NAME)
-      files.reject { |f| ::File.exist? f.path }.each { |f| f.add_tag missing }
-      directories.each(&:validate)
-    end
-
-    # Get full path of this directory
-    #
-    # @result full path of this directory
-    def path
-      parents = [self]
-      parents << parents.last.parent while parents.last.parent
-      ::File.join(parents.reverse.map(&:name))
-    end
-  end
-end