hancock_cms_gallery 1.0.0 → 1.0.2

data/lib/hancock/gallery/version.rb

@@ -1,5 +1,5 @@
 module Hancock
   module Gallery
-    VERSION = "1.0.0".freeze
+    VERSION = "1.0.2".freeze
   end
 end

data/lib/hancock_cms_gallery.rb

@@ -1,13 +1,5 @@
-# unless defined?(Hancock) && Hancock.respond_to?(:orm) && [:active_record, :mongoid].include?(Hancock.orm)
-#   puts "please use hancock_cms_mongoid or hancock_cms_activerecord"
-#   puts "also: please use hancock_cms_news_mongoid or hancock_cms_news_activerecord and not hancock_cms_news directly"
-#   exit 1
-# end
-
 require "hancock/gallery/version"
 
-# require 'hancock_cms'
-
 if Hancock.mongoid?
   begin
     begin
@@ -16,11 +8,16 @@ if Hancock.mongoid?
       require 'mongoid-paperclip'
     end
   rescue LoadError
-    raise 'Add mongoid-paperclip or glebtv-mongoid-paperclip'
+    raise 'Add glebtv-mongoid-paperclip (*recommended*) or mongoid-paperclip or  in Gemfile'
   end
 elsif Hancock.active_record?
-  require 'paperclip'
+  begin
+    require 'paperclip'
+  rescue LoadError
+    raise 'Add paperclip in Gemfile'
+  end
 end
+require 'hancock/gallery/paperclip_patch'
 # require "image_optim"
 # require "paperclip-optimizer"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms_gallery
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<="
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<="
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.x
 - !ruby/object:Gem::Dependency
   name: ack_rails_admin_jcrop
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ files:
 - app/assets/javascripts/hancock/gallery/page_selector.coffee
 - app/controllers/concerns/hancock/gallery/load_gallery.rb
 - app/controllers/concerns/hancock/gallery/load_gallery_images.rb
-- app/controllers/concerns/rails_admin/jcrop_controller.rb
+- app/controllers/rails_admin/jcrop_controller.rb
 - app/models/concerns/hancock/gallery/active_record_paperclip.rb
 - app/models/concerns/hancock/gallery/auto_crop.rb
 - app/models/concerns/hancock/gallery/decorators/embedded_image.rb
@@ -110,15 +110,16 @@ files:
 - app/models/hancock/gallery/image.rb
 - app/models/hancock/gallery/original_image.rb
 - app/views/rails_admin/jcrop/edit.html.slim
+- app/views/rails_admin/main/_form_hancock_image.html.slim
 - bin/console
 - bin/setup
 - config/initializers/hancock_gallery.rb
 - config/initializers/paperclip_fix.rb
 - config/locales/hancock.gallery.ru.yml
 - hancock_cms_gallery.gemspec
-- lib/generators/hancock/gallery/config/install_generator.rb
+- lib/generators/hancock/gallery/config/config_generator.rb
 - lib/generators/hancock/gallery/config/templates/hancock_gallery.erb
-- lib/generators/hancock/gallery/migrations/migration_generator.rb
+- lib/generators/hancock/gallery/migrations/migrations_generator.rb
 - lib/generators/hancock/gallery/migrations/templates/migration_gallery.rb
 - lib/generators/hancock/gallery/models/decorators_generator.rb
 - lib/generators/hancock/gallery/models/embedded_image_generator.rb
@@ -145,6 +146,7 @@ files:
 - lib/hancock/gallery/models/mongoid/image.rb
 - lib/hancock/gallery/models/mongoid/original_image.rb
 - lib/hancock/gallery/models/original_image.rb
+- lib/hancock/gallery/paperclip_patch.rb
 - lib/hancock/gallery/rails_admin_ext/hancock_image.rb
 - lib/hancock/gallery/version.rb
 - lib/hancock_cms_gallery.rb