activeadmin-settings 0.3.5 → 0.4.0

data/README.md

@@ -2,9 +2,11 @@
 
 **IN DEVELOPMENT**
 
-Easy to use general purpose settings backend for activeadmin. At the moment only [activeadmin-mongoid](https://github.com/elia/activeadmin-mongoid/) is suported. ActiveRecord support is not in my plans, so everyone interested is welcome on a board.
+**TODO**: use yaml file only for settings synchronisation, all settings should be stored in db with all those default values and other meta.
 
-![ActiveadminSettings Demo](https://raw.github.com/alexkravets/activeadmin-settings/master/img/activeadmin-settings-demo.jpg)
+Easy to use general purpose settings backend for activeadmin.
+
+![ActiveadminSettings Demo](https://raw.github.com/slate-studio/activeadmin-settings/master/img/activeadmin-settings-demo.jpg)
 
 
 ### Installation
@@ -17,6 +19,22 @@ Run installer:
 
     $ rails g activeadmin_settings:install
 
+#### ActiveRecord
+
+    gem "aws-s3"
+    gem "fog"
+    gem "mini_magick"
+    gem "carrierwave"
+
+    gem "bson_ext"
+    gem "devise"
+    gem "activeadmin-settings"
+
+Run migrations:
+
+    $ rake activeadmin_settings:install:migrations
+    $ rake db:migrate
+
 #### Mongoid 2.x
 
 If you're using mongoid 2.x the gem expects to see **activeadmin-mongoid** and **carrierwave-mongoid** (for image uploading feature) in Gemfile. Here is a working example:
@@ -28,6 +46,7 @@ If you're using mongoid 2.x the gem expects to see **activeadmin-mongoid** and *
 
     gem "bson_ext"
     gem "mongoid"
+    gem "mongoid-globalize"
     gem "devise"
     gem "activeadmin-mongoid"
     gem "activeadmin-settings"
@@ -51,6 +70,7 @@ Here is an example of Gemfile with a support of 3.x version:
     # Activeadmin
     gem 'devise',               '>= 2.1.2'
     gem 'activeadmin-mongoid',  git: 'git://github.com/elia/activeadmin-mongoid.git'
+    gem "mongoid-globalize"
     gem 'activeadmin-settings'
 
 

data/activeadmin-settings.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.version       = ActiveadminSettings::VERSION
   gem.authors       = ["Alex Kravets"]
   gem.email         = ["santyor@gmail.com"]
-  gem.homepage      = "https://github.com/alexkravets/activeadmin-settings"
+  gem.homepage      = "https://github.com/slate-studio/activeadmin-settings"
   gem.description   = "Easy to use general purpose settings backend for activeadmin"
   gem.summary       = ""
 
@@ -14,6 +14,4 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-
-  gem.add_runtime_dependency "mongoid_globalize"
-end
+end

data/app/models/activeadmin_settings/picture.rb

@@ -1,48 +1,69 @@
-class ActiveadminSettings::Picture
-  include Mongoid::Document
-  include Mongoid::Timestamps
+module ActiveadminSettings
+  module PictureMethods
 
-  # Fields
-  field :data_file_size
-  field :data_content_type
-  field :width,   :type => Integer
-  field :height,  :type => Integer
+    def self.included(base)
+      # Features
+      base.mount_uploader :data, ActiveadminSettings::RedactorPictureUploader
+    end
 
-  # Features
-  mount_uploader :data, ActiveadminSettings::RedactorPictureUploader
+    # Helpers
+    def has_dimensions?
+      respond_to?(:width) && respond_to?(:height)
+    end
 
-  # Scopes
-  default_scope order_by(:created_at => :desc)
+    def image?
+      ActiveadminSettings::IMAGE_TYPES.include?(data_content_type)
+    end
 
-  # Helpers
-  def has_dimensions?
-    respond_to?(:width) && respond_to?(:height)
-  end
+    def url
+      data.url
+    end
 
-  def image?
-    ActiveadminSettings::IMAGE_TYPES.include?(data_content_type)
-  end
+    def image
+      url
+    end
 
-  def url
-    data.url
-  end
+    def thumb
+      data.thumb.url
+    end
 
-  def image
-    url
-  end
+    def as_json_methods
+      [:image, :thumb]
+    end
 
-  def thumb
-    data.thumb.url
+    def as_json(options = nil)
+      options = {
+        :methods => as_json_methods
+      }
+      super options
+    end
   end
 
-  def as_json_methods
-    [:image, :thumb]
-  end
+  if defined?(Mongoid)
+    class Picture
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      # Fields
+      field :data_file_size
+      field :data_content_type
+      field :width,   :type => Integer
+      field :height,  :type => Integer
+
+      include PictureMethods
+
+      # Scopes
+      default_scope order_by(:created_at => :desc)
+    end
+  else
+    class Picture < ActiveRecord::Base
+
+      attr_accessible :data_content_type, :data_file_size, :height, :width, :data
+
+      include PictureMethods
 
-  def as_json(options = nil)
-    options = {
-      :methods => as_json_methods
-    }
-    super options
+      # Scopes
+      default_scope order('created_at desc')
+    end
   end
-end
+end

data/app/models/activeadmin_settings/setting.rb

@@ -1,59 +1,85 @@
-class ActiveadminSettings::Setting
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Globalize
-
-  # Fields
-  field :name
-  
-  translates do
-    field :string, :default => ""
-    fallbacks_for_empty_translations!
-  end
+module ActiveadminSettings
+  module SettingMethods
+    def self.included(base)
+      base.mount_uploader  :file, ActiveadminSettings::SettingsFileUploader
 
-  mount_uploader  :file, ActiveadminSettings::SettingsFileUploader
+      # Validators
+      base.validates_presence_of   :name
+      base.validates_uniqueness_of :name
+      base.validates_length_of     :name, minimum: 1
 
-  # Validators
-  validates_presence_of   :name
-  validates_uniqueness_of :name
-  validates_length_of     :name, minimum: 1
+      base.extend ClassMethods
+    end
 
-  # Indexes
-  index :name rescue index name: 1
-              # Mongoid 3.x workaround
 
-  # Instance
-  def type
-    (ActiveadminSettings.all_settings[name]["type"] ||= "string").to_s
-  end
+    # Class
+    module ClassMethods
+      def initiate_setting(name)
+        s = self.new(name: name)
+        if s.type == "text" or s.type == "html"
+          s.string = s.default_value
+        end
+        s.save
+        s
+      end
+    end
 
-  def description
-    (ActiveadminSettings.all_settings[name]["description"] ||= "").to_s
-  end
 
-  def default_value
-    val = (ActiveadminSettings.all_settings[name]["default_value"] ||= "").to_s
-    
-    if type == "file" and not val.include? '//'
-      val = ActionController::Base.helpers.asset_path(val)
+    # Instance
+    def type
+      (ActiveadminSettings.all_settings[name]["type"] ||= "string").to_s
+    end
+
+    def description
+      (ActiveadminSettings.all_settings[name]["description"] ||= "").to_s
+    end
+
+    def default_value
+      val = (ActiveadminSettings.all_settings[name]["default_value"] ||= "").to_s
+
+      if type == "file" and not val.include? '//'
+        val = ActionController::Base.helpers.asset_path(val)
+      end
+
+      val
+    end
+
+    def value
+      val = respond_to?(type) ? send(type).to_s : send(:string).to_s
+      val = default_value if val.empty?
+      val.html_safe
     end
-    
-    val
-  end
 
-  def value
-    val = respond_to?(type) ? send(type).to_s : send(:string).to_s
-    val = default_value if val.empty?
-    val.html_safe
   end
 
-  # Class
-  def self.initiate_setting(name)
-    s = self.new(name: name)
-    if s.type == "text" or s.type == "html"
-      s.string = s.default_value
+  if defined?(Mongoid)
+    class Setting
+      include Mongoid::Document
+      include Mongoid::Timestamps
+      include Mongoid::Globalize
+
+      # Fields
+      field :name
+
+      translates do
+        field :string, :default => ""
+        fallbacks_for_empty_translations!
+      end
+
+      include SettingMethods
+
+      def self.[](name)
+        find_or_create_by(:name => name).value
+      end
+    end
+  else
+    class Setting < ActiveRecord::Base
+      include SettingMethods
+      attr_accessible :name, :string, :file
+
+      def self.[](name)
+        find_or_create_by_name(name).value
+      end
     end
-    s.save
-    s
   end
 end

data/db/migrate/20121123145121_create_activeadmin_settings_pictures.rb

@@ -0,0 +1,13 @@
+class CreateActiveadminSettingsPictures < ActiveRecord::Migration
+  def change
+    create_table :activeadmin_settings_pictures do |t|
+      t.string :data
+      t.string :data_file_size
+      t.string :data_content_type
+      t.integer :width
+      t.integer :height
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20121123145237_create_activeadmin_settings_settings.rb

@@ -0,0 +1,11 @@
+class CreateActiveadminSettingsSettings < ActiveRecord::Migration
+  def change
+    create_table :activeadmin_settings_settings do |t|
+      t.string :name
+      t.string :string
+      t.string :file
+
+      t.timestamps
+    end
+  end
+end

data/lib/activeadmin-settings.rb

@@ -1,8 +1,10 @@
 require "activeadmin-settings/version"
 
-require "mongoid_globalize"
-
 module ActiveadminSettings
+  def self.table_name_prefix
+    'activeadmin_settings_'
+  end
+
   require 'activeadmin-settings/engine'
   require 'activeadmin-settings/helper'
   require 'activeadmin-settings/routing'

data/lib/activeadmin-settings/helper.rb

@@ -1,12 +1,12 @@
 module ActiveadminSettings
   module Helpers
     def settings_value(name)
-      Setting.find_or_create_by(name: name).value
+      Setting[name]
     end
 
     def settings_link_value(name, html_options={})
-      val = Setting.find_or_create_by(name: name).value
-      
+      val = Setting[name]
+
       if not val.empty? # add regular expression check here
         title, url = val.split(')')
         title.gsub!('(', '').strip!
@@ -14,7 +14,7 @@ module ActiveadminSettings
 
         link_to(title, url, html_options)
       end
-    end    
+    end
 
     module_function :settings_value, :settings_link_value
   end

data/lib/activeadmin-settings/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSettings
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-settings
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongoid_globalize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2012-11-28 00:00:00.000000000 Z
+dependencies: []
 description: Easy to use general purpose settings backend for activeadmin
 email:
 - santyor@gmail.com
@@ -52,6 +36,8 @@ files:
 - app/views/admin/settings/_admins_table.html.erb
 - app/views/admin/settings/_index.html.erb
 - app/views/admin/settings/_settings_table.html.erb
+- db/migrate/20121123145121_create_activeadmin_settings_pictures.rb
+- db/migrate/20121123145237_create_activeadmin_settings_settings.rb
 - img/activeadmin-settings-demo.jpg
 - lib/activeadmin-settings.rb
 - lib/activeadmin-settings/.DS_Store
@@ -73,7 +59,7 @@ files:
 - vendor/assets/javascripts/redactor.js.erb
 - vendor/assets/stylesheets/activeadmin_settings.css.scss
 - vendor/assets/stylesheets/redactor.css
-homepage: https://github.com/alexkravets/activeadmin-settings
+homepage: https://github.com/slate-studio/activeadmin-settings
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -85,18 +71,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2595808076055630025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2595808076055630025
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24