camaleon_cms 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62fc7ad41d7bb84eb19b420320039004edf012ba
-  data.tar.gz: fed0f9bc7a3ea5b624eba15c41c8f28f15ac7b39
+  metadata.gz: d108ac8f32bb33eae1fb694f6162c5cee33ff093
+  data.tar.gz: 599fa7428f1fe9b7fba9414a96e286573a3c2860
 SHA512:
-  metadata.gz: 726e598be6d038d1f63a3abad00fac9b79d94c0162716cbf31153f4919fb2d7b797c312e3c0522dede7318c016182ab3411893802b4b60bc327cac97ab171067
-  data.tar.gz: afc6f987d85a6e649310b6ff49b7c5720fa4fc596efeb18f35d9daf3564aa6de159a8881181bea1cc5653b3b08a846b039e7b3e58b0f8bb2ffb9dd5178dc0fda
+  metadata.gz: 6a7d641d8afce4af8bd65a3de03e860580e12d67bf83820aecc1cbad5b7cf7962d2d6fa07ef2d2b225f31e1aaf5123a3b228d27d87b4aed6b6a4a1689061ec12
+  data.tar.gz: 2a5762b637a1f4f7afd0e3e41f5be720125ebb979933cee3a4e676ddc24ad74e92f98fc060fa4757c52435cde034195c05e30cbc73eeb27221cb0b02b2b3a68b

data/app/helpers/uploader_helper.rb

@@ -37,7 +37,7 @@ module UploaderHelper
     settings[:folder] = settings[:folder].to_s
     if settings[:create_folder] && !File.directory?(settings[:folder])
       FileUtils.mkdir_p(settings[:folder])
-      FileUtils.chmod(0655, folder)
+      FileUtils.chmod(0777, settings[:folder])
     end
 
     # folder validation
@@ -87,20 +87,22 @@ module UploaderHelper
 
     # check for destroy the file in the future
     if settings[:temporal_time] > 0
-      if defined?(ActiveJob::Base)
-        TemporalFileJob.set(wait: settings[:is_temporal]).perform_later(file_path)
-        {
-            "file" => file_path,
-            "name"=> File.basename(file_path),
-            "size"=> File.size(file_path),
-            "url"=> file_path_to_url(file_path),
-            "type"=> uploaded_io.content_type,
-            "deleteUrl"=> ""
-        }
-      else
-        Rails.logger.error " ******************** Camaleon: This version of rails doesn't support active job, please install a gem or manage your file destroy manually."
+      Thread.new do
+        sleep(settings[:temporal_time])
+        FileUtils.rm_rf(file_path) if File.exist?(file_path) && !File.directory?(file_path)
+        ActiveRecord::Base.connection.close
       end
     end
+
+    # returning data
+    {
+        "file" => file_path,
+        "name"=> File.basename(file_path),
+        "size"=> File.size(file_path),
+        "url"=> file_path_to_url(file_path),
+        "type"=> uploaded_io.content_type,
+        "deleteUrl"=> ""
+    }
   end
 
   # helper to find an available filename for file_path in that directory
@@ -148,4 +150,61 @@ module UploaderHelper
     file.gsub(ext, "_crop#{ext}")
   end
 
+  # resize and crop a file
+  # Params:
+  #   file: (String) File path
+  #   w: (Integer) width
+  #   h: (Integer) height
+  #   gravity: (Sym, default :north_east) Crop position: :north_west, :north, :north_east, :east, :south_east, :south, :south_west, :west, :center
+  #   overwrite: (Boolean, default true) true for overwrite current image with resized resolutions, false: create other file called with prefix "crop_"
+  # Return: (String) file path where saved this cropped
+  def cama_resize_and_crop(file, w, h, settings = {})
+    settings = {gravity: :north_east, overwrite: true}.merge(settings)
+    img = MiniMagick::Image.open(file)
+    w_original, h_original = [img[:width].to_f, img[:height].to_f]
+
+    # check proportions
+    if w_original * h < h_original * w
+      op_resize = "#{w.to_i}x"
+      w_result = w
+      h_result = (h_original * w / w_original)
+    else
+      op_resize = "x#{h.to_i}"
+      w_result = (w_original * h / h_original)
+      h_result = h
+    end
+
+    w_offset, h_offset = cama_crop_offsets_by_gravity(settings[:gravity], [w_result, h_result], [ w, h])
+    img.combine_options do |i|
+      i.resize(op_resize)
+      i.gravity(settings[:gravity])
+      i.crop "#{w.to_i}x#{h.to_i}+#{w_offset}+#{h_offset}!"
+    end
+
+    img.write(file) if settings[:overwrite]
+    img.write(file = uploader_verify_name(File.join(File.dirname(file), "crop_#{File.basename(file)}"))) unless settings[:overwrite]
+    file
+  end
+
+  private
+  # helper for resize and crop method
+  def cama_crop_offsets_by_gravity(gravity, original_dimensions, cropped_dimensions)
+    original_width, original_height = original_dimensions
+    cropped_width, cropped_height = cropped_dimensions
+
+    vertical_offset = case gravity
+                        when :north_west, :north, :north_east then 0
+                        when :center, :east, :west then [ ((original_height - cropped_height) / 2.0).to_i, 0 ].max
+                        when :south_west, :south, :south_east then (original_height - cropped_height).to_i
+                      end
+
+    horizontal_offset = case gravity
+                          when :north_west, :west, :south_west then 0
+                          when :center, :north, :south then [ ((original_width - cropped_width) / 2.0).to_i, 0 ].max
+                          when :north_east, :east, :south_east then (original_width - cropped_width).to_i
+                        end
+
+    return [ horizontal_offset, vertical_offset ]
+  end
+
 end

data/app/views/admin/plugins/_plugins_list.html.erb

@@ -18,7 +18,7 @@
                     <td>
                         <%= plugin["title"] %>
                         <br>
-                        <% r[:links] << (link_to("#{t('admin.sidebar.information')}", plugin_asset_path(plugin["key"], "docs/index.html"),  onclick: "do_modal_plugin2(this, '#{plugin["title"]}'); return false;", title: "#{plugin["title"]}")) if File.exist?(File.join(plugin["path"], "assets", "docs/index.html")) %>
+                        <% r[:links] << (link_to("#{t('admin.sidebar.information')}", "http://camaleon.tuzitio.com/store/plugins/info/#{plugin["key"]}", target: "_blank",  title: "#{plugin["title"]}")) %>
                         <% hook_run(plugin, "plugin_options", r) if status %>
                         <%= raw r[:links].join(" | ") %>
                     </td>
@@ -27,8 +27,6 @@
                     <td><%= t("admin.plugins.status_#{status}") %></td>
                     <td>
                         <%= link_to raw("<i class='fa fa-#{status ? "check-square" : "square"}'></i>"), {action: :toggle, id: plugin["key"], status: status }, class: "btn btn-default btn-xs", title: "#{status ? t('admin.button.disable_plugin') : t('admin.button.activate_plugin') }" %>
-                        <%#= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: plugin["key"] },
-                                    method: :delete, data: { confirm: t('admin.message.delete_item') }, class: "btn btn-danger btn-xs", title: "#{t('admin.button.delete')}" if plugin_can_be_deleted?(plugin["key"]) %>
                     </td>
                 </tr>
             <% end %>
@@ -37,23 +35,4 @@
         </table>
         <%= content_tag("div", raw(t('admin.message.data_found_list')), class: "alert alert-warning") if plugins.empty? %>
     </div>
