groupy 0.2.1 → 0.2.2

data/Rakefile

@@ -33,7 +33,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "groupy"
-  s.version           = "0.2.1"
+  s.version           = "0.2.2"
   s.summary           = "Categorise Active Records in nested groups with magical scopes, ? methods, and constants."
   s.author            = "Matthew Rudy Jacobs"
   s.email             = "MatthewRudyJacobs@gmail.com"
@@ -52,7 +52,8 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("activesupport")
 
   # If your tests use any gems, include them here
-  # s.add_development_dependency("mocha") # for example
+  s.add_development_dependency("activerecord")
+  s.add_development_dependency("sqlite3-ruby")
 end
 
 # This task actually builds the gem. We also regenerate a static

data/lib/groupy.rb

@@ -73,7 +73,11 @@ module Groupy
     def initialize(&block)
       super(:all, &block)
     end
-
+    
+    def subgroups
+      super().merge(:all => self.values)
+    end
+    
     def attach!(klass, column_name, options)
       self.subgroups.each do |group_name, group_values|
 
@@ -110,7 +114,12 @@ module Groupy
       
       klass.class_eval <<-RUBY
         def self.all_#{column_name.to_s.pluralize}
-          self.groupies[#{column_name.inspect}].values
+          self.#{column_name.to_s.pluralize}(:all)
+        end
+        
+        # self.roles(:non_superadmin) => ["some", "list", "of", "roles"]
+        def self.#{column_name.to_s.pluralize}(subgroup_name)
+          self.groupies[#{column_name.inspect}].subgroups[subgroup_name]
         end
       RUBY
     end

data/test/groupy_test.rb

@@ -45,7 +45,7 @@ class GroupyTest < ActiveSupport::TestCase
   end
 
   test "subgroups" do
-    assert_equal [:healthy, :fruit, :apple, :orange, :rice, :unhealthy, :fried_egg, :bacon].sort_by(&:to_s), Food.groupies[:dish].subgroups.keys.sort_by(&:to_s)
+    assert_equal [:all, :healthy, :fruit, :apple, :orange, :rice, :unhealthy, :fried_egg, :bacon].sort_by(&:to_s), Food.groupies[:dish].subgroups.keys.sort_by(&:to_s)
     assert_equal ["apple", "orange", "rice"], Food.groupies[:dish].subgroups[:healthy]
     assert_equal ["apple", "orange"],         Food.groupies[:dish].subgroups[:fruit]
     assert_equal ["apple"],                   Food.groupies[:dish].subgroups[:apple]

data/test/with_database_test.rb

@@ -5,8 +5,7 @@ require 'active_record'
 
 ActiveRecord::Base.establish_connection(
     :adapter => "sqlite3",
-    :dbfile  => ":memory:",
-    :database => "groupy_test"
+    :database => ":memory:"
 )
 
 ActiveRecord::Schema.define(:version => 0) do
@@ -44,4 +43,9 @@ class WithDatabaseTest < ActiveSupport::TestCase
     assert_equal 1,                Something.medium_sizes.count
   end
   
+  test "subgroup shortcut" do
+    assert_equal ["small", "medium", "large"], Something.sizes(:all)
+    assert_equal ["small"], Something.sizes(:small)
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: groupy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matthew Rudy Jacobs
@@ -32,6 +32,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: MatthewRudyJacobs@gmail.com
 executables: []