setting_accessors 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed332f105a50d26ae337675c092e529bf9ce7d0
-  data.tar.gz: edb4613293773b8bfa27dd9402beaecc2a6dbbd7
+  metadata.gz: d0b13cae5880dc3e448d1d26d64ff6bce9149d81
+  data.tar.gz: 7b56e7cec309297d20edfb0a90a346c028c98ad9
 SHA512:
-  metadata.gz: d87bfe17b531e82471548437ce5affd9a593fe38d32cca6592eeb0ead32ac5974f195cedce90b5923c02d8ca53f932d0770d8215f3107bc07a98efe989e4e140
-  data.tar.gz: d024b156d3ddc3fa7c94a6895765ebee666b0b9893d890be0fa203c5a49e209997a8ae3987f67073fc64088be50df201d74062727bcc2100c7f372ad82c82370
+  metadata.gz: 062e4ad9c0fb336a109aae63f9987715dbfce2d9ac5b2b607a8a4a5f339e0e64a020e98606e76cdb2fdcb615de895a42843307dd50d988165d18faf6919430e3
+  data.tar.gz: e140c13822008a93b770ece981ea8be7b75d1b155df28bb5d1fe5f39d6477f7f1cc9fe63f170e081030a79405b3f59cc1bc4917b501bfb40d834c9ba1e2b4c65

data/lib/setting_accessors/accessor.rb

@@ -13,7 +13,7 @@ class SettingAccessors::Accessor
   # Gets a setting's value
   #
   def [](key)
-    @temp_settings[key.to_sym] || SettingAccessors.setting_class.get(key, @record)
+    has_key?(key) ? @temp_settings[key.to_sym] : SettingAccessors.setting_class.get(key, @record)
   end
 
   def has_key?(key)

data/lib/setting_accessors/integration.rb

@@ -49,6 +49,9 @@ module SettingAccessors::Integration
       #create multi-param fields in forms.
       self.columns_hash[setting_name.to_s] = OpenStruct.new(type: SettingAccessors::Internal.setting_value_type(setting_name, self.new).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)
+
       #Getter
       define_method(setting_name) do
         settings.get_with_fallback(setting_name, fallback)
@@ -76,6 +79,14 @@ module SettingAccessors::Integration
     end
   end
 
+  def as_json(*args)
+    json = super(*args)
+    SettingAccessors::Internal.setting_accessor_names(self.class).each do |setting_name|
+      json[setting_name.to_s] = send(setting_name)
+    end
+    json
+  end
+
   def settings
     @settings_accessor ||= SettingAccessors::Accessor.new(self)
   end

data/lib/setting_accessors/internal.rb

@@ -69,7 +69,6 @@ module SettingAccessors
       end
     end
 
-
     #
     # @return [Hash] configuration data regarding this setting
     #
@@ -104,5 +103,24 @@ module SettingAccessors
     def self.get_class_setting(klass, setting_name)
       self.lookup_nested_hash(@@class_settings, klass.to_s, setting_name.to_s)
     end
+
+    #
+    # Adds the given setting name to the list of used setting accessors
+    # in the given class.
+    # This is mainly to keep track of all accessors defined in the different classes
+    #
+    def self.add_setting_accessor_name(klass, setting_name)
+      @@setting_accessor_names ||= {}
+      @@setting_accessor_names[klass.to_s] ||= []
+      @@setting_accessor_names[klass.to_s] << setting_name.to_s
+    end
+
+    #
+    # @return [Array<String>] all setting accessor names defined in the given +class+
+    #
+    def self.setting_accessor_names(klass)
+      self.lookup_nested_hash(@@setting_accessor_names, klass.to_s)
+    end
+
   end
 end

data/lib/setting_accessors/version.rb

@@ -1,3 +1,3 @@
 module SettingAccessors
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/test/dummy/test/models/user_test.rb

@@ -1,5 +1,20 @@
 class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  context 'JSON serialization' do
+    setup do
+      @user = User.new(:a_string => 'test', :a_number => 42, :a_boolean => false)
+    end
+
+    should 'include the setting accessors' do
+      SettingAccessors::Internal.setting_accessor_names(User).each do |setting_name|
+        assert_includes @user.as_json.keys, setting_name
+      end
+    end
+
+    should 'contain the correct values' do
+      SettingAccessors::Internal.setting_accessor_names(User).each do |setting_name|
+        assert_equal @user.as_json[setting_name.to_s], @user.send(setting_name)
+      end
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: setting_accessors
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stefan Exner