mix-rails-settings 0.22.0 → 0.23.0

data/app/models/admix/settings_datagrid.rb

@@ -3,7 +3,7 @@ class Admix::SettingsDatagrid
   include Datagrid
 
   scope do
-    Setting.desc(:name)
+    Setting
   end
 
   filter :name, :string

data/app/models/setting.rb

@@ -1,19 +1,11 @@
-class Setting
-  include Mongoid::Document
-
-  field :name,      type: String
-  field :key,       type: String
-  field :value
-  field :activated,  type: Boolean
-  field :system,    type: Boolean, default: false
-
-  validates_uniqueness_of :key
+class Setting < ActiveRecord::Base
+  attr_accessible :activated, :key, :name, :system, :value, :image, :image_cache
 
   mount_uploader :image, Settings::ImageUploader
-
+  
   def self.app_title
     begin
-      Setting.find_by(key: 'app_title', activated: true).value
+      Setting.where(key: 'app_title', activated: true).first.value
     rescue
       false
     end
@@ -21,7 +13,7 @@ class Setting
 
   def self.app_email
     begin
-      Setting.find_by(key: 'app_email', activated: true).value
+      Setting.where(key: 'app_email', activated: true).first.value
     rescue
       false
     end
@@ -29,7 +21,7 @@ class Setting
   
   def self.admix_logo
     begin
-      Setting.find_by(key: 'admix_logo', activated: true)
+      Setting.where(key: 'admix_logo', activated: true).first
     rescue
       false
     end
@@ -37,7 +29,7 @@ class Setting
 
   def self.link_twitter
     begin
-      Setting.find_by(key: 'link_twitter', activated: true).value
+      Setting.where(key: 'link_twitter', activated: true).first.value
     rescue
       false
     end
@@ -45,7 +37,7 @@ class Setting
 
   def self.link_facebook
     begin
-      Setting.find_by(key: 'link_facebook', activated: true).value
+      Setting.where(key: 'link_facebook', activated: true).first.value
     rescue
       false
     end
@@ -53,7 +45,7 @@ class Setting
 
   def self.albums_watermark
     begin
-      Setting.find_by(key: 'albums_watermark', activated: true)
+      Setting.where(key: 'albums_watermark', activated: true).first
     rescue
       false
     end
@@ -61,10 +53,11 @@ class Setting
 
   def self.albums_title
     begin
-      Setting.find_by(key: 'albums_title', activated: true).value
+      Setting.where(key: 'albums_title', activated: true).first.value
     rescue
       false
     end
   end
 
+
 end

data/app/uploaders/settings/image_uploader.rb

@@ -11,14 +11,13 @@ class Settings::ImageUploader < CarrierWave::Uploader::Base
   include Sprockets::Helpers::RailsHelper
   include Sprockets::Helpers::IsolatedHelper
 
-  # Choose what kind of storage to use for this uploader:
-  storage :grid_fs
+  
   # storage :fog
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   def cache_dir

data/db/migrate/20130206201915_create_settings.rb

@@ -0,0 +1,13 @@
+class CreateSettings < ActiveRecord::Migration
+  def change
+    create_table :settings do |t|
+      t.string :name
+      t.string :key
+      t.string :value
+      t.boolean :activated
+      t.boolean :system
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130206212203_add_image_to_setting.rb

@@ -0,0 +1,5 @@
+class AddImageToSetting < ActiveRecord::Migration
+  def change
+    add_column :settings, :image, :string
+  end
+end

data/lib/mix-rails-settings/engine.rb

@@ -1,5 +1,10 @@
 module MixRailsSettings
   class Engine < ::Rails::Engine
+
+    config.generators do |g|                                                               
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
     
     initializer "settings.default_settings" do |app|
 

data/lib/mix-rails-settings/version.rb

@@ -1,7 +1,7 @@
 module MixRailsSettings
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 22
+    MINOR = 23
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-settings
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,6 +48,8 @@ files:
 - config/locales/settings.pt-BR.yml
 - config/locales/settings.en.yml
 - config/routes.rb
+- db/migrate/20130206201915_create_settings.rb
+- db/migrate/20130206212203_add_image_to_setting.rb
 - lib/tasks/settings_tasks.rake
 - lib/mix-rails-settings/version.rb
 - lib/mix-rails-settings/engine.rb
@@ -69,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4399716911145312350
+      hash: 1974863421853086140
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4399716911145312350
+      hash: 1974863421853086140
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24