cockpit 0.2.0 → 0.2.1

data/lib/cockpit/core/include.rb

@@ -17,7 +17,7 @@ module Cockpit
           end
           
           define_method "#{key}?" do
-            send(:cockpit).has_key?(key)
+            send(:cockpit).present?(key)
           end
         end
       end

data/lib/cockpit/core/scope.rb

@@ -4,7 +4,7 @@ module Cockpit
     
     def initialize(settings, method, *args, &block)
       @settings = settings
-      process(method, *args, &block)
+      _process(method, *args, &block)
     end
     
     def value
@@ -15,17 +15,46 @@ module Cockpit
       settings[key] = x
     end
     
-    def process(method, *args, &block)
-      node = method.to_s
-
+    def to_i
+      value.to_i
+    end
+    
+    def to_s
+      value.to_s
+    end
+    
+    def to_f
+      value.to_f
+    end
+    
+    def nil?
+      value.nil?
+    end
+    
+    def empty?
+      value.empty?
+    end
+    
+    def blank?
+      value.blank?
+    end
+    
+    def _process(method, *args, &block)
+      method  = method.to_s
+      node    = method.dup
+      
       boolean = !!(node =~ /\?$/)
       node.gsub!(/\?/, "") if boolean
       
       set     = !!(node =~ /=$/)
       node.gsub!("=", "") if set
       
+      new_key = "#{key}.#{node}"
+      
+      return value.send(method) if key && !settings.has_key?(new_key) && value.respond_to?(method)
+      
       if key
-        @key       = "#{key}.#{node}"
+        @key       = new_key
       else
         @key       = node
       end
@@ -40,7 +69,7 @@ module Cockpit
     end
     
     def method_missing(method, *args, &block)
-      process(method, *args, &block)
+      _process(method, *args, &block)
     end
   end
 end

data/lib/cockpit/core/settings.rb

@@ -172,11 +172,20 @@ module Cockpit
       @spec ||= self.class.spec(self.name, self.record_type)
     end
     
+    def present?(key)
+      has_key?(key) && !empty?(key)  
+    end
+    
+    def empty?(key)
+      value = self[key]
+      value.respond_to?(:empty?) ? value.empty? : !value
+    end
+    
     protected
     
     def method_missing(method, *args, &block)
       if method.to_s =~ /(\w+)\?$/
-        has_key?($1)
+        present?($1)
       elsif has_key?(method)
         Cockpit::Scope.new(self, method, *args, &block)
       else

metadata

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