ruby-lint 0.0.4 → 0.0.5

data/spec/ruby-lint/definition/{dsl.rb → dsl_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::Definition::RubyObject do
   before do
@@ -6,13 +6,13 @@ describe RubyLint::Definition::RubyObject do
   end
 
   describe 'definining constants using a DSL' do
-    should 'define a constant' do
+    example 'define a constant' do
       @first.define_constant('B')
 
       @first.lookup(:const, 'B').is_a?(ruby_object).should == true
     end
 
-    should 'define a constant using a block' do
+    example 'define a constant using a block' do
       @first.define_constant('B') do |b|
         b.define_constant('C')
       end
@@ -23,7 +23,7 @@ describe RubyLint::Definition::RubyObject do
         .should == true
     end
 
-    should 'inherit from another object' do
+    example 'inherit from another object' do
       @first.define_constant('B') do |b|
         b.define_constant('C')
       end
@@ -38,7 +38,7 @@ describe RubyLint::Definition::RubyObject do
         .should == true
     end
 
-    should 'define a constant using a constant path' do
+    example 'define a constant using a constant path' do
       @first.define_constant('A')
       @first.define_constant('A::B')
 
@@ -50,13 +50,13 @@ describe RubyLint::Definition::RubyObject do
   end
 
   describe 'defining methods using a DSL' do
-    should 'define a method' do
+    example 'define a method' do
       @first.define_method('example')
 
       @first.lookup(:method, 'example').is_a?(ruby_method).should == true
     end
 
-    should 'define an instance method' do
+    example 'define an instance method' do
       @first.define_instance_method('example')
 
       @first.lookup(:instance_method, 'example') \
@@ -64,7 +64,7 @@ describe RubyLint::Definition::RubyObject do
         .should == true
     end
 
-    should 'define a method\'s return value' do
+    example 'define a method\'s return value' do
       string = ruby_object.new(:type => :str, :value => 'hello')
 
       @first.define_method('example') do |example|
@@ -77,14 +77,14 @@ describe RubyLint::Definition::RubyObject do
         .should == true
     end
 
-    should 'add a required argument' do
+    example 'add a required argument' do
       arg = method_with_argument(@first, :argument).arguments.first
 
       arg.is_a?(ruby_object).should == true
       arg.name.should                == 'number'
     end
 
-    should 'add a optional argument' do
+    example 'add a optional argument' do
       arg = method_with_argument(@first, :optional_argument) \
         .optional_arguments \
         .first
@@ -93,21 +93,21 @@ describe RubyLint::Definition::RubyObject do
       arg.name.should                == 'number'
     end
 
-    should 'add a rest argument' do
+    example 'add a rest argument' do
       arg = method_with_argument(@first, :rest_argument).rest_argument
 
       arg.is_a?(ruby_object).should == true
       arg.name.should                == 'number'
     end
 
-    should 'add a block argument' do
+    example 'add a block argument' do
       arg = method_with_argument(@first, :block_argument).block_argument
 
       arg.is_a?(ruby_object).should == true
       arg.name.should                == 'number'
     end
 
-    should 'easily define constructor methods' do
+    example 'easily define constructor methods' do
       @first.define_constructors do |method|
         method.define_argument('name')
       end
@@ -122,7 +122,7 @@ describe RubyLint::Definition::RubyObject do
   end
 
   describe 'defining global variables using a DSL' do
-    should 'define a global variable' do
+    example 'define a global variable' do
       @first.define_global_variable('$number', '10')
 
       found = @first.lookup(:gvar, '$number')
@@ -132,4 +132,4 @@ describe RubyLint::Definition::RubyObject do
       found.name.should               == '$number'
     end
   end
-end
+end

data/spec/ruby-lint/definition/{ruby_method.rb → ruby_method_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::Definition::RubyObject do
   describe 'method definition DSL' do
@@ -7,13 +7,13 @@ describe RubyLint::Definition::RubyObject do
     end
 
     describe 'return values' do
-      should 'return a static value' do
+      example 'return a static value' do
         @method.returns(10)
 
         @method.return_value.should == 10
       end
 
-      should 'return a value using a block' do
+      example 'return a value using a block' do
         @method.returns do
           20
         end
@@ -28,11 +28,11 @@ describe RubyLint::Definition::RubyObject do
         @method.returns(10)
       end
 
-      should 'call the method directly' do
+      example 'call the method directly' do
         @method.call.should == 10
       end
 
-      should 'call the method by name' do
+      example 'call the method by name' do
         container = ruby_object.new(
           :name          => 'String',
           :type          => :const,
@@ -44,48 +44,62 @@ describe RubyLint::Definition::RubyObject do
         container.call_method('example').should == 10
       end
 
-      should 'raise for calling an undefined method' do
+      example 'raise for calling an undefined method' do
         container = ruby_object.new(
           :name          => 'String',
           :type          => :const,
           :instance_type => :instance
         )
 
-        error = should.raise?(NoMethodError) do
-          container.call_method('derp')
-        end
-
-        error.message.should =~ /undefined method derp for/i
+        lambda { container.call_method('derp') }
+          .should raise_error(NoMethodError, /undefined method derp for/i)
       end
     end
 
     describe 'defining arguments' do
-      should 'define an argument' do
+      example 'define an argument' do
         @method.define_argument('number')
 
         @method.lookup(:arg, 'number').is_a?(ruby_object).should  == true
         @method.lookup(:lvar, 'number').is_a?(ruby_object).should == true
+
+        @method.arguments[0].is_a?(ruby_object).should == true
       end
 
-      should 'define an optional argument' do
+      example 'define an optional argument' do
         @method.define_optional_argument('number')
 
         @method.lookup(:optarg, 'number').is_a?(ruby_object).should == true
         @method.lookup(:lvar, 'number').is_a?(ruby_object).should   == true
+
+        @method.optional_arguments[0].is_a?(ruby_object).should == true
       end
 
-      should 'define a rest argument' do
+      example 'define a rest argument' do
         @method.define_rest_argument('number')
 
         @method.lookup(:restarg, 'number').is_a?(ruby_object).should == true
-        @method.lookup(:lvar, 'number').is_a?(ruby_object).should   == true
+        @method.lookup(:lvar, 'number').is_a?(ruby_object).should    == true
+
+        @method.rest_argument.is_a?(ruby_object).should == true
       end
 
-      should 'define a block argument' do
+      example 'define a block argument' do
         @method.define_block_argument('number')
 
         @method.lookup(:blockarg, 'number').is_a?(ruby_object).should == true
-        @method.lookup(:lvar, 'number').is_a?(ruby_object).should   == true
+        @method.lookup(:lvar, 'number').is_a?(ruby_object).should     == true
+
+        @method.block_argument.is_a?(ruby_object).should == true
+      end
+
+      example 'define a keyword argument' do
+        @method.define_keyword_argument('number')
+
+        @method.lookup(:kwoptarg, 'number').is_a?(ruby_object).should == true
+        @method.lookup(:lvar, 'number').is_a?(ruby_object).should     == true
+
+        @method.keyword_arguments[0].is_a?(ruby_object).should == true
       end
     end
   end

data/spec/ruby-lint/definition/{ruby_object.rb → ruby_object_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'spec_helper'
 
 describe ruby_object do
   before do
@@ -14,42 +14,35 @@ describe ruby_object do
     )
   end
 
-  should 'return the name of the object' do
+  example 'return the name of the object' do
     @object.name.should == 'hello'
   end
 
-  should 'return the object type' do
+  example 'return the object type' do
     @object.type.should == :lvar
   end
 
-  should 'return the value of the node' do
+  example 'return the value of the node' do
     @object.value.value.should == '10'
   end
 
-  should 'only store RubyObject objects' do
+  example 'only store RubyObject objects' do
     obj = ruby_object.new(
       :type => :lvar,
       :name => 'foo'
     )
 
-    should.raise?(TypeError) do
-      @object.add(:lvar, 'foo', 10)
-    end
-
-    should.not.raise?(TypeError) do
-      @object.add(:lvar, 'foo', obj)
-    end
+    lambda { @object.add(:lvar, 'foo', 10) }.should raise_error(TypeError)
+    lambda { @object.add(:lvar, 'foo', obj) }.should_not raise_error
   end
 
-  should 'only add valid collection types' do
+  example 'only add valid collection types' do
     obj = ruby_object.new(:name => 'Foo', :type => :test)
 
-    should.raise?(ArgumentError) do
-      @object.add_definition(obj)
-    end
+    lambda { @object.add_definition(obj) }.should raise_error(ArgumentError)
   end
 
-  should 'look up a constant path' do
+  example 'look up a constant path' do
     first  = ruby_object.new(:name => 'A', :type => :const)
     second = ruby_object.new(:name => 'B', :type => :const)
     third  = ruby_object.new(:name => 'C', :type => :const)
@@ -60,7 +53,7 @@ describe ruby_object do
     first.lookup_constant_path('B::C').should == third
   end
 
-  should 'store a variable' do
+  example 'store a variable' do
     var = ruby_object.new(
       :type => :lvar,
       :name => 'number'
@@ -76,7 +69,7 @@ describe ruby_object do
     found.type.should == :lvar
   end
 
-  should 'set the parent definitions' do
+  example 'set the parent definitions' do
     var1 = ruby_object.new(
       :type  => :lvar,
       :name  => 'numberx',
@@ -93,7 +86,7 @@ describe ruby_object do
     var2.parents.length.should == 1
   end
 
-  should 'retrieve parent definitions' do
+  example 'retrieve parent definitions' do
     method = ruby_object.new(
       :type => :lvar,
       :name => 'example'
@@ -114,7 +107,7 @@ describe ruby_object do
     found.name.should == 'example'
   end
 
-  should 'create a RubyObject that represents an instance' do
+  example 'create a RubyObject that represents an instance' do
     object = ruby_object.new(:type => :const, :name => 'String')
 
     object.instance_type.should == :class
@@ -126,7 +119,7 @@ describe ruby_object do
     instance.instance_type.should == :instance
   end
 
-  should 'add data to a parent definition' do
+  example 'add data to a parent definition' do
     initial = ruby_object.new(
       :type  => :lvar,
       :name  => 'test',
@@ -164,7 +157,7 @@ describe ruby_object do
     parent.lookup(child_only.type, child_only.name).nil?.should == true
   end
 
-  should 'return the members as the definition value' do
+  example 'return the members as the definition value' do
     array  = ruby_object.new(:type => :array, :members_as_value => true)
     values = [10, 20]
 
@@ -189,4 +182,16 @@ describe ruby_object do
       array.value[index].value.value.should == value
     end
   end
+
+  example 'merging two definitions' do
+    source = ruby_object.new(:type => :const, :name => 'Source')
+    target = ruby_object.new(:type => :const, :name => 'Target')
+    const  = ruby_object.new(:type => :const, :name => 'Foo')
+
+    source.add_definition(const)
+
+    target.merge(source)
+
+    target.lookup(:const, 'Foo').should == const
+  end
 end

data/spec/ruby-lint/definition_builder/{primitive.rb → primitive_spec.rb}

@@ -1,11 +1,11 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::DefinitionBuilder::Primitive do
   before do
     @root = ruby_object.new(:name => 'root')
   end
 
-  should 'build an integer definition' do
+  example 'build an integer definition' do
     builder = RubyLint::DefinitionBuilder::Primitive.new(s(:int, 10), @root)
     built   = builder.build
 
@@ -13,7 +13,7 @@ describe RubyLint::DefinitionBuilder::Primitive do
     built.value.should == 10
   end
 
-  should 'build a float definition' do
+  example 'build a float definition' do
     builder = RubyLint::DefinitionBuilder::Primitive.new(s(:float, 10.0), @root)
     built   = builder.build
 
@@ -21,7 +21,7 @@ describe RubyLint::DefinitionBuilder::Primitive do
     built.value.should == 10.0
   end
 
-  should 'build a string definition' do
+  example 'build a string definition' do
     builder = RubyLint::DefinitionBuilder::Primitive.new(s(:str, 'a'), @root)
     built   = builder.build
 
@@ -29,7 +29,7 @@ describe RubyLint::DefinitionBuilder::Primitive do
     built.value.should == 'a'
   end
 
-  should 'build a symbol definition' do
+  example 'build a symbol definition' do
     builder = RubyLint::DefinitionBuilder::Primitive.new(s(:sym, :a), @root)
     built   = builder.build
 
@@ -37,13 +37,13 @@ describe RubyLint::DefinitionBuilder::Primitive do
     built.value.should == :a
   end
 
-  should 'build primitives as instances by default' do
+  example 'build primitives as instances by default' do
     builder = RubyLint::DefinitionBuilder::Primitive.new(s(:int, 10), @root)
 
     builder.build.instance?.should == true
   end
 
-  should 'allow custom options to be defined' do
+  example 'allow custom options to be defined' do
     builder = RubyLint::DefinitionBuilder::Primitive.new(
       s(:int, 10),
       @root,
@@ -53,10 +53,10 @@ describe RubyLint::DefinitionBuilder::Primitive do
     builder.build.class?.should == true
   end
 
-  should 'include the definitions of the corresponding Ruby class' do
+  example 'include the definitions of the corresponding Ruby class' do
     builder = RubyLint::DefinitionBuilder::Primitive.new(s(:int, 10), @root)
     built   = builder.build
 
     built.lookup(:instance_method, 'to_s').is_a?(ruby_object).should == true
   end
-end
+end

data/spec/ruby-lint/definition_builder/{ruby_class.rb → ruby_class_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'spec_helper'
 
 describe RubyLint::DefinitionBuilder::RubyClass do
   describe 'using an implicit parent class' do
@@ -8,15 +8,15 @@ describe RubyLint::DefinitionBuilder::RubyClass do
       @builder = RubyLint::DefinitionBuilder::RubyClass.new(node, @root)
     end
 
-    should 'return the name of the class' do
+    example 'return the name of the class' do
       @builder.build.name.should == 'A'
     end
 
-    should 'return the type of the class' do
+    example 'return the type of the class' do
       @builder.build.type.should == :const
     end
 
-    should 'return the parent definitions' do
+    example 'return the parent definitions' do
       built = @builder.build
 
       built.parents.length.should == 2
@@ -25,11 +25,11 @@ describe RubyLint::DefinitionBuilder::RubyClass do
       built.parents[1].name.should == 'root'
     end
 
-    should 'return the reference amount' do
+    example 'return the reference amount' do
       @builder.build.reference_amount.should == 1
     end
 
-    should 'return the scope to define the class in' do
+    example 'return the scope to define the class in' do
       @builder.scope.should == @root
     end
   end
@@ -48,11 +48,11 @@ describe RubyLint::DefinitionBuilder::RubyClass do
       )
     end
 
-    should 'return the name of the class' do
+    example 'return the name of the class' do
       @builder.build.name.should == 'A'
     end
 
-    should 'return the parent definitions' do
+    example 'return the parent definitions' do
       built = @builder.build
 
       built.parents.length.should == 2
@@ -61,7 +61,7 @@ describe RubyLint::DefinitionBuilder::RubyClass do
       built.parents[1].name.should == 'root'
     end
 
-    should 'return the scope to define the class in' do
+    example 'return the scope to define the class in' do
       @builder.scope.should == @root
     end
   end
@@ -88,11 +88,11 @@ describe RubyLint::DefinitionBuilder::RubyClass do
       )
     end
 
-    should 'return the name of the class' do
+    example 'return the name of the class' do
       @builder.build.name.should == 'B'
     end
 
-    should 'return the parent definitions' do
+    example 'return the parent definitions' do
       built = @builder.build
 
       built.parents.length.should == 2
@@ -101,8 +101,8 @@ describe RubyLint::DefinitionBuilder::RubyClass do
       built.parents[1].name.should == 'root'
     end
 
-    should 'return the scope to define the class in' do
+    example 'return the scope to define the class in' do
       @builder.scope.should == @root.lookup(:const, 'A')
     end
   end
-end
+end