pg_tags_on 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ed743033dfd067912e4ffe4878cf719e87d920220c656318eb4a780c4f9196
-  data.tar.gz: 03f9ea30352f7ced5e6c5b87d343c410a8d6522d7475ee34685c53870a9952f3
+  metadata.gz: 066f0a47a35f600a5f4048b2bc4f53348f546778e4be9979d8ba821036f59b78
+  data.tar.gz: bbbc6d9b19187f32c2dcb9be084694e52d9267e4303288dd503ea0046201d709
 SHA512:
-  metadata.gz: 118f18d7f3dc1e5e7809b03ec03a107499b8be1e66f225b3b40d819f55e95e98e7deaf469fe4f8ad29cd790962082b2a314081ac266009d1d4bc65cf9fd94d86
-  data.tar.gz: 7771926231fc5013bce1e01938aeef247e9b602b6308dbfbfdf29d10b6d111bb8743a4fbc0bd97c6d0ad4daf773bb9efc0edcedcaa166e74ea7b8096d32cca12
+  metadata.gz: 313542b894433383a4058a669eef4e9e06bf1a3417580efa24765330b9b3e0254842ae7a22de1a05ab1c7d515388c5302d1dda2ca3e65d621598cc22b74de19f
+  data.tar.gz: 2990fc830e4a250e52c4dc710d9b711cb1a62b9ba6f4ef38be521e3cfbcd02471937b253dc9b63516bb83709eca820583b704ffe29213a4c750d3f578640f54b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0 ( 2020-04-15)
+
+  * apply PR for gem versions
+  * fixed Arel deprecation warning
+  * changed validation param names
+
 ## 0.2.0 ( 2020-09-02)
 
 * Added support for multiple tags creation and deletion

data/README.md

@@ -42,7 +42,7 @@ Or install it yourself as:
 ## Usage
 ### ActiveRecord model setup
 
-One or multiple columns can be specified:
+One or multiple columns that store tags can be specified:
 
 ```ruby
 class Entity < ActiveRecord::Base
@@ -51,7 +51,7 @@ class Entity < ActiveRecord::Base
 end
 ```
 
-For ```jsonb[]``` columns you'll have to specify the key for the tag value. If you store multiple attributes in the objects then you must set also ```has_attributes: true```.
+In ```jsonb[]``` columns, by default each tag is stored as an object with a single key. For example ```{"tag": "rubygems"}```. If you store multiple attributes in the objects, then you must set also ```has_attributes: true```.
 
 ```ruby
 class Entity < ActiveRecord::Base
@@ -65,7 +65,7 @@ Maximum number of tags and maximum tag length can be validated. Errors will be i
 
 ```ruby
 class Entity < ActiveRecord::Base
-  pg_tags_on :tags, limit: 10, tag_length: 50 # limit to 10 tags and 50 chars. per tag.
+  pg_tags_on :tags, limit: 10, length: 50 # limit to 10 tags and 50 chars. per tag.
 end
 ```
 

data/lib/pg_tags_on/active_record/base.rb

@@ -12,7 +12,7 @@ module PgTagsOn
 
           pg_tags_on_init_model unless @pg_tags_on_init_model
           pg_tags_on_settings[name] = options.deep_symbolize_keys
-          validates(name, 'pg_tags_on/tags': true) if %i[limit tag_length].any? { |k| options[k] }
+          validates(name, 'pg_tags_on/tags': true) if %i[limit length].any? { |k| options[k] }
           instance_eval <<-RUBY, __FILE__, __LINE__ + 1
             scope :#{name}, -> { PgTagsOn::Repository.new(self, "#{name}") }
           RUBY

data/lib/pg_tags_on/repositories/array_jsonb_repository.rb

@@ -5,7 +5,7 @@ module PgTagsOn
     # Operatons for 'jsonb[]' column type
     class ArrayJsonbRepository < ArrayRepository
       def create(tag_or_tags, returning: nil)
-        tags = normalize_tags(Array.wrap(tag_or_tags))
+        tags = normalize_tags(tag_or_tags)
 
         super(tags, returning: returning)
       end
@@ -24,13 +24,14 @@ module PgTagsOn
       end
 
       def delete(tag_or_tags, returning: nil)
-        tags = Array.wrap(tag_or_tags)
-        normalized_tags = normalize_tags(tags)
-        rel = klass.where(column_name => PgTagsOn.query_class.any(tags))
+        tags = normalize_tags(tag_or_tags)
         sm = build_tags_select_manager
-        normalized_tags.each do |tag|
+
+        tags.each do |tag|
           sm.where(arel_infix_operation('@>', Arel.sql('tag'), bind_for(tag.to_json, nil)).not)
         end
+
+        rel = klass.where(column_name => PgTagsOn.query_class.any(tag_or_tags))
         value = arel_function('array', sm)
 
         perform_update(rel, { column_name => value }, returning: returning)
@@ -48,7 +49,9 @@ module PgTagsOn
                   .as('_tags'))
       end
 
-      def normalize_tags(tags)
+      def normalize_tags(tag_or_tags)
+        tags = Array.wrap(tag_or_tags)
+
         return tags unless key?
 
         tags.map do |tag|

data/lib/pg_tags_on/repositories/array_repository.rb

@@ -42,8 +42,8 @@ module PgTagsOn
         all.count
       end
 
-      def create(tag, returning: nil)
-        value = arel_array_cat(arel_column, bind_for(Array.wrap(tag)))
+      def create(tag_or_tags, returning: nil)
+        value = arel_array_cat(arel_column, bind_for(Array.wrap(tag_or_tags)))
 
         perform_update(klass, { column_name => value }, returning: returning)
       end

data/lib/pg_tags_on/repositories/base_repository.rb

@@ -65,7 +65,7 @@ module PgTagsOn
 
         stmt = ::Arel::UpdateManager.new
         stmt.table(arel_table)
-        stmt.key = klass.arel_attribute(klass.primary_key)
+        stmt.key = arel_table[klass.primary_key]
         stmt.take(rel.arel.limit)
         stmt.offset(rel.arel.offset)
         stmt.order(*rel.arel.orders)

data/lib/pg_tags_on/validations/validator.rb

@@ -4,7 +4,7 @@ module PgTagsOn
   # Validator for max. number of tags and max. tag length.
   #
   #   class Entity
-  #     pg_tags_on :tags, limit: 20, tag_length: 64
+  #     pg_tags_on :tags, limit: 20, length: 64
   #   end
   #
   class TagsValidator < ActiveModel::EachValidator
@@ -15,7 +15,7 @@ module PgTagsOn
 
     def validate_each(record, attribute, value)
       validate_limit(record, attribute, value)
-      validate_tag_length(record, attribute, value)
+      validate_length(record, attribute, value)
 
       record.errors.present?
     end
@@ -31,8 +31,8 @@ module PgTagsOn
       record.errors.add(attr, "size exceeded #{limit} tags") if value.size > limit.to_i
     end
 
-    def validate_tag_length(record, attr, value)
-      limit, key = klass.pg_tags_on_options_for(attr).values_at(:tag_length, :key)
+    def validate_length(record, attr, value)
+      limit, key = klass.pg_tags_on_options_for(attr).values_at(:length, :key)
       return true unless limit && value
 
       value.map! { |tag| tag.with_indifferent_access.dig(*key) } if key

data/lib/pg_tags_on/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgTagsOn
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_tags_on
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Catalin Marinescu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,7 +122,7 @@ metadata:
   changelog_uri: https://github.com/cata-m/pg_tags_on/blob/master/CHANGELOG.md
   homepage_uri: http://github.com/cata-m/pg_tags_on
   source_code_uri: https://github.com/cata-m/pg_tags_on
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,8 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Query and manage tags stored in a Postgresql column.
 test_files: []