ar_protobuf_store 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b67ef49a41ab742a3297873aca775dd9924c09
-  data.tar.gz: 9c12f9608f7cf76ad0974f5411f835667f01923f
+  metadata.gz: 98e9759f6a95859a2855c87b78b2d64e07f5ad51
+  data.tar.gz: dd06b77140489773f24e6f1b38aa1e8213fdcc7c
 SHA512:
-  metadata.gz: a5d54888716c80b4a92fa1fb8f1c2e06c9fa2a18c0ccd3c9372410fba150fa4da0cacaae7ea3954548e6dd7fac25cdddda317ae26e948b083db32cdaac022bcb
-  data.tar.gz: c912925d794e7e9f2901b22e22554c1a8ee3c192a1c6129226d65173e88ebad5e36083d1d9cf73bf89a57c5cc7bdab14621f00aeed7cc8c36e55ad120c1c53f8
+  metadata.gz: 07c55b3e1e88d423f33efd5426dd0fafdfe1eb742fa51714d1f2baef0ef9226ad0e3cbd49b5f28980700bdce25f6a4d36e13c471f3e96202419fbdf585bbfb87
+  data.tar.gz: 0852128fcfc9d4786a991ee07836bd753a78ae2d30c841008b117ac74c76d67e6efa6f2be825ca676abf59c2a01ad66f281b91850a88901f969235c8f3a3e6fe

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0

data/Appraisals

@@ -1,4 +1,4 @@
-RAILS_VERSIONS = ["3.2", "4.0", "4.1", "4.2", "4.2.5"]
+RAILS_VERSIONS = ["3.2", "4.0.0", "4.1.0", "4.2.0", "4.2.6"]
 PROTOBUF_SPECS = [
   ["protobuf", "~> 3.0"],
   ["ruby_protobuf", "~> 0.4"]

data/ChangeLog.md

@@ -1,3 +1,8 @@
+### 1.0.0 / 2015-05-15
+
+* Don't allow coder's dump method to fail. Instead, return nil.
+* Pass options through correctly, so coder can respect defaults.
+
 ### 0.2.3 / 2015-11-21
 
 Update gemspec, gem supports Rails 4.2

data/gemfiles/rails4.0.0_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "protobuf", "~> 3.0"
+
+gemspec :path => "../"

data/gemfiles/rails4.0.0_ruby_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "ruby_protobuf", "~> 0.4"
+
+gemspec :path => "../"

data/gemfiles/rails4.1.0_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "protobuf", "~> 3.0"
+
+gemspec :path => "../"

data/gemfiles/rails4.1.0_ruby_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "ruby_protobuf", "~> 0.4"
+
+gemspec :path => "../"

data/gemfiles/rails4.2.0_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "protobuf", "~> 3.0"
+
+gemspec :path => "../"

data/gemfiles/rails4.2.0_ruby_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "ruby_protobuf", "~> 0.4"
+
+gemspec :path => "../"

data/gemfiles/rails4.2.6_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.6"
+gem "protobuf", "~> 3.0"
+
+gemspec :path => "../"

data/gemfiles/rails4.2.6_ruby_protobuf.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.6"
+gem "ruby_protobuf", "~> 0.4"
+
+gemspec :path => "../"

data/lib/ar_protobuf_store.rb

@@ -12,19 +12,20 @@ module ArProtobufStore
     base.extend(ClassMethods)
   end
 
-  def self.find_parser!(pb_class)
+  def self.find_parser!(pb_class, options={})
     if defined?(ProtocolBuffers) && ::ProtocolBuffers::Message > pb_class
-      return ArProtobufStore::CodekitchenProtobufParser.new(pb_class)
+      return ArProtobufStore::CodekitchenProtobufParser.new(pb_class, options)
     elsif defined?(Protobuf) && ::Protobuf::Message > pb_class
-      return ArProtobufStore::ProtobufParser.new(pb_class)
+      return ArProtobufStore::ProtobufParser.new(pb_class, options)
     else
       raise "Could not identify protocol buffer library for #{pb_class}"
     end
   end
 
   module ClassMethods
-    def protobuf_store(store_attribute, pb_class, options={})
-      parser = ArProtobufStore.find_parser!(pb_class)
+    def protobuf_store(store_attribute, pb_class, options=nil)
+      options ||= {}
+      parser = ArProtobufStore.find_parser!(pb_class, options)
       serialize(store_attribute, parser)
       protobuf_store_accessor(store_attribute, parser.extract_fields(options[:accessors]))
     end

data/lib/ar_protobuf_store/codekitchen_protobuf_parser.rb

@@ -2,8 +2,9 @@ module ArProtobufStore
   class CodekitchenProtobufParser
     def initialize(pb_class, opts = nil)
       @klass = pb_class
-      @opts = opts
-      @opts ||=  { :default => Proc.new { pb_class.new() } }
+      @opts = {
+        :default => Proc.new { pb_class.new() }
+      }.merge(opts || {})
     end
 
     def load(str)
@@ -24,6 +25,14 @@ module ArProtobufStore
 
     def dump(str)
       str.serialize_to_string
+    rescue Exception
+      if defined?(Rails)
+        Rails.logger.error("Failed to serialize: #{$!}")
+      else
+        puts "Failed to serialize: #{$!}"
+      end
+
+      return nil
     end
 
     def extract_fields(accessors = nil)

data/lib/ar_protobuf_store/protobuf_parser.rb

@@ -2,8 +2,10 @@ module ArProtobufStore
   class ProtobufParser
     def initialize(pb_class, opts = nil)
       @klass = pb_class
-      @opts = opts
-      @opts ||=  { :default => Proc.new { pb_class.new() } }
+      @opts = opts || {}
+      @opts = {
+        :default => Proc.new { pb_class.new() }
+      }.merge(opts || {})
     end
 
     def load(str)
@@ -24,6 +26,14 @@ module ArProtobufStore
 
     def dump(str)
       str.serialize_to_string
+    rescue Exception
+      if defined?(Rails)
+        Rails.logger.error("Failed to serialize: #{$!}")
+      else
+        puts "Failed to serialize: #{$!}"
+      end
+
+      return nil
     end
 
     def extract_fields(accessors = nil)

data/lib/ar_protobuf_store/version.rb

@@ -1,4 +1,4 @@
 module ArProtobufStore
   # ar_protobuf_store version
-  VERSION = "0.2.3"
+  VERSION = "1.0.0"
 end

data/spec/codekitchen_protobuf_spec.rb

@@ -17,42 +17,118 @@ begin
       teardown_db
     end
 
-    let(:ar_klass) {
-      # Define everything using anonymous classes to reduce leakage.
-      extras = Class.new(::ProtocolBuffers::Message) do
+    def pb_class
+      Class.new(::ProtocolBuffers::Message) do
         optional :uint64, :int_attr, 1
         optional :string, :str_attr, 2
       end
+    end
 
+    let :ar_class do
+      # Define everything using anonymous classes to reduce leakage.
+      pb_class = self.pb_class
       Class.new(::ActiveRecord::Base) do
         self.table_name = "foos"
 
         include ArProtobufStore
 
-        protobuf_store :extras, extras
+        protobuf_store :extras, pb_class
       end
-    }
+    end
 
     describe ArProtobufStore::ClassMethods do
       it "should allow setting fields individually" do
-        record = ar_klass.create!
+        record = ar_class.create!
         record.int_attr = 2
         record.str_attr = "TEST"
         record.save
         expect(record.persisted?).to eq(true)
         record_id = record.id
 
-        record = ar_klass.find(record_id)
+        record = ar_class.find(record_id)
         expect(record.int_attr).to eq(2)
         expect(record.str_attr).to eq("TEST")
       end
 
       it "should allow setting fields in constructor" do
-        record = ar_klass.create!(:int_attr => 2, :str_attr => "TEST")
+        record = ar_class.create!(:int_attr => 2, :str_attr => "TEST")
+        expect(record.persisted?).to eq(true)
+        record_id = record.id
+
+        record = ar_class.find(record_id)
+        expect(record.int_attr).to eq(2)
+        expect(record.str_attr).to eq("TEST")
+      end
+
+      it "should allow required fields" do
+        pb_class = Class.new(::ProtocolBuffers::Message) do
+          optional :uint64, :int_attr, 1
+          required :string, :req_str_attr, 2
+        end
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class
+        end
+
+        # Handle batch create:
+        record = ar_class.create!(:int_attr => 2, req_str_attr: "required")
         expect(record.persisted?).to eq(true)
+
         record_id = record.id
+        record = ar_class.find(record_id)
+        expect(record.int_attr).to eq(2)
+        expect(record.req_str_attr).to eq("required")
+
+        # Handle calling setters:
+        record.req_str_attr = "something"
+        record.save!
+        record = ar_class.find(record_id)
+        expect(record.req_str_attr).to eq("something")
+      end
 
-        record = ar_klass.find(record_id)
+      it "should respect nil default value" do
+        pb_class = self.pb_class
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class, :default => nil
+        end
+
+        # Handle batch create:
+        record = ar_class.create!
+        expect(record.persisted?).to eq(true)
+        expect(record.extras).to eq(nil)
+
+        record_id = record.id
+        record = ar_class.find(record_id)
+        expect(record.extras).to eq(nil)
+      end
+
+      it "should respect default proc" do
+        pb_class = self.pb_class
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class, :default => Proc.new { pb_class.new(int_attr: 2) }
+        end
+
+        # Handle batch create:
+        record = ar_class.create!
+        expect(record.persisted?).to eq(true)
+        expect(record.int_attr).to eq(2)
+
+        record.str_attr = "TEST"
+        record.save!
+
+        record_id = record.id
+        record = ar_class.find(record_id)
         expect(record.int_attr).to eq(2)
         expect(record.str_attr).to eq("TEST")
       end

data/spec/localshred_protobuf_spec.rb

@@ -20,42 +20,119 @@ begin
       teardown_db
     end
 
-    let(:ar_klass) {
-      # Define everything using anonymous classes to reduce leakage.
-      extras = Class.new(::Protobuf::Message) do
+    def pb_class
+      Class.new(::Protobuf::Message) do
         optional :uint64, :int_attr, 1
         optional :string, :str_attr, 2
       end
+    end
+
+    let :ar_class do
+      # Define everything using anonymous classes to reduce leakage.
+      pb_class = self.pb_class
 
       Class.new(::ActiveRecord::Base) do
         self.table_name = "foos"
 
         include ArProtobufStore
 
-        protobuf_store :extras, extras
+        protobuf_store :extras, pb_class
       end
-    }
+    end
 
     describe ArProtobufStore::ClassMethods do
       it "should allow setting fields individually" do
-        record = ar_klass.create!
+        record = ar_class.create!
         record.int_attr = 2
         record.str_attr = "TEST"
         record.save
         expect(record.persisted?).to eq(true)
         record_id = record.id
 
-        record = ar_klass.find(record_id)
+        record = ar_class.find(record_id)
         expect(record.int_attr).to eq(2)
         expect(record.str_attr).to eq("TEST")
       end
 
       it "should allow setting fields in constructor" do
-        record = ar_klass.create!(:int_attr => 2, :str_attr => "TEST")
+        record = ar_class.create!(:int_attr => 2, :str_attr => "TEST")
+        expect(record.persisted?).to eq(true)
+        record_id = record.id
+
+        record = ar_class.find(record_id)
+        expect(record.int_attr).to eq(2)
+        expect(record.str_attr).to eq("TEST")
+      end
+
+      it "should allow required fields" do
+        pb_class = Class.new(::Protobuf::Message) do
+          optional :uint64, :int_attr, 1
+          required :string, :req_str_attr, 2
+        end
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class
+        end
+
+        # Handle batch create:
+        record = ar_class.create!(:int_attr => 2, req_str_attr: "required")
+        expect(record.persisted?).to eq(true)
+
+        record_id = record.id
+        record = ar_class.find(record_id)
+        expect(record.int_attr).to eq(2)
+        expect(record.req_str_attr).to eq("required")
+
+        # Handle calling setters:
+        record.req_str_attr = "something"
+        record.save!
+        record = ar_class.find(record_id)
+        expect(record.req_str_attr).to eq("something")
+      end
+
+      it "should respect nil default value" do
+        pb_class = self.pb_class
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class, :default => nil
+        end
+
+        # Handle batch create:
+        record = ar_class.create!
         expect(record.persisted?).to eq(true)
+        expect(record.extras).to eq(nil)
+
         record_id = record.id
+        record = ar_class.find(record_id)
+        expect(record.extras).to eq(nil)
+      end
 
-        record = ar_klass.find(record_id)
+      it "should respect default proc" do
+        pb_class = self.pb_class
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class, :default => Proc.new { pb_class.new(int_attr: 2) }
+        end
+
+        # Handle batch create:
+        record = ar_class.create!
+        expect(record.persisted?).to eq(true)
+        expect(record.int_attr).to eq(2)
+
+        record.str_attr = "TEST"
+        record.save!
+
+        record_id = record.id
+        record = ar_class.find(record_id)
         expect(record.int_attr).to eq(2)
         expect(record.str_attr).to eq("TEST")
       end

data/spec/macks_protobuf_spec.rb

@@ -23,42 +23,119 @@ begin
       teardown_db
     end
 
-    let(:ar_klass) {
-      # Define everything using anonymous classes to reduce leakage.
-      extras = Class.new(::Protobuf::Message) do
+    def pb_class
+      Class.new(::Protobuf::Message) do
         optional :uint64, :int_attr, 1
         optional :string, :str_attr, 2
       end
+    end
+
+    let :ar_class do
+      # Define everything using anonymous classes to reduce leakage.
+      pb_class = self.pb_class
 
       Class.new(::ActiveRecord::Base) do
         self.table_name = "foos"
 
         include ArProtobufStore
 
-        protobuf_store :extras, extras
+        protobuf_store :extras, pb_class
       end
-    }
+    end
 
     describe ArProtobufStore::ClassMethods do
       it "should allow setting fields individually" do
-        record = ar_klass.create!
+        record = ar_class.create!
         record.int_attr = 2
         record.str_attr = "TEST"
         record.save
         expect(record.persisted?).to eq(true)
         record_id = record.id
 
-        record = ar_klass.find(record_id)
+        record = ar_class.find(record_id)
         expect(record.int_attr).to eq(2)
         expect(record.str_attr).to eq("TEST")
       end
 
       it "should allow setting fields in constructor" do
-        record = ar_klass.create!(:int_attr => 2, :str_attr => "TEST")
+        record = ar_class.create!(:int_attr => 2, :str_attr => "TEST")
+        expect(record.persisted?).to eq(true)
+        record_id = record.id
+
+        record = ar_class.find(record_id)
+        expect(record.int_attr).to eq(2)
+        expect(record.str_attr).to eq("TEST")
+      end
+
+      it "should allow required fields" do
+        pb_class = Class.new(::Protobuf::Message) do
+          optional :uint64, :int_attr, 1
+          required :string, :req_str_attr, 2
+        end
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class
+        end
+
+        # Handle batch create:
+        record = ar_class.create!(:int_attr => 2, :req_str_attr => "required")
+        expect(record.persisted?).to eq(true)
+
+        record_id = record.id
+        record = ar_class.find(record_id)
+        expect(record.int_attr).to eq(2)
+        expect(record.req_str_attr).to eq("required")
+
+        # Handle calling setters:
+        record.req_str_attr = "something"
+        record.save!
+        record = ar_class.find(record_id)
+        expect(record.req_str_attr).to eq("something")
+      end
+
+      it "should respect nil default value" do
+        pb_class = self.pb_class
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class, :default => nil
+        end
+
+        # Handle batch create:
+        record = ar_class.create!
         expect(record.persisted?).to eq(true)
+        expect(record.extras).to eq(nil)
+
         record_id = record.id
+        record = ar_class.find(record_id)
+        expect(record.extras).to eq(nil)
+      end
 
-        record = ar_klass.find(record_id)
+      it "should respect default proc" do
+        pb_class = self.pb_class
+        ar_class = Class.new(::ActiveRecord::Base) do
+          self.table_name = "foos"
+
+          include ArProtobufStore
+
+          protobuf_store :extras, pb_class, :default => Proc.new { pb_class.new(int_attr: 2) }
+        end
+
+        # Handle batch create:
+        record = ar_class.create!
+        expect(record.persisted?).to eq(true)
+        expect(record.int_attr).to eq(2)
+
+        record.str_attr = "TEST"
+        record.save!
+
+        record_id = record.id
+        record = ar_class.find(record_id)
         expect(record.int_attr).to eq(2)
         expect(record.str_attr).to eq("TEST")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_protobuf_store
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Hsiu-Fan Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -163,12 +163,20 @@ files:
 - ar_protobuf_store.gemspec
 - gemfiles/rails3.2_protobuf.gemfile
 - gemfiles/rails3.2_ruby_protobuf.gemfile
+- gemfiles/rails4.0.0_protobuf.gemfile
+- gemfiles/rails4.0.0_ruby_protobuf.gemfile
 - gemfiles/rails4.0_protobuf.gemfile
 - gemfiles/rails4.0_ruby_protobuf.gemfile
+- gemfiles/rails4.1.0_protobuf.gemfile
+- gemfiles/rails4.1.0_ruby_protobuf.gemfile
 - gemfiles/rails4.1_protobuf.gemfile
 - gemfiles/rails4.1_ruby_protobuf.gemfile
+- gemfiles/rails4.2.0_protobuf.gemfile
+- gemfiles/rails4.2.0_ruby_protobuf.gemfile
 - gemfiles/rails4.2.5_protobuf.gemfile
 - gemfiles/rails4.2.5_ruby_protobuf.gemfile
+- gemfiles/rails4.2.6_protobuf.gemfile
+- gemfiles/rails4.2.6_ruby_protobuf.gemfile
 - gemfiles/rails4.2_protobuf.gemfile
 - gemfiles/rails4.2_ruby_protobuf.gemfile
 - lib/ar_protobuf_store.rb