auser-dslify 0.0.4 → 0.0.5

data/dslify.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dslify}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2009-03-16}
+  s.date = %q{2009-04-14}
   s.description = %q{Easily add DSL-like calls to any class}
   s.email = ["arilerner@mac.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "website/index.txt"]

data/lib/dslify/dslify.rb

@@ -1,23 +1,69 @@
 # Quick 1-file dsl accessor
-class Object  
-  def h
-    @h||={}
-  end
-  def dsl_options;h;end
-  def set_vars_from_options(h={})
-    h.each{|k,v|send k.to_sym, v } unless h.empty?
+module Dslify
+  module ClassMethods
+    def default_options(hsh={})
+      @default_dsl_options ||= hsh
+    end
   end
-  def method_missing(m,*a,&block)
-    if block
-      if args.empty?
-        ((a[0].class==self.class)?a[0].instance_eval(&block): super)
+  
+  module InstanceMethods
+    def default_dsl_options;self.class.default_options;end
+    def dsl_options(hsh={})
+      @dsl_options ||= default_dsl_options.merge(hsh)
+    end
+    alias :options :dsl_options
+    def set_vars_from_options(h={}, contxt=self)
+      h.each{|k,v| contxt.send k.to_sym, v }
+    end
+    def add_method(meth)
+      # instance_eval <<-EOM        
+      #   def #{meth}(n=nil)
+      #     puts "called #{meth}(\#\{n\}) from \#\{self\}"
+      #     n ? (__h[:#{meth}] = n) : __h[:#{meth}]
+      #   end
+      #   def #{meth}=(n)
+      #     __h[:#{meth}] = n
+      #   end
+      # EOM
+    end
+    def method_missing(m,*a,&block)
+      if block
+        if a.empty?
+          (a[0].class == self.class) ? a[0].instance_eval(&block) : super
+        else
+          inst = a[0]
+          inst.instance_eval(&block)
+          dsl_options[m] = inst
+        end
       else
-        inst = a[0]
-        inst.instance_eval(&block)
-        h[m] = inst
+        if a.empty?          
+          if dsl_options.has_key?(m)
+            dsl_options[m]
+          elsif m.to_s.index("?") == (m.to_s.length - 1)
+            if options.has_key?(val = m.to_s.gsub(/\?/, '').to_sym)
+              options[val] != false
+            else
+              false
+            end
+          else
+            if self.class.superclass.respond_to?(:default_options) && self.class.superclass.default_options.has_key?(m)
+              self.class.superclass.default_options[m]
+            elsif ((respond_to? :parent) && (parent != self))
+              parent.send m, *a, &block
+            else
+              super
+            end
+          end
+        else
+          clean_meth = m.to_s.gsub(/\=/,"").to_sym
+          dsl_options[clean_meth] = (a.size > 1 ? a : a[0])
+        end
       end
-    else
-      ((a.empty?)?h[m]:h[m.to_s.gsub(/\=/,"").to_sym]=(a.size>1?a:a[0]))
     end
   end
-end
+  
+  def self.included(receiver)
+    receiver.extend         ClassMethods
+    receiver.send :include, InstanceMethods
+  end
+end

data/lib/dslify/version.rb

@@ -1,10 +1,10 @@
 module Dslify
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 0
-    TINY  = 4
+    MAJOR = 0 unless const_defined?("MAJOR")
+    MINOR = 0 unless const_defined?("MINOR")
+    TINY  = 5 unless const_defined?("TINY")
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY].join('.') unless const_defined?("STRING")
     self
   end
 end

data/test/test_dslify.rb

@@ -4,6 +4,7 @@ require "matchy"
 require "context"
 
 class Quickie
+  include Dslify
 end
 
 class QuickieTest < Test::Unit::TestCase
@@ -24,7 +25,7 @@ class QuickieTest < Test::Unit::TestCase
     end
     it "should set these values in the h Hash on the object" do
       @q.movies "can be fun"
-      @q.h.keys.should == [:movies]
+      @q.dsl_options.keys.should == [:movies]
     end
     it "should set multiple keys with set_vars_from_options" do
       @q.set_vars_from_options({:a => "a", :b => "b"})
@@ -42,5 +43,72 @@ class QuickieTest < Test::Unit::TestCase
       end
       @q.bobs.franks.should == "franke"
     end
+    it "should not blow up when called with a ? at the end of the method" do
+      @q.set_vars_from_options({:pete => "and pete"})
+      lambda{@q.pete?}.should_not raise_error
+    end
+    it "should return false if the method exists" do
+      @q.bones "is a tv show"
+      @q.bops?.should == false
+    end
+    it "should return true if the option is set" do
+      @q.bones "is a tv show"
+      @q.bones?.should == true
+    end
+  end
+  
+  context "with inheritance and classes" do
+    before do
+      class Pop
+        include Dslify
+        def initialize(h={})
+          dsl_options h
+        end
+        default_options :name => "pop"
+      end
+      
+      class Foo < Pop
+        default_options :name=>'fooey'
+      end
+      
+      class Bar < Pop
+        default_options :name=>'pangy', :taste => "spicy"
+      end
+      
+      class Dad < Pop
+      end
+      
+      @pop = Pop.new
+      @poptart = Pop.new :name => "Cinnamon"
+      @foo = Foo.new
+      @bar = Bar.new
+    end
+    it "should take the default options set on the class" do
+      @pop.dsl_options[:name].should == "pop"
+    end
+    it "should allow us to add defaults on the instance by calling dsl_options" do
+      @poptart.name.should == "Cinnamon"
+    end
+    it "should take the default options on a second class that inherits from the base" do
+      @foo.name.should == "fooey"
+    end
+    it "should take the default options on a third inheriting class" do
+      @bar.name.should == "pangy"
+    end
+    it "should not add a method not in the default_dsl_options" do
+      @bar.respond_to?(:boat).should == false      
+    end
+    it "should return the original default options test" do
+      @bar.default_dsl_options[:taste].should == "spicy"
+      @bar.default_dsl_options[:name].should == "pangy"
+    end
+    it "should set the default options of the child to the superclass's if it doesn't exist" do
+      Dad.new.name.should == "pop"
+    end
+    it "should raise if the method isn't found on itself, the parent or in the rest of the method missing chain" do
+      lambda {
+        Class.new.sanitorium
+      }.should raise_error
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-dslify
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency