rails_admin_settings 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc19ffd66918e198000472862fc7045515bf282
-  data.tar.gz: 952677372ec953f096e51741cd0ef947cb955bdc
+  metadata.gz: 04813caf7297c8963bfeb2ef852f48b59bad20e0
+  data.tar.gz: e7f5313d59b0d98ee04fd229f9cf3667b6050e06
 SHA512:
-  metadata.gz: a92df07ac3ba6a9f2e9d1789f41d17ea70a8fdd1a0aa29797dfc56b3a3319d5b9237f4bab61a4d1ab6c2d5ddcc9c0195dd6c8d8509b7d5c5b3172a96bad9cda3
-  data.tar.gz: f5d158f45f9ec64d5093a6c44619a63c3faef976ae316d6ef17f45d73670bc2fc495d4e2bf035c9a20dcfe7547ff867e1ffc02b59f44106d07e2781f73c9f2b2
+  metadata.gz: 1f4d2ab7a2e3d31fa5f40bc52e61fc6ba8429d64068a2ab6fe033224937b701458ad454e18e3e2aba672415a3fcdc8c129c2d38270af5fa945578abad0367a50
+  data.tar.gz: df8efddcdcce6daf6a99ec0759e98e2747abed205b06df39b562ca5c4cc1215336078efb06e181627359cf915e6d5244b036601705622d0dcc3486798ebb101f

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea
+/uploads

data/.travis.yml

@@ -1,5 +1,20 @@
 language: ruby
 services: mongodb
+
+notifications:
+  email: false
+
 rvm:
   - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+
+env:
+- "UPLOADS=paperclip"
+- "UPLOADS=carrierwave"
 
+gemfile:
+  - Gemfile
+  - gemfiles/mongoid-3.0.gemfile
+  - gemfiles/mongoid-3.1.gemfile
+  - gemfiles/mongoid-4.0.gemfile

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/rs-pro/rails_admin_settings.png?branch=master)](http://travis-ci.org/rs-pro/rails_admin_settings)
 [![Dependency Status](https://gemnasium.com/rs-pro/rails_admin_settings.png)](https://gemnasium.com/rs-pro/rails_admin_settings)
 
-Note: This gem currently supports Mongoid only, as I don't need AR support.
+Note: This gem currently supports Mongoid 3/4 only, as I don't need AR support.
 
 Pull request with AR support will be welcome
 

data/app/models/rails_admin_settings/setting.rb

@@ -25,7 +25,6 @@ module RailsAdminSettings
     include RailsAdminSettings::Uploads
     include RailsAdminSettings::Validation
 
-
     def disabled?
       !enabled
     end

data/gemfiles/mongoid-3.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "3.0.0-stable"
+gem "activemodel", "~> 3.2"
+
+gemspec path: "../"

data/gemfiles/mongoid-3.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "3.1.0-stable"
+
+gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+
+gemspec path: "../"

data/lib/rails_admin_settings/processing.rb

@@ -10,13 +10,21 @@ module RailsAdminSettings
       (RailsAdminSettings.types - ['phone', 'integer', 'yaml']).include? type
     end
 
+    def upload_type?
+      ['file', 'image'].include? type
+    end
+
     def html_type?
       ['html', 'sanitized'].include? type
     end
 
     def value
-      if file_type?
-        file.url
+      if upload_type?
+        if file?
+          file.url
+        else
+          nil
+        end
       elsif raw.blank? || disabled?
         default_value
       else

data/lib/rails_admin_settings/settings.rb

@@ -1,32 +1,39 @@
+require 'thread'
+
 class Settings
   cattr_accessor :file_uploads_supported, :file_uploads_engine, :settings
   @@file_uploads_supported = false
   @@file_uploads_engine = false
+  @@mutex = Mutex.new
 
   class << self
     @@loaded = false
     @@settings = {}
 
     def load!
-      if @@loaded
-        false
-      else
-        @@settings = {}
-        RailsAdminSettings::Setting.all.each do |setting|
-          @@settings[setting.key] = setting
+      @@mutex.synchronize do
+        if @@loaded
+          false
+        else
+          @@settings = {}
+          RailsAdminSettings::Setting.all.each do |setting|
+            @@settings[setting.key] = setting
+          end
+          @@loaded = true
+          true
         end
-        @@loaded = true
-        true
       end
     end
 
     def unload!
-      if @@loaded
-        @@settings = {}
-        @@loaded = false
-        true
-      else
-        false
+      @@mutex.synchronize do
+        if @@loaded
+          @@settings = {}
+          @@loaded = false
+          true
+        else
+          false
+        end
       end
     end
 
@@ -54,12 +61,29 @@ class Settings
         value = value.to_yaml
       end
 
+      is_file = !options[:type].nil? && (options[:type] == 'image' || options[:type] == 'file')
+      if is_file
+        options[:raw] = ''
+      else
+        options[:raw] = value
+      end
+
       if @@settings[key].nil?
-        write_to_database(key, options.merge(key: key, raw: value))
+        write_to_database(key, options.merge(key: key))
       else
-        @@settings[key].update_attributes!(options.merge(raw: value))
-        @@settings[key]
+        @@mutex.synchronize do
+          @@settings[key].update_attributes!(options)
+        end
       end
+
+      if is_file
+        @@mutex.synchronize do
+          @@settings[key].file = value
+          @@settings[key].save!
+        end
+      end
+
+      @@settings[key]
     end
 
     def valid_yaml?(value)
@@ -100,6 +124,7 @@ class Settings
       load!
       key = key.to_s
       options.merge!(default: value)
+
       if @@settings[key].nil?
         create_setting(key, options).val
       else
@@ -116,6 +141,7 @@ class Settings
       key = key.to_s
       options.symbolize_keys!
       options[:raw] = options.delete(:default)
+
       if @@settings[key].nil?
         write_to_database(key, options.merge(key: key))
       else
@@ -139,9 +165,12 @@ class Settings
     def destroy!(key)
       load!
       key = key.to_s
-      unless @@settings[key].nil?
-        @@settings[key].destroy
-        @@settings.delete(key)
+
+      @@mutex.synchronize do
+        unless @@settings[key].nil?
+          @@settings[key].destroy
+          @@settings.delete(key)
+        end
       end
     end
 
@@ -153,20 +182,23 @@ class Settings
 
     def write_to_database(key, options)
       key = key.to_s
-      @@settings[key] = RailsAdminSettings::Setting.create(options)
-      unless @@settings[key].persisted?
-        if @@settings[key].errors[:key].any?
-          @@settings[key] = RailsAdminSettings::Setting.where(key: key).first
-          if options[:raw].blank? && !@@settings[key].blank?
-            # do not update setting if it's not blank in DB and we want to make it blank
-          else
-            unless @@settings[key].update_attributes(options)
-              raise RailsAdminSettings::PersistenceException
+
+      @@mutex.synchronize do
+        @@settings[key] = RailsAdminSettings::Setting.create(options)
+        unless @@settings[key].persisted?
+          if @@settings[key].errors[:key].any?
+            @@settings[key] = RailsAdminSettings::Setting.where(key: key).first
+            if options[:raw].blank? && !@@settings[key].blank?
+              # do not update setting if it's not blank in DB and we want to make it blank
+            else
+              unless @@settings[key].update_attributes(options)
+                raise RailsAdminSettings::PersistenceException
+              end
             end
           end
         end
+        @@settings[key]
       end
-      @@settings[key]
     end
 
     def label key

data/lib/rails_admin_settings/types.rb

@@ -1,5 +1,5 @@
 module RailsAdminSettings
   def self.types
-    ['string', 'integer', 'html', 'sanitized', 'yaml', 'phone', 'email', 'address', 'file', 'url', 'domain', 'color']
+    ['string', 'integer', 'html', 'sanitized', 'yaml', 'phone', 'email', 'address', 'file', 'image', 'url', 'domain', 'color']
   end
 end

data/lib/rails_admin_settings/uploads.rb

@@ -5,7 +5,7 @@ module RailsAdminSettings
     def self.included(base)
       # carrierwave
       if base.respond_to?(:mount_uploader)
-        # puts "[rails_admin_settings] CarrierWave detected"
+        puts "[rails_admin_settings] CarrierWave detected"
         # base.field(:file, type: String)
         base.mount_uploader(:file, RailsAdminSettings::Uploads::CarrierWave)
         Settings.file_uploads_supported = true
@@ -13,16 +13,20 @@ module RailsAdminSettings
       # paperclip
       elsif Mongoid.const_defined?('Paperclip')
         base.send(:include, Mongoid::Paperclip)
-        # puts "[rails_admin_settings] PaperClip detected"
+        puts "[rails_admin_settings] PaperClip detected"
         base.field(:file, type: String)
-        base.has_mongoid_attached_file(:file)
+        if defined?(Rails)
+          base.has_mongoid_attached_file(:file)
+        else
+          base.has_mongoid_attached_file(:file, path: "#{File.dirname(__FILE__)}/../../uploads/:filename", url: '/uploads/:filename')
+        end
         base.send(:attr_accessor, :delete_file)
         base.before_validation { self.file.clear if self.delete_file == '1' }
 
         Settings.file_uploads_supported = true
         Settings.file_uploads_engine = :paperclip
       else
-        # puts "[rails_admin_settings] Uploads disabled"
+        puts "[rails_admin_settings] Uploads disabled"
       end
     end
   end

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/rails_admin_settings.gemspec

@@ -34,4 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "validates_email_format_of", "~> 1.5.3"
   spec.add_development_dependency "geocoder", "~> 1.1.6"
   spec.add_development_dependency "addressable", "~> 2.3.3"
+
+  spec.add_development_dependency "glebtv-carrierwave-mongoid"
+  spec.add_development_dependency "glebtv-mongoid-paperclip"
 end

data/spec/carrierwave_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe "Uploads" do
+  if Settings.file_uploads_engine != :carrierwave
+    pending "paperclip not detected, skipped. To run use UPLOADS=carrierwave rspec"
+  else
+    before :each do
+      f = "#{File.dirname(__FILE__)}/../uploads/1024x768.gif"
+      if File.file?(f)
+        File.unlink(f)
+      end
+    end
+    it 'supports file type' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'file')
+
+      # because we're not inside Rails
+      Settings.get(:file).file.root = '/'
+
+      Settings.get(:file).file.file.file.should eq "#{File.dirname(__FILE__).gsub('/spec', '/')}uploads/1024x768.gif"
+
+      File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif").should be_true
+    end
+
+    it 'supports image type' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'image')
+
+      # because we're not inside Rails
+      Settings.get(:file).file.root = '/'
+
+      Settings.get(:file).file.file.file.should eq "#{File.dirname(__FILE__).gsub('/spec', '/')}uploads/1024x768.gif"
+
+      File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif").should be_true
+    end
+  end
+end
+

data/spec/paperclip_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+
+describe "Uploads" do
+  if Settings.file_uploads_engine != :paperclip
+    pending "paperclip not detected, skipped. To run use UPLOADS=paperclip rspec"
+  else
+    Paperclip.options[:log] = false
+    before :each do
+      f = "#{File.dirname(__FILE__)}/../uploads/1024x768.gif"
+      if File.file?(f)
+        File.unlink(f)
+      end
+    end
+    it 'supports file type' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'file')
+      Settings.get(:file).file_file_name.should eq '1024x768.gif'
+      Settings.get(:file).file_file_size.should eq 4357
+      Settings.file[0..21].should eq '/uploads/1024x768.gif?'
+
+      File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif").should be_true
+    end
+
+    it 'supports image type' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'image')
+      Settings.get(:file).file_file_name.should eq '1024x768.gif'
+      Settings.get(:file).file_file_size.should eq 4357
+      Settings.file[0..21].should eq '/uploads/1024x768.gif?'
+
+      File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif").should be_true
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -12,6 +12,16 @@ require 'database_cleaner'
 require 'factory_girl'
 require 'mongoid-rspec'
 
+require "glebtv-mongoid-paperclip" if ENV['UPLOADS'] == 'paperclip'
+if ENV['UPLOADS'] == 'carrierwave'
+  require "glebtv-carrierwave-mongoid"
+  CarrierWave.configure do |config|
+    config.asset_host = proc do |file|
+      "http://localhost"
+    end
+  end
+end
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f|
   require f
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -206,6 +206,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.3
+- !ruby/object:Gem::Dependency
+  name: glebtv-carrierwave-mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: glebtv-mongoid-paperclip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mongoid / RailsAdmin App Settings management
 email:
 - glebtv@gmail.com
@@ -226,6 +254,9 @@ files:
 - app/views/rails_admin/main/_setting_value.html.haml
 - config/locales/en.rails_admin_settings.yml
 - config/locales/ru.rails_admin_settings.yml
+- gemfiles/mongoid-3.0.gemfile
+- gemfiles/mongoid-3.1.gemfile
+- gemfiles/mongoid-4.0.gemfile
 - lib/rails_admin_settings.rb
 - lib/rails_admin_settings/engine.rb
 - lib/rails_admin_settings/hex_color_validator.rb
@@ -240,12 +271,15 @@ files:
 - lib/rails_admin_settings/version.rb
 - rails_admin_settings.gemspec
 - spec/advanced_usage_spec.rb
+- spec/carrierwave_spec.rb
 - spec/database_trickery_spec.rb
 - spec/factories/setting.rb
 - spec/label_spec.rb
 - spec/model_spec.rb
+- spec/paperclip_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
+- spec/support/1024x768.gif
 - spec/support/database_cleaner.rb
 - spec/support/mongoid.rb
 - spec/support/mongoid.yml
@@ -270,18 +304,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Setting for Rails app with mongoid and RailsAdmin
 test_files:
 - spec/advanced_usage_spec.rb
+- spec/carrierwave_spec.rb
 - spec/database_trickery_spec.rb
 - spec/factories/setting.rb
 - spec/label_spec.rb
 - spec/model_spec.rb
+- spec/paperclip_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
+- spec/support/1024x768.gif
 - spec/support/database_cleaner.rb
 - spec/support/mongoid.rb
 - spec/support/mongoid.yml