setler 0.0.4 → 0.0.5

data/lib/setler/active_record.rb

@@ -5,17 +5,6 @@ module Setler
       define_method scopename do
         Setler::ScopedSettings.for_thing(self)
       end
-      
-      define_method "#{scopename}=" do |hash|
-        hash.each do |key,value|
-          Setler::Settings.find_or_create_by_thing_id_and_thing_type_and_var(
-            self.id,
-            self.class,
-            key,
-            value: value
-          )
-        end
-      end
     end
     
   end

data/lib/setler/settings.rb

@@ -15,9 +15,22 @@ module Setler
       else
         method_name = method.to_s
         if method_name.ends_with?("=")
-          thing_scoped.find_or_create_by_var(method_name[0..-2]).update_attribute(:value, args.first)
+          # THIS IS BAD
+          # thing_scoped.find_or_create_by_var(method_name[0..-2]) should work but doesnt for some reason
+          # When @object is present, thing_scoped sets the where scope for the polymorphic association
+          # but the find_or_create_by wasn't using the thing_type and thing_id
+          thing_scoped.find_or_create_by_var_and_thing_type_and_thing_id(
+            method_name[0..-2],
+            @object.try(:class).try(:base_class).try(:to_s),
+            @object.try(:id)
+          ).update_attribute(:value, args.first)
         else
-          thing_scoped.find_by_var(method_name).try(:value) || @@defaults[method_name]
+          the_setting = thing_scoped.find_by_var(method_name)
+          if the_setting.nil?
+            return @@defaults[method_name]
+          else
+            return the_setting.value
+          end
         end
       end
     end
@@ -33,7 +46,7 @@ module Setler
     end
     
     def self.all
-      Hash[thing_scoped.all.collect{ |s| [s.var, s.value] }].merge(@@defaults)
+      @@defaults.merge(Hash[thing_scoped.all.collect{ |s| [s.var, s.value] }])
     end
     
     def self.thing_scoped

data/lib/setler/version.rb

@@ -1,3 +1,3 @@
 module Setler
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: setler
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70271069152000 !ruby/object:Gem::Requirement
+  requirement: &70364807212080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70271069152000
+  version_requirements: *70364807212080
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70271069151500 !ruby/object:Gem::Requirement
+  requirement: &70364807211580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70271069151500
+  version_requirements: *70364807211580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70271069151120 !ruby/object:Gem::Requirement
+  requirement: &70364807211200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271069151120
+  version_requirements: *70364807211200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70271069150660 !ruby/object:Gem::Requirement
+  requirement: &70364807210740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271069150660
+  version_requirements: *70364807210740
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70271069150240 !ruby/object:Gem::Requirement
+  requirement: &70364807210320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271069150240
+  version_requirements: *70364807210320
 description: Setler is a Gem that lets one easily implement the "Feature Flags" pattern,
   or add settings to individual models. This is a cleanroom implementation of what
   the 'rails-settings' gem does. It's been forked all over the place, and my favorite