can_play 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829809925b3179fce5cb8b03140d5b66f65efacb
-  data.tar.gz: 4b05d13c459c921cc14af34ab07374471577d292
+  metadata.gz: cac379c788b3996ff429cb1f575c831b64c411b9
+  data.tar.gz: fce69d11a015bd7b31830b48793a20a1790a9636
 SHA512:
-  metadata.gz: 4bfc3ce70ce00fe83bf83d3a8da069ee0996c230f7afdacebc4d8534b915da2a42b8932338090ac22f23b1dd57eeed99dc1c8a30e9cf18ffbfa1732138bcb157
-  data.tar.gz: 8945c14309e79517e5394ea23f219baa9de23598467dc8319c1c88b462bedcc65c99eb5e4e7630eb4ed1bcd3c4e5b93c781d627c0c577afde137d6667c83be7f
+  metadata.gz: 36a995cf2803c25e2eec9fd631386414b1e1efac56b4f63829085b5fd6df14b5ad7c86cf498e0c96c16abb7d448f3358b268f1e6ff0b9e4e02098219315559d6
+  data.tar.gz: 092425cd490844e7230f35411288b1494a913c08332ca22dc2adecce934fb74eb2c30850299bf7dfeb79910b18232fc11cb5c98d68cf14c7419a9e7a34c0f69b

data/lib/can_play/version.rb

@@ -1,3 +1,3 @@
 module CanPlay
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/can_play.rb

@@ -14,9 +14,10 @@ module CanPlay
     def included(base)
       base.class_eval <<-RUBY
         include RorHack::ClassLevelInheritableAttributes
-        inheritable_attributes(:groups, :current_group)
+        inheritable_attributes(:groups, :current_group, :module_name)
         @groups        = []
         @current_group = nil
+        @module_name = ''
       RUBY
       base.extend ClassMethods
     end
@@ -26,7 +27,7 @@ module CanPlay
     end
 
     def grouped_resources
-      @grouped_resources ||= CanPlay.resources.group_by { |i| i[:group] }
+      @grouped_resources ||= CanPlay.resources.multi_group_by(:module_name, :group)
     end
 
     def my_resources
@@ -34,18 +35,20 @@ module CanPlay
     end
 
     def grouped_resources_with_chinese_desc
-      grouped_resources.tap do |i|
-        i.each do |group, resources|
-          group[:chinese_desc] = begin
-            name = I18n.t("can_play.class_name.#{group[:name].singularize}", default: '')
-            name = group[:klass].model_name.human if name.blank?
-            name
-          end
-          resources.each do |resource|
-            resource[:chinese_desc] = I18n.t("can_play.authority_name.#{group[:name].singularize}.#{resource[:verb]}", default: '').presence || I18n.t("can_play.authority_name.common.#{resource[:verb]}")
+      grouped_resources.tap do |e|
+        e.each do |i, v|
+          v.each do |group, resources|
+            group[:chinese_desc] = begin
+              name = I18n.t("can_play.class_name.#{group[:name].singularize}", default: '')
+              name = group[:klass].model_name.human if name.blank?
+              name
+            end
+            resources.each do |resource|
+              resource[:chinese_desc] = I18n.t("can_play.authority_name.#{group[:name].singularize}.#{resource[:verb]}", default: '').presence || I18n.t("can_play.authority_name.common.#{resource[:verb]}")
+            end
           end
+          v.rehash
         end
-        i.rehash
       end
     end
   end
@@ -69,24 +72,23 @@ module CanPlay
     def group(opts, &block)
       if opts.is_a?(Hash)
         opts  = opts.with_indifferent_access
-        group = {name: opts.delete(:name), klass: opts.delete(:klass)}
+        group =  OpenStruct.new(name: opts.delete(:name), klass: opts.delete(:klass))
       elsif opts.is_a?(Module)
         name = opts.try(:table_name).presence || opts.to_s.underscore.gsub('/', '_').pluralize
-        group = {name: name, klass: opts}
+        group =  OpenStruct.new(name: name, klass: opts)
       else
         # do nothing
       end
-      group = group.with_indifferent_access
       @groups << group
-      @groups        = @groups.uniq { |i| i[:name] }
+      @groups        = @groups.uniq(&:name)
       @current_group = group
-      block.call(group[:klass])
+      block.call(group.klass)
       @current_group = nil
     end
 
     def limit(name=nil, &block)
       raise "Need define group first" if @current_group.nil?
-      Power.power(name||@current_group[:name], &block)
+      Power.power(name||@current_group.name, &block)
     end
 
     def collection(verb_or_verbs, &block)
@@ -104,10 +106,10 @@ module CanPlay
 
       if verb_or_verbs.kind_of?(Array)
         verb_or_verbs.each do |verb|
-          add_resource(group, verb, group[:klass], 'collection', behavior)
+          add_resource(group, verb, group.klass, 'collection', behavior)
         end
       else
-        add_resource(group, verb_or_verbs, group[:klass], 'collection', behavior)
+        add_resource(group, verb_or_verbs, group.klass, 'collection', behavior)
       end
     end
 
@@ -126,24 +128,25 @@ module CanPlay
 
       if verb_or_verbs.kind_of?(Array)
         verb_or_verbs.each do |verb|
-          add_resource(group, verb, group[:klass], 'member', behavior)
+          add_resource(group, verb, group.klass, 'member', behavior)
         end
       else
-        add_resource(group, verb_or_verbs, group[:klass], 'member', behavior)
+        add_resource(group, verb_or_verbs, group.klass, 'member', behavior)
       end
     end
 
     def add_resource(group, verb, object, type, behavior)
-      name     = "#{verb}_#{group[:name]}"
-      resource = {
+      name     = "#{verb}_#{group.name}"
+      resource = OpenStruct.new(
+        module_name: module_name,
         name:     name,
         group:    group,
         verb:     verb,
         object:   object,
         type:     type,
         behavior: behavior
-      }.with_indifferent_access
-      CanPlay.resources.keep_if { |i| i[:name] != name }
+      )
+      CanPlay.resources.keep_if { |i| i.name != name }
       CanPlay.resources << resource
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_play
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - happyming9527
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler