enop 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e989593e40d999366ab21adfd8f54f05f9ab50b
-  data.tar.gz: b33826e9c971b7c93bc05d4c0401f89413e4842f
+  metadata.gz: 1fa944930a75dae78c4a3c7555fdc0ddec16bc02
+  data.tar.gz: ba1657c161e1ef665034808cf59de98c9a40a6c2
 SHA512:
-  metadata.gz: 8e15eda394a9a51d48dfead71776f3ed6a03d220bdd70295cdb187fc56f55a61c8933b5c9dd08dae5895c1017110039be35d548bfb3c02a2cede454a9456b738
-  data.tar.gz: b6b17fe1ef6a4c92434db4cdaeb38d59b48838978d999cd081d00e39883f810186635ba8d0c2e3ad3aa265a281a09970a86bce637bd8cb35c739f9cf3ec94165
+  metadata.gz: 2ed7565163dfe70302e7ba820e317380f8c7787a3ff7f9f8ba75bfd3de1b8b538e3c43c4d3b6583f00adf40fe97d72f5e6d2d70593c391e97aea91b58bba8e69
+  data.tar.gz: c0d2b09c2d36844b9a428db743aac9640c7271cd357493bf0b8438c81e840ccb0bebabf1cf49380b563f82d59a3a296deb73510b7c6b26e1608fac4183ac0c95

data/exe/enop

@@ -1,9 +1,25 @@
 #!/usr/bin/env ruby
 
+require 'arxutils'
 require "enop"
 
-authToken = "S=s18:U=1f38cb:E=15110796cd9:C=149b8c83d38:P=1cd:A=en-devtoken:V=2:H=970049a2b990ad5e0f58252a626539b0"
+dbconfig = Arxutils::Dbutil::DBCONFIG_MYSQL
+dbconfig = Arxutils::Dbutil::DBCONFIG_SQLITE3
 
-enop = Enop::Enop.new(Arxutils::DB_DIR, Arxutils::MIGRATE_DIR , Arxutils::CONFIG_DIR , Arxutils::DBCONFIG , Arxutils::DATABASELOG , authToken)
+token = ARGV[0]
+hs = {
+  "db_dir" => Arxutils::Dbutil::DB_DIR,
+  "migrate_dir" => Arxutils::Dbutil::MIGRATE_DIR,
+  "config_dir" => Arxutils::Dbutil::CONFIG_DIR,
+  "dbconfig" => dbconfig,
+  "log_fname" => Arxutils::Dbutil::DATABASELOG,
+}
+
+
+enop = Enop::Enop.new(
+                      token,
+                      :db,
+                      hs
+                      )
 enop.connect
 enop.list_notebooks

data/exe/makemigrate

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-require 'dbinit'
-require 'migrate'
+require 'arxutils'
 require 'enop'
 
 data_ary = [
@@ -42,9 +41,14 @@ data_ary = [
   },
 ]
 
+dbconfig = Arxutils::Dbutil::DBCONFIG_MYSQL
+dbconfig = Arxutils::Dbutil::DBCONFIG_SQLITE3
+
 forced = true
-mig = Arxutils::Migrate.new(Arxutils::DB_DIR, Arxutils::MIGRATE_DIR  , Arxutils::CONFIG_DIR , Arxutils::DBCONFIG, Arxutils::DATABASELOG , forced )
-data_ary.reduce(0) do |next_num , x| 
-  mig.make( next_num , x )
-end
-mig.migrate
+Arxutils::Migrate.migrate(
+                          data_ary,
+                          0,
+                          dbconfig,
+                          forced
+                          )
+

data/lib/enop.rb

@@ -1,144 +1,10 @@
 # -*- coding: utf-8 -*-
-
+require "arxutils"
 require "enop/version"
-
-require 'evernote-thrift'
-require 'csv'
-require 'pp'
-
-require 'forwardable'
-require 'dbutil_base'
-require 'dbutil_enop'
+require "enop/enop"
+require "enop/dbutil"
+#require "enop/dbutil/dbmgr"
+#require "enop/dbutil/enopmgr"
 
 module Enop
-  class Enop
-    extend Forwardable
-    
-    def_delegator( :@dbmgr , :add , :db_add)
-
-    def initialize( db_dir , migrate_dir , config_dir, dbconfig , log_fname , authToken)
-
-      @stack_hs = {}
-      @nbinfos = {}
-      @notebookinfo = Struct.new("NotebookInfo", :name, :stack, :defaultNotebook, :count , :tags )
-
-      @authToken = authToken
-
-      register_time = Arxutils::Dbutil::DbMgr.init( db_dir , migrate_dir , config_dir, dbconfig , log_fname )
-
-      @dbmgr = Dbutil::DbMgr.new( register_time )
-
-      evernoteHost = "www.evernote.com"
-      userStoreUrl = "https://#{evernoteHost}/edam/user"
-      userStoreTransport = Thrift::HTTPClientTransport.new(userStoreUrl)
-      userStoreProtocol = Thrift::BinaryProtocol.new(userStoreTransport)
-      @userStore = Evernote::EDAM::UserStore::UserStore::Client.new(userStoreProtocol)
-
-      versionOK = @userStore.checkVersion("Evernote EDAMTest (Ruby)",
-                                          Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR,
-                                          Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
-      puts "Is my Evernote API version up to date?  #{versionOK}"
-      puts
-      exit(1) unless versionOK
-
-      set_output_dest( get_output_filename_base )
-    end
-
-    def set_output_dest( fname )
-      if fname
-        fname_txt = fname + ".txt"
-        fname_csv = fname + ".csv"
-        @output = File.open( fname_txt , "w" , { :encoding => 'UTF-8' } )
-        @output_csv = CSV.open( fname_csv , "w" , { :encoding => 'UTF-8' } )
-      else
-        @output = STDOUT
-      end
-    end
-
-    def get_output_filename_base
-      Time.now.strftime("ennblist-%Y-%m-%d-%H-%M-%S")
-    end
-
-    def putsx( str )
-      @output.puts( str )
-    end
-
-    def connect
-      # Get the URL used to interact with the contents of the user's account
-      # When your application authenticates using OAuth, the NoteStore URL will
-      # be returned along with the auth token in the final OAuth request.
-      # In that case, you don't need to make this call.
-      #noteStoreUrl = userStore.getNoteStoreUrl(authToken)
-      noteStoreUrl = "https://www.evernote.com/shard/s18/notestore"
-      
-      noteStoreTransport = Thrift::HTTPClientTransport.new(noteStoreUrl)
-      noteStoreProtocol = Thrift::BinaryProtocol.new(noteStoreTransport)
-      @noteStore = Evernote::EDAM::NoteStore::NoteStore::Client.new(noteStoreProtocol)
-    end
-
-    def list_notebooks
-      # List all of the notebooks in the user's account
-      filter = Evernote::EDAM::NoteStore::NoteFilter.new
-
-      begin
-        notebooks = @noteStore.listNotebooks(@authToken)
-      rescue => ex
-        puts "Can't call listNotebooks"
-        exit
-      end
-
-      puts "Found #{notebooks.size} notebooks:"
-      memo = notebooks.inject({:defaultNotebook => nil , :nbinfo => []}) do |memo , notebook|
-        notebook_name = ( notebook.name == nil ? "" : notebook.name )
-        stack_name = ( notebook.stack == nil ? "" : notebook.stack )
-
-        filter.notebookGuid = notebook.guid
-
-        ret = nil
-        begin
-          ret = @noteStore.findNoteCounts(@authToken , filter , false )
-        rescue => ex
-          puts "Can't call findNoteCounts with #{notebook_name}"
-        end
-
-        if ret
-          if ret.notebookCounts
-            notebookCounts = ret.notebookCounts[notebook.guid]
-          else
-            notebookCounts = 0
-          end
-          tagcount = 0
-          if ret.tagCounts
-            tagcount = ret.tagCounts.size
-          end
-          nbinfo = @notebookinfo.new( notebook_name , stack_name , notebook.defaultNotebook , notebookCounts , tagcount )
-          # CSVファイルへ追加（自動的に出力）
-          register_notebook( nbinfo.stack , nbinfo )
-          # dbへの登録
-          db_add(  nbinfo.stack , nbinfo.name , nbinfo.count , nbinfo.tags.size )
-
-          #  p notebook
-          memo[:defaultNotebook] = nbinfo if nbinfo.defaultNotebook
-          memo[:nbinfo] << nbinfo
-        end
-
-        memo
-      end
-
-      @stack_hs.keys.sort.each do |k|
-        # TXTファイルに出力
-        putsx "#{k},#{@stack_hs[k]}"
-      end
-
-      pp memo[:defaultNotebook]
-    end
-
-    def register_notebook( stack , nbinfo )
-      @stack_hs[stack] ||= []
-      @stack_hs[stack] << nbinfo
-      @nbinfos[nbinfo.name] = nbinfo
-
-      @output_csv << [ stack , nbinfo.name , nbinfo.count ]
-    end
-  end
 end

data/lib/enop/dbutil.rb

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+require 'enop/dbutil/dbmgr'
+require 'enop/dbutil/enopmgr'

data/lib/enop/dbutil/dbmgr.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+require 'enop/dbutil/enopmgr'
+require 'forwardable'
+require 'pp'
+
+module Enop
+  module Dbutil
+    class DbMgr
+      extend Forwardable
+      
+      def_delegator( :@ennblistmgr , :add, :add)
+      
+      def initialize( register_time )
+        @ennblistmgr = EnopMgr.new( register_time )
+      end
+    end
+  end
+end
+

data/lib/{dbutil_enop.rb → enop/dbutil/enopmgr.rb}

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'active_record'
 require 'forwardable'
 require 'pp'
 
@@ -20,21 +21,9 @@ module Enop
     class Countdatetime < ActiveRecord::Base
     end
 
-    class DbMgr
-      extend Forwardable
-      
-      def_delegator( :@ennblistmgr , :add, :add)
-
-      def initialize( register_time )
-        @ennblistmgr = EnopMgr.new( register_time )
-      end
-
-    end
-    
     class EnopMgr
-      
       extend Forwardable
-
+      
       def initialize(register_time)
         @register_time = register_time
         @ct = Countdatetime.create( countdatetime: @register_time )
@@ -79,7 +68,7 @@ module Enop
         end
         ennblist
       end
-
+      
       def post_process( dir_id )
         h_ids = Currentennblist.pluck(:org_id)
         t_ids = @hs_by_id.keys
@@ -93,3 +82,5 @@ module Enop
     end
   end
 end
+
+

data/lib/enop/enop.rb

@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+require 'evernote-thrift'
+require 'csv'
+require 'pp'
+
+require 'forwardable'
+
+module Enop
+  class Enop
+    extend Forwardable
+    
+    def_delegator( :@dbmgr , :add , :db_add)
+
+    def initialize( authToken , kind, hs )
+
+      @stack_hs = {}
+      @nbinfos = {}
+      @notebookinfo = Struct.new("NotebookInfo", :name, :stack, :defaultNotebook, :count , :tags )
+
+      @authToken = authToken
+
+      @dbmgr = Arxutils::Store.init(kind , hs ){ | register_time |
+        Dbutil::DbMgr.new( register_time )
+      }
+
+      evernoteHost = "www.evernote.com"
+      userStoreUrl = "https://#{evernoteHost}/edam/user"
+      userStoreTransport = Thrift::HTTPClientTransport.new(userStoreUrl)
+      userStoreProtocol = Thrift::BinaryProtocol.new(userStoreTransport)
+      @userStore = Evernote::EDAM::UserStore::UserStore::Client.new(userStoreProtocol)
+
+      versionOK = @userStore.checkVersion("Evernote EDAMTest (Ruby)",
+                                          Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR,
+                                          Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
+      puts "Is my Evernote API version up to date?  #{versionOK}"
+      puts
+      exit(1) unless versionOK
+
+      set_output_dest( get_output_filename_base )
+    end
+
+    def set_output_dest( fname )
+      if fname
+        fname_txt = fname + ".txt"
+        fname_csv = fname + ".csv"
+        @output = File.open( fname_txt , "w" , { :encoding => 'UTF-8' } )
+        @output_csv = CSV.open( fname_csv , "w" , { :encoding => 'UTF-8' } )
+      else
+        @output = STDOUT
+      end
+    end
+
+    def get_output_filename_base
+      Time.now.strftime("ennblist-%Y-%m-%d-%H-%M-%S")
+    end
+
+    def putsx( str )
+      @output.puts( str )
+    end
+
+    def connect
+      # Get the URL used to interact with the contents of the user's account
+      # When your application authenticates using OAuth, the NoteStore URL will
+      # be returned along with the auth token in the final OAuth request.
+      # In that case, you don't need to make this call.
+      #noteStoreUrl = userStore.getNoteStoreUrl(authToken)
+      noteStoreUrl = "https://www.evernote.com/shard/s18/notestore"
+      
+      noteStoreTransport = Thrift::HTTPClientTransport.new(noteStoreUrl)
+      noteStoreProtocol = Thrift::BinaryProtocol.new(noteStoreTransport)
+      @noteStore = Evernote::EDAM::NoteStore::NoteStore::Client.new(noteStoreProtocol)
+    end
+
+    def list_notebooks
+      # List all of the notebooks in the user's account
+      filter = Evernote::EDAM::NoteStore::NoteFilter.new
+
+      begin
+        notebooks = @noteStore.listNotebooks(@authToken)
+      rescue => ex
+        puts "Can't call listNotebooks"
+        exit
+      end
+
+      puts "Found #{notebooks.size} notebooks:"
+      memo = notebooks.inject({:defaultNotebook => nil , :nbinfo => []}) do |memo , notebook|
+        notebook_name = ( notebook.name == nil ? "" : notebook.name )
+        stack_name = ( notebook.stack == nil ? "" : notebook.stack )
+
+        filter.notebookGuid = notebook.guid
+
+        ret = nil
+        begin
+          ret = @noteStore.findNoteCounts(@authToken , filter , false )
+        rescue => ex
+          puts "Can't call findNoteCounts with #{notebook_name}"
+        end
+
+        if ret
+          if ret.notebookCounts
+            notebookCounts = ret.notebookCounts[notebook.guid]
+          else
+            notebookCounts = 0
+          end
+          tagcount = 0
+          if ret.tagCounts
+            tagcount = ret.tagCounts.size
+          end
+          nbinfo = @notebookinfo.new( notebook_name , stack_name , notebook.defaultNotebook , notebookCounts , tagcount )
+          # CSVファイルへ追加（自動的に出力）
+          register_notebook( nbinfo.stack , nbinfo )
+          # dbへの登録
+          db_add(  nbinfo.stack , nbinfo.name , nbinfo.count , nbinfo.tags.size )
+
+          #  p notebook
+          memo[:defaultNotebook] = nbinfo if nbinfo.defaultNotebook
+          memo[:nbinfo] << nbinfo
+        end
+
+        memo
+      end
+
+      @stack_hs.keys.sort.each do |k|
+        # TXTファイルに出力
+        putsx "#{k},#{@stack_hs[k]}"
+      end
+
+      pp memo[:defaultNotebook]
+    end
+
+    def register_notebook( stack , nbinfo )
+      @stack_hs[stack] ||= []
+      @stack_hs[stack] << nbinfo
+      @nbinfos[nbinfo.name] = nbinfo
+
+      @output_csv << [ stack , nbinfo.name , nbinfo.count ]
+    end
+  end
+end
+

data/lib/enop/version.rb

@@ -1,3 +1,3 @@
 module Enop
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: enop
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - yasuo kominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evernote_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: arxutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: evernote operation.
@@ -117,9 +117,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -128,10 +128,11 @@ files:
 - enop.gemspec
 - exe/enop
 - exe/makemigrate
-- lib/dbutil_enop.rb
-- lib/en_oauth.rb
-- lib/ennb.rb
 - lib/enop.rb
+- lib/enop/dbutil.rb
+- lib/enop/dbutil/dbmgr.rb
+- lib/enop/dbutil/enopmgr.rb
+- lib/enop/enop.rb
 - lib/enop/version.rb
 - lib/evernote_config.rb
 homepage: ''
@@ -143,12 +144,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -158,3 +159,4 @@ signing_key:
 specification_version: 4
 summary: evernote operation.
 test_files: []
+has_rdoc: 

data/lib/en_oauth.rb

@@ -1,314 +0,0 @@
-##
-# Copyright 2012 Evernote Corporation. All rights reserved.
-##
-
-require 'sinatra'
-require 'sinatra/reloader'
-enable :sessions
-
-# Load our dependencies and configuration settings
-$LOAD_PATH.push(File.expand_path(File.dirname(__FILE__)))
-
-#set :port, 4569
-set :port, 4570
-
-require "evernote_config.rb"
-
-##
-# Verify that you have obtained an Evernote API key
-##
-before do
-  if OAUTH_CONSUMER_KEY.empty? || OAUTH_CONSUMER_SECRET.empty?
-    halt '<span style="color:red">Before using this sample code you must edit evernote_config.rb and replace OAUTH_CONSUMER_KEY and OAUTH_CONSUMER_SECRET with the values that you received from Evernote. If you do not have an API key, you can request one from <a href="http://dev.evernote.com/documentation/cloud/">dev.evernote.com/documentation/cloud/</a>.</span>'
-  end
-end
-
-helpers do
-  def auth_token
-    session[:access_token].token if session[:access_token]
-  end
-
-  def client
-    @client ||= EvernoteOAuth::Client.new(token: auth_token, consumer_key:OAUTH_CONSUMER_KEY, consumer_secret:OAUTH_CONSUMER_SECRET, sandbox: SANDBOX)
-  end
-
-  def user_store
-    @user_store ||= client.user_store
-  end
-
-  def note_store
-    @note_store ||= client.note_store
-  end
-
-  def en_user
-    user_store.getUser(auth_token)
-  end
-
-  def notebooks
-    @notebooks ||= note_store.listNotebooks(auth_token)
-  end
-
-  def total_note_count
-    filter = Evernote::EDAM::NoteStore::NoteFilter.new
-    counts = note_store.findNoteCounts(auth_token, filter, false)
-    notebooks.inject(0) do |total_count, notebook|
-      total_count + (counts.notebookCounts[notebook.guid] || 0)
-    end
-  end
-
-  def notebooks_hash
-    @notebooks_hash ||= {}
-    if @notebooks_hash.size != notebooks.size
-      notebooks.each do |x|
-        @notebooks_hash[x.name] = x
-      end
-    end
-    @notebooks_hash
-  end
-
-  def notes(guid)
-    filter = Evernote::EDAM::NoteStore::NoteFilter.new
-#    filter.notebookGuid = @notebook.guid
-    filter.notebookGuid = guid
-    @found_n = note_store.findNotes(auth_token, filter, 0 , 100 )
-#    @found_notes = @found_n.notes
-    @found_n.notes
-  end
-end
-
-##
-# Index page
-##
-get '/' do
-  erb :index
-end
-
-##
-# Reset the session
-##
-get '/reset' do
-  session.clear
-  redirect '/'
-end
-
-##
-# Obtain temporary credentials
-##
-get '/requesttoken' do
-  callback_url = request.url.chomp("requesttoken").concat("callback")
-  begin
-    session[:request_token] = client.request_token(:oauth_callback => callback_url)
-    redirect '/authorize'
-  rescue => e
-    @last_error = "3 Error obtaining temporary credentials: #{e.message}"
-    erb :error
-  end
-end
-
-##
-# Redirect the user to Evernote for authoriation
-##
-get '/authorize' do
-  if session[:request_token]
-    redirect session[:request_token].authorize_url
-  else
-    # You shouldn't be invoking this if you don't have a request token
-    @last_error = "Request token not set."
-    erb :error
-  end
-end
-
-##
-# Receive callback from the Evernote authorization page
-##
-get '/callback' do
-  unless params['oauth_verifier'] || session['request_token']
-    @last_error = "Content owner did not authorize the temporary credentials"
-    halt erb :error
-  end
-  session[:oauth_verifier] = params['oauth_verifier']
-  begin
-    session[:access_token] = session[:request_token].get_access_token(:oauth_verifier => session[:oauth_verifier])
-    redirect '/list'
-  rescue => e
-    @last_error = '2 Error extracting access token'
-    erb :error
-  end
-end
-
-
-##
-# Access the user's Evernote account and display account data
-##
-get '/list' do
-  begin
-    # Get notebooks
-    session[:notebooks] = notebooks.collect{ |notebook|
-      [ notebook.name , notebook.guid ]
-    }
-#    session[:notebooks] = notebooks.map(&:name)
-    # Get username
-    session[:username] = en_user.username
-    # Get total note count
-    session[:total_notes] = total_note_count
-    erb :index
-  rescue => e
-#    @last_error = "Error listing notebooks: #{e.message}"
-    @last_error = "1 Error listing notebooks: #{e}"
-    erb :error
-  end
-end
-
-##
-# 
-##
-get '/notebook/:name/:guid' do
-  begin
-    session[:notebook_name] = params[:name]
-    session[:notebook_guid] = params[:guid]
-
-#    @notebook = notebooks_hash[ params[:name] ]
-    @found_notes = notes( params[:guid] )
-
-    erb :notes
-  rescue => e
-    @last_error = "0 Error listing notebook: #{e.message}"
-    erb :error
-  end
-end
-
-get '/create_note/:name/:guid' do
-  begin
-    ENML_HEADER = <<HEADER
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
-HEADER
-
-    note_content = <<CONTENT
-#{ENML_HEADER}
-<en-note>Hello, my Evernote (from Ruby)!</en-note>
-CONTENT
-
-    note = Evernote::EDAM::Type::Note.new
-    note.title = "Note Title"
-    note.notebookGuid = params[:guid]
-    note.content = note_content
-    note_store.createNote( auth_token , note)
-    @found_notes = notes(session[:notebook_guid])
-
-    erb :notes
-  rescue => e
-    @last_error = "0 Error listing notebook: #{e.message}"
-    erb :error
-  end
-end
-
-
-__END__
-
-@@ index
-<html>
-<head>
-  <title>Evernote Ruby Example App</title>
-</head>
-<body>
-  <a href="/requesttoken">Click here</a> to authenticate this application using OAuth.
-  <% if session[:notebooks] %>
-  <hr />
-  <h3>The current user is <%= session[:username] %> and there are <%= session[:total_notes] %> notes in their account</h3>
-  <br />
-  <h3>Here are the notebooks in this account:</h3>
-  <ul>
-    <% session[:notebooks].each do |notebook| %>
-<% p session[:notebooks] %>
-    <li><a href="/notebook/<%= notebook[0] %>/<%= notebook[1] %>"><%= notebook[0] %></a></li>
-    <% end %>
-  </ul>
-  <% end %>
-</body>
-</html>
-
-@@ error 
-<html>
-<head>
-  <title>Evernote Ruby Example App &mdash; Error</title>
-</head>
-<body>
-  <p>An error occurred: <%= @last_error %></p>
-  <p>Please <a href="/reset">start over</a>.</p>
-</body>
-</html>
-
-@@ notebook
-<html>
-<head>
-</head>
-<body>
-    <table>
-    <% @found_notes.collect do |x| %>
-<tr>
-<td>
-<%= x.guid %>
-</td>
-<td>
-<%= x.title %>
-</td>
-</tr>
-    <% end %>
-    </table>
-<form action="/create_note" method="get">
-<input type="text" name="val" value="1">
-<input type="submit" value="Create Note">
-</form>
-</body>
-</html>
-
-@@ notes
-<html>
-<head>
-</head>
-<body>
-    <table>
-    <% @found_notes.collect do |x| %>
-<tr>
-<td>
-<%= x.guid %>
-</td>
-<td>
-<%= x.title %>
-</td>
-</tr>
-    <% end %>
-    </table>
-<form action="/create_note/<%= session[:notebook_name] %>/<%= session[:notebook_guid] %>" method="get">
-<input type="text" name="val" value="1">
-<input type="submit" value="Create Note">
-</form>
-</body>
-</html>
-
-@@ notebook1
-<html>
-<head>
-</head>
-<body>
-Notebook<p>
-    <%= p @notebook.class %><p>
-    <%= p @found_n.class %><p>
-    <%= p @found_notes.class %><p>
-  <ul>
-    <% p @found_notes; @found_notes.each do |note| %>
-    <li><a href="/note/<%= note.name %>/<%= note.guid %>"><%= note.name %></li>
-    <% end %>
-  </ul>
-</body>
-</html>
-
-@@ note
-<html>
-<head>
-</head>
-<body>
-
-</body>
-</html>

data/lib/ennb.rb

@@ -1,149 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'evernote-thrift'
-require 'csv'
-require 'pp'
-
-require 'forwardable'
-require 'dbutil_base'
-require 'dbutil_ennblist'
-
-class Ennb
-  extend Forwardable
-  
-  def_delegator( :@dbmgr , :add , :db_add)
-
-  def initialize
-    @sqlite3yaml = 'config/sqlite3.yaml'
-    @databaselog = 'db/database.log'
-
-    @stack_hs = {}
-    @nbinfos = {}
-    @notebookinfo = Struct.new("NotebookInfo", :name, :stack, :defaultNotebook, :count , :tags )
-
-    @authToken = "S=s18:U=1f38cb:E=15110796cd9:C=149b8c83d38:P=1cd:A=en-devtoken:V=2:H=970049a2b990ad5e0f58252a626539b0"
-
-    evernoteHost = "www.evernote.com"
-    userStoreUrl = "https://#{evernoteHost}/edam/user"
-    userStoreTransport = Thrift::HTTPClientTransport.new(userStoreUrl)
-    userStoreProtocol = Thrift::BinaryProtocol.new(userStoreTransport)
-    @userStore = Evernote::EDAM::UserStore::UserStore::Client.new(userStoreProtocol)
-
-    versionOK = @userStore.checkVersion("Evernote EDAMTest (Ruby)",
-				   Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR,
-				   Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
-    puts "Is my Evernote API version up to date?  #{versionOK}"
-    puts
-    exit(1) unless versionOK
-
-    set_output_dest( get_output_filename_base )
-
-    dbx
-  end
-
-  def dbx
-    @dbmgr = Dbutil::DbMgr.init( @sqlite3yaml , @databaselog )
-  end
-
-  def set_output_dest( fname )
-    if fname
-      fname_txt = fname + ".txt"
-      fname_csv = fname + ".csv"
-      @output = File.open( fname_txt , "w" , { :encoding => 'UTF-8' } )
-      @output_csv = CSV.open( fname_csv , "w" , { :encoding => 'UTF-8' } )
-    else
-      @output = STDOUT
-    end
-  end
-
-  def get_output_filename_base
-    Time.now.strftime("ennblist-%Y-%m-%d-%H-%M-%S")
-  end
-
-  def putsx( str )
-   @output.puts( str )
-  end
-
-  def connect
-    # Get the URL used to interact with the contents of the user's account
-    # When your application authenticates using OAuth, the NoteStore URL will
-    # be returned along with the auth token in the final OAuth request.
-    # In that case, you don't need to make this call.
-    #noteStoreUrl = userStore.getNoteStoreUrl(authToken)
-    noteStoreUrl = "https://www.evernote.com/shard/s18/notestore"
-    
-    noteStoreTransport = Thrift::HTTPClientTransport.new(noteStoreUrl)
-    noteStoreProtocol = Thrift::BinaryProtocol.new(noteStoreTransport)
-    @noteStore = Evernote::EDAM::NoteStore::NoteStore::Client.new(noteStoreProtocol)
-  end
-
-  def list_notebooks
-    # List all of the notebooks in the user's account
-    filter = Evernote::EDAM::NoteStore::NoteFilter.new
-
-    begin
-      notebooks = @noteStore.listNotebooks(@authToken)
-    rescue => ex
-      puts "Can't call listNotebooks"
-      exit
-    end
-
-    puts "Found #{notebooks.size} notebooks:"
-    memo = notebooks.inject({:defaultNotebook => nil , :nbinfo => []}) do |memo , notebook|
-      notebook_name = ( notebook.name == nil ? "" : notebook.name )
-      stack_name = ( notebook.stack == nil ? "" : notebook.stack )
-
-      filter.notebookGuid = notebook.guid
-
-      ret = nil
-      begin
-        ret = @noteStore.findNoteCounts(@authToken , filter , false )
-      rescue => ex
-        puts "Can't call findNoteCounts with #{notebook_name}"
-      end
-
-      if ret
-        if ret.notebookCounts
-          notebookCounts = ret.notebookCounts[notebook.guid]
-        else
-          notebookCounts = 0
-        end
-        tagcount = 0
-        if ret.tagCounts
-          tagcount = ret.tagCounts.size
-        end
-        nbinfo = @notebookinfo.new( notebook_name , stack_name , notebook.defaultNotebook , notebookCounts , tagcount )
-        # CSVファイルへ追加（自動的に出力）
-        register_notebook( nbinfo.stack , nbinfo )
-        # dbへの登録
-        db_add(  nbinfo.stack , nbinfo.name , nbinfo.count , nbinfo.tags.size )
-
-        #  p notebook
-        memo[:defaultNotebook] = nbinfo if nbinfo.defaultNotebook
-        memo[:nbinfo] << nbinfo
-      end
-
-      memo
-    end
-
-    @stack_hs.keys.sort.each do |k|
-      # TXTファイルに出力
-      putsx "#{k},#{@stack_hs[k]}"
-    end
-
-    pp memo[:defaultNotebook]
-  end
-
-  def register_notebook( stack , nbinfo )
-    @stack_hs[stack] ||= []
-    @stack_hs[stack] << nbinfo
-    @nbinfos[nbinfo.name] = nbinfo
-
-    @output_csv << [ stack , nbinfo.name , nbinfo.count ]
-  end
-end
-
-ennb = Ennb.new
-ennb.connect
-ennb.list_notebooks
-