real_settings 0.0.3 → 0.0.4

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+### 0.0.1
+
+* Initial release
+
+### 0.0.2
+
+* Fix bugs
+
+### 0.0.3
+
+* Fix bugs
+
+### 0.0.4
+
+* Add 'db_config_default' config method
+* change 'config' to 'file_config' for file config
+* Add smart convert setting type
+* Add column aut detect for simple_form

data/README.md

@@ -1,4 +1,4 @@
-# RealSettings
+# RealSettings [![Build Status](https://secure.travis-ci.org/Macrow/real_settings.png)](http://travis-ci.org/Macrow/real_settings)
 
 RealSettings is a real settings tool for Rails3.
 
@@ -30,17 +30,23 @@ Run install command and migrate database:
     
 ## Configuration in config/initializers/real_settings.rb
 
+Caution: settings in 'file_config' can't store in database.
+
 ```ruby
-Settings.config do
+Settings.file_config do |settings|
   settings.app_name = "My Application Name"
   settings.app_url = "http://www.my-application.com"
   settings.default_meta_keywords = "default meta keywords"
   settings.default_meta_description = "default meta description"
   # add some settings here
 end
+
+Settings.db_config_default do |settings|
+  settings.paginate_count = 10
+end
 ```
 
-## Caution: settings in config/initializers/real_settings.rb can't store in database.
+## Caution: settings set by 'file_config' in config/initializers/real_settings.rb can't store in database.
 
 ```ruby
 Settings.app_name # => "real_settings"
@@ -48,6 +54,11 @@ Settings.app_name = "new app name"
 Settings.app_name # => "new app name"
 Settings.save!
 Settings.app_name # => "real_settings"
+
+Settings.paginate_count # => 10
+Settings.paginate_count = 20
+Settings.save!
+Setttings.paginate_count # => 20
 ```
     
 ## Features & Usage
@@ -77,6 +88,27 @@ Settings.admin_name = "Macrow"
 Settings.save!
 ```
 
+### Smart Convert setting type
+
+```ruby
+Settings.a = 123
+Settings.b = 'string'
+Settings.c = [1,2,3]
+Settings.d = Time.now
+Settings.e = 12.345
+Settings.f = false
+
+Settings.save!
+Settings.reload!
+
+Settings.a # 123 # Fixnum
+Settings.b # 'string' # String
+Settings.c # [1,2,3] # Array
+Settings.d # Time.now # Time
+Settings.e # 12.345 # Float
+Settings.f # false # Boolean
+```
+
 ### Support has_settings method
 
 ```ruby    
@@ -147,10 +179,16 @@ form_for Settings, :as => :settings, :url => settings_update_path, :method => :p
   ......
 end
 
+simple_form_for Settings, :as => :settings, :url => settings_update_path, :method => :put do |f|
+  f.input :app_name
+  f.input :app_url
+  ......
+end
+
 # Update Action:
 Settings.update_settings(params[:settings])
 ```
- 
+
 ### Editing User's settings
 
 ```ruby
@@ -167,6 +205,12 @@ form_for @user.settings, :as => :settings, :url => user_settings_update_path(@us
   ......
 end
 
+simple_form_for @user.settings, :as => :settings, :url => user_settings_update_path(@user), :method => :put do |f|
+  f.input :notebook
+  f.input :mobile
+  ......
+end
+
 # Update Action:
 @user = User.find(params[:user_id])
 @user.settings.update_settings(params[:settings])

data/Rakefile

@@ -1,2 +1,8 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+task :default => :rspec
+
+task :rspec do
+  system 'rspec'
+end

data/lib/generators/real_settings/install/templates/real_settings.rb

@@ -1,6 +1,10 @@
-# Caution: settings in config/initializers/real_settings.rb can't store in database.
+# Caution: settings in 'file_config' can't store in database.
 
-Settings.config do |settings|
+Settings.file_config do |settings|
   # settings.app_name = "My Application Name"
   # settings.app_url = "http://www.my-application.com"
+end
+
+Settings.db_config_default do |settings|
+  # settings.paginate_count = 10
 end

data/lib/real_settings.rb

@@ -1,4 +1,6 @@
 require 'real_settings/version'
+require 'real_settings/smart_convert'
+require 'real_settings/fake_column'
 require 'real_settings/settings'
 require 'real_settings/owner_settings'
 require 'real_settings/relations'

data/lib/real_settings/fake_column.rb

@@ -0,0 +1,23 @@
+# Hack for simple_form auto column type detectation
+module RealSettings
+  class FakeColumn
+    attr_accessor :type, :number
+    
+    def initialize(type, number = false)
+      self.type = type.downcase.to_sym
+      self.number = number
+    end
+    
+    def number?
+      number
+    end
+    
+    def limit
+      if type == 'string'
+        255
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/real_settings/settings.rb

@@ -4,12 +4,23 @@ class Settings < ActiveRecord::Base
   cattr_accessor :__settings, :__file_settings, :__db_settings, :__temp_settings
   
   class << self
-    def config
+    def file_config
       yield self
       self.__file_settings = __temp_settings
       reload!
     end
     
+    def db_config_default
+      yield self
+      db_default = __temp_settings
+      reload!
+      self.__settings = db_default.merge(__db_settings)
+      save!
+    end
+    
+    # config method should be deprecated in future version
+    alias_method :config, :file_config
+    
     def to_hash
       __settings.dup
     end
@@ -33,9 +44,9 @@ class Settings < ActiveRecord::Base
       __settings.delete_if { |key, value| value == __db_settings[key] || __hook_for_delete_owner_default_settings(key, value) }
       __settings.each do |key, value|
         if __db_settings.has_key?(key)
-          where(:key => key).first.update_attribute(:value, value)
+          where(:key => key).first.update_attribute(:value, value.to_s)
         else
-          create!(:key => key, :value => value, :target_id => target_id, :target_type => target_type)
+          create!(:key => key, :value => value.to_s, :target_id => target_id, :target_type => target_type)
         end
       end
       __db_settings.merge!(__settings)
@@ -56,20 +67,42 @@ class Settings < ActiveRecord::Base
     end
     
     def method_missing(name, *args)
-      if self.respond_to?(name)
+      if respond_to?(name)
         super(name, args)
       else
         if name =~ /\w+=$/
           __temp_settings[name.to_s.downcase.gsub('=', '').to_sym] = args.first
           __settings[name.to_s.downcase.gsub('=', '').to_sym] = args.first
         elsif name =~ /\w+/
-          __settings[name.to_s.downcase.to_sym] || __hook_for_load_owner_default_settings(name.to_s.downcase.to_sym)
+          if __settings[name.to_s.downcase.to_sym].nil?
+            __hook_for_load_owner_default_settings(name.to_s.downcase.to_sym)
+          else
+            __settings[name.to_s.downcase.to_sym]
+          end
         else
           raise NoMethodError
         end
       end
     end
     
+    # Hack for simple_form auto column type detectation
+    def column_for_attribute(name)
+      if __settings[name].nil?
+        RealSettings::FakeColumn.new('string')
+      else
+        case __settings[name].class.to_s
+        when 'Fixnum', 'Bignum'
+          RealSettings::FakeColumn.new('integer', true)
+        when 'Float'
+          RealSettings::FakeColumn.new('float', true)
+        when 'TrueClass', 'FalseClass'
+          RealSettings::FakeColumn.new('boolean')
+        else
+          RealSettings::FakeColumn.new('string')
+        end
+      end
+    end
+    
     protected
     
     def __hook_for_load_owner_default_settings(key)
@@ -94,7 +127,7 @@ class Settings < ActiveRecord::Base
     def load_from_database!
       begin
         __db_settings = {}
-        where(:target_type => target_type, :target_id => target_id).order(:key).all.each { |s| self.__db_settings[s.key.to_sym] = s.value }
+        where(:target_type => target_type, :target_id => target_id).order(:key).each { |s| self.__db_settings[s.key.to_sym] = RealSettings::SmartConvert.convert(s.value) }
       rescue
         __db_settings = {}
       end

data/lib/real_settings/smart_convert.rb

@@ -0,0 +1,27 @@
+require 'time'
+
+module RealSettings
+  # Just convert simple format for : Time, Array(simple), Float, Fixnum, Boolean, String
+  class SmartConvert
+    def self.convert(value)
+      case value.strip
+      when /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} \+\d{4}$/ # Time
+        Time.parse(value)
+      when /^\[.+\]$/ # Array
+        array = []
+        value.gsub(/\[|\]/,'').split(',').each {|v| array << RealSettings::SmartConvert.convert(v)}
+        array
+      when /^\d+\.\d+$/ # Float
+        value.to_f
+      when /^\d+$/ # Fixnum
+        value.to_i
+      when 'true'
+        true
+      when 'false'
+        false
+      else # String and Others
+        value
+      end
+    end
+  end
+end

data/lib/real_settings/version.rb

@@ -1,3 +1,3 @@
 module RealSettings
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/real_settings.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["Macrow_wh@163.com"]
   gem.description   = %q{A real settings tool for Rails3}
   gem.summary       = %q{A real settings tool for Rails3}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/Macrow/real_settings"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -14,4 +14,9 @@ Gem::Specification.new do |gem|
   gem.name          = "real_settings"
   gem.require_paths = ["lib"]
   gem.version       = RealSettings::VERSION
+  
+  gem.add_dependency 'rails'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'sqlite3'
 end

data/spec/real_settings_spec.rb

@@ -6,22 +6,74 @@ describe "RealSettings" do
   before(:each) do
     @app_name = "real_settings"
     @app_url = "http://github.real_settings.com"
-    Settings.config do |settings|
+    @app_online_at = Time.now
+    @paginate_count = 10
+    @app_open = true
+    Settings.file_config do |settings|
       settings.app_name = @app_name
       settings.app_url = @app_url
+      settings.app_online_at = @app_online_at
+    end
+    Settings.db_config_default do |settings|
+      settings.paginate_count = @paginate_count
+      settings.app_open = @app_open
     end
     @user1 = User.create!(:name => 'admin1')
     @user2 = User.create!(:name => 'admin2')
   end
   
+  it "save value and get right value type" do
+    at = Time.now
+    Settings.a_array = [1,2,3,4,5]
+    Settings.a_string = 'abc'
+    Settings.a_time = at
+    Settings.a_number = 123456
+    Settings.a_float = 123.456
+    Settings.a_bool_true = true
+    Settings.a_bool_false = false
+    
+    Settings.save!
+    Settings.reload!
+      
+    Settings.a_array.should == [1,2,3,4,5]
+    Settings.a_string.should == 'abc'
+    Settings.a_time.should.eql? at
+    Settings.a_number.should == 123456
+    Settings.a_float.should == 123.456
+    Settings.a_bool_true.should == true
+    Settings.a_bool_false.should == false
+  end
+  
+  it "db_config_default load for default only" do
+    Settings.save!
+    Settings.reload!
+    
+    Settings.paginate_count.should == @paginate_count
+    Settings.app_open.should == @app_open
+    
+    Settings.db_config_default do |settings|
+      settings.paginate_count = 50
+      settings.app_open = false
+    end
+    
+    Settings.save!
+    Settings.reload!
+    
+    Settings.paginate_count.should == @paginate_count
+    Settings.app_open.should == @app_open
+  end
+  
   it "load default settings from config file" do
     Settings.app_name.should == @app_name
     Settings.app_url.should == @app_url
+    Settings.app_online_at.should == @app_online_at
+    Settings.paginate_count.should == @paginate_count
+    Settings.app_open.should == @app_open
   end
   
   it "load settings priority is file > database > temp" do
-    Settings.create(:key => 'app_name', :value => 'name from database')
-    Settings.create(:key => 'app_url', :value => 'url from database')
+    Settings.app_name = 'name from database'
+    Settings.app_url = 'url from database'
     Settings.reload!
     Settings.app_name.should == @app_name
     Settings.app_url.should == @app_url
@@ -32,9 +84,26 @@ describe "RealSettings" do
     Settings.app_name.should == @app_name
   end
   
+  it "load db default config" do
+    Settings.paginate_count.should == @paginate_count
+    Settings.app_open.should == @app_open
+    Settings.reload!
+    Settings.paginate_count.should == @paginate_count
+    Settings.app_open.should.eql? @app_open
+    Settings.paginate_count = 30
+    new_open_time = Time.now
+    Settings.app_open = new_open_time
+    Settings.paginate_count.should == 30
+    Settings.app_open.should == new_open_time
+    Settings.save!
+    Settings.paginate_count.should == 30
+    Settings.app_open.should == new_open_time    
+  end
+  
   it "load default settings from database" do
-    Settings.create(:key => 'another_name', :value => 'name from database')
-    Settings.create(:key => 'another_url', :value => 'url from database')
+    Settings.another_name = 'name from database'
+    Settings.another_url = 'url from database'    
+    Settings.save!
     Settings.reload!
     Settings.another_name.should == 'name from database'
     Settings.another_url.should == 'url from database'
@@ -133,30 +202,40 @@ describe "RealSettings" do
   end
   
   it "user has default settings" do
-    # has_settings :defaults => { :notebook => 'Macbook Pro', :mobile => 'iPhone 4' }
+    # has_settings :defaults => { :notebook => 'Macbook Pro', :mobile => 'iPhone 4', :page_count => 20 }
     @user1.settings.to_hash[:notebook].should == 'Macbook Pro'
     @user1.settings.to_hash[:mobile].should == 'iPhone 4'    
+    @user1.settings.to_hash[:page_count].should == 20
     @user1.settings.notebook.should == 'Macbook Pro'
     @user1.settings.mobile.should == 'iPhone 4'
+    @user1.settings.page_count.should == 20
+    
     @user1.settings.notebook = 'Macbook Air'
     @user1.settings.mobile = 'iPhone 4S'
+    @user1.settings.page_count = 10
     @user1.settings.notebook.should == 'Macbook Air'
     @user1.settings.mobile.should == 'iPhone 4S'    
+    @user1.settings.page_count.should == 10 
     @user1.settings.reload!
     @user1.settings.notebook.should == 'Macbook Pro'
     @user1.settings.mobile.should == 'iPhone 4'
+    @user1.settings.page_count.should == 20
 
     @user1.settings.notebook = 'Macbook Air'
     @user1.settings.mobile = 'iPhone 4S'
+    @user1.settings.page_count = 10
     @user1.save!
     @user1.settings.notebook.should == 'Macbook Air'
     @user1.settings.mobile.should == 'iPhone 4S'
+    @user1.settings.page_count.should == 10
     @user1.settings.reload!
     @user1.settings.notebook.should == 'Macbook Air'
     @user1.settings.mobile.should == 'iPhone 4S'
+    @user1.settings.page_count.should == 10
     
     @user2.settings.notebook.should == 'Macbook Pro'
     @user2.settings.mobile.should == 'iPhone 4'
+    @user2.settings.page_count.should == 20
   end
   
   it "be sure destroy settings after destroy user" do

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":me
 ActiveRecord::Migration.verbose = false
 
 class User < ActiveRecord::Base
-  has_settings :defaults => { :notebook => 'Macbook Pro', :mobile => 'iPhone 4' }
+  has_settings :defaults => { :notebook => 'Macbook Pro', :mobile => 'iPhone 4', :page_count => 20 }
 end
 
 class Account < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: real_settings
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
-dependencies: []
+date: 2013-03-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A real settings tool for Rails3
 email:
 - Macrow_wh@163.com
@@ -19,6 +83,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -30,14 +96,16 @@ files:
 - lib/generators/real_settings/install/templates/migration.rb
 - lib/generators/real_settings/install/templates/real_settings.rb
 - lib/real_settings.rb
+- lib/real_settings/fake_column.rb
 - lib/real_settings/owner_settings.rb
 - lib/real_settings/relations.rb
 - lib/real_settings/settings.rb
+- lib/real_settings/smart_convert.rb
 - lib/real_settings/version.rb
 - real_settings.gemspec
 - spec/real_settings_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/Macrow/real_settings
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -51,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3229865968002796882
+      hash: 77739245330383594
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -60,10 +128,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3229865968002796882
+      hash: 77739245330383594
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A real settings tool for Rails3