komagire 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb494e56cf84ce9fabac8968194676ebfe7a7f78
-  data.tar.gz: a8025f0834147ef385eedfd258f8f17098e31f1f
+  metadata.gz: db899ad581973f576f0ff378aa6bf9243dbdb830
+  data.tar.gz: d85052ab6d758f54484c5c6234225c1c500ce341
 SHA512:
-  metadata.gz: 36a74776f1601dab5a36c425947ddd6a287adc58ef84b3e60ed170f743ce1bee3d1b900c396d9bc4082fdb5917e485e80c992b5a2248bc28549f34af96581232
-  data.tar.gz: d72a91de731986192454056dea70f368428aba6728c9f553c8a8a2397f1d89278a3f5ed8c4925d04fbadcbe1f4e90054aa0c57767bf761bee982a3e2019943cc
+  metadata.gz: c02f65725a2f9eb47c3f43f434763fd4aa03156fabec83ff6878668c136955f16c4c718cec45ba0ce9888c3efc0e60feace1adc8d317c8c40225ccae51de4df3
+  data.tar.gz: 8e6e6cafecf88af7b47626f971ea8b41dc556d6d2fbaac9b309057921f99a5a92e1ec91dbe6b8be45061d8694ceb70aa1245b7404b0c5858ca5e821d3ca61280

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+## Unreleased
+
+## 0.2.0
+
+- Add sort option for comma separated keys order (default: false)
+
+## 0.1.1
+
+- Drop id_list to_i conversion, because there are cases when PK is not integer (#1)
+
+## 0.1.0
+
+- Initial release

data/README.md

@@ -36,7 +36,7 @@ Tag.create(id: 2, name: 'perl')
 Tag.create(id: 3, name: 'java')
 
 class Post < ActiveRecord::Base
-  composed_of_komagire_key_list :tags, :tag_names, 'Tag', :name, komagire: {delimiter: '|'}
+  composed_of_komagire_key_list :tags, :tag_names, 'Tag', :name, komagire: {delimiter: '|', sort: true}
 end
 
 post = Post.new
@@ -51,7 +51,7 @@ Compose an object from comma separated ids.
 
 ```ruby
 class Post < ActiveRecord::Base
-  composed_of_komagire_id_list :tags, :tag_ids, 'Tag'
+  composed_of_komagire_id_list :tags, :tag_ids, 'Tag', komagire: {sort: true}
 end
 
 post = Post.new
@@ -71,7 +71,7 @@ post.tags = %w[1 2]                    # array of string
 post.tags = [1, 2]                     # array of integer(id)
 post.tags = [Tag.find(1), Tag.find(2)] # array of Tag
 post.tags = Tag.where(id: [1, 2])      # ActiveRecord::Relation
-post.tags = Komagire::IdList.new('Tag', '1,2') # same object
+post.tags = Komagire::IdList.new('Tag', '1,2', sort: true) # same object
 ```
 
 ## Development

data/lib/komagire/id_list.rb

@@ -26,7 +26,12 @@ module Komagire
     def _find_by_cskeys
       ancestors = content_class_name.constantize.ancestors.map(&:to_s)
       if ancestors.include?('ActiveHash::Base')
-        _keys.map { |id| content_class_name.constantize.find_by_id(id) }.compact
+        values = _keys.map { |id| content_class_name.constantize.find_by_id(id) }.compact
+        if @sort
+          values.sort_by { |v| v.id }
+        else
+          values
+        end
       else
         super
       end

data/lib/komagire/key_list.rb

@@ -17,6 +17,7 @@ module Komagire
       @content_class_name = content_class_name
       @attribute = attribute
       @delimiter = options[:delimiter] || Komagire::DEFAULT_DELIMITER
+      @sort = options[:sort] || false
       @cskeys = _convert(cskeys)
       super(_find_by_cskeys)
     end
@@ -25,7 +26,8 @@ module Komagire
     #
     # @return [String]
     def cskeys
-      ([''] + map(&@attribute).sort.uniq + ['']).join(@delimiter)
+      key_values = compact.map(&@attribute).uniq.tap {|values| values.sort! if @sort }
+      ([''] + key_values + ['']).join(@delimiter)
     end
 
     def freeze
@@ -44,11 +46,16 @@ module Komagire
     end
 
     def _keys
-      @cskeys.split(@delimiter).sort.uniq
+      @cskeys.split(@delimiter).uniq
     end
 
     def _find_by_cskeys
-      content_class_name.constantize.where(@attribute => _keys)
+      values = content_class_name.constantize.where(@attribute => _keys).compact
+      if @sort
+        values.sort_by { |v| v.public_send(@attribute) }
+      else
+        values.index_by { |v| v.public_send(@attribute).to_s }.values_at(*_keys)
+      end
     end
 
     class Converter

data/lib/komagire/version.rb

@@ -1,3 +1,3 @@
 module Komagire
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: komagire
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Takumi IINO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -166,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Compose an object from comma separated keys.
 test_files: []
-has_rdoc: