cockpit 0.2.3 → 0.2.4

data/lib/cockpit/core/scope.rb

@@ -8,7 +8,11 @@ module Cockpit
     end
     
     def value
-      settings[key]
+      if settings[key].nil?
+        nil
+      else
+        JSON.parse(%Q|{"value":#{settings[key]}}|)['value']
+      end
     end
     
     def value=(x)

data/lib/cockpit/core/settings.rb

@@ -1,3 +1,4 @@
+# http://refactormycode.com/codes/1204-nested-hash-from-delimiter-separated-string
 module Cockpit
   # settings have one direct definition and many child proxy
   class Settings
@@ -181,6 +182,22 @@ module Cockpit
       value.respond_to?(:empty?) ? value.empty? : !value
     end
     
+    def to_tree
+      keys.inject({}) do |result, path|
+        curr = result
+        names = path.split(".")
+        names.each do |name|
+          if name == names.last
+            curr[name] = Cockpit::Settings[path]
+          else
+            curr[name] ||= {}
+            curr = curr[name]
+          end
+        end
+        result
+      end
+    end
+    
     protected
     
     def method_missing(method, *args, &block)

data/lib/cockpit/stores/active_record.rb

@@ -15,14 +15,26 @@ module Cockpit
             def setting_sum(key, conditions = {})
               conditions[:configurable_type] ||= self.sti_classes
               conditions[:key] = key
-              Setting.sum(:value, :conditions => conditions)
+              if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && connection.is_a?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+                select = "INTEGER"
+              else
+                select = "SIGNED"
+              end
+              select = "CAST(#{::Cockpit::AR::Setting.quoted_table_name}.value AS #{select})"
+              Setting.sum(:value, :conditions => conditions, :select => select)
             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)
+              if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && connection.is_a?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+                select = "INTEGER"
+              else
+                select = "SIGNED"
+              end
+              select = "CAST(#{::Cockpit::AR::Setting.quoted_table_name}.value AS #{select})"
+              Setting.average(:value, :conditions => conditions, :select => select)
             end
             alias setting_avg setting_average
             

metadata

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