mournful_settings 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJkYzIzNWJhNmIwNDU1MzIzOGIxZmJhYWE1MGRjOGNmYjc4MTM0Ng==
+    OTkwNTdkNWM5OTM1MjIwMzUzM2YxOTFlYTVjMmU1YzllYmI0ZmQ4ZQ==
   data.tar.gz: !binary |-
-    ZDU2YmVhY2Q3MjBiYzgxNzhlM2M0ZjQ0ZTk2MzYzZmM4OGI5ZWM1ZA==
+    MTY5MzRiNzhkYjNiZmI0MDRkOGNlN2EzMDQ5YTIwNzBhZDk0NzM0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2U2ZGI5NDg4ZjE0ZWMzOGFmM2ZhYTcyZjdjMGM4MjNlNWY0ZTE2ZGE5NDA1
-    NmE2ODRhODIxZTQwNzMxYTg3OTY5Y2Y2MWE0MWI3ZjZhMjk4Yjc0ODAzYjdi
-    Y2ZkZTkwNjY5NTIzNjBiNjgwYjkyNDUwYWVkNjY0MGEwZTNjYmQ=
+    YzZmYjczNGQzOWQwN2FkYzYzZGNjZjQ5ODQ5ZDc4ZDcwMmU2NjU2N2NjZjVj
+    MmY3OTQ5NjMwZmMwMTk4ZWVhMWJjYmQ5NzU0MWVlYTE5OWRjM2YzYWI0Yjli
+    MjJjYTJhMjZjNmZlN2ZiNDliYjczZWFkYWE3NTY0YTVlNTNkMjE=
   data.tar.gz: !binary |-
-    NmFhM2Y4MDU2NTA0MjM2MjdhYmVmOTMxMmJhNjUzNmIwOGQ1YTViYjUwMDBi
-    ZDZjNTM0MzJmOWI4MDFjNzk5ZTJkNmE0ZTkxMzdiNmJiNWI2OGQ2NmNhODZm
-    ZjRjMzQxYmRkMjdhNjUxZThhOTQxM2Y4M2Y1YjhkNDQ0YWViNjg=
+    Njc3ZWNlNmUxNDM2NjlmOWUzYWI1NGQ1ZjliYWU0NTA2ZTRlOGNmYzhiYjU5
+    ZTJiYzgxOWRjMThhMTU1YjkwOTg2ZGQyZjc1NjU1OTAzMWUwNDg2ZTE3OTlj
+    NDZjNmQzZTUzNTYyNTZjYjk2ZWZkZWI1NWNjY2VlOTc1M2I2NzQ=

data/README.rdoc

@@ -154,6 +154,12 @@ To add mournful_settings migrations to the host app run this rake task:
 
 Then run 'rake db:migrate' to create the 'mournful_settings_settings' table.
 
+==== Settings before the database is created
+
+If the database table is not present, it will be assumed that the default
+setting (or nil) should be used until the table is created and the matching
+setting stored.
+
 === Updating inherited Setting to use acts_as_mournful_setting
 
 The class Setting above could be modified to work with acts_as_mournful_setting,

data/lib/active_admin/admin/settings.rb

@@ -22,7 +22,7 @@ ActiveAdmin.register Setting do
           :checked => (setting.encrypted == false ? false : true)
         }
       )
-      f.input :value_type, collection: MournfulSettings::SettingMethods::VALUE_TYPES
+      f.input :value_type, :collection => MournfulSettings::SettingMethods::VALUE_TYPES
     end
     f.buttons
   end

data/lib/mournful_settings.rb

@@ -2,11 +2,24 @@ require 'active_record'
 require_relative "mournful_settings/railtie" if defined?(Rails) # needed for rake tasks to be loaded into host app
 require_relative 'active_record/acts/mournful_setting'
 require_relative 'mournful_settings/setting'
+require 'logger'
 
 module MournfulSettings
   
   def self.active_admin_load_path
     File.expand_path("active_admin/admin", File.dirname(__FILE__))
   end
+
+  def self.logger
+    defined?(Rails) ? Rails.logger : local_logger
+  end
+
+  def self.logger=(alternative_logger)
+    @logger = alternative_logger
+  end
+
+  def self.local_logger
+    @logger ||= Logger.new('log/mournful_settings.log')
+  end
     
 end

data/lib/mournful_settings/setting_methods.rb

@@ -21,7 +21,11 @@ module MournfulSettings
 
       def for(name, default = nil)
         setting = find_by_name(name.to_s)  # values should be passed to AR as strings
+        MournfulSettings.logger.debug "MornfulSetting for #{name} called"
         setting ? setting.value : default
+      rescue ActiveRecord::StatementInvalid => e
+        MournfulSettings.logger.warn "Default MournfulSetting for '#{name}' forced because: #{e.message}"
+        return default
       end
       
       def recrypt_all &do_while_unencrypted

data/lib/mournful_settings/version.rb

@@ -1,10 +1,17 @@
 module MournfulSettings
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end
 
 # History
 # =======
 #
+# 0.1.3: Handles lack of database on initial use
+# ----------------------------------------------
+# In a rails app, if a setting is used in an initializer before the settings
+# table is created, the app could not be run to build the table. In this
+# version, it is assumed that if the database is not present, the default
+# setting should be used.
+#
 # 0.1.2: Add facility to select value type via active_admin form
 # --------------------------------------------------------------
 # Lack of value type was preventing new settings to be created via active admin

data/test/dummy/lib/setting_without_table.rb

@@ -0,0 +1,6 @@
+
+class SettingWithoutTable < ActiveRecord::Base
+
+  acts_as_mournful_setting
+
+end

data/test/dummy/test/setting_without_table_test.rb

@@ -0,0 +1,24 @@
+require_relative '../../test_helper'
+require 'setting_without_table'
+
+# If an application is moved to a new location and settings are used in the
+# application configuration, it is impossible to create the Settings table
+# via the normal rake tasks if MournfulSetting.for returns a
+# 'Could not find table' error. That leave the app in the loop - need a
+# settings table to start the app, but can't create the tables without starting
+# the app.
+#
+# So MournfulSetting.for needs to be handle the lack of table.
+#
+class SettingWithoutTableTest < Test::Unit::TestCase
+
+  def test_for_without_default
+    assert_equal nil, SettingWithoutTable.for(:foo)
+  end
+
+  def test_for_with_default
+    default = 'bar'
+    assert_equal default, SettingWithoutTable.for(:foo, default)
+  end
+
+end

data/test/test_helper.rb

@@ -1,6 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 $:.unshift File.join(File.dirname(__FILE__),'dummy','lib')
 
+unless defined?(Rails)
+  MournfulSettings.logger = Logger.new('log/test.log')
+  MournfulSettings.logger.level = Logger::INFO
+end
+
 require 'test/unit'
 
 require 'active_record'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mournful_settings
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rob Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -46,24 +46,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- lib/active_admin/admin/settings.rb
 - lib/active_record/acts/mournful_setting.rb
-- lib/mournful_settings/version.rb
+- lib/mournful_settings.rb
+- lib/mournful_settings/railtie.rb
 - lib/mournful_settings/setting.rb
-- lib/mournful_settings/setting_methods/cipher.rb
 - lib/mournful_settings/setting_methods.rb
-- lib/mournful_settings/railtie.rb
-- lib/mournful_settings.rb
-- lib/active_admin/admin/settings.rb
+- lib/mournful_settings/setting_methods/cipher.rb
+- lib/mournful_settings/version.rb
 - lib/tasks/mournful_settings.rake
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
-- test/dummy/lib/setting_actor.rb
-- test/dummy/lib/setting.rb
 - test/dummy/db/development.sqlite3.db
 - test/dummy/db/test.sqlite3.db
+- test/dummy/lib/setting.rb
+- test/dummy/lib/setting_actor.rb
+- test/dummy/lib/setting_without_table.rb
 - test/dummy/test/setting_actor_test.rb
 - test/dummy/test/setting_test.rb
+- test/dummy/test/setting_without_table_test.rb
 - test/test_helper.rb
 homepage: https://github.com/reggieb/mournful_settings
 licenses:
@@ -85,15 +87,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tool for adding encrypted settings to an app.
 test_files:
 - test/dummy/lib/setting_actor.rb
 - test/dummy/lib/setting.rb
+- test/dummy/lib/setting_without_table.rb
 - test/dummy/db/development.sqlite3.db
 - test/dummy/db/test.sqlite3.db
+- test/dummy/test/setting_without_table_test.rb
 - test/dummy/test/setting_actor_test.rb
 - test/dummy/test/setting_test.rb
 - test/test_helper.rb