rails_admin_jcrop 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d5489e657c9d9affc179738e5c61e0abc3b9eb
-  data.tar.gz: 08e64cefde8e422604c65d31aef910fa878e5191
+  metadata.gz: 698215a17058dded1d3a8fe99cf82009e54729ed
+  data.tar.gz: 84de62206d48f4a18e6ca9bda452cbd421d7d90f
 SHA512:
-  metadata.gz: 1507eebf55b314a1e6977009647972f4347f55e424a81d46cc1f76bd6371f7a9b0f6db88d433b4ff8f96b685f1fde89d6a9cf489a995897a84af23c3802f1e65
-  data.tar.gz: 2c81e11ad84afe5a22e8df2d1a86d442e200e99a3d75d12800a167f07fe7977b0011b5cf6ac05e8c929d5b7b7cb8dfee16d5e07b76a12aaf082ecf49a126c555
+  metadata.gz: 8fdc043d952fa2e2208c437a12504911ca907bc9b55327514e1c444ad2e588843685e78184b03bc0c7847956f2543e250e720adc8f2346ad71af7313522c4181
+  data.tar.gz: 2248c99b98eea262a50c904e2986f026c74bf7026dade026dc3727f6ea6fa95d5fdc93e0d95e495b10207fa26e2065cd9f26d7ea2cca49da31fc4215821850e2

data/README.markdown

@@ -36,7 +36,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
 
   version :thumb do
     process :rails_admin_crop
-    process :resize_to_fill: [500,320]
+    process resize_to_fill: [500,320]
   end
 
 end
@@ -133,7 +133,8 @@ Any help is encouraged. Here are some ways you can contribute:
 * [Alan Rosin Sikora](https://github.com/alansikora) ([alansikora](https://github.com/alansikora))
 * [cec](https://github.com/cec)
 * [Alex Chien](https://github.com/AlexChien)
-* [Mitsuhiro Shibuya]([mshibuya](https://github.com/mshibuya))
+* [Mitsuhiro Shibuya](https://github.com/mshibuya)
+* [anant anil kolvankar](https://github.com/anantkolvankar)
 
 ### And ... ###
 

data/app/controllers/rails_admin/jcrop_controller.rb

@@ -15,10 +15,33 @@ module RailsAdmin
 
       @image_tag_options = {}
       @image_tag_options[:class] = "jcrop-subject"
-      @image_tag_options[:'data-geometry'] = geometry(@object.send(@field).path).join(",")
+      @file_path=''
+      #Condition for Carrierwave.
+      if @object.send(@field).class.to_s =~ /Uploader/
 
-      if @fit_image
-        fit_image_geometry = fit_image_geometry(@object.send(@field).path)
+        if @object.send(@field)._storage.to_s =~ /Fog/
+
+          @file_path=@object.send(@field).url
+        else
+
+          @file_path=@object.send(@field).path
+        end
+      #Condition for Paperclip.
+      elsif @object.send(@field).class.to_s =~ /Paperclip/
+
+        if (@object.send(@field).options[:storage].to_s =='s3')
+
+          @file_path=@object.send(@field).url
+        else
+
+          @file_path=@object.send(@field).path
+        end
+      end
+
+      @image_tag_options[:'data-geometry'] = geometry(@file_path).join(",")
+
+      if @fit_image_geometry
+        fit_image_geometry = fit_image_geometry(@file_path)
 
         @form_options[:'style'] = "margin-left: #{375 - (fit_image_geometry[0]/2) - 15}px;"
 

data/lib/rails_admin_jcrop/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminJcrop
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_jcrop
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Jcrop plugin for rails admin. Image cropping made easy!
@@ -59,34 +59,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/rails_admin/jcrop_controller.rb
+- MIT-LICENSE
+- README.markdown
+- Rakefile
 - app/assets/javascripts/rails_admin/ra.jcrop.js
-- app/views/rails_admin/main/_form_jcrop.html.haml
+- app/controllers/rails_admin/jcrop_controller.rb
 - app/views/rails_admin/jcrop/edit.html.haml
-- config/routes.rb
+- app/views/rails_admin/main/_form_jcrop.html.haml
 - config/locales/en.yml
+- config/routes.rb
 - lib/rails_admin_jcrop.rb
-- lib/rails_admin_jcrop/engine.rb
-- lib/rails_admin_jcrop/rails_admin.rb
-- lib/rails_admin_jcrop/orm/active_record.rb
-- lib/rails_admin_jcrop/orm/mongoid.rb
-- lib/rails_admin_jcrop/image_helper.rb
-- lib/rails_admin_jcrop/orm.rb
 - lib/rails_admin_jcrop/asset_engine.rb
 - lib/rails_admin_jcrop/asset_engine/carrier_wave.rb
 - lib/rails_admin_jcrop/asset_engine/paperclip.rb
+- lib/rails_admin_jcrop/engine.rb
+- lib/rails_admin_jcrop/image_helper.rb
+- lib/rails_admin_jcrop/orm.rb
+- lib/rails_admin_jcrop/orm/active_record.rb
+- lib/rails_admin_jcrop/orm/mongoid.rb
+- lib/rails_admin_jcrop/rails_admin.rb
 - lib/rails_admin_jcrop/version.rb
-- vendor/assets/javascripts/rails_admin/jquery.color.js
+- vendor/assets/images/rails_admin/Jcrop.gif
 - vendor/assets/javascripts/rails_admin/jquery.Jcrop.js
 - vendor/assets/javascripts/rails_admin/jquery.Jcrop.min.js
+- vendor/assets/javascripts/rails_admin/jquery.color.js
 - vendor/assets/javascripts/rails_admin/jquery.min.js
 - vendor/assets/stylesheets/rails_admin/Jcrop.gif
-- vendor/assets/stylesheets/rails_admin/jquery.Jcrop.min.css
 - vendor/assets/stylesheets/rails_admin/jquery.Jcrop.css
-- vendor/assets/images/rails_admin/Jcrop.gif
-- MIT-LICENSE
-- Rakefile
-- README.markdown
+- vendor/assets/stylesheets/rails_admin/jquery.Jcrop.min.css
 homepage: https://github.com/janx/rails_admin_jcrop
 licenses: []
 metadata: {}
@@ -96,19 +96,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Jcrop plugin for rails admin.
 test_files: []
-has_rdoc: