cockpit 0.2.2 → 0.2.3

data/lib/cockpit/stores/active_record.rb

@@ -11,6 +11,30 @@ module Cockpit
         base.class_eval do
           has_many :settings, :as => :configurable, :class_name => "::Cockpit::AR::Setting", :dependent => :destroy
           
+          class << self
+            def setting_sum(key, conditions = {})
+              conditions[:configurable_type] ||= self.sti_classes
+              conditions[:key] = key
+              Setting.sum(:value, :conditions => conditions)
+            end
+            alias setting_total setting_sum
+            
+            def setting_average(key, conditions = {})
+              conditions[:configurable_type] ||= self.sti_classes
+              conditions[:key] = key
+              Setting.average(:value, :conditions => conditions)
+            end
+            alias setting_avg setting_average
+            
+            def method_missing(method, *args, &block)
+              if method.to_s =~ /(total|sum|average|avg)_(\w+)/
+                self.send("setting_#{$1}", $2, args.extract_options!)
+              else
+                super(method, *args, &block)
+              end
+            end
+          end
+          
           unless respond_to?("get")
             def get(key)
               cockpit[key]
@@ -35,7 +59,7 @@ module Cockpit
       end
       
       def parsed_value
-        JSON.parse(value)['root']
+        value#['root']
       end
     end
     
@@ -64,15 +88,15 @@ module Cockpit
         record.save! if record && record.new_record?
         
         setting = find_setting(key)
-        
-        attributes = {:value => {'root' => value}.to_json}#.merge(configurable_attributes)
-        
+        #{:value => {'root' => value}.to_json}
+        attributes = {:value => value.to_json}.merge(configurable_attributes)
         if setting
           setting.update_attributes!(attributes)
         else
           setting = Setting.new(attributes)
           setting.key = key
           record.settings << setting if record
+          setting[:configurable_type] = attributes[:configurable_type]
           setting.save!
         end
         
@@ -118,7 +142,7 @@ module Cockpit
       def configurable_attributes
         conditions = {}
         if record
-          conditions[:configurable_type] = [record.class.name, record.class.base_class.name]
+          conditions[:configurable_type] = record.class.name
           conditions[:configurable_id] = record.id
         else
           conditions[:configurable_type] = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cockpit
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -05:00
+date: 2010-09-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency