Merge pull request #8 from Stex/release/0.3.0

Release/0.3.0

.gitignore

@@ -21,8 +21,8 @@ tmp
 *.a
 mkmf.log
 
-#Rubymine
-.idea
+# RVM
+.ruby-version
 
 #Dummy Application
 test/dummy/log

.travis.yml

@@ -5,6 +5,9 @@ rvm:
   - 2.2
   - 2.3.1
 
+env:
+  - DISABLE_DATABASE_ENVIRONMENT_CHECK=1
+
 before_install: 'gem install bundler'
 script: 'bundle exec rake'
 

CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.3.0
+
+* Fixed a bug that caused setting accessors not being initialized when being called as part of a rake task chain (#6)

lib/setting_accessors/integration.rb

@@ -36,20 +36,11 @@ module ClassMethods
     #   setting and return +nil+ if none was specified previously.
     #
     def setting_accessor(setting_name, options = {})
-      #If the database table does not yet exist,
-      return unless self.table_exists?
-
       fallback = options.delete(:fallback)
 
       SettingAccessors::Internal.set_class_setting(self, setting_name, options)
 
-      setting_type = SettingAccessors::Internal.setting_value_type(setting_name, self.new).to_sym
-
-      #Create a virtual column in the models column hash.
-      #This is currently not absolutely necessary, but will become important once
-      #Time etc. are supported. Otherwise, Rails won't be able to e.g. automatically
-      #create multi-param fields in forms.
-      self.columns_hash[setting_name.to_s] = OpenStruct.new(type: setting_type)
+      setting_type = SettingAccessors::Internal.setting_value_type(setting_name, self).to_sym
 
       #Add the setting's name to the list of setting_accessors for this class
       SettingAccessors::Internal.add_setting_accessor_name(self, setting_name)

lib/setting_accessors/internal.rb

@@ -76,8 +76,12 @@ def self.set_class_setting(klass, setting_name, options = {})
     #   - If it's a setting defined in a setting_accessor call, the information is taken from this call
     #   - Otherwise, an empty hash is returned
     #
-    def self.setting_data(setting_name, assignable = nil)
-      (assignable && self.get_class_setting(assignable.class, setting_name)) ||
+    def self.setting_data(setting_name, assignable_class = nil)
+      # As a convenience function (and to keep the existing code working),
+      # it is possible to provide a class or an instance of said class
+      assignable_class &&= assignable_class.class unless assignable_class.is_a?(Class)
+
+      (assignable_class && self.get_class_setting(assignable_class, setting_name)) ||
           self.global_config[setting_name.to_s] ||
           {}
     end

lib/setting_accessors/version.rb

@@ -1,3 +1,3 @@
 module SettingAccessors
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

test/test_helper.rb

@@ -18,6 +18,14 @@
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
 
+# configure shoulda matchers
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :minitest
+    with.library :rails
+  end
+end
+
 # For generators
 require "rails/generators/test_case"
 require "generators/setting_accessors/install_generator"