picojson_ruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 137d421ec982c80068225b39ea31706d95098a51
-  data.tar.gz: 86986ee4df601fef4bd285e69dc2070912963880
+  metadata.gz: 9ebf8f8e1be7d3af34e13747ee921ed88f0fa075
+  data.tar.gz: 6c1adc24d16457e375d28a387200eed0b7e64c27
 SHA512:
-  metadata.gz: f340245f8205f688e265fa8973e7ad48f4a1ba5d087e7debb954483957f63661cef078a4b0ba273ec17f2ad2e71ac5ff39b223a59edf81ab3b6768492c84bc4c
-  data.tar.gz: 32d3658da12a13a56eebbad841542c537fd243126d1527d96c3345641faa509ed0bd8e30aae7c830642c7cf8b110ddf73a97ba7b11c119d67b1a09b8b7d26298
+  metadata.gz: 8de85cb0c6155df52b06b1e8a1028f5b0e04278fed238265abc7026ce6cc85b50e0be6fd98b3effc4eea88544b735a800d163b03e73d9fb460c9942d4ac30f84
+  data.tar.gz: 236fdcd19eed20938adf0ef769ae6e63bf7daf95f20b7647ed864d1baab6fee9543da1bca7a72c40e01088dd02e7e38d3d7d0d7ed63b32d5457b21fd023cb848

data/ext/picojson_ruby/picojson_ruby.cpp

@@ -3,7 +3,7 @@
 
 VALUE rb_cPicojsonRuby;
 
-static VALUE rb_picojson_merge(VALUE self, VALUE base, VALUE key, VALUE value) {
+static VALUE rb_picojson_merge(VALUE self, VALUE base, VALUE addingObj) {
   picojson::value v;
   std::string err;
   const char* json = StringValuePtr(base);
@@ -12,21 +12,43 @@ static VALUE rb_picojson_merge(VALUE self, VALUE base, VALUE key, VALUE value) {
     rb_raise(rb_eTypeError, err.c_str());
   }
 
-  const char* inserting_key = StringValuePtr(key);
   picojson::object &obj = v.get<picojson::object>();
-
-  switch (TYPE(value)) {
-    case T_FIXNUM:
-      obj.insert(std::map<std::string, double>::value_type(inserting_key, FIX2INT(value)));
-      break;
-    case T_STRING:
-      obj.insert(std::make_pair(inserting_key, StringValuePtr(value)));
+  switch (TYPE(addingObj)) {
+    case T_HASH:
       break;
     default:
       /* 例外を発生させる */
       rb_raise(rb_eTypeError, "not valid value");
       break;
   }
+  VALUE ary = rb_funcall(addingObj, rb_intern("to_a"), 0);
+  if (TYPE(ary) != T_ARRAY) {
+    rb_raise(rb_eTypeError, "Can not execute to_a");
+  }
+
+  long i;
+  for (i = 0; i < RARRAY_LEN(ary); ++i) {
+    VALUE entry = rb_ary_entry(ary, i);
+    if (TYPE(entry) != T_ARRAY || RARRAY_LEN(entry) != 2) {
+      rb_raise(rb_eTypeError, "Not A Hash");
+    }
+    VALUE key = rb_ary_entry(entry, 0);
+    VALUE val = rb_ary_entry(entry, 1);
+    const char* inserting_key = StringValuePtr(key);
+    switch (TYPE(val)) {
+      case T_FIXNUM:
+        obj.insert(std::map<std::string, double>::value_type(inserting_key, FIX2INT(val)));
+        break;
+      case T_STRING:
+        obj.insert(std::make_pair(inserting_key, StringValuePtr(val)));
+        break;
+      default:
+        /* 例外を発生させる */
+        rb_raise(rb_eTypeError, "not valid value");
+        break;
+    }
+  }
+
   std::string new_json = v.serialize();
   const char* new_json_char = new_json.c_str();
   return rb_str_new(new_json_char, strlen(new_json_char));
@@ -36,5 +58,5 @@ extern "C" void
 Init_picojson_ruby(void)
 {
   rb_cPicojsonRuby = rb_define_class("PicojsonRuby", rb_cObject);
-  rb_define_singleton_method(rb_cPicojsonRuby, "append", RUBY_METHOD_FUNC(rb_picojson_merge), 3);
+  rb_define_singleton_method(rb_cPicojsonRuby, "append", RUBY_METHOD_FUNC(rb_picojson_merge), 2);
 }

data/lib/picojson_ruby/version.rb

@@ -1,3 +1,3 @@
 class PicojsonRuby
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/picojson_ruby_spec.rb

@@ -4,23 +4,23 @@ require "picojson_ruby"
 describe PicojsonRuby do
   describe ".append" do
     context 'valid appending string value' do
-      subject { PicojsonRuby.append("{}", "test", "test") }
+      subject { PicojsonRuby.append("{}", {"test" => "test"}) }
       it { expect(subject).to eq "{\"test\":\"test\"}" }
     end
     context 'valid appending string value 2' do
-      subject { PicojsonRuby.append("{}", "test", "1234567890") }
+      subject { PicojsonRuby.append("{}", {"test" => "1234567890"}) }
       it { expect(subject).to eq "{\"test\":\"1234567890\"}" }
     end
     context 'valid appending string fixnum' do
-      subject { PicojsonRuby.append("{}", "test", 1234567890) }
+      subject { PicojsonRuby.append("{}", {"test" => 1234567890}) }
       it { expect(subject).to eq "{\"test\":1234567890}" }
     end
     context 'invalid with Array' do
-      subject { PicojsonRuby.append("{}", "test", []) }
+      subject { PicojsonRuby.append("{}", "test") }
       it { expect { subject }.to raise_error TypeError }
     end
     context 'invalid with invalid json' do
-      subject { PicojsonRuby.append("{test]", "test", "test") }
+      subject { PicojsonRuby.append("{hoge]", "test") }
       it { expect { subject }.to raise_error TypeError }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picojson_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - SpringMT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,4 +102,3 @@ summary: Memory saving JSON merge.
 test_files:
 - spec/picojson_ruby_spec.rb
 - spec/spec_helper.rb
-has_rdoc: