dsl_accessor 0.1.0 → 0.3.3

data/lib/dsl_accessor.rb

@@ -1,52 +1,11 @@
-require 'active_support'
-
-class Class
-  def dsl_accessor(name, options = {})
-    raise TypeError, "DSL Error: options should be a hash. but got `#{options.class}'" unless options.is_a?(Hash)
-    writer = options[:writer] || options[:setter]
-    writer =
-      case writer
-      when NilClass then Proc.new{|value| value}
-      when Symbol   then Proc.new{|value| __send__(writer, value)}
-      when Proc     then writer
-      else raise TypeError, "DSL Error: writer should be a symbol or proc. but got `#{options[:writer].class}'"
-      end
-    write_inheritable_attribute(:"#{name}_writer", writer)
-
-    default =
-      case options[:default]
-      when NilClass then nil
-      when []       then Proc.new{[]}
-      when {}       then Proc.new{{}}
-      when Symbol   then Proc.new{__send__(options[:default])}
-      when Proc     then options[:default]
-      else Proc.new{options[:default]}
-      end
-    write_inheritable_attribute(:"#{name}_default", default)
-
-    self.class.class_eval do
-      define_method("#{name}=") do |value|
-        writer = read_inheritable_attribute(:"#{name}_writer")
-        value  = writer.call(value) if writer
-        write_inheritable_attribute(:"#{name}", value)
-      end
+unless Class.new.respond_to?(:write_inheritable_attribute)
+  require File.dirname(__FILE__) + "/../core_ext/duplicable" unless Object.new.respond_to?(:duplicable?)
+  require File.dirname(__FILE__) + "/../core_ext/class/inheritable_attributes"
+end
 
-      define_method(name) do |*values|
-        if values.empty?
-          # getter method
-          key = :"#{name}"
-          if !inheritable_attributes.has_key?(key)
-            default = read_inheritable_attribute(:"#{name}_default")
-            value   = default ? default.call(self) : nil
-            __send__("#{name}=", value)
-          end
-          read_inheritable_attribute(key)
-        else
-          # setter method
-          __send__("#{name}=", *values)
-        end
-      end
-    end
-  end
+unless Module.new.respond_to?(:delegate)
+  require File.dirname(__FILE__) + "/../core_ext/module/delegation"
 end
 
+require File.dirname(__FILE__) + '/../core_ext/class/dsl_accessor'
+

data/spec/auto_declared_spec.rb

@@ -0,0 +1,106 @@
+require File.join( File.dirname(__FILE__), "spec_helper" )
+
+describe DslAccessor do
+  before(:each) do
+    Object.send(:remove_const, :Foo) if Object.const_defined?(:Foo)
+    class Foo
+    end
+  end
+
+  def foo_should_not_be_defined
+    Foo    .should_not respond_to(:foo)
+    Foo.new.should_not respond_to(:foo)
+  end
+
+  it "should provide .dsl_accessor_auto_declared as private method" do
+    Class.private_methods.should include("dsl_accessor_auto_declared?")
+  end
+
+  it "should provide .dsl_accessor" do
+    Class.should respond_to(:dsl_accessor)
+  end
+
+  describe " should raise NoMethodError when we call a method " do
+    it "without arugments" do
+      foo_should_not_be_defined
+      lambda { Foo.foo }.should raise_error(NoMethodError)
+      foo_should_not_be_defined
+    end
+    it "with arguments" do
+      foo_should_not_be_defined
+      lambda { Foo.foo(1) }.should raise_error(NoMethodError)
+      lambda { Foo.foo(1, 2) }.should raise_error(NoMethodError)
+      foo_should_not_be_defined
+    end
+    it "with block" do
+      foo_should_not_be_defined
+      lambda { Foo.foo{} }.should raise_error(NoMethodError)
+      foo_should_not_be_defined
+    end
+    it "with arguments and block" do
+      foo_should_not_be_defined
+      lambda { Foo.foo(1){} }.should raise_error(NoMethodError)
+      foo_should_not_be_defined
+    end
+  end
+
+  describe ".dsl_accessor without arguments" do
+    it "should be accepted" do
+      lambda {
+        Foo.dsl_accessor
+      }.should_not raise_error
+    end
+
+    it "should mark auto_declared" do
+      Foo.send(:dsl_accessor_auto_declared?).should be_false
+      Foo.dsl_accessor
+      Foo.send(:dsl_accessor_auto_declared?).should be_true
+    end
+  end
+
+  describe "auto_declared" do
+    before(:each) do
+      class Foo
+        dsl_accessor
+      end
+    end
+
+    it "should raise NoMethodError if unknown method with args is called" do
+      lambda {
+        Foo.foo(1)
+      }.should raise_error(NoMethodError)
+    end
+
+    it "should raise NoMethodError when unknown method is called with args and block" do
+      lambda {
+        Foo.foo(1){}
+      }.should raise_error(NoMethodError)
+    end
+
+    describe " when unknown method is called with a block" do
+      it "should trap NoMethodError" do
+        lambda {
+          Foo.foo{}
+        }.should_not raise_error(NoMethodError)
+      end
+
+      it "should define its instance method automatically" do
+        foo_should_not_be_defined
+        Foo.foo{1}
+        Foo.new.should respond_to(:foo)
+        Foo.new.foo.should == 1
+      end
+    end
+
+    it "should affect nothing to subclasses" do
+      class Bar < Foo
+      end
+
+      lambda { Bar.bar       }.should raise_error(NoMethodError)
+      lambda { Bar.bar(1)    }.should raise_error(NoMethodError)
+      lambda { Bar.bar(1, 2) }.should raise_error(NoMethodError)
+      lambda { Bar.bar{}     }.should raise_error(NoMethodError)
+      lambda { Bar.bar(1){}  }.should raise_error(NoMethodError)
+    end
+  end
+end

data/spec/inherit_spec.rb

@@ -0,0 +1,21 @@
+require File.join( File.dirname(__FILE__), "spec_helper" )
+
+describe DslAccessor do
+  module Exts
+    class All
+    end
+
+    class Base < All
+    end
+  end
+
+  module Exts
+    class All
+      dsl_accessor :ext, "*"
+    end
+  end
+
+  it "should inherit value" do
+    Exts::Base.ext.should == "*"
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require "rubygems"
+require "spec"
+
+require File.dirname(__FILE__) + "/../init"
+

data/tasks/dsl_accessor_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :dsl_accessor do
+#   # Task goes here
+# end

data/test/default_test.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+
+class DslDefaultAccessorTest < Test::Unit::TestCase
+
+  class CoolActiveRecord
+    dsl_accessor :primary_key, :default=>"id"
+    dsl_accessor :table_name,  :default=>proc{|klass| klass.name.split(/::/).last.downcase+"s"}
+  end
+
+  class Item < CoolActiveRecord
+  end
+
+  class User < CoolActiveRecord
+  end
+
+  class Folder
+    dsl_accessor :array_folder, :default=>[]
+    dsl_accessor :hash_folder,  :default=>{}
+  end
+
+  class SubFolder < Folder
+  end
+
+  def test_default_accessor_with_string
+    assert_equal "id", Item.primary_key
+    assert_equal "id", User.primary_key
+  end
+
+  def test_default_accessor_with_proc
+    assert_equal "items", Item.table_name
+    assert_equal "users", User.table_name
+  end
+
+  def test_default_accessor_should_duplicate_empty_array_or_hash
+    Folder.array_folder << 1
+    Folder.hash_folder[:name] = "maiha"
+
+    assert_equal([1], Folder.array_folder)
+    assert_equal({:name=>"maiha"}, Folder.hash_folder)
+
+    assert_equal([], SubFolder.array_folder)
+    assert_equal({}, SubFolder.hash_folder)
+  end
+end
+
+
+class DslOverwritenDefaultAccessorTest < Test::Unit::TestCase
+  class CoolActiveRecord
+    dsl_accessor :primary_key, :default=>"id"
+    dsl_accessor :table_name,  :default=>proc{|klass| klass.name+"s"}
+  end
+
+  class Item < CoolActiveRecord
+    primary_key :item_id
+    table_name  :item_table
+  end
+
+  def test_overwrite_default_accessor
+    assert_equal :item_id,    Item.primary_key
+    assert_equal :item_table, Item.table_name
+  end
+end
+

data/test/dsl_accessor_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
+
 
 class DslAccessorTest < Test::Unit::TestCase
   class CoolActiveRecord
@@ -14,6 +15,12 @@ class DslAccessorTest < Test::Unit::TestCase
     table_name  :item
   end
 
+  class OtherClass
+  end
+
+  def test_dsl_accessor_doesnt_affect_other_classes
+    assert !OtherClass.respond_to?(:primary_key)
+  end
 
   def test_accessor_without_initialization
     assert_equal nil, Item.primary_key
@@ -38,83 +45,3 @@ class DslAccessorTest < Test::Unit::TestCase
   end
 end
 
-
-class DslDefaultAccessorTest < Test::Unit::TestCase
-
-  class CoolActiveRecord
-    dsl_accessor :primary_key, :default=>"id"
-    dsl_accessor :table_name,  :default=>proc{|klass| klass.name.demodulize.underscore.pluralize}
-  end
-
-  class Item < CoolActiveRecord
-  end
-
-  class User < CoolActiveRecord
-  end
-
-  class Folder
-    dsl_accessor :array_folder, :default=>[]
-    dsl_accessor :hash_folder,  :default=>{}
-  end
-
-  class SubFolder < Folder
-  end
-
-  def test_default_accessor_with_string
-    assert_equal "id", Item.primary_key
-    assert_equal "id", User.primary_key
-  end
-
-  def test_default_accessor_with_proc
-    assert_equal "items", Item.table_name
-    assert_equal "users", User.table_name
-  end
-
-  def test_default_accessor_should_duplicate_empty_array_or_hash
-    Folder.array_folder << 1
-    Folder.hash_folder[:name] = "maiha"
-
-    assert_equal([1], Folder.array_folder)
-    assert_equal({:name=>"maiha"}, Folder.hash_folder)
-
-    assert_equal([], SubFolder.array_folder)
-    assert_equal({}, SubFolder.hash_folder)
-  end
-end
-
-
-class DslOverwritenDefaultAccessorTest < Test::Unit::TestCase
-  class CoolActiveRecord
-    dsl_accessor :primary_key, :default=>"id"
-    dsl_accessor :table_name,  :default=>proc{|klass| klass.name.demodulize.underscore.pluralize}
-  end
-
-  class Item < CoolActiveRecord
-    primary_key :item_id
-    table_name  :item_table
-  end
-
-  def test_overwrite_default_accessor
-    assert_equal :item_id,    Item.primary_key
-    assert_equal :item_table, Item.table_name
-  end
-end
-
-
-class DslWriterAccessorTest < Test::Unit::TestCase
-  class Item
-    dsl_accessor :primary_key, :writer=>proc{|value| value.to_s}
-  end
-
-  def test_string_writer
-    assert_equal "", Item.primary_key
-
-    Item.primary_key :id
-    assert_equal "id", Item.primary_key
-
-    Item.primary_key "id"
-    assert_equal "id", Item.primary_key
-  end
-end
-
-

data/test/instance_options_test.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class DefineInstanceMethodWithOptionsTest < Test::Unit::TestCase
+  class Window
+    dsl_accessor :width, :default=>640, :instance=>:options
+  end
+
+  class OptionedWindow
+    dsl_accessor :width, :default=>640, :instance=>:options
+    def initialize(options = {})
+      @options = options
+    end
+  end
+
+  def test_class_method
+    assert_equal Window.width, 640
+    assert_equal OptionedWindow.width, 640
+  end
+
+  def test_instance_method
+    assert_raises(TypeError) { Window.new.width }
+    assert_equal OptionedWindow.new.width, 640
+  end
+
+  def test_use_options_variable_rather_than_default_value
+    window = OptionedWindow.new( :width => 320 )
+    assert_equal window.width, 320
+  end
+
+  def test_instance_options_value_doesnt_affect_to_class_method
+    window = OptionedWindow.new( :width => 320 )
+    assert_equal OptionedWindow.width, 640
+  end
+
+end
+
+
+

data/test/instance_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class DefineInstanceMethodTest < Test::Unit::TestCase
+  class Item
+    dsl_accessor :primary_key, "code", :instance=>true
+  end
+
+  class OtherClass
+  end
+
+  def test_dsl_accessor_doesnt_affect_other_classes
+    assert !OtherClass.respond_to?(:primary_key)
+  end
+
+  def test_dsl_accessor_doesnt_affect_other_instances
+    assert !OtherClass.new.respond_to?(:primary_key)
+  end
+
+  def test_class_method
+    assert Item.respond_to?(:primary_key)
+    assert_nothing_raised do
+      Item.primary_key
+    end
+  end
+
+  def test_class_method_value
+    assert_equal "code", Item.primary_key
+  end
+
+  def test_instance_method
+    assert Item.new.respond_to?(:primary_key)
+    assert_nothing_raised do
+      Item.new.primary_key
+    end
+  end
+
+  def test_instance_method_value
+    assert_equal "code", Item.new.primary_key
+  end
+end
+
+
+

data/test/test_helper.rb

@@ -1,3 +1,5 @@
 require 'test/unit'
-require 'rubygems'
-require File.dirname(__FILE__) + '/../lib/dsl_accessor'
+
+def __DIR__; File.dirname(__FILE__); end
+require File.dirname(__FILE__) + '/../init'
+

data/test/writer_test.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+
+class DslWriterAccessorTest < Test::Unit::TestCase
+  class Item
+    dsl_accessor :primary_key, :writer=>proc{|value| value.to_s}
+  end
+
+  def test_string_writer
+    assert_equal "", Item.primary_key
+
+    Item.primary_key :id
+    assert_equal "id", Item.primary_key
+
+    Item.primary_key "id"
+    assert_equal "id", Item.primary_key
+  end
+end
+
+
+

metadata

@@ -1,72 +1,73 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: dsl_accessor
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-01-16 00:00:00 -08:00
-summary: This gem gives hybrid accessor class methods to classes by DSL like definition.
-require_paths: 
-- lib
-email: anna@wota.jp
-homepage: http://dsl-accessor.rubyforge.org
-rubyforge_project: dsl-accessor
-description: This gem gives hybrid accessor class methods to classes by DSL like definition.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.3.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Maiha
-- Alex Wayne
+- maiha
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-10-19 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: This plugin gives hybrid accessor class methods to classes by DSL like definition
+email: maiha@wota.jp
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
 files: 
-- History.txt
-- Manifest.txt
-- README.txt
+- LICENSE
+- README
 - Rakefile
-- setup.rb
+- core_ext/duplicable.rb
+- core_ext/module/delegation.rb
+- core_ext/class/dsl_accessor.rb
+- core_ext/class/inheritable_attributes.rb
 - lib/dsl_accessor.rb
-- lib/dsl_accessor/version.rb
+- spec/inherit_spec.rb
+- spec/auto_declared_spec.rb
+- spec/spec_helper.rb
+- tasks/dsl_accessor_tasks.rake
+- test/instance_test.rb
+- test/default_test.rb
+- test/writer_test.rb
 - test/test_helper.rb
 - test/dsl_accessor_test.rb
-test_files: 
-- test/dsl_accessor_test.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
+- test/instance_options_test.rb
+has_rdoc: true
+homepage: http://github.com/maiha/dsl_accessor
+licenses: []
 
-extensions: []
+post_install_message: 
+rdoc_options: []
 
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.7
-    version: 
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: This plugin gives hybrid accessor class methods to classes by DSL like definition
+test_files: []
+

data/Manifest.txt

@@ -1,9 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-setup.rb
-lib/dsl_accessor.rb
-lib/dsl_accessor/version.rb
-test/test_helper.rb
-test/dsl_accessor_test.rb