katuv 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTE0MjU5ZjdmNDg3YmU1MjExNDE4MGIzMDYzMWQ1YzIwZDUzYmM2Mg==
+  data.tar.gz: !binary |-
+    MTE3OTJhZTc1Y2E5NWE0ZDdiNGU3YmQxMzI4NThmOWZhY2NjOTkwZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDU1NGE2NWQ5NzM5ZTBkNDliNzM3MGU5MjdjMjY1ZWQwOWQ2MTZhMDZkNzdm
+    YmJlYjM3Y2QzOWJlNGIwYTIwZTIwNDhjNjZhNTI4MmY4MzExZjM3M2ZmYmYx
+    MThhOTZmYWJhMWI2MDIyNjhmNWMzMzJiYjZkMTUyYzM0ZWQzOWY=
+  data.tar.gz: !binary |-
+    MGExNzFkZWRiNmQ2YjVhMmIyNzZhMWE3NjE0MjZhMDYxNGE3OTM4OWZhNzk2
+    NzI2ZWFlMmI5NDVkMTkyNDk0NzcyMDBhNDQ5Y2Y4YzNjNDIyYjc4MDgyZjZk
+    MGIzNTEyZGFkY2MzOTVjMjI2Mjg1NGUxMzMwYjg5NjViNTAxMDA=

data/.ruby-gemset

@@ -0,0 +1 @@
+katuv

data/.ruby-version

@@ -0,0 +1 @@
+rbx-head

data/Gemfile

@@ -1,16 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-
-gem 'rspec'
-gem 'rspec-spies'
-gem 'coveralls', require: false
-gem 'flay'
-gem 'flog'
-gem 'mutant'
-
-gem 'pry'
-
+gem 'crystalline'
+gem 'rspec', '2.13.0'
 
 # Specify your gem's dependencies in katuv.gemspec
 gemspec

data/Rakefile

@@ -24,6 +24,8 @@ task :flay do
 end
 
 task :mutant, [:klass] do |_, args|
+  ENV['NO_COVERAGE'] = 'true'
+
   puts "#### MUTANT TESTING ####"
   system "mutant -I lib -r katuv --rspec-full #{args[:name] || '::Katuv'}"
   puts "########################"

data/lib/katuv/dsl.rb

@@ -1,7 +1,7 @@
 module Katuv
   module DSL
     def nonterminal(type)
-      raise "NonterminalInTerminalError" if terminal?
+      raise NonterminalInTerminalError if terminal?
       define_method(_type_to_method_name(type)) do |name=nil, opts={}, &block|
         if children.has_key?(type) and children[type]
           children[type].run!(&block)
@@ -14,9 +14,9 @@ module Katuv
 
     def terminal(type)
       #should only allow one.
-      raise "InvalidNodeTypeError" unless type.terminal?
+      raise InvalidNodeTypeError unless type.terminal?
       define_method(_type_to_method_name(type)) do |name=nil, opts={}, &block|
-        raise "TerminalAlreadySetError" if children.has_key?(type)
+        raise TerminalAlreadySetError if children.has_key?(type)
         children[type] = type.new(name, opts.merge(parent: self), &block)
       end
     end
@@ -28,7 +28,7 @@ module Katuv
     def multiple(type)
       #should store an entry in #children that is a list of all the instances
       #it sees of this type. eg, `file 'x'; file 'y' #=> children[File] = [File<@name=x>, File<@name=y>]
-      raise "InvalidNodeTypeError" unless type.terminal?
+      raise InvalidNodeTypeError unless type.terminal?
       define_method(_type_to_method_name(type)) do |name, opts={}, &block|
         children[type] ||= ObjectSet.new
         children[type] << type.new(name, opts.merge(parent: self), &block)
@@ -42,5 +42,9 @@ module Katuv
         type.to_s
       end.split('::').last.downcase
     end
+
+    class InvalidNodeTypeError < ArgumentError ; end
+    class TerminalAlreadySetError < ArgumentError ; end
+    class NonterminalInTerminalError < ArgumentError ; end
   end
 end

data/lib/katuv/node.rb

@@ -2,12 +2,15 @@ module Katuv
   module Node
     def self.included(base)
       base.send(:include, VisitorBehavior)
-      base.send(:include, Enumerable)
 
       base.send(:include, NamingBehavior)
       base.send(:include, NodeBehavior)
 
       base.send(:extend, DSL)
     end
+
+    def inspect
+      method_name
+    end
   end
 end

data/lib/katuv/node_behavior.rb

@@ -4,7 +4,8 @@ module Katuv
       @parent = opts[:parent]
       @name = name
       @opts = opts
-      instance_eval &block if block_given?
+      @block = block
+      run! &block unless terminal?
     end
     attr_reader :parent, :name
 
@@ -12,12 +13,26 @@ module Katuv
       self.class.terminal?
     end
 
+    def block
+      # pretend there's no method if we're not a terminal class.
+      raise NoMethodError unless terminal?
+      @block
+    end
+
+    def arity
+      @block.arity
+    end
+
+    def parameters
+      @block.parameters
+    end
+
     def each(&block)
       children.values.each(&block)
     end
 
-    def run!
-      #this sucks
+    def run!(&block)
+      instance_eval &block if block_given?
     end
 
     def children

data/lib/katuv/version.rb

@@ -1,3 +1,3 @@
 module Katuv
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/katuv/visitor_behavior.rb

@@ -1,5 +1,9 @@
 module Katuv
   module VisitorBehavior
+    def self.included(base)
+      base.send(:include, Enumerable)
+    end
+
     def visit(visitor)
       visitor.before(self) if visitor.respond_to? :before
 
@@ -9,6 +13,10 @@ module Katuv
         visitor.unknown(self)
       end
 
+      each do |c|
+        c.visit(visitor)
+      end
+
       visitor.after(self) if visitor.respond_to? :after
       nil
     end

data/spec/integration/dsl_integration_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+describe 'a dsl defined directly with katuv classes' do
+  before :all do
+    class Bar
+      include Katuv::Node
+      terminal!
+    end
+
+    class Baz
+      include Katuv::Node
+
+      terminal!
+
+      def self.name
+        'Quux'
+      end
+    end
+
+    class Foo
+      include Katuv::Node
+      multiple Bar
+      terminal Baz
+      nonterminal Foo
+    end
+  end
+
+  # A necessary bit of boilerplate required to start a script. you could,
+  # in theory, just do "Foo.new" to start the script, but you'd have to
+  # explicitly pass the parent.
+  #
+  # In needs to be in the outer scope (ie, not in the before block) so tests can
+  # get at it.
+  def foo(name = nil, opts={}, &block)
+    Foo.new(name, opts.merge(parent: nil), &block)
+  end
+
+  after :all do
+    Object.send(:remove_const, :Bar)
+    Object.send(:remove_const, :Baz)
+    Object.send(:remove_const, :Foo)
+  end
+
+  describe 'a correctly written script' do
+    subject :example_dsl_script do
+      foo do
+        bar '1'
+        bar '2'
+        quux 'bingle'
+
+        foo do
+          bar '3'
+          bar '4'
+
+          quux 'bangle'
+        end
+      end
+    end
+
+    it "parses the example script cleanly, raising no errors" do
+      expect { example_dsl_script }.to_not raise_error Katuv::DSL::NonterminalInTerminalError
+      expect { example_dsl_script }.to_not raise_error Katuv::DSL::TerminalAlreadySetError
+      expect { example_dsl_script }.to_not raise_error Katuv::DSL::InvalidNodeTypeError
+    end
+
+    context 'setting a terminal twice' do
+      subject :example_dsl_script do
+        foo do
+          bar '1'
+
+          quux '2'
+          quux 'bingle'
+        end
+      end
+
+      it 'raises a TerminalAlreadySetError' do
+        expect { example_dsl_script }.to raise_error Katuv::DSL::TerminalAlreadySetError
+      end
+    end
+  end
+end
+

data/spec/shared/visitor_behavior_examples.rb

@@ -7,6 +7,10 @@ shared_examples_for 'a class with the visitable behavior' do
   let(:visitor) { double('visitor') }
   before { visitor.stub(:unknown) }
 
+  # this by virtue of the fact that it is visitable and defines #each,
+  # VisitorBehavior includes Enumerable for us.
+  it { should be_an Enumerable }
+
   context 'with before hook' do
     before { visitor.stub(:before) }
 

data/spec/spec_helper.rb

@@ -6,8 +6,10 @@ require 'katuv'
 
 require 'rspec-spies'
 
-require 'coveralls'
-Coveralls.wear!
+unless ENV['NO_COVERAGE']
+  require 'coveralls'
+  Coveralls.wear!
+end
 
 #include helpers
 Dir["./spec/helpers/*.rb"].each { |file| require file }

data/spec/unit/dsl_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'The Katuv DSL' do
+  before :all do
+    class Example
+    end
+  end
+  subject(:example) { Example }
+
+  context 'before inclusion' do
+    describe 'api' do
+      it { should_not respond_to :terminal }
+      it { should_not respond_to :terminal! }
+      it { should_not respond_to :terminal? }
+      it { should_not respond_to :nonterminal }
+      it { should_not respond_to :multiple }
+
+      #technically private, but we need to test it... badly.
+      it { should_not respond_to :_type_to_method_name }
+    end
+  end
+
+  context 'after inclusion' do
+    before :all do
+      class Example
+        include Katuv::Node
+      end
+    end
+
+    describe 'api' do
+      it { should respond_to :terminal }
+      it { should respond_to :terminal! }
+      it { should respond_to :terminal? }
+
+      it { should respond_to :nonterminal }
+      it { should respond_to :multiple }
+
+      #technically private, but we need to test it... badly.
+      it { should respond_to :_type_to_method_name }
+    end
+
+    context do
+      describe '#_type_to_method_name' do
+        # this is kind of lousy
+        subject { example._type_to_method_name(example) }
+
+        it { should == 'example' }
+      end
+    end
+  end
+end

data/spec/{node_spec.rb → unit/node_spec.rb}

@@ -4,6 +4,7 @@ describe Katuv::Node do
   before :all do
     class ExampleTerminal
       include Katuv::Node
+
       terminal!
     end
 
@@ -16,6 +17,7 @@ describe Katuv::Node do
 
     class Example
       include Katuv::Node
+
       terminal ExampleTerminal
       nonterminal ExampleNonterminal
     end
@@ -33,6 +35,8 @@ describe Katuv::Node do
     it_should_behave_like 'a visitable class'
     it_should_behave_like 'a class with the visitable behavior'
 
+    it { should be_an Enumerable }
+
     its(:method_name) { should == "example" }
   end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katuv
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joe Fredette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies: []
 description: A tool for parsing and transforming internal Ruby DSLs
 email:
@@ -18,94 +17,62 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  LmdpdGlnbm9yZQ==
-- !binary |-
-  LnJ2bXJj
-- !binary |-
-  LnRyYXZpcy55bWw=
-- !binary |-
-  Q0hBTkdFTE9H
-- !binary |-
-  R2VtZmlsZQ==
-- !binary |-
-  TElDRU5TRS50eHQ=
-- !binary |-
-  Tk9URVMubWQ=
-- !binary |-
-  UkVBRE1FLm1k
-- !binary |-
-  UmFrZWZpbGU=
-- !binary |-
-  a2F0dXYuZ2Vtc3BlYw==
-- !binary |-
-  bGliL2thdHV2LnJi
-- !binary |-
-  bGliL2thdHV2L2RzbC5yYg==
-- !binary |-
-  bGliL2thdHV2L25hbWluZ19iZWhhdmlvci5yYg==
-- !binary |-
-  bGliL2thdHV2L25vZGUucmI=
-- !binary |-
-  bGliL2thdHV2L25vZGVfYmVoYXZpb3IucmI=
-- !binary |-
-  bGliL2thdHV2L29iamVjdF9zZXQucmI=
-- !binary |-
-  bGliL2thdHV2L3ZlcnNpb24ucmI=
-- !binary |-
-  bGliL2thdHV2L3Zpc2l0b3JfYmVoYXZpb3IucmI=
-- !binary |-
-  c3BlYy9kc2xfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9ub2RlX3NwZWMucmI=
-- !binary |-
-  c3BlYy9vYmplY3Rfc2V0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9zaGFyZWQvbmFtaW5nX2JlaGF2aW9yX2V4YW1wbGVzLnJi
-- !binary |-
-  c3BlYy9zaGFyZWQvdmlzaXRvcl9iZWhhdmlvcl9leGFtcGxlcy5yYg==
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
+- CHANGELOG
+- Gemfile
+- LICENSE.txt
+- NOTES.md
+- README.md
+- Rakefile
+- katuv.gemspec
+- lib/katuv.rb
+- lib/katuv/dsl.rb
+- lib/katuv/naming_behavior.rb
+- lib/katuv/node.rb
+- lib/katuv/node_behavior.rb
+- lib/katuv/object_set.rb
+- lib/katuv/version.rb
+- lib/katuv/visitor_behavior.rb
+- spec/integration/dsl_integration_spec.rb
+- spec/shared/naming_behavior_examples.rb
+- spec/shared/visitor_behavior_examples.rb
+- spec/spec_helper.rb
+- spec/unit/dsl_spec.rb
+- spec/unit/node_spec.rb
+- spec/unit/object_set_spec.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2002549777813010636
-      version: '0'
+      version: !binary |-
+        MA==
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2002549777813010636
-      version: '0'
+      version: !binary |-
+        MA==
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for parsing and transforming internal Ruby DSLs
 test_files:
-- !binary |-
-  c3BlYy9kc2xfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9ub2RlX3NwZWMucmI=
-- !binary |-
-  c3BlYy9vYmplY3Rfc2V0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9zaGFyZWQvbmFtaW5nX2JlaGF2aW9yX2V4YW1wbGVzLnJi
-- !binary |-
-  c3BlYy9zaGFyZWQvdmlzaXRvcl9iZWhhdmlvcl9leGFtcGxlcy5yYg==
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- spec/integration/dsl_integration_spec.rb
+- spec/shared/naming_behavior_examples.rb
+- spec/shared/visitor_behavior_examples.rb
+- spec/spec_helper.rb
+- spec/unit/dsl_spec.rb
+- spec/unit/node_spec.rb
+- spec/unit/object_set_spec.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-RVM_STRING="rvm use rbx-head@katuv --create --verbose"
-[ -e './.rvmrc_local' ] && source './.rvmrc_local' || $RVM_STRING

data/spec/dsl_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe 'The Katuv DSL' do
-  before :all do
-    class Example
-    end
-  end
-  subject { Example }
-
-  context 'before inclusion' do
-    describe 'api' do
-      it { should_not respond_to :terminal }
-      it { should_not respond_to :nonterminal }
-      it { should_not respond_to :multiple }
-    end
-  end
-
-  context 'after inclusion' do
-    before do
-      class Example
-        include Katuv::Node
-      end
-    end
-
-    describe 'api' do
-      it { should respond_to :terminal }
-      it { should respond_to :nonterminal }
-      it { should respond_to :multiple }
-    end
-  end
-end