-
-</div>
-
-<script type="text/javascript" charset="utf-8">
-    function do_modal_plugin(ele, url_asset){
-        $.get($(ele).attr("href"), function(res){
-            var template = $('<div class="modal" id="modal_large" tabindex="-1" role="dialog" aria-labelledby="largeModalHead" aria-hidden="true"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <h4 class="modal-title" id="largeModalHead">Large Modal</h4> </div> <div class="modal-body"></div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">'+lang.close+'</button> </div> </div> </div> </div>');
-            template.find(".modal-body").html(res.replace(/src=\"/g, 'src="'+url_asset));
-            template.find("#largeModalHead").html($(ele).attr("title"));
-            template.modal();
-        });
-    }
-
-    function do_modal_plugin2(item, title){
-        var title = 'Plugin '+ title;
-        var template = $('<div class="modal" id="modal_large" tabindex="-1" role="dialog" aria-labelledby="largeModalHead" aria-hidden="true"> <div class="modal-dialog modal-lg"> <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <h4 class="modal-title" id="largeModalHead">'+title+'</h4> </div> <div class="modal-body"></div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">'+lang.close+'</button> </div> </div> </div> </div>');
-        template.find(".modal-body").html('<iframe src="'+$(item).attr("href")+'" width="100%" height="500px" frameborder=0></iframe>');
-        template.modal();
-    }
-</script>
+</div>

data/config/initializers/fix_ssl.rb

@@ -8,12 +8,18 @@ module Net
     # fix ssl for facebook connection
     def use_ssl=(flag)
       if @address.include?("facebook.com")
-        self.ca_file = Rails.root.join('lib/ca-bundle.crt').to_s
+        self.ca_file =  File.join($camaleon_engine_dir, 'lib/ca-bundle.crt').to_s
         self.verify_mode = OpenSSL::SSL::VERIFY_PEER
         self.original_use_ssl = flag
-      else
-        super
+
+      else # original method
+        flag = flag ? true : false
+        if started? and @use_ssl != flag
+          raise IOError, "use_ssl value changed, but session already started"
+        end
+        @use_ssl = flag
       end
+
     end
   end
 end

data/config/initializers/sass.rb

@@ -0,0 +1,42 @@
+module Sass::Script::Functions
+  # similar to asset_path with prefix for current theme asset
+  # def theme_path(path, options = {})
+  #   asset_path("#{get_theme_prefix}#{path}", options)
+  # end
+
+  # similar to asset_url with prefix for current theme asset
+  def theme_asset(path, options = {})
+    asset_url("#{get_theme_prefix}#{path}", options)
+  end
+
+  # # similar to asset_path with prefix for current plugin asset
+  # def plugin_path(path, options = {})
+  #   asset_path("#{get_plugin_prefix}#{path}", options)
+  # end
+
+  # similar to asset_url with prefix for current plugin asset
+  def plugin_asset(path, options = {})
+    asset_url("#{get_plugin_prefix}#{path}", options)
+  end
+
+  private
+  # get plugin asset prefix
+  def get_plugin_prefix
+    file = sprockets_context.filename
+    res = ""
+    if file.include?("/app/apps/plugins/")
+      res = "themes/#{file.split("/app/apps/plugins/").last.split("/").first}/assets/"
+    end
+    res
+  end
+
+  # get theme asset prefix
+  def get_theme_prefix
+    file = sprockets_context.filename
+    res = ""
+    if file.include?("/app/apps/themes/")
+      res = "themes/#{file.split("/app/apps/themes/").last.split("/").first}/assets/"
+    end
+    res
+  end
+end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/generators/cplugin_generator.rb

@@ -20,11 +20,13 @@ class CpluginGenerator < Rails::Generators::Base
       else
 
         # helpers + controllers
-        plugin_app = Rails.root.join("lib", "generators", "cplugin_template", "app_#{get_plugin_name}")
+        plugin_app = File.join($camaleon_engine_dir, "lib", "generators", "cplugin_template", "app_#{get_plugin_name}")
         plugin_folder = File.join(plugin_app, "apps", "plugins", get_plugin_name)
 
+        FileUtils.rm_r(plugin_app) if Dir.exist?(plugin_app)
+
         # tmp copy
-        FileUtils.cp_r(Rails.root.join("lib", "generators", "cplugin_template", "app"), plugin_app)
+        FileUtils.cp_r(File.join($camaleon_engine_dir, "lib", "generators", "cplugin_template", "app"), plugin_app)
         FileUtils.mv(File.join(plugin_app, "apps", "plugins", "my_plugin"), plugin_folder) rescue nil
 
         # configuration

data/lib/generators/ctheme_generator.rb

@@ -19,11 +19,13 @@ class CthemeGenerator < Rails::Generators::Base
       else
 
         # helpers + controllers
-        plugin_app = Rails.root.join("lib", "generators", "ctheme_template", "app_#{get_theme_name}")
+        plugin_app = File.join($camaleon_engine_dir, "lib", "generators", "ctheme_template", "app_#{get_theme_name}")
         plugin_folder = File.join(plugin_app, "apps", "themes", get_theme_name)
 
+        FileUtils.rm_r(plugin_app) if Dir.exist?(plugin_app)
+
         # tmp copy
-        FileUtils.cp_r(Rails.root.join("lib", "generators", "ctheme_template", "app"), plugin_app)
+        FileUtils.cp_r(File.join($camaleon_engine_dir, "lib", "generators", "ctheme_template", "app"), plugin_app)
         FileUtils.mv(File.join(plugin_app, "apps", "themes", "my_theme"), plugin_folder) rescue nil
 
         # configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies: []
 description: Camaleon CMS is a dynamic and advanced content management system based
   on Ruby on Rails 4 as an alternative to Wordpress.
@@ -596,6 +596,7 @@ files:
 - config/initializers/mobu.rb
 - config/initializers/page_caching.rb
 - config/initializers/rufus_cron.rb
+- config/initializers/sass.rb
 - config/locales/admin/en.yml
 - config/locales/admin/es.yml
 - config/locales/ar.yml