s_matrix 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f8531538924a03ba311631db046c9297191ae0d
-  data.tar.gz: 16ac09c06c0106317814bb73553fce502fdf8746
+  metadata.gz: 873b7c7f5cf89a315b84cd9b373923819962522c
+  data.tar.gz: 9706ed9b6207ddeba5970c09ba027c6bc0739b62
 SHA512:
-  metadata.gz: 9424d88c77864237d2f7a41dc6bc5ae01f2a339bf3302c0749386abaafb968908cc21c421e8a2f752924b5e1c46f19faf960968737c0677dca04010d9f3eefc5
-  data.tar.gz: 46c2d3de7e6f9227a8b5a583d0bce41928b3fb2ee10851f108a8513816649c95da7326a8651f7d453260fb9a9efd1f0a2f96d339fd6797e980e62d139e15178b
+  metadata.gz: 5015507f5e37081199965b0098dc2ee9d0f6e4df0bab055c55d159bbb1127b6e9295e36350586634980d140ab80adcfdc3906a7a8b33aff6f4156bec27518793
+  data.tar.gz: c16ea95270874368b5c53f531f455d1c2abef4e3412c335860a8b3b2e8c754be8187694b3eb20d5778335b55dc59b7e9b10f0533a0ee00a660f420486fa2712e

data/.gitattributes

@@ -0,0 +1 @@
+*.rb linguist-language=Java

data/README.md

@@ -18,7 +18,7 @@ Result from test:   rspec ./spec/performance\_spec.rb<br>
 
 Add this line to your application's Gemfile:
 
-    gem 's_matrix'
+    gem 's_matrix', '~>1.0'
 
 And then execute:
 
@@ -48,5 +48,14 @@ Or install it yourself as:
     EQUIPMENTS.get\_row('20002')<br>
   # each
     EQUIPMENTS.each {|k, v| k == '10001', v == {'id' => '10001', 'name' => 'sword', ...} }
-  # for debug
+  # all
+    EQUIPMENTS.all.should == { '20002' => {'id' => '10002', 'name' => 'shoe', 'speed' => '5'}, '20003' => {} }
+  # ids
+    EQUIPMENTS.ids.should == ['20002', '20003']
+  # keys
+    EQUIPMENTS.keys.should == ['id', 'name', 'hp']
+  # to\_s for debug
     puts EQUIPMENTS.to_s
+
+### todolist
+  https://github.com/libinzhangyuan/s\_matrix/blob/master/todolist.txt

data/ext/s_matrix/gmatx.cpp

@@ -38,8 +38,13 @@ t_key_value_hash GMatx::get_row(const std::string& id) const
     return row.to_key_value_hash(titles);
 }
 
-// typedef void (*each_call_func)(const std::string& /*key*/, const t_key_value_hash& /*row_content*/);
-void GMatx::each_call(each_call_func func) const
+const std::vector<std::string>& GMatx::get_titles(void) const
+{
+    return m_titles.get_titles();
+}
+
+// typedef void (*each_call_func)(const std::string& /*key*/, const t_key_value_hash& /*row_content*/, void* args);
+void GMatx::each_call(each_call_func func, void* args) const
 {
     const std::vector<std::string>& titles = m_titles.get_titles();
     for (std::map<std::string /* id */, MatxRow>::const_iterator iter = m_contents.begin();
@@ -47,7 +52,7 @@ void GMatx::each_call(each_call_func func) const
     {
         const std::string& id = iter->first;
         const MatxRow& row = iter->second;
-        func(id, row.to_key_value_hash(titles));
+        func(id, row.to_key_value_hash(titles), args);
     }
 }
 

data/ext/s_matrix/gmatx.h

@@ -15,11 +15,14 @@ public:
     // 当找不到id所对应的行时，返回的t_key_value_hash数据的size=0
     // size of t_key_value_hash will be zero when couldn't find the row.
     t_key_value_hash get_row(const std::string& id) const;
+    const std::vector<std::string>& get_titles(void) const;
     std::string to_s(void) const;
     size_t size(void) const;
 
-    typedef void (*each_call_func)(const std::string& /*key*/, const t_key_value_hash& /*row_content*/);
-    void each_call(each_call_func func) const;
+    // iterator function
+    // the args parameter of each_call function will pass to callback function each_call_func.
+    typedef void (*each_call_func)(const std::string& /*key*/, const t_key_value_hash& /*row_content*/, void* args);
+    void each_call(each_call_func func, void* args) const;
 
 private:
     MatxTitle m_titles;

data/ext/s_matrix/matx_title.h

@@ -9,10 +9,6 @@ class MatxTitle
 public:
     MatxTitle(void);
 
-    int get_i(void) {return m_titles.size();};
-    void set_i(const int i) {m_i = i; m_titles.push_back(std::string("fsfd"));};
-
-
     void add_title(const std::string& title);
     bool is_title_exist(const std::string& title) const;
     const std::vector<std::string>& get_titles(void) const;

data/ext/s_matrix/s_matrix.cpp

@@ -126,7 +126,7 @@ static VALUE t_get_row(VALUE self, VALUE id)
     return row_hash_to_ruby_hash(row_hash);
 }
 
-static void do_each_call_func(const std::string& key, const t_key_value_hash& row_content)
+static void callback_func__each(const std::string& key, const t_key_value_hash& row_content, void* args)
 {
     rb_yield_values(2, rb_str_new_cstr(key.c_str()), row_hash_to_ruby_hash(row_content));
 }
@@ -140,10 +140,57 @@ static VALUE t_each(VALUE self)
 
     class GMatx* pMatx = NULL;
     Data_Get_Struct(self, class GMatx, pMatx);
-    pMatx->each_call(do_each_call_func);
+    pMatx->each_call(callback_func__each, NULL);
     return self;
 }
 
+static void callback_func__all(const std::string& key, const t_key_value_hash& row_content, void* args)
+{
+    VALUE* p_ret_hash = (VALUE*)(args);
+    rb_hash_aset(*p_ret_hash, rb_str_new_cstr(key.c_str()), row_hash_to_ruby_hash(row_content));
+}
+
+static VALUE t_all(VALUE self)
+{
+    VALUE ret_hash = rb_hash_new();
+
+    class GMatx* pMatx = NULL;
+    Data_Get_Struct(self, class GMatx, pMatx);
+    pMatx->each_call(callback_func__all, &ret_hash);
+    return ret_hash;
+}
+
+static void callback_func__ids(const std::string& key, const t_key_value_hash& row_content, void* args)
+{
+    VALUE* p_ret_array = (VALUE*)(args);
+    rb_ary_push(*p_ret_array, rb_str_new_cstr(key.c_str()));
+}
+
+static VALUE t_ids(VALUE self)
+{
+    VALUE ret_array = rb_ary_new();
+
+    class GMatx* pMatx = NULL;
+    Data_Get_Struct(self, class GMatx, pMatx);
+    pMatx->each_call(callback_func__ids, &ret_array);
+    return ret_array;
+}
+
+static VALUE t_keys(VALUE self)
+{
+    VALUE ret_array = rb_ary_new();
+
+    class GMatx* pMatx = NULL;
+    Data_Get_Struct(self, class GMatx, pMatx);
+    const std::vector<std::string>& titles = pMatx->get_titles();
+    for (size_t i = 0; i < titles.size(); ++i)
+    {
+        const std::string& title = titles[i];
+        rb_ary_push(ret_array, rb_str_new_cstr(title.c_str()));
+    }
+    return ret_array;
+}
+
 static VALUE t_to_s(VALUE self)
 {
     class GMatx* pMatx = NULL;
@@ -174,4 +221,7 @@ extern "C" void Init_s_matrix()
     rb_define_method(cSMatrix, "add_row", (VALUE(*)(ANYARGS))t_add_row, 2);
     rb_define_method(cSMatrix, "get_row", (VALUE(*)(ANYARGS))t_get_row, 1);
     rb_define_method(cSMatrix, "each", (VALUE(*)(ANYARGS))t_each, 0);
+    rb_define_method(cSMatrix, "all", (VALUE(*)(ANYARGS))t_all, 0);
+    rb_define_method(cSMatrix, "ids", (VALUE(*)(ANYARGS))t_ids, 0);
+    rb_define_method(cSMatrix, "keys", (VALUE(*)(ANYARGS))t_keys, 0);
 }

data/lib/s_matrix/version.rb

@@ -1,5 +1,5 @@
 class SMatrix
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end
 
 require "s_matrix/s_matrix"

data/s_matrix.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = SMatrix::VERSION
   spec.authors       = ["zhangyuan"]
   spec.email         = ["libinzhangyuan@gmail.com"]
-  spec.summary       = %q{educe memory usage for a large number of config. for example game config in excel.}
-  spec.description   = %q{not finish}
+  spec.summary       = %q{Reduce memory usage for a large Hash.}
+  spec.description   = %q{Matrix store the hash like this: {'234234' => {'id' => '23232', 'name' => 'haha'}, ...}}
   spec.homepage      = "https://github.com/libinzhangyuan/s_matrix"
   spec.license       = "MIT"
 

data/spec/smatrix_spec.rb

@@ -96,5 +96,32 @@ describe SMatrix do
     end
   end
 
+  describe 'all && ids && keys' do
+    it '' do
+      a = SMatrix.new
+      expect(a.all).to eq({})
+      expect(a.ids).to eq([])
+      expect(a.keys).to eq([])
+
+      a.add_row('2', {a: 2})
+      expect(a.all).to eq({'2' => {'a' => '2'}})
+      expect(a.ids).to eq(['2'])
+      expect(a.keys).to eq(['a'])
+
+      a.add_row('2', {b: 3})
+      expect(a.all).to eq({'2' => {'a' => nil, 'b' => '3'}})
+      expect(a.ids).to eq(['2'])
+      expect(a.keys).to eq(['a', 'b'])
+
+      a.add_row('3', {b: 3})
+      expect(a.all).to eq({
+        '2' => {'a' => nil, 'b' => '3'},
+        '3' => {'a' => nil, 'b' => '3'}
+        })
+      expect(a.ids).to eq(['2', '3'])
+      expect(a.keys).to eq(['a', 'b'])
+    end
+  end
+
 end
 

data/todolist.txt

@@ -0,0 +1,28 @@
+todolist:
+
+1. function with first priority:
+-done all
+  -return {'23423' => {'name' => 'haha', 'hp' => '23425'}, '234232' => {} }
+-done ids
+  -return ['233423', '234134']
+keys
+  -return ['name', 'hp']
+first
+empty?
+include? {|k, v| k == '2323232'}
+find_by name: 'haha', hp: '2342'
+select {|k, v| k == '2232'}
+merge
+
+
+2. function with normal priority:
+each_key; each_value; each_pair
+all?  any?  one?  none? key?
+collect {|k, v| k}    map inject reduce
+
+3. function with low priority
+sort sort_by
+
+4. add delete feature. or not?  also merge!
+
+5. changing equipment_strengthen.plist test to another. this one take 30M disk storage.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s_matrix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - zhangyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-description: not finish
+description: 'Matrix store the hash like this: {''234234'' => {''id'' => ''23232'',
+  ''name'' => ''haha''}, ...}'
 email:
 - libinzhangyuan@gmail.com
 executables: []
@@ -88,6 +89,7 @@ extensions:
 - ext/s_matrix/extconf.rb
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - Gemfile
 - LICENSE
@@ -116,6 +118,7 @@ files:
 - spec/smatrix_spec.rb
 - spec/spec_helper.rb
 - spec/xml_load.rb
+- todolist.txt
 homepage: https://github.com/libinzhangyuan/s_matrix
 licenses:
 - MIT
@@ -139,8 +142,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: educe memory usage for a large number of config. for example game config
-  in excel.
+summary: Reduce memory usage for a large Hash.
 test_files:
 - spec/equipment_strengthen.plist
 - spec/performance_spec.rb