golden-setting 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f164c6d98361ffa4e4b3771ce3cf17eafff21cfd
-  data.tar.gz: 25fc0397c0c46b4fc9b4d86a2cd6a94ba96318e8
+  metadata.gz: 512bed1909c6513efb9e69ae74b1dc7c2d8a0f95
+  data.tar.gz: 7ccc2a33821007ea7293f445b257c8311be4cc84
 SHA512:
-  metadata.gz: 400e88f42a4b4a1f174df3c8bb3931fbda32b6a82ba3e14cb4ff86a6ee1bc717e9745fdde75578fbb79747f7c62d02872f63078c40ef9dd5d67231d484c57364
-  data.tar.gz: 6ea526354f6ca07787eb6db00abfa26288b270188ad56ef97eb2090e6b293755cf8adc77c8eda2758c0200b3b2b22cd9973e931df302ad8be82f93b3ca729d5b
+  metadata.gz: fa58ff93a5ab01f2baa9a81f82abfb18e3e497592ad2d176013d8f2a7daddd0e60bf404664799e2958912dfb785a88846adbb32683235fe841a8b4ec86ef873c
+  data.tar.gz: a2f19af0367d4b98e0f66ed9deb4010f893987f47a26dd6b79555c14a97f582eba9e112f6f59b634af700ce703d367a4f701306378f929902eb1ba93927fa38b

data/README.md

@@ -14,7 +14,7 @@ gem 'cancancan'
 gem 'simple_form', '~> 3.0'
 gem 'bootstrap-sass'
 gem 'will_paginate'
-gem 'rails-theme-helper'
+gem 'golden-theme'
 ```
 
 If you add `gem 'protected_attributes'` in your `Gemfile`, remember to add
@@ -33,7 +33,7 @@ gem 'cancancan'
 gem 'simple_form', '>= 2.0', '< 3.0'
 gem 'bootstrap-sass'
 gem 'will_paginate'
-gem 'rails-theme-helper'
+gem 'golden-theme'
 ```
 
 Please make sure these gems are installed and configured properly.
@@ -68,6 +68,7 @@ You will need to add these basic configures of `golden-setting` for your needs.
 * `groups` for grouping settings with a name
 * `default_group` for saving settings with a group
 * `default_tab` for a group of settings shown in tab views
+* `before_actions` for setting up authentication filters
 
 Edit `config/initializers/golden_setting.rb` for more detail.
 
@@ -137,7 +138,7 @@ You can add virtaul settings for your application by setting defaults.
 Add `config/initializers/golden_setting_defaults.rb`.
 
 ```ruby
-YourApp::Application.config.after_initialize do
+Rails.application.config.after_initialize do
   Setting.defaults[:administrator] = 'tsechingho'
 end
 ```
@@ -152,7 +153,7 @@ Setting.administrator    # => 'tsechingho'
 You can also save default settings in database after initializing your application.
 
 ```ruby
-YourApp::Application.config.after_initialize do
+Rails.application.config.after_initialize do
   Setting.save_default :manager, 'tsechingho'
 end
 ```
@@ -165,6 +166,8 @@ Setting.object('manager').group    # => 'site'
 Setting.manager    # => 'tsechingho'
 ```
 
+For Rails 3 project, use `YourApp::Application.config.after_initialize` instead.
+
 ### Resourced settings
 
 Settings may be bound to any existing ActiveRecord object.

data/app/controllers/golden/setting/settings_controller.rb

@@ -1,5 +1,10 @@
 class Golden::Setting::SettingsController < ApplicationController
-  before_filter :authenticate_session!
+  if Golden::Setting.before_actions.blank?
+    raise "Please set config.before_actions like `authenticate_user!` for security."
+  end
+  Golden::Setting.before_actions.each do |action|
+    before_filter action.to_sym
+  end
   before_filter :load_setting_class, only: [:index, :create, :list, :batch_update]
   before_filter :new_setting, only: [:create]
   load_and_authorize_resource :setting, class: Golden::Setting.setting_class, parent: false
@@ -47,7 +52,7 @@ class Golden::Setting::SettingsController < ApplicationController
   def batch_update
     params[:setting].each do |setting, value|
       @setting_class.send "#{setting}=", value
-    end
+    end if params[:setting]
     redirect_to action: :index
   end
 

data/lib/generators/golden/setting/USAGE

@@ -7,8 +7,8 @@ Example:
     This will create/modify:
         db/migrate/20130516050309_create_golden_settings.rb
         app/models/setting.rb
-        app/assets/javascripts/application.js
-        app/assets/stylesheets/application.css
+        app/assets/javascripts/application.js(.coffee)
+        app/assets/stylesheets/application.css(.sass|.scss)
         config/initializers/golden_setting.rb
         config/application.rb
         config/locales/golden/settings.en.yml

data/lib/generators/golden/setting/install_generator.rb

@@ -24,8 +24,9 @@ class Golden::Setting::InstallGenerator < Rails::Generators::NamedBase
     template file, File.join('app/models', class_path, "#{file_name}.rb"), verbose: false
   end
 
-  def inject_javascript
+  def inject_javascript_js
     file = 'app/assets/javascripts/application.js'
+    return unless File.exists? file
     log :javascripts, 'application.js'
     sentinel = "//= require_tree .\n"
     insert_into_file file, before: sentinel, verbose: false do
@@ -33,8 +34,19 @@ class Golden::Setting::InstallGenerator < Rails::Generators::NamedBase
     end
   end
 
-  def inject_stylesheet
+  def inject_javascript_coffee
+    file = 'app/assets/javascripts/application.js.coffee'
+    return unless File.exists? file
+    log :javascripts, 'application.js.coffee'
+    sentinel = "#= require_tree .\n"
+    insert_into_file file, before: sentinel, verbose: false do
+      "#= require golden/setting/settings\n"
+    end
+  end
+
+  def inject_stylesheet_css
     file = 'app/assets/stylesheets/application.css'
+    return unless File.exists? file
     log :stylesheets, 'application.css'
     sentinel = " *= require_self\n"
     insert_into_file file, before: sentinel, verbose: false do
@@ -42,6 +54,26 @@ class Golden::Setting::InstallGenerator < Rails::Generators::NamedBase
     end
   end
 
+  def inject_stylesheet_sass
+    file = 'app/assets/stylesheets/application.css.sass'
+    return unless File.exists? file
+    log :stylesheets, 'application.css.sass'
+    sentinel = "//= require_self\n"
+    insert_into_file file, before: sentinel, verbose: false do
+      "//= require golden/setting/settings\n"
+    end
+  end
+
+  def inject_stylesheet_scss
+    file = 'app/assets/stylesheets/application.css.scss'
+    return unless File.exists? file
+    log :stylesheets, 'application.css.scss'
+    sentinel = "//= require_self\n"
+    insert_into_file file, before: sentinel, verbose: false do
+      "//= require golden/setting/settings\n"
+    end
+  end
+
   def generate_initializer
     file = 'golden_setting.rb'
     log :initializer, file
@@ -68,14 +100,6 @@ class Golden::Setting::InstallGenerator < Rails::Generators::NamedBase
     route "mount Golden::Setting::Engine, at: '/'\n"
   end
 
-  def inject_controller
-    file = 'app/controllers/application_controller.rb'
-    sentinel = "protect_from_forgery with: :exception\n"
-    insert_into_file file, after: sentinel do
-      "  alias_method :authenticate_session!, :authenticate_user!\n"
-    end
-  end
-
   def inject_layout
     file = 'app/views/layouts/application.html.erb'
     sentinel = "<%= yield %>\n"

data/lib/generators/golden/setting/templates/golden_setting.rb

@@ -36,4 +36,9 @@ Golden::Setting.configure do |config|
 
   # Add more allowed fields for strong paramters.
   #config.permitted_fields += []
+
+  # Define before_actions.
+  config.before_actions += [
+    'authenticate_user!'
+  ]
 end

data/lib/golden/setting.rb

@@ -40,6 +40,9 @@ module Golden
       :field_type, :field_values, :group, :name, :value
     ]
 
+    mattr_accessor :before_actions
+    @@before_actions = []
+
     def self.configure
       yield self
     end

data/lib/golden/setting/version.rb

@@ -1,5 +1,5 @@
 module Golden
   module Setting
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: golden-setting
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Tse-Ching Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord