taggata 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7713cd81be332797275ebd869ea39818c825a8
-  data.tar.gz: 138c4eb01a7c07cad98c8522463474d912ab7023
+  metadata.gz: af1fd56a3c40bf5cae4dd502103e294280763987
+  data.tar.gz: f8f7b604307f9ce1402a5b73989475be2778ab45
 SHA512:
-  metadata.gz: 37a36288180cb07f9ba8889b77c2b3d54ef5ce6cffcba14d970caa6f4322a7410cd577427db3d76f5f13f21d4cbad44334b8c0d7d772999bcfb8c9870c47aecb
-  data.tar.gz: 6ec36c4c738c0265910a200428c6cdec2ccf7468cf2363677446c9ee7d37caed6ddba901a59c2106511676af136c79c25113ec2dfae15f69b667e97172575659
+  metadata.gz: fce98df89bbb25cbe946517853ef9b675b12687071538c246bad6c6ae165697d65ecac7458e997699d2d6668d6a67c9b2d959748fd7e9b56012347c49dec23bd
+  data.tar.gz: cc2c1d8091c499072ebc92c0c7616626f96fd2eb83700ac92467126591a10587f31e2ae6efdcbf182be980ff786a350bc7b3c2148d5334577aeed24fb6b440fa

data/bin/taggata

@@ -6,6 +6,7 @@ DB = Sequel.connect("sqlite://#{ARGV[0]}")
 DB.create_table :file_tags do
   foreign_key :tag_id, :tags
   foreign_key :file_id, :files
+  primary_key [:tag_id, :file_id], :name => :file_tags_pk, :unique => true
 end unless DB.table_exists? :file_tags
 
 Sequel::Model.plugin(:schema)
@@ -29,14 +30,18 @@ when 'tag'
   result = ::Taggata::Parser::Query.parse(ARGV[2])
   tag_hash = ::Taggata::Parser::Tag.parse(ARGV[3])
   result.each do |file|
-    tag_hash[:del].each { |tag| file.remove_tag tag }
-    tag_hash[:add].each { |tag| file.add_tag tag }
-  end
+    deletions = tag_hash[:del].map { |tag| [file.id, tag.id] }
+    DB[:file_tags].where([:file_id, :tag_id] => deletions).delete
+  end.flatten 1
+  additions = result.map do |file|
+    adds = tag_hash[:add].map { |tag| [file.id, tag.id] }
+    in_db = DB[:file_tags].where([:file_id, :tag_id] => adds).map([:file_id, :tag_id])
+    (adds - in_db).map { |file_id, tag_id| { :file_id => file_id, :tag_id => tag_id } }
+  end.flatten
+  DB[:file_tags].multi_insert(additions)
 when 'remove'
   files = ::Taggata::Parser::Query.parse(ARGV[2])
   files.each(&:destroy)
 when 'count'
   puts ::Taggata::Parser::Query.parse(ARGV[2]).count
-when 'pry'
-  require 'pry'; binding.pry
 end

data/lib/taggata/constants.rb

@@ -1,5 +1,3 @@
 module Taggata
   MISSING_TAG_NAME = '_MISSING'
-  DEFAULT_TAG_NAME = 'default'
 end
-

data/lib/taggata/parser/tag.rb

@@ -18,7 +18,7 @@ module Taggata
       private
 
       def self.find_tags(names)
-        in_db = ::Taggata::Tag.where(:name => names).all
+        in_db = ::Taggata::Tag.where(:name => names).map(:name)
         ::Taggata::Tag
           .dataset
           .multi_insert((names - in_db).map { |name| { :name => name } })

data/lib/taggata/tag.rb

@@ -7,7 +7,7 @@ module Taggata
 
     set_schema do
       primary_key :id
-      String :name
+      String :name, :unique => true
     end
 
     create_table unless table_exists?

data/lib/taggata/version.rb

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

data/taggata.gemspec

@@ -27,7 +27,4 @@ Gem::Specification.new do |spec|
   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 'mocha', '~> 1.1', '>= 1.1.0'
-  spec.add_development_dependency 'pry', '~> 0.1', '>= 0.0.1'
-  spec.add_development_dependency 'pry-coolline', '~> 0.1', '>= 0.0.1'
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taggata
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Adam Ruzicka
@@ -138,46 +138,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: pry-coolline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 description: 
 email:
 - a.ruzicka@outlook.com