evernote_utils 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f1ce1d6ba7eb482686b02c7fbab61a5b69544a
-  data.tar.gz: 1a5aab22da6f5dc08498269656cd305e7be44663
+  metadata.gz: f356220e4344d4dbc251b94ded74db09f122c0e2
+  data.tar.gz: 6c49ec6ecb152ada1d78da0719f28f2fb0f36248
 SHA512:
-  metadata.gz: 80ff2b4f18fd00b09fb64c69c53e1bb21654b5417a93aa00b2e9321eb05ccd6354f6b028aa552683ca7725e5c5bb575f978be600e14f0d307c880ac81d822932
-  data.tar.gz: 68097bc431430a63bd807c6867055498be45f51cc13f05ee5e009cbc67aca396364fbcda5e66857234d327e6077ca2a36b6d9d0dc4f32912cd22c889a7a880ed
+  metadata.gz: f195ccea97cf381c923d6ded9419a78f5e2d5a006702b913aee906d533a0b688cc3310f1b72ac5ec6d9f369c881d224c21686718f1fc3df5a236651ab8d7ae25
+  data.tar.gz: b10c826989e81e22822aa0569832774344788153560b8fa1a34cb78cc500c67ec74612b3edc9bcb495f7693bcc65ff9c96c5dbdeb0fad730c39c461756f0f7b5

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+coverage

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.2

data/README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://travis-ci.org/memerelics/evernote_utils.svg?branch=master)](https://travis-ci.org/memerelics/evernote_utils)
+[![Coverage Status](https://coveralls.io/repos/memerelics/evernote_utils/badge.png?branch=master)](https://coveralls.io/r/memerelics/evernote_utils?branch=master)
+
 # EvernoteUtils
 
 A thin OOP-friendly wrapper of Evernote Ruby SDK.
@@ -35,6 +38,8 @@ EvenoteUtils don't support authentication feature, because dominant other option
 
 ## Usage
 
+### get
+
 First, initialize ENUtils with an OAuth token credential identifier.
 
 ```ruby
@@ -112,6 +117,24 @@ tag      = enutils.tags(name: 'language').first
 enutils.notes(notebook: notebook, tag: tag, words: 'beginners\' guide')
 ```
 
+
+### update
+
+```ruby
+notebook = enutils.notebook('Inbox')
+tags = enutils.tags.take(2)
+
+# set ENUtils::Notebook instance or notebookGuid
+note.notebook = notebook
+# set ENUtils::Tag instances or tagGuids
+note.tags = tags
+
+note.title = 'some new title'
+
+note.save #=> save to Evernote Cloud
+````
+
 ## Planning to do
 
-* update notes
+* create note
+* `ENutils::Note#content` simple access

data/Rakefile

@@ -1,44 +1,3 @@
-require "bundler/gem_tasks"
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs.push 'spec'
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = true
-end
-
-# CSV.open('output.csv', 'w') do |w|
-#   CSV.open('words.csv', 'r') do |r|
-#     reader.each do |row|
-#       # extract plain text from ENUtils::Note#content, which is an ENML document.
-#       w << [row[0], row[1], Nokogiri::XML(row[2]).elements.first.text.gsub(/^\n|\n$/,')]
-#     end
-#   end
-# end
-
-###################################################
-require 'rubygems'
-require 'bundler/setup'
-Bundler.require
-require 'pry'
-require 'evernote_utils'
-
-e = ENUtils::Core.new("xxxxxxxxxxx")
-
-binding.pry
-
-# notebook_archive = e.notebooks(name: 'Archive').first
-# tag_english = e.tags(name: 'english').first
-# results = []
-# results << e.notes(notebook: notebook_archive, tag: tag_english, limit: 50, offset: 0)
-# results << e.notes(notebook: notebook_archive, tag: tag_english, limit: 50, offset: 50)
-# results << e.notes(notebook: notebook_archive, tag: tag_english, limit: 50, offset: 100)
-# results.flatten!
-# results.each{|n| n.set_content! }
-#
-# require 'csv'
-# CSV.open('hoge.csv', 'w') do |csv|
-#   results.each do |n|
-#     csv << [n.created, n.title, n.content]
-#   end
-# end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/evernote_utils.gemspec

@@ -19,13 +19,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'evernote-thrift', '~>1.25.1'
-  spec.add_dependency 'activesupport', '~>3.2.13'
+  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec", "~>3.0.0.beta"
+  spec.add_development_dependency "factory_girl", "~> 4.0"
   spec.add_development_dependency "rb-readline"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "mocha"
+  spec.add_development_dependency "coveralls"
 end

data/lib/evernote_utils.rb

@@ -35,7 +35,17 @@ module ENUtils
     end
 
     def notes(options={})
-      Note.where(self, options)
+      Note.where(self, options.reverse_merge(order: :updated))
+    end
+
+    def find_note(guid, with_content: false,
+                        with_resources_data: false,
+                        with_resources_recognition: false,
+                        with_resources_alternate_data: false)
+      self.notestore.getNote(self.token, guid, with_content,
+                                               with_resources_data,
+                                               with_resources_recognition,
+                                               with_resources_alternate_data)
     end
 
     def notebook(name=nil)

data/lib/evernote_utils/note.rb

@@ -1,8 +1,8 @@
 require 'active_support/core_ext/object'
-require "evernote_utils/notelist"
+require 'evernote_utils/notelist'
 
 module ENUtils
-  class Note < Evernote::EDAM::Type::Note
+  class Note
 
     DEFAULT_LIMIT = 10
 
@@ -18,24 +18,13 @@ module ENUtils
     #   notebookGuid:"4xxxxxda-xxxx-xxxx-xxxx-zzzzzzzzzzzz"
     #   attributes:<Evernote::EDAM::Type::NoteAttributes >
 
-    attr_reader :guid, :title, :contentHash, :contentLength, :created, :updated, :active, :updateSequenceNum, :notebookGuid, :tagGuids, :attributes
-    attr_accessor :content
+    attr_reader :edam_note
 
-    def initialize(core, edam_note)
-       @core              = core
-
-       @guid              = edam_note.guid
-       @title             = edam_note.title
-       @contentHash       = edam_note.contentHash
-       @contentLength     = edam_note.contentLength
-       @created           = Time.at(edam_note.created/1000)
-       @updated           = Time.at(edam_note.updated/1000)
-       @active            = edam_note.active
-       @updateSequenceNum = edam_note.updateSequenceNum
-       @notebookGuid      = edam_note.notebookGuid
-       @tagGuids          = edam_note.tagGuids
-       @attributes        = edam_note.attributes
-    end
+    delegate :guid, :title, :contentHash, :contentLength, :deleted,
+    :active, :updateSequenceNum, :notebookGuid, :tagGuids, :resources, :attributes, :tagNames,
+    :active=, :contentLength=, :deleted=, :notebookGuid=, :tagGuids=, :title=, :updated=,
+    :attributes=, :contentHash=, :created=, :guid=, :resources=, :tagNames=, :updateSequenceNum=,
+    :to => :edam_note
 
     def self.where(core, options={})
       offset = options.delete(:offset) || 0
@@ -44,18 +33,63 @@ module ENUtils
       NoteList.new(core, result, options)
     end
 
-    def set_content!
-      # getNote(token, guid, withContent, withResourcesData, withResourcesRecognition, withResourcesAlternateData)
-      @content ||= @core.notestore.getNote(@core.token, guid, true, false, false, false).content
+    def initialize(core, edam_note)
+      @core      = core
+      @edam_note = edam_note
+    end
+
+    def inspect
+      "<#{self.class} @edam_note=#{@edam_note.inspect}>"
+    end
+
+    # not delegated methods
+    def created; Time.at(@edam_note.created/1000); end
+    def updated; Time.at(@edam_note.updated/1000); end
+
+    def content
+      @content ||= remote_content
+    end
+
+    def content=(val)
+      @content = @edam_note.content = val
     end
 
     def notebook
       @notebook ||= Notebook.find_by_guid(@core, notebookGuid)
     end
 
+    def notebook=(val)
+      case val
+      when ENUtils::Notebook
+        self.notebookGuid = val.guid
+      when String
+        self.notebookGuid = val
+      end
+    end
+
     def tags
       return nil unless tagGuids
       @tags ||= tagGuids.map{|guid| Tag.find_by_guid(@core, guid) }.compact
     end
+
+    def tags=(val)
+      return false unless val.is_a? Array
+      if val.all?{|v| v.is_a? ENUtils::Tag }
+        self.tagGuids = val.map(&:guid)
+      elsif val.all?{|v| v.is_a? String }
+        self.tagGuids = val
+      end
+    end
+
+    def save
+      @edam_note.updated = Time.now.to_i * 1000
+      @core.notestore.updateNote(@core.token, @edam_note)
+      true
+    end
+
+    private
+    def remote_content
+      @core.find_note(guid, with_content: true).content
+    end
   end
 end

data/lib/evernote_utils/version.rb

@@ -1,3 +1,3 @@
 module ENUtils
-  VERSION = "0.0.4"
+  VERSION = "0.0.9"
 end

data/spec/evernote_utils/note_spec.rb

@@ -1,8 +1,70 @@
 require 'spec_helper'
 
 describe ENUtils::Note do
+  let(:edam) { build(:edam_note) }
+  let(:core) { build(:core) }
+  let(:note) { ENUtils::Note.new(core, edam) }
+
   before do
+    allow_any_instance_of(Evernote::EDAM::UserStore::UserStore::Client)
+      .to receive(:getNoteStoreUrl).and_return('notestoreurl')
+    note
+  end
+
+  it { expect(edam).to be_instance_of Evernote::EDAM::Type::Note }
+  it { expect(note.title).to be_instance_of String }
+
+  describe '.where' do
+    before do
+      allow(core).to receive_message_chain(:notestore, :findNotes, :notes, :map)
+        .and_return(result)
+    end
+    let(:result) { [] }
+    it { expect(ENUtils::Note.where(core)).to be_instance_of ENUtils::NoteList }
+  end
+
+  describe '#inspect' do
+    it { expect(note.inspect).to match('@edam_note=') }
+  end
+
+  describe '#created, #updated' do
+    it { expect(note.created).to be_instance_of Time }
+    it { expect(note.updated).to be_instance_of Time }
   end
-  describe 'could change parent notebook' do
+
+  describe '#notebook=' do
+    before do
+      note.notebook = val
+    end
+    [FactoryGirl.build(:notebook, guid: 'updated_guid'), 'updated_guid'].each do |val|
+      context { let(:val) { val }
+        it { expect(note.notebookGuid).to eq 'updated_guid' } }
+    end
+  end
+
+  describe '#tags=' do
+    before do
+      note.tags = [val]
+    end
+    [FactoryGirl.build(:tag, guid: 'updated_guid'), 'updated_guid'].each do |val|
+      context { let(:val) { val }
+        it { expect(note.tagGuids).to eq ['updated_guid'] } }
+    end
+  end
+
+  describe '#tags' do
+    before do
+      allow(note).to receive(:tagGuids).and_return(['weiwei'])
+      allow(note).to receive_message_chain(:tagGuids, :map, :compact)
+        .and_return([build(:tag)])
+    end
+    it { expect(note.tags.first).to be_instance_of ENUtils::Tag }
+  end
+
+  describe '#save' do
+    before do
+      allow(core).to receive_message_chain(:notestore, :updateNote).and_return(true)
+    end
+    it { expect(note.save).to eq true }
   end
 end

data/spec/evernote_utils/notebook_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe ENUtils::Notebook do
+  let(:edam) { build(:edam_notebook) }
+  let(:core) { build(:core) }
+  let(:notebook) { ENUtils::Notebook.new(core, edam) }
+
+  before do
+    allow_any_instance_of(Evernote::EDAM::UserStore::UserStore::Client)
+      .to receive(:getNoteStoreUrl).and_return('notestoreurl')
+    notebook
+  end
+
+  it { expect(edam).to be_instance_of Evernote::EDAM::Type::Notebook }
+  it { expect(notebook.name).to be_instance_of String }
+
+end

data/spec/evernote_utils/tag_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe ENUtils::Tag do
+  let(:edam) { build(:edam_tag) }
+  let(:core) { build(:core) }
+  let(:tag) { ENUtils::Tag.new(core, edam) }
+
+  before do
+    allow_any_instance_of(Evernote::EDAM::UserStore::UserStore::Client)
+      .to receive(:getNoteStoreUrl).and_return('notestoreurl')
+    tag
+  end
+
+  it { expect(edam).to be_instance_of Evernote::EDAM::Type::Tag }
+  it { expect(tag.name).to be_instance_of String }
+
+  describe '#notes' do
+    before do
+      allow(core).to receive_message_chain(:notestore, :findNotes, :notes, :map)
+        .and_return([])
+    end
+    it { expect(tag.notes).to be_instance_of ENUtils::NoteList }
+  end
+
+  describe '.find_by_guid' do
+    before do
+      allow(core).to receive_message_chain(:notestore, :listTags, :find)
+        .and_return(build(:edam_tag))
+    end
+    it { expect(ENUtils::Tag.find_by_guid(core, 'guidddd')).to be_instance_of ENUtils::Tag }
+  end
+
+  describe '.find_by_name' do
+    before do
+      allow(core).to receive_message_chain(:notestore, :listTags)
+        .and_return([build(:edam_tag, name: 'book')])
+    end
+    it { expect(ENUtils::Tag.find_by_name(core, 'book')).to be_instance_of ENUtils::Tag }
+  end
+
+  describe '.where' do
+    before do
+      allow(core).to receive_message_chain(:notestore, :listTags)
+        .and_return([build(:edam_tag, name: 'book')])
+    end
+    subject { ENUtils::Tag.where(core, options) }
+    [/oo/, 'book'].each do |name|
+      let(:options) { {name: name} }
+      it { expect(subject).to be_instance_of Array }
+      it { expect(subject.first).to be_instance_of ENUtils::Tag }
+    end
+  end
+
+end

data/spec/factories.rb

@@ -0,0 +1,53 @@
+FactoryGirl.define do
+
+  factory :core, class: ENUtils::Core do
+    token 'hogehoge'
+    notestore 'hoge'
+    initialize_with { new(token, false) }
+  end
+
+  factory :notestore, class: Evernote::EDAM::NoteStore::NoteStore::Client do
+  end
+
+  factory :edam_note, class: Evernote::EDAM::Type::Note do
+    guid 'f1df2a4d-5852-4cb6-82f7-6240ee4e2b5c'
+    title 'title'
+    content nil
+    contentHash 'eeeeeeee6bxxxxxxxxxxxxxxxa889ca7'
+    contentLength 2246
+    created 1266881336000
+    updated 1266881347000
+    active true
+    updateSequenceNum 2653
+    notebookGuid '4xxxxxda-xxxx-xxxx-xxxx-zzzzzzzzzzzz'
+    attributes nil
+  end
+
+  factory :edam_notebook, class: Evernote::EDAM::Type::Notebook do
+    guid 'afa4ba59-xxxx-42ed-xxxx-zzzzzzzzzzzz'
+    name 'Books'
+    updateSequenceNum 24108
+    defaultNotebook false
+    serviceCreated 1297607548000
+    serviceUpdated 1387262389000
+    restrictions nil
+  end
+
+  factory :notebook, class: ENUtils::Notebook do
+    core 'core'
+    edam_notebook { build(:edam_notebook) }
+    initialize_with { new(core, edam_notebook) }
+  end
+
+  factory :edam_tag, class: Evernote::EDAM::Type::Tag do
+    guid 'aaaaaaaaaaa'
+    name 'tagName'
+    updateSequenceNum 1234
+  end
+
+  factory :tag, class: ENUtils::Tag do
+    core 'core'
+    edam_tag { FactoryGirl.build(:edam_tag) }
+    initialize_with { new(core, edam_tag) }
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,13 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'rubygems'
 require 'evernote_utils'
+require 'factory_girl'
+
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end
+
+FactoryGirl.definition_file_paths << Pathname.new("../factories.rb")
+FactoryGirl.find_definitions # required

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evernote_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - memerelics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evernote-thrift
@@ -28,16 +28,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A thin OOP-friendly wrapper of Evernote Ruby SDK.
 email:
 - takuya21hashimoto@gmail.com
@@ -143,7 +171,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -158,7 +188,10 @@ files:
 - lib/evernote_utils/tag.rb
 - lib/evernote_utils/version.rb
 - spec/evernote_utils/note_spec.rb
+- spec/evernote_utils/notebook_spec.rb
+- spec/evernote_utils/tag_spec.rb
 - spec/evernote_utils_spec.rb
+- spec/factories.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -186,5 +219,8 @@ specification_version: 4
 summary: A thin OOP-friendly wrapper of Evernote Ruby SDK.
 test_files:
 - spec/evernote_utils/note_spec.rb
+- spec/evernote_utils/notebook_spec.rb
+- spec/evernote_utils/tag_spec.rb
 - spec/evernote_utils_spec.rb
+- spec/factories.rb
 - spec/spec_helper.rb