stark 0.8.0 → 0.9.0

data/README.md

@@ -120,7 +120,7 @@ namespace.
 
 ### Debugging
 
-Spark will output some valuable (albeit verbose) debugging information
+Stark will output some valuable (albeit verbose) debugging information
 if you set the `STARK_DEBUG` environment variable.
 
 ```

data/Rakefile

@@ -16,8 +16,8 @@ Hoe.spec 'stark' do
   readme_file = "README.md"
 end
 
+desc 'Run kpeg to generate new parser'
 task :parser do
   sh "kpeg -o lib/stark/raw_parser.rb -s -f lib/stark/thrift.kpeg"
 end
-
 # vim: syntax=ruby

data/lib/stark.rb

@@ -2,7 +2,7 @@ require 'thrift'
 require 'logger'
 
 module Stark
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 
   def self.logger
     @logger ||= ::Logger.new($stdout)
@@ -28,7 +28,7 @@ module Stark
     require 'stringio'
 
     begin
-      contents = file.respond_to?(:read) ? file.read : File.read(file)
+      contents = Stark::Parser.read_file(file)
       ast = Stark::Parser.ast contents
     rescue => e
       raise e, e.message + " while processing #{file} -\n#{e.backtrace.join("\n")}"

data/lib/stark/parser.rb

@@ -1,6 +1,7 @@
 module Stark
 end
 
+require 'set'
 require 'stark/raw_parser'
 
 class Stark::Parser
@@ -9,11 +10,11 @@ class Stark::Parser
 
     ast.each do |elem|
       case elem
-      when AST::Include
-        data = File.read elem.path
-        out += expand(Stark::Parser.ast(data))
-      else
-        out << elem
+        when AST::Include
+          data = Stark::Parser.read_file(elem.path)
+          out += expand(Stark::Parser.ast(data))
+        else
+          out << elem
       end
     end
 
@@ -29,4 +30,16 @@ class Stark::Parser
     parser = Stark::Parser.new arg
     parser.ast
   end
+
+  def self.read_file(file)
+    @@include_path ||= Set.new([Dir.pwd])
+    if file.respond_to?(:read)
+      @@include_path << File.dirname(File.expand_path(file.path, Dir.pwd)) if file.respond_to?(:path)
+      return file.read
+    else
+      @@include_path << File.dirname(File.expand_path(file, Dir.pwd))
+      fn = (@@include_path.map { |path| File.expand_path(file, path) }.detect { |fn| File.exist?(fn) }) || file
+      File.read fn
+    end
+  end
 end

data/lib/stark/raw_parser.rb

@@ -1669,7 +1669,7 @@ class Stark::Parser
     return _tmp
   end
 
-  # Element = (Comment | obsp Header bsp | Definition bsp)
+  # Element = (Comment | obsp Header bsp | Definition obsp)
   def _Element
 
     _save = self.pos
@@ -1707,7 +1707,7 @@ class Stark::Parser
           self.pos = _save2
           break
         end
-        _tmp = apply(:_bsp)
+        _tmp = apply(:_obsp)
         unless _tmp
           self.pos = _save2
         end
@@ -4049,7 +4049,7 @@ class Stark::Parser
   Rules[:_CaptureDocText] = rule_info("CaptureDocText", "{}")
   Rules[:_DestroyDocText] = rule_info("DestroyDocText", "{}")
   Rules[:_HeaderList] = rule_info("HeaderList", "(HeaderList Header | Header)")
-  Rules[:_Element] = rule_info("Element", "(Comment | obsp Header bsp | Definition bsp)")
+  Rules[:_Element] = rule_info("Element", "(Comment | obsp Header bsp | Definition obsp)")
   Rules[:_Header] = rule_info("Header", "(Include | Namespace)")
   Rules[:_Namespace] = rule_info("Namespace", "(\"namespace\" - tok_identifier:l - tok_identifier:n {namespace(l,n)} | \"namespace\" - \"*\" - tok_identifier:n {namespace(nil,n)})")
   Rules[:_Include] = rule_info("Include", "\"include\" - tok_literal:f {include(f)}")

data/lib/stark/struct.rb

@@ -27,7 +27,14 @@ module Stark
       {}.tap do |hash|
         self.class.fields.each do |idx,name|
           v = send name
-          hash[name] = v if v
+          case v
+          when Array
+            hash[name] = v.map(&:to_hash)
+          when Struct
+            hash[name] = v.to_hash
+          else
+            hash[name] = v if v
+          end
         end
       end
     end

data/lib/stark/thrift.kpeg

@@ -187,7 +187,7 @@ HeaderList = HeaderList Header
 
 Element = Comment
         | obsp Header bsp
-        | Definition bsp
+        | Definition obsp
 
 Header = Include | Namespace
 

data/test/comments.thrift

@@ -12,4 +12,4 @@
 struct Foo {
   // one comment entry is allowed here, but not elsewhere inside the struct
   1: i32 id
-}
+}

data/test/include_blah.thrift

@@ -1 +1 @@
-include "test/blah.thrift"
+include "blah.thrift"

data/test/test_ruby.rb

@@ -138,6 +138,32 @@ EOM
     assert_equal({:str => "hi", :int => 20}, foo.to_hash)
   end
 
+  def test_to_struct_to_hash_nested
+    ruby = create_ruby <<-EOM, :only_ast => true
+struct Bar {
+1: string blah
+}
+struct Quux {
+1: i32 int
+}
+struct Foo {
+1:string str
+2:list<Bar> bars
+3:i32 int
+4:Quux q
+}
+EOM
+
+    ns = Module.new
+    ns.module_eval ruby
+    assert ns::Foo
+
+    foo = ns::Foo.new :str => "hi", :int => 20
+    foo.bars = [ns::Bar.new(:blah => "baz")]
+    foo.q = ns::Quux.new(:int => 42)
+    assert_equal({:str => "hi", :int => 20, :bars => [{:blah => "baz"}], :q => {:int => 42}}, foo.to_hash)
+  end
+
   def test_to_struct_aref
     ruby = create_ruby <<-EOM, :only_ast => true
 struct Foo {

data/test/test_stark.rb

@@ -39,7 +39,7 @@ class TestStark < Test::Unit::TestCase
     assert @m.const_defined?(:FavoriteUsers)
   end
 
-  def test_materialize_service_with_comments
+  def test_materialize_service_with_comments_and_no_ending_newline
     file_path = File.join(File.dirname(__FILE__), 'comments.thrift')
     assert_nothing_raised do
       Stark.materialize file_path, @m
@@ -64,4 +64,12 @@ class TestStark < Test::Unit::TestCase
     assert @m.const_defined?(:Types)
   end
 
+  def test_include_in_same_dir_not_working_dir
+    Dir.chdir(File.dirname(__FILE__) + '/../') do
+      file_path = File.join(File.dirname(__FILE__), 'include_blah.thrift')
+      assert_nothing_raised do
+        Stark.materialize file_path, @m
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stark
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.5'
 description: Optimized thrift bindings for ruby.
 email:
 - evan@phx.io
@@ -68,8 +68,6 @@ extensions: []
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
-- README.md
-- examples/README.md
 files:
 - .autotest
 - .gemtest
@@ -142,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: stark
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Optimized thrift bindings for ruby.