yinx 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6010d01c5bb3a399c0b20032756fc9f3bf71d4ae
-  data.tar.gz: 5fd766dbb2cdb25743be78163a102bd193d6d575
+  metadata.gz: 3fd66ccaa0654d53f1efc187f7b21e140bab2c8a
+  data.tar.gz: 20a4c800c0adca5b13e9464539187c3f3aa8be50
 SHA512:
-  metadata.gz: 52525dfca89aec744d21fc5094cfe43054ed32728c482818c69da552ed282d5381cded9b6396d4e26043b668f6d4eac3f4d7960b57a525eb066944468c1683b4
-  data.tar.gz: c3343c36f65bb6fd6172f6e98a3d95a9577388f7060027d9cefee135c1805ff7297713570cfbfe4e9441a2f4704a8fa4dd2d3e06a7965e6ffd08b98fb08cde4f
+  metadata.gz: 56c323674093cd55c88f093c5b574de48ac7e8a0c2ec0e2d6ecc88e19ba51750b3e1dd67c34aa7b6665321bb2f3d22adabb4c8e7705e5c5b5e78a44dee549fc1
+  data.tar.gz: c5924b1a5ee4a25d8419822344dc4c7e14f674f8e47689f6c28df6feac8c3d3fe8c69d0102a3d31ce0dcb90b1e3643e3801d8dab9fc60d2010d4da078ba8ebcf

data/lib/yinx/down_config.rb

@@ -15,7 +15,8 @@ module Yinx
 
     %w{book stack tag word}.each do |condition|
       define_method "wanted_#{condition}s" do
-        instance_variable_get("@wanted_#{condition}s") || []
+        iv_name = "@wanted_#{condition}s"
+        instance_variable_defined?(iv_name) ? instance_variable_get(iv_name) : []
       end
 
       define_method "want_#{condition}?" do |name|

data/lib/yinx/note_meta.rb

@@ -1,10 +1,12 @@
 require 'evernote-thrift'
-require 'yinx/hash'
-require 'yinx/array'
 
 class Yinx::NoteMeta
 
-  [:updated, :created, :title, :notebookGuid, :guid, :contentLength, :tagGuids].each do |method|
+  OfficialApi = [:updated, :created, :title, :notebookGuid, :guid, :contentLength, :tagGuids]
+
+  FullApi = OfficialApi + [:tags, :book, :stack]
+
+  OfficialApi.each do |method|
     define_method method do
       iv_name = "@#{method}"
       unless instance_variable_defined? iv_name
@@ -41,7 +43,7 @@ class Yinx::NoteMeta
   end
 
   def to_h
-    @h = attr_methods.each_with_object({}) do |method, hash|
+    @h = FullApi.each_with_object({}) do |method, hash|
         hash[method] = send method
       end
   end
@@ -62,10 +64,29 @@ class Yinx::NoteMeta
     end
   end
 
+  NoTagGuid, NoTag = 'NoTagGuid', 'NoTag'
+
+  def unwind_tags
+    if tags.empty?
+      [_unwind_tags(NoTagGuid, NoTag)]
+    else
+      tagGuids.zip(tags).map do |tag_id, tag_name|
+        _unwind_tags tag_id, tag_name
+      end
+    end
+  end
+
+  protected
+
+  attr_writer :tagGuids, :tags
+
   private
 
-  def attr_methods
-    self.class.instance_methods(false) - [:to_h, :marshal_dump, :marshal_load]
+  def _unwind_tags tag_id, tag_name
+    uw = self.dup
+    uw.tagGuids = tag_id
+    uw.tags = tag_name
+    uw
   end
 
 end

data/lib/yinx/version.rb

@@ -1,3 +1,3 @@
 module Yinx
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yinx
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,7 @@ files:
 - bin/console
 - bin/setup
 - lib/yinx.rb
-- lib/yinx/array.rb
 - lib/yinx/down_config.rb
-- lib/yinx/hash.rb
 - lib/yinx/note_meta.rb
 - lib/yinx/note_store.rb
 - lib/yinx/user_store.rb
@@ -110,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Get my evernote metadata

data/lib/yinx/array.rb

@@ -1,5 +0,0 @@
-class Array
-  def to_yinx
-    map &:to_yinx
-  end
-end

data/lib/yinx/hash.rb

@@ -1,9 +0,0 @@
-class Hash
-  def to_yinx
-    raw = Yinx::NoteMeta.raw
-    raise TypeError, "can not convert #{self} to Yinx::NoteMeta" unless raw.send(:attr_methods).all?{|m| self.has_key?(m) or self.has_key?(m.to_s)}
-    raw.marshal_load self
-    raw
-  end
-
-end