mongo_grid 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b967f020175148e6e9660e41afe88a24107b524
-  data.tar.gz: bdd8ab76393220b35e312d90ee92a4e926871a52
+  metadata.gz: eaaf801a15cf6a1c400fc477e72a2b8ddd2aff78
+  data.tar.gz: 885ad7f222cad01171aa333f6d63e4ddf4c42a04
 SHA512:
-  metadata.gz: b290adb6b358518090d8a47afba2ded797d261d99fa795c83c3277d9ce8f2de061dd7414cf264226a974a39a0193c8e118538b8062a1da64819502012e46c4d4
-  data.tar.gz: d954c56e866c6d939986f93b18c3c14d95741ae16342b8dc6e4ae6eb6cec4e3e5d390e93b552fad69ed14dfcf7bcf4363dd50aed484f2938a19209cb5330d891
+  metadata.gz: 4b9396ae097514e6df16d181263216caa947401a084aa6dbe9d7c7eb93b04a32994d0398de003bc0a8f2c142b662b4fb71dfa7328b23af35cbbeb66c10039e92
+  data.tar.gz: 9ebf0cc33dd29c9800c94d2ad99ceddd53f5a91d6b1792bc7da6f69f4e538e5f1e8f44fc7dfe334ff56937a1821aa910c960015245f98281290e9a75470310cd

data/lib/mongo_grid/action_base.rb

@@ -1,36 +1,35 @@
-class ActionController::Base
-  def self.need_role(*roles)
-    roles.each do |role|
-      eval(%Q(
+require "action_controller"
+  ActionController::Base.class_eval do
+    def self.need_role(*roles)
+      roles.each do |role|
+        eval(%Q(
         def need_#{role.to_s} 
         unless is_#{role.to_s}?
           flash[:alert] = "身份不对"
           redirect_to root_path and return
         end
         end
-      ))
+        ))
+      end
     end
-  end
-
 
-  def attachit(model,attach = :attach)
-    unless params[model.to_sym][attach].blank?
-      if params[:action] == 'update'
-        old_attach = eval("@#{model}.#{attach.to_s}")
-        unless old_attach.blank?
-          id = BSON::ObjectId.from_string(old_attach['grid_id'])
-          MongoGrid.grid.delete(id)
+    def attachit(model,attach = :attach)
+      unless params[model.to_sym][attach].blank?
+        if params[:action] == 'update'
+          old_attach = eval("@#{model}.#{attach.to_s}")
+          unless old_attach.blank?
+            id = BSON::ObjectId.from_string(old_attach['grid_id'])
+            MongoGrid.grid.delete(id)
+          end
         end
+        attach=params[model.to_sym][attach]
+        MongoGrid.uploadtogrid(attach,width: 300)
       end
-      attach=params[model.to_sym][attach]
-      MongoGrid.uploadtogrid(attach,width: 300)
     end
-  end
 
-  def pageit
-    params[:page] ||= 1   
-    per_page = 10
-    @num=per_page*(params[:page].to_i-1)
+    def pageit
+      params[:page] ||= 1   
+      per_page = 10
+      @num=per_page*(params[:page].to_i-1)
+    end
   end
-
-end

data/lib/mongo_grid/mongoid.rb

@@ -1,26 +1,27 @@
 module ::Mongoid
   module Document
-    def remove_logo
-      logo=self.logo
-      unless logo.blank?
-        id = BSON::ObjectId.from_string(logo['grid_id'])
-        MongoGrid.grid.delete(id)
-      end
-    end
 
-    def remove_avatar
-      attach=self.avatar
+    %w[logo avatar attach].each do |name|
+    module_eval(%Q(
+    def remove_#{name}
+      attach=self.#{name}
       unless attach.blank?
         id = BSON::ObjectId.from_string(attach['grid_id'])
         MongoGrid.grid.delete(id)
       end
     end
-    def remove_attach 
-      attach=self.attach
-      unless attach.blank?
-        id = BSON::ObjectId.from_string(attach['grid_id'])
-        MongoGrid.grid.delete(id)
-      end
+    ))
     end
+
+=begin
+    def self.included(base)
+      base.class_eval(%Q(
+          before_destroy :remove_logo
+          before_destroy :remove_avatar
+          before_destroy :remove_attach
+      ))
+    end
+=end
+
   end
 end

data/lib/mongo_grid/version.rb

@@ -1,3 +1,3 @@
 module MongoGrid
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/mongo_grid.rb

@@ -1,5 +1,9 @@
-require "mongo_grid/version"
 require 'zbox'
+require 'mongo_grid/version'
+
+#Dir[File.join(File.dirname(__FILE__), 'mongo_grid', '*.rb')].each do |extension|
+#  require extension
+#end
 
 module ::MongoGrid
   attr_accessor :db_name, :db_url
@@ -55,6 +59,8 @@ module ::MongoGrid
            :content_type=>content_type,:file_size=>file_size}
 
   end 
+end
 
 
-end
+require 'mongo_grid/mongoid'
+require 'mongo_grid/action_base'

data/mongo_grid.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "action_controller", "~> 5.0.2"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 11.2",'>=11.2.0'
   spec.add_development_dependency "zbox", "~> 0.0.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_grid
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - zxy
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: action_controller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement