sparsam 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80bcbb2225d5e0f24f9a295afd99be378fca3fcc
-  data.tar.gz: cdfd6e2214719008a2482693bcf60ca662a22609
+  metadata.gz: 4b9246d1a569e7fa72c9f97015e0f9031b31249a
+  data.tar.gz: ba92cae518e5606f8c7273fb32519f307163b72c
 SHA512:
-  metadata.gz: 41eff67315ab200edfab3501d6997136fd1a0642e0b1cbe0a46e47e5bccd0f3a4926ffb2ed6a04f97e757736058e0c76d6dc875a7a7bbb58c132c9665d06cef0
-  data.tar.gz: a7d5aef8bd988ec4535f54c7dbd73f3352742ed2574e5cb1c79b51508a2529201121adb9d15726a9508347c458d80142e643b50a8fadc29a16881895849cad86
+  metadata.gz: 268c577839d6ba4ff96b19dfdf9d09e6b903a72ef298a4cba763ed13dd4723181b85bf213e0a974ffa0abdf0a5ac131b6ef51f3fe8b42ae753ac4f3d48378afe
+  data.tar.gz: 83b7f8c97f0feea55491958a67ae0db8805a080a0e874c27e7046211f49f74cd6b39e0f67ac1014b27a70734247ca38173dd1ece94b6dd11bf41ca0b435c9646

data/lib/sparsam.rb

@@ -4,6 +4,7 @@ require 'sparsam_native'
 require 'sparsam/types'
 require 'sparsam/exceptions'
 require 'sparsam/struct'
+require 'sparsam/application_exception'
 require 'sparsam/union'
 require 'sparsam/deserializer'
 

data/lib/sparsam/application_exception.rb

@@ -0,0 +1,10 @@
+require 'sparsam/base_type'
+require 'sparsam/base_struct'
+
+module Sparsam
+  class ApplicationException < StandardError
+    include ::Sparsam::BaseType
+    include ::Sparsam::StructInitialization
+    include ::Sparsam::BaseStruct
+  end
+end

data/lib/sparsam/base_struct.rb

@@ -0,0 +1,35 @@
+module Sparsam
+  module BaseStruct
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def field_accessor(klass, field_key, field_info)
+        field_name = field_info[:name]
+        klass.class_eval(<<-EOF, __FILE__, __LINE__)
+          attr_accessor :'#{field_name}'
+        EOF
+      end
+    end
+
+    private
+
+    def assign_defaults(defaults)
+      defaults.each do |name, default_value|
+        accessors = name_to_accessors(name)
+        send(accessors.writer, default_value)
+      end
+    end
+
+    def assign_from_arg(d)
+      d.each do |name, value|
+        accessors = name_to_accessors(name)
+        unless accessors
+          raise Sparsam::Exception, "Unknown key given to #{self.class}.new: #{name}"
+        end
+        send(accessors.writer, value)
+      end
+    end
+  end
+end

data/lib/sparsam/base_type.rb

@@ -0,0 +1,89 @@
+require 'set'
+require 'sparsam/types'
+
+module Sparsam
+  module BaseType
+    class AccessorNames < Struct.new(:reader, :writer); end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def generate_field_syms(klass)
+        field_syms = {}
+        klass::FIELDS.each do |_, field_info|
+          name = field_info[:name].to_sym
+          accessors = AccessorNames.new(name, :"#{name}=")
+          field_syms[name] = accessors
+          field_syms[name.to_s] = accessors
+        end
+
+        klass.const_set(
+          :FIELD_SYMS,
+          field_syms
+        )
+      end
+
+      def generate_accessors(klass)
+        klass::FIELDS.each do |field_key, field_info|
+          field_accessor(klass, field_key, field_info)
+        end
+      end
+
+      def generate_default_values(klass)
+        fields_with_default_values = {}
+        klass::FIELDS.each do |fid, field_def|
+          unless field_def[:default].nil?
+            fields_with_default_values[field_def[:name]] = field_def[:default].freeze
+          end
+        end
+
+        if fields_with_default_values.empty?
+          klass.const_set(
+            :DEFAULT_VALUES,
+            nil
+          )
+        else
+          klass.const_set(
+            :DEFAULT_VALUES,
+            fields_with_default_values
+          )
+        end
+      end
+
+      def init_thrift_struct(klass)
+        generate_accessors(klass)
+        generate_field_syms(klass)
+        Sparsam.cache_fields(klass)
+        generate_default_values(klass)
+        klass.class_eval(<<-EOF, __FILE__, __LINE__)
+          def struct_fields
+            FIELDS
+          end
+        EOF
+      end
+    end
+
+    def serialize(prot = Sparsam::CompactProtocol)
+      s = Sparsam::Serializer.new(prot, "")
+      s.serialize(self.class, self)
+    end
+
+    def validate(mode = Sparsam::NORMAL)
+      Sparsam.validate(self.class, self, mode)
+    end
+
+    private
+
+    def name_to_accessors(name)
+      self.class::FIELD_SYMS[name]
+    end
+
+    def each_field
+      struct_fields.each do |fid, data|
+        yield fid, data
+      end
+    end
+  end
+end

data/lib/sparsam/struct.rb

@@ -1,9 +1,12 @@
 # -*- coding: UTF-8 -*-
-require 'sparsam/base_class'
+require 'sparsam/base_type'
+require 'sparsam/base_struct'
 
 module Sparsam
-  class Struct < ::Sparsam::BaseClass
+  class Struct
+    include ::Sparsam::BaseType
     include ::Sparsam::StructInitialization
+    include ::Sparsam::BaseStruct
 
     def ==(other)
       return true if other.equal?(self)
@@ -15,31 +18,5 @@ module Sparsam
       end
     end
     alias_method :eql?, :==
-
-    def self.field_accessor(klass, field_key, field_info)
-      field_name = field_info[:name]
-      klass.class_eval(<<-EOF, __FILE__, __LINE__)
-        attr_accessor :'#{field_name}'
-      EOF
-    end
-
-    private
-
-    def assign_defaults(defaults)
-      defaults.each do |name, default_value|
-        accessors = name_to_accessors(name)
-        send(accessors.writer, default_value)
-      end
-    end
-
-    def assign_from_arg(d)
-      d.each do |name, value|
-        accessors = name_to_accessors(name)
-        unless accessors
-          raise Sparsam::Exception, "Unknown key given to #{self.class}.new: #{name}"
-        end
-        send(accessors.writer, value)
-      end
-    end
   end
 end

data/lib/sparsam/union.rb

@@ -1,8 +1,10 @@
 # -*- coding: UTF-8 -*-
-require 'sparsam/base_class'
+require 'sparsam/base_type'
 
 module Sparsam
-  class Union < ::Sparsam::BaseClass
+  class Union
+    include ::Sparsam::BaseType
+
     def initialize(name = nil, value = nil)
       if name
         if name.is_a? Hash

data/spec/gen-ruby/user_constants.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.1.0)
+# Autogenerated by Thrift Compiler (0.1.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/spec/gen-ruby/user_types.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.1.0)
+# Autogenerated by Thrift Compiler (0.1.1)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -126,3 +126,20 @@ class EveryType < ::Sparsam::Struct
   init_thrift_struct(self)
 end
 
+class SimpleException < ::Sparsam::ApplicationException
+  FIELDS = {
+    1 => {:type => ::Sparsam::Types::STRING, :name => 'message', :optional => true}
+  }
+
+  init_thrift_struct(self)
+end
+
+class WithFieldsException < ::Sparsam::ApplicationException
+  FIELDS = {
+    1 => {:type => ::Sparsam::Types::I64, :name => 'an_i64', :optional => true},
+    2 => {:type => ::Sparsam::Types::STRING, :name => 'message', :optional => true}
+  }
+
+  init_thrift_struct(self)
+end
+

data/spec/sparsam_spec.rb

@@ -460,5 +460,27 @@ describe 'Sparsam' do
 
       expect { data.serialize }.not_to raise_error
     end
+
+    describe 'ApplicationException' do
+      it 'creates exceptions that can be raised' do
+        e = SimpleException.new(message: "Oops")
+
+        e.message.should eq("Oops")
+
+        expect { raise e }.to raise_error(SimpleException, "Oops")
+      end
+
+      it 'serializes and reads exceptions' do
+        e = SimpleException.new(message: "Oops")
+
+        data = e.serialize
+
+        e2 = Sparsam::Deserializer.deserialize(SimpleException, data)
+
+        e2.message.should eq("Oops")
+
+        expect { raise e2 }.to raise_error(SimpleException, "Oops")
+      end
+    end
   end
 end

data/spec/user.thrift

@@ -81,3 +81,12 @@ struct EveryType {
   14: optional US a_struct
   15: optional UN a_union
 }
+
+exception SimpleException {
+  1: optional string message
+}
+
+exception WithFieldsException {
+  1: optional i64 an_i64
+  2: optional string message
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparsam
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Airbnb Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -90,24 +90,26 @@ extra_rdoc_files:
 - README.md
 - ext/ruby_hooks.c
 - ext/serializer.h
-- ext/third-party/sparsepp/sparsepp/spp.h
-- ext/third-party/sparsepp/sparsepp/spp_config.h
-- ext/third-party/sparsepp/sparsepp/spp_dlalloc.h
 - ext/third-party/sparsepp/sparsepp/spp_memory.h
+- ext/third-party/sparsepp/sparsepp/spp_utils.h
 - ext/third-party/sparsepp/sparsepp/spp_smartptr.h
+- ext/third-party/sparsepp/sparsepp/spp.h
 - ext/third-party/sparsepp/sparsepp/spp_stdint.h
 - ext/third-party/sparsepp/sparsepp/spp_timer.h
+- ext/third-party/sparsepp/sparsepp/spp_config.h
 - ext/third-party/sparsepp/sparsepp/spp_traits.h
-- ext/third-party/sparsepp/sparsepp/spp_utils.h
+- ext/third-party/sparsepp/sparsepp/spp_dlalloc.h
 - ext/extconf.rb
 - ext/serializer.cpp
-- lib/sparsam/base_class.rb
-- lib/sparsam/deserializer.rb
-- lib/sparsam/exceptions.rb
+- lib/sparsam.rb
 - lib/sparsam/struct.rb
-- lib/sparsam/types.rb
+- lib/sparsam/base_struct.rb
 - lib/sparsam/union.rb
-- lib/sparsam.rb
+- lib/sparsam/application_exception.rb
+- lib/sparsam/exceptions.rb
+- lib/sparsam/types.rb
+- lib/sparsam/deserializer.rb
+- lib/sparsam/base_type.rb
 files:
 - README.md
 - ext/extconf.rb
@@ -124,7 +126,9 @@ files:
 - ext/third-party/sparsepp/sparsepp/spp_traits.h
 - ext/third-party/sparsepp/sparsepp/spp_utils.h
 - lib/sparsam.rb
-- lib/sparsam/base_class.rb
+- lib/sparsam/application_exception.rb
+- lib/sparsam/base_struct.rb
+- lib/sparsam/base_type.rb
 - lib/sparsam/deserializer.rb
 - lib/sparsam/exceptions.rb
 - lib/sparsam/struct.rb
@@ -166,7 +170,8 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for Apache Thrift
 test_files:
-- spec/gen-ruby/user_constants.rb
-- spec/gen-ruby/user_types.rb
 - spec/sparsam_spec.rb
+- spec/gen-ruby/user_types.rb
+- spec/gen-ruby/user_constants.rb
 - spec/user.thrift
+has_rdoc: true

data/lib/sparsam/base_class.rb

@@ -1,83 +0,0 @@
-require 'set'
-require 'sparsam/types'
-
-module Sparsam
-  class BaseClass
-    class AccessorNames < Struct.new(:reader, :writer); end
-
-    def self.generate_field_syms(klass)
-      field_syms = {}
-      klass::FIELDS.each do |_, field_info|
-        name = field_info[:name].to_sym
-        accessors = AccessorNames.new(name, :"#{name}=")
-        field_syms[name] = accessors
-        field_syms[name.to_s] = accessors
-      end
-
-      klass.const_set(
-        :FIELD_SYMS,
-        field_syms
-      )
-    end
-
-    def self.generate_accessors(klass)
-      klass::FIELDS.each do |field_key, field_info|
-        field_accessor(klass, field_key, field_info)
-      end
-    end
-
-    def self.generate_default_values(klass)
-      fields_with_default_values = {}
-      klass::FIELDS.each do |fid, field_def|
-        unless field_def[:default].nil?
-          fields_with_default_values[field_def[:name]] = field_def[:default].freeze
-        end
-      end
-
-      if fields_with_default_values.empty?
-        klass.const_set(
-          :DEFAULT_VALUES,
-          nil
-        )
-      else
-        klass.const_set(
-          :DEFAULT_VALUES,
-          fields_with_default_values
-        )
-      end
-    end
-
-    def self.init_thrift_struct(klass)
-      generate_accessors(klass)
-      generate_field_syms(klass)
-      Sparsam.cache_fields(klass)
-      generate_default_values(klass)
-      klass.class_eval(<<-EOF, __FILE__, __LINE__)
-        def struct_fields
-          FIELDS
-        end
-      EOF
-    end
-
-    def serialize(prot = Sparsam::CompactProtocol)
-      s = Sparsam::Serializer.new(prot, "")
-      s.serialize(self.class, self)
-    end
-
-    def validate(mode = Sparsam::NORMAL)
-      Sparsam.validate(self.class, self, mode)
-    end
-
-    private
-
-    def name_to_accessors(name)
-      self.class::FIELD_SYMS[name]
-    end
-
-    def each_field
-      struct_fields.each do |fid, data|
-        yield fid, data
-      end
-    end
-  end
-end