simple_group 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f47630bc3ad16cf66d9aa6fb224de3cb8aa40e2
-  data.tar.gz: 028ca3ce3d739386e6254457910ba5d4f305d99f
+  metadata.gz: 6f1b79e0f95379a33f17b1227b437f53032b140a
+  data.tar.gz: 7a7efe44591c5376652791bf4908e5131aa01023
 SHA512:
-  metadata.gz: 642dd9661d75bacc87f9f39e3eef6619537fcc7e2986d1d4dfcee1fc7c192a63a28c5859fb826335e89783f58e99ab9aa1ce0cf29859245fc678b43b3505a257
-  data.tar.gz: ddf13fe7880005e85a95bcedc51206b18acc7675b5b0fdf822581316c10008f9bd33afcc3275aa35e2d0c271c2f4b8459b8b54e1c734ba8b36124590ca992398
+  metadata.gz: 65605cac5efaa68e755be72ac38508625f3288c5438432901cf26d41554998febea8dc7bf6a0bfd5301285c3fa9905f8cc19f67c7f7018200c58c93c78247756
+  data.tar.gz: 0ed9b29df1ed5728c41748b666dfda6cd0146728e714042923b5c3f8d52f11cc2dc123812f802cc28785329ab890f280e7bbafbf3d3c2c412751a6b3574ceb09

data/lib/generators/simple_group/migration/templates/active_record/migration.rb

@@ -7,9 +7,11 @@ class SimpleGroupMigration < ActiveRecord::Migration
     end
 
     if ActiveRecord::VERSION::MAJOR < 4
-      add_index :simple_groups, [:group_item_id, :group_item_type]
-      add_index :simple_groups, [:group_id, :group_type]
+      add_index :simple_group_combinations, [:group_item_id, :group_item_type]
+      add_index :simple_group_combinations, [:group_id, :group_type]
     end
+    add_index :simple_group_combinations, [:group_item_id, :group_item_type, :group_id, :group_type],
+              unique: true, name: :index_simple_group_combinations
   end
 
   def self.down

data/lib/simple_group/combination.rb

@@ -16,6 +16,7 @@ module SimpleGroup
 
     validates :group_item_id, presence: true
     validates :group_id, presence: true
+    validates_uniqueness_of :group_id, scope: [:group_type, :group_item_id, :group_item_type]
   end
 
   class GroupNotAllowError < Exception; end

data/lib/simple_group/group.rb

@@ -10,9 +10,18 @@ module SimpleGroup
       end
     end
 
+    def include?(model)
+      raise SimpleGroup::GroupNotAllowError unless model.class.groupable?
+      SimpleGroup::Combination.exists?(group: self, group_item: model)
+    end
+
+    def exclude?(model)
+      !include?(model)
+    end
+
     def add(model)
       raise SimpleGroup::GroupNotAllowError unless model.class.groupable?
-      SimpleGroup::Combination.create(group: self, group_item: model)
+      SimpleGroup::Combination.new(group: self, group_item: model).save
     end
 
     def remove(model)

data/lib/simple_group/version.rb

@@ -1,3 +1,3 @@
 module SimpleGroup
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_group
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Toyoaki Oko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler