can_play 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bffbc9843de69ebd8720ee793bd41aaa11891134
-  data.tar.gz: c841a03382c818458f1f6b2e0b52daf404b11527
+  metadata.gz: 9fd62b816fcaf89f3a9b08af34ffb0319f162901
+  data.tar.gz: ee11cda4ba4c8cbc4885acff43ac1b000a846eaa
 SHA512:
-  metadata.gz: 05b2ff862ad23c979c357d940aea2bdb7d38dca8d8c67783c78273008c9f1307cb1c0bc4c2ef2403448c34a6aa4a99facbeaa350108f133b87e7233840a9546e
-  data.tar.gz: afa43502a9fde559dfeff5da14a783a0857bb2c9451f520d3c28256a63aace729f17f4e5ed7866ea4c0a31e3ae91483b051703e05b624c39715bb3fa734697cf
+  metadata.gz: 740264f9348de73902ad021f27e4d347d849cc7102c1aceb7442c3c25347e9233c369a539e748073cec06c348b225cdca0358c806b992c6407837340ccfef744
+  data.tar.gz: a4e2f01374e35124bf2f61675e9f28bd49da9df9f7b169ab80e5566fafce3bb87573092c88bf9eb82ec561d2fc3a887d7a266dc8d84de001697a8bc7f149f155

data/lib/can_play/version.rb

@@ -1,3 +1,3 @@
 module CanPlay
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/can_play.rb

@@ -25,23 +25,23 @@ module CanPlay
       resource || CanPlay.resources.find { |r| r.name.to_s == name.to_s }
     end
 
-    def conjunct_resources(block=nil)
+    def conjunct_resources(&block)
       resources = CanPlay.override_resources[CanPlay.override_code].p2a + CanPlay.resources
       resources = resources.uniq { |i| i.name }
       resources = resources.select(&block) if block
       resources
     end
 
-    def grouped_resources(block=nil)
+    def grouped_resources(&block)
       conjunct_resources(block).multi_group_by(:module_name, :group)
     end
 
-    def splat_grouped_resources(block=nil)
-      conjunct_resources(block).multi_group_by(:group)
+    def splat_grouped_resources(&block)
+      conjunct_resources(&block).multi_group_by(:group)
     end
 
     def grouped_resources_with_chinese_desc(&block)
-      grouped_resources(block).tap do |e|
+      grouped_resources(&block).tap do |e|
         e.each do |i, v|
           v.each do |group, resources|
             group.chinese_desc = begin
@@ -59,7 +59,7 @@ module CanPlay
     end
 
     def splat_grouped_resources_with_chinese_desc(&block)
-      splat_grouped_resources(block).tap do |i|
+      splat_grouped_resources(&block).tap do |i|
         i.each do |group, resources|
           group[:chinese_desc] = begin
             name = I18n.t("can_play.class_name.#{group.name.singularize}", default: '')
@@ -97,16 +97,19 @@ module CanPlay
     end
 
     # 为每个 resource 添加一个 group, 方便管理
-    def group(opts, &block)
-      if opts.is_a?(Hash)
+    def group(*args, &block)
+      opts = args.extract_options!.with_indifferent_access
+      clazz = args.first
+      if clazz.is_a?(Module)
+        name  = clazz.try(:table_name).presence || clazz.to_s.underscore.gsub('/', '_').pluralize
+        group = NameImportantOpenStruct.new(name: name, klass: clazz)
+      elsif clazz.blank? &&  opts.key?(:name)
         opts  = opts.with_indifferent_access
         group = NameImportantOpenStruct.new(name: opts.delete(:name).to_s, klass: opts.delete(:klass))
-      elsif opts.is_a?(Module)
-        name  = opts.try(:table_name).presence || opts.to_s.underscore.gsub('/', '_').pluralize
-        group = NameImportantOpenStruct.new(name: name, klass: opts)
       else
-        # do nothing
+        raise "group klass need set"
       end
+      group.opts = OpenStruct.new opts
       self.groups << group
       self.groups        = groups.uniq(&:name)
       self.current_group = group
@@ -119,8 +122,9 @@ module CanPlay
       CanPlay::Power.power(name||current_group.name, &block)
     end
 
-    def collection(verb_or_verbs, opts={}.with_indifferent_access, &block)
+    def collection(verb_or_verbs, opts={}, &block)
       raise "Need define group first" if current_group.nil?
+      opts = OpenStruct.new opts
       group    = current_group
       behavior = nil
       if block
@@ -141,8 +145,9 @@ module CanPlay
       end
     end
 
-    def member(verb_or_verbs, opts={}.with_indifferent_access, &block)
+    def member(verb_or_verbs, opts={}, &block)
       raise "Need define group first" if current_group.nil?
+      opts = OpenStruct.new opts
       group    = current_group
       behavior = nil
       if block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_play
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - happyming9527
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: a permission system